This is an archive of the discontinued Mercurial Phabricator instance.

Differential D565

rebase: remove an unnecessary adjustdest in clearrebased
ClosedPublic

Authored by quark on Aug 29 2017, 9:40 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG06b0cc2588de: rebase: remove an unnecessary adjustdest in clearrebased
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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

quark created this revision.Aug 29 2017, 9:40 PM
martinvonz added a subscriber: martinvonz.Aug 30 2017, 1:13 AM

For the record, my testing suggests that the call to adjustdest has been unnecessary ever since the function was introduced in commit 52f82e7d6a7e

Closed by commit rHG06b0cc2588de: rebase: remove an unnecessary adjustdest in clearrebased (authored by quark). · Explain WhyAug 30 2017, 2:02 AM
This revision was automatically updated to reflect the committed changes.
quark added a comment.Aug 30 2017, 3:38 PM

You're right. I didn't realize the old code has state[rev] set. I was avoiding depending on the old defineparents but that turned out to not matter in this case.

Revision Contents
Changeset List

Diff 1428

hgext/rebase.py

"""dispose of rebased revision at the end of the rebase """dispose of rebased revision at the end of the rebase
If `collapsedas` is not None, the rebase was a collapse whose result if the If `collapsedas` is not None, the rebase was a collapse whose result if the
`collapsedas` node.""" `collapsedas` node."""
tonode = repo.changelog.node tonode = repo.changelog.node
# Move bookmark of skipped nodes to destination. This cannot be handled # Move bookmark of skipped nodes to destination. This cannot be handled
# by scmutil.cleanupnodes since it will treat rev as removed (no successor) # by scmutil.cleanupnodes since it will treat rev as removed (no successor)
# and move bookmark backwards. # and move bookmark backwards.
bmchanges = [(name, tonode(max(adjustdest(repo, rev, destmap, state)))) bmchanges = [(name, tonode(state[rev]))
for rev in skipped for rev in skipped
for name in repo.nodebookmarks(tonode(rev))] for name in repo.nodebookmarks(tonode(rev))]
if bmchanges: if bmchanges:
with repo.transaction('rebase') as tr: with repo.transaction('rebase') as tr:
repo._bookmarks.applychanges(repo, tr, bmchanges) repo._bookmarks.applychanges(repo, tr, bmchanges)
mapping = {} mapping = {}
for rev, newrev in sorted(state.items()): for rev, newrev in sorted(state.items()):
if newrev >= 0 and newrev != rev: if newrev >= 0 and newrev != rev: