D565: rebase: remove an unnecessary adjustdest in clearrebased

quark (Jun Wu) phabricator at mercurial-scm.org
Wed Aug 30 02:02:19 EDT 2017


This revision was automatically updated to reflect the committed changes.
Closed by commit rHG06b0cc2588de: rebase: remove an unnecessary adjustdest in clearrebased (authored by quark).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D565?vs=1420&id=1428

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
@@ -1497,7 +1497,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: martinvonz, mercurial-devel


More information about the Mercurial-devel mailing list