[PATCH] cmdutil: pass node instead of ctx to diffordiffstat

Sean Farley sean at farley.io
Mon Jan 4 18:33:51 CST 2016


Durham Goode <durham at fb.com> writes:

> # HG changeset patch
> # User Durham Goode <durham at fb.com>
> # Date 1451952844 28800
> #      Mon Jan 04 16:14:04 2016 -0800
> # Node ID ab7ae1e47b6d8418918874d98e0bf4cf11acf13f
> # Parent  b8405d739149cdd6d8d9bd5e3dd2ad8487b1f09a
> cmdutil: pass node instead of ctx to diffordiffstat
>
> 93bcc73df8d5 changed showpatch to use ctx's more, but it accidentally passed
> prev as a context and node as a binary string, when both should be passed as
> binary strings (since diffordiffstat tries to resolve them via repo[X]).
>
> This affected hggit since the existing ctx belongs to the git overlay, but the
> resolved context (from the repo[X] resolution) should belong to the main repo.
> This broke a test because it tried to look in the git repo for data that didn't
> exist.

Ah, thanks for fixing that! I had a debugger window opened just now
looking into it. Much obliged.


More information about the Mercurial-devel mailing list