[PATCH 2 of 2 STABLE] py3: fix 'log --line-range' with uncommitted changes in range

Yuya Nishihara yuya at tcha.org
Fri Nov 29 23:31:25 EST 2019


On Fri, 29 Nov 2019 21:59:19 +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 8e65df8a972333c0d30b03f5dee4ce802088d799
> # Parent  969e8a52e3842d19387d02e91d6a19a993950ac0
> py3: fix 'log --line-range' with uncommitted changes in range

> diff --git a/mercurial/logcmdutil.py b/mercurial/logcmdutil.py
> --- a/mercurial/logcmdutil.py
> +++ b/mercurial/logcmdutil.py
> @@ -930,7 +930,7 @@ def getlinerangerevs(repo, userrevs, opt
>          fctx = wctx.filectx(fname)
>          for fctx, linerange in dagop.blockancestors(fctx, fromline, toline):
>              rev = fctx.introrev()
> -            if rev not in userrevs:
> +            if rev is None or rev not in userrevs:
>                  continue

Mapping None to wdirrev seems more correct. Hopefully that will fix
-fr'wdir()' -L line-range.


More information about the Mercurial-devel mailing list