[PATCH STABLE v2] log: map None rev to wdirrev when filtering revisions with --line-range

Yuya Nishihara yuya at tcha.org
Sat Nov 30 14:42:16 UTC 2019


On Sat, 30 Nov 2019 12:16:16 +0100, Denis Laxalde wrote:
> # HG changeset patch
> # User Denis Laxalde <denis at laxalde.org>
> # Date 1575060193 -3600
> #      Fri Nov 29 21:43:13 2019 +0100
> # Branch stable
> # Node ID 411d301683935cb02d1c15adbe1d7ef58789da76
> # Parent  969e8a52e3842d19387d02e91d6a19a993950ac0
> log: map None rev to wdirrev when filtering revisions with --line-range

> @@ -940,7 +945,7 @@ def getlinerangerevs(repo, userrevs, opt
>          return hunks
>  
>      def hunksfilter(ctx):
> -        fctxlineranges = linerangesbyrev.get(ctx.rev())
> +        fctxlineranges = linerangesbyrev.get(mapwdir(ctx.rev()))
>          if fctxlineranges is None:
>              return nofilterhunksfn
>  
> @@ -960,7 +965,7 @@ def getlinerangerevs(repo, userrevs, opt
>          return filterfn
>  
>      def filematcher(ctx):
> -        files = list(linerangesbyrev.get(ctx.rev(), []))
> +        files = list(linerangesbyrev.get(mapwdir(ctx.rev()), []))

For ctx.rev(), scmutil.intrev(ctx) can be used instead.



More information about the Mercurial-devel mailing list