[PATCH 4 of 4 hyperblame] annotate: add a new experimental --skip option to skip revs

Yuya Nishihara yuya at tcha.org
Mon May 29 09:37:29 EDT 2017


On Sun, 28 May 2017 22:40:47 -0700, Martin von Zweigbergk via Mercurial-devel wrote:
> On Wed, May 24, 2017 at 7:39 PM, Siddharth Agarwal <sid0 at fb.com> wrote:
> > # HG changeset patch
> > # User Siddharth Agarwal <sid0 at fb.com>
> > # Date 1495679973 25200
> > #      Wed May 24 19:39:33 2017 -0700
> > # Node ID 0c6f6c4b027191c30d867fb4eb0005682ea90a76
> > # Parent  134dcc1222e4b992b4a60c44c9b9ed8d10422632
> > annotate: add a new experimental --skip option to skip revs

> > +--skip a modified line
> > +
> > +  $ hg annotate -nlf b --skip 6
> > +  0 a:1: a
> > +  1 a:2: z
> > +  1 a:3: a
> > +  3 b:4: b4
> > +  4 b:5: c
> > +  3 b:5: b5
> > +  7 b:7: d
> 
> This fails with --pure as follows. I haven't even tried to figure it out.
> 
> @@ -232,7 +232,7 @@
> 
>    $ hg annotate -nlf b --skip 6
>    0 a:1: a
> -  1 a:2: z
> +  0 a:1: z
>    1 a:3: a
>    3 b:4: b4
>    4 b:5: c

Perhaps this shows pure/cext bdiff incompatibility. Pure version uses Python
difflib.


More information about the Mercurial-devel mailing list