# HG changeset patch # User Martin von Zweigbergk <martinvonz@google.com> # Date 1498686834 25200 # Wed Jun 28 14:53:54 2017 -0700 # Node ID 5d29c55414b3594a572ea0de94b09b55de1c26b8 # Parent 5ebf39ae10ed135cf96dd65c929abd6cadbae275 rebase: always pass destination as revnum to _handleskippingobsolete() We were passing it as a revision number in one place and as a context in another. It worked because the only use was in "repo[dest].rev()", but it was confusing. By always passing a revision number, we can also remove that unnecessary lookup. diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -317,7 +317,7 @@ hint=_('use --keep to keep original changesets')) obsrevs = _filterobsoleterevs(self.repo, set(rebaseset)) - self._handleskippingobsolete(rebaseset, obsrevs, dest) + self._handleskippingobsolete(rebaseset, obsrevs, dest.rev()) result = buildstate(self.repo, dest, rebaseset, self.collapsef, self.obsoletenotrebased) @@ -1464,7 +1464,7 @@ if allsuccessors: # Look for successors of obsolete nodes to be rebased among # the ancestors of dest - ancs = cl.ancestors([repo[dest].rev()], + ancs = cl.ancestors([dest], stoprev=min(allsuccessors), inclusive=True) for s in allsuccessors: