[PATCH 2 of 2 v2] convert: keep converted hg parents that are outside convert.hg.revs (BC)

Yuya Nishihara yuya at tcha.org
Wed Apr 13 11:49:26 EDT 2016


On Wed, 13 Apr 2016 00:18:07 +0200, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1460499381 -7200
> #      Wed Apr 13 00:16:21 2016 +0200
> # Node ID f7c245a1e550915fca416e76abff626af85e4291
> # Parent  637869e31c974eecea10853fadac216107c434e1
> convert: keep converted hg parents that are outside convert.hg.revs (BC)

Yeah, this looks much better than V1, thanks.

> -        parents = [p.hex() for p in self._parents(ctx)]
> +        _parents = self._parents(ctx)
> +        parents = [p.hex() for p in _parents]
> +        optparents = [p.hex() for p in ctx.parents() if p not in _parents]

One nit. ctx.parents() may contain null revision if p1 is null. Perhaps we'd
better filter out it like self._parents().

If you agree, I'll change s/if p not in _parents/if p and p not in _parents/
in flight.


More information about the Mercurial-devel mailing list