git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] install-webdoc: quell diff output on stdout

From
Michael J Gruber <git@drmicha.warpmail.net>
Date
Sep 2, 2010, 07:29 UTC
Message-ID
<4C7F5267.5030708@drmicha.warpmail.net>
In-Reply-To
<7vzkw15t50.fsf@alter.siamese.dyndns.org>
Junio C Hamano venit, vidit, dixit 01.09.2010 18:24:
Show 13 quoted lines
> Michael J Gruber <git@drmicha.warpmail.net> writes:
> 
>> When installing html-doc, install-webdoc.sh compares the installed html
>> with the version to be installed using diff. Currently, the diff output
>> fills up stdout.
> 
> As I've been using this output as the final sanity check on k.org
> environment, I personally do not want to lose the output from that
> particular diff.
> 
> When I push to the public repository, a hook is triggered to build and
> install the documentation, sending its progress to a log file, and I have
> a window open running "tail -f" on it.

Sorry, isn't that a somewhat crazy type of sanity check? You're getting the complete diff for the generated htmls flying by. Wouldn't the actual "install..." be sufficient, or maybe, a QUIET_DIFF variant which displays the command line? And not only sufficient, but actually easier to check visually as you seem to do?

[A more throrough check would be comparing the name-diff of Documentation/*.txt with that of the generated html.]

Show 34 quoted lines
> 
> Actually why don't we do the attached instead as the first step?
> 
> The timestamp that follows "Last updated " is formatted differently
> depending on the version of AsciiDoc.  Looking at 4604fe56 on "html"
> branch, you can see that AsciiDoc 7.0.2 used to give "02-Jul-2008 03:02:14
> UTC" but AsciiDoc 8.2.5 gave "2008-09-19 06:33:25 UTC".  We haven't been
> correctly filtering out phantom changes that result from only the build
> date for some time now, it seems.
> 
>     Side note:
> 
>     How can you find the above easily?  Here is one way, if you run git
>     with f506b8e (git log/diff: add -G<regexp> that greps in the patch
>     text, 2010-08-23) currently parked in 'pu':
> 
> 	git log -p -G"Last updated [0-9][0-9]-[A-Z][a-z][a-z]-" origin/html
> 
>  Documentation/install-webdoc.sh |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/Documentation/install-webdoc.sh b/Documentation/install-webdoc.sh
> index 34d02a2..37e67d1 100755
> --- a/Documentation/install-webdoc.sh
> +++ b/Documentation/install-webdoc.sh
> @@ -12,7 +12,7 @@ do
>  	then
>  		: did not match
>  	elif test -f "$T/$h" &&
> -	   $DIFF -u -I'Last updated [0-9][0-9]-[A-Z][a-z][a-z]-' "$T/$h" "$h"
> +		$DIFF -u -I'^Last updated ' "$T/$h" "$h"
>  	then
>  		:; # up to date
>  	else

I think that is the right fix for the problem you mentioned, which is a different one ;)

With your fix, the problem I'm after occurs less often, of course, maybe to the extent of not being a real problem any more.

Michael
Previous: Junio C HamanoNext: Junio C Hamano
Message 3 of 7 in “install-webdoc: quell diff output on stdout”
  1. install-webdoc: quell diff output on stdoutMichael J Gruber, Sep 1, 2010
  2. Junio C HamanoSep 1, 2010
  3. Michael J GruberSep 2, 2010
  4. Junio C HamanoSep 2, 2010
  5. [PATCHv2] install-webdoc: quell diff output on stdoutMichael J Gruber, Sep 6, 2010
  6. Junio C HamanoSep 6, 2010
  7. Michael J GruberSep 6, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.