D565: rebase: remove an unnecessary adjustdest in clearrebased
quark (Jun Wu)
phabricator at mercurial-scm.org
Wed Aug 30 01:40:34 UTC 2017
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
`rev` being "skipped" could currently be caused by moving `rev` does not
create a new commit. In this case, `state[rev]` is already changed to `p1`,
and is a sane destination for bookmark or working parent movement. Therefore
an additional destination adjustment is unnecessary.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D565
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -1514,7 +1514,7 @@
# Move bookmark of skipped nodes to destination. This cannot be handled
# by scmutil.cleanupnodes since it will treat rev as removed (no successor)
# and move bookmark backwards.
- bmchanges = [(name, tonode(max(adjustdest(repo, rev, destmap, state))))
+ bmchanges = [(name, tonode(state[rev]))
for rev in skipped
for name in repo.nodebookmarks(tonode(rev))]
if bmchanges:
To: quark, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list