[PATCH 0 of 4] graphmod/graphlog refactoring; linear run suppression in glog

Peter Arrenbrecht peter.arrenbrecht at gmail.com
Thu May 14 12:46:44 CDT 2009


On Thu, May 14, 2009 at 7:15 PM, Martin Geisler <mg at lazybytes.net> wrote:
> Peter Arrenbrecht <peter.arrenbrecht at gmail.com> writes:
>
>> Refactoring of graphmod and graphlog to move some common code into
>> graphmod. Clearly separate basic changelog walks from later stages
>> like adding edge info. Make it possible to filter changelog walks. As
>> a first filter, add linear run collapsing (to get branch/merge
>> overview in glog).
>
> Cool feature! I guess the --collapse-linear option should be added to
> 'hg log' like the --graph option is?
>
> I'm getting some small chages to the graphs like this:
>
> ERROR: test-rebase-scenario-global output changed
> --- Expected output
> +++ Test output
> @@ -99,11 +99,11 @@
>  rebase completed
>  @    5: E
>  |\
> -| o  4: F
> +o |  4: F
>  | |
> -| o  3: D
> +o |  3: D
>  | |
> -o |  2: C
> +| o  2: C
>  |/
>  | o  1: B
>  |/
>
>
> and some bigger failures like this:
>
> ERROR: test-hgweb-empty output changed
> --- Expected output
> +++ Test output
> - [... lots of normal output ...]
> +500 Internal Server Error
> +
> +Internal Server Error200 Script output follows
>
>
> I can take a look at it later tonight, unless you beat me to it :-)

Argh, sorry. I thought just running test-glog would do. I probably
cannot look into it tonight, but sometime tomorrow.

I hope you did not apply the DEMO patch, right? That one's just to
show how one would go about integrating the collapser with hgweb.

-parren



More information about the Mercurial-devel mailing list