[PATCH 02 of 11] context: also return ancestor's line range in blockancestors

Yuya Nishihara yuya at tcha.org
Thu Feb 23 09:49:22 EST 2017


On Wed, 22 Feb 2017 16:09:56 +0100, Denis Laxalde wrote:
> # HG changeset patch
> # User Denis Laxalde <denis.laxalde at logilab.fr>
> # Date 1484583276 -3600
> #      Mon Jan 16 17:14:36 2017 +0100
> # Node ID af5922c52aef6f494cb7c7e9914f1ba987916ea2
> # Parent  a65cc4f311cd1aab4502811e865a67ef7205c010
> # EXP-Topic linerange-log/hgweb-filelog
> context: also return ancestor's line range in blockancestors

> diff --git a/mercurial/revset.py b/mercurial/revset.py
> --- a/mercurial/revset.py
> +++ b/mercurial/revset.py
> @@ -1145,7 +1145,7 @@ def followlines(repo, subset, x):
>      fromline -= 1
>  
>      fctx = repo[rev].filectx(fname)
> -    revs = (c.rev() for c in context.blockancestors(fctx, fromline, toline))
> +    revs = (c.rev() for c, _ in context.blockancestors(fctx, fromline, toline))

It shadows the global _() function. Changed to 'for c, _linerange'.


More information about the Mercurial-devel mailing list