( )⚙ D2878 rebase: avoid defining two lists with the same contents

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2878

rebase: avoid defining two lists with the same contents
ClosedPublic

Authored by martinvonz on Mar 16 2018, 1:36 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGa046d6890761: rebase: avoid defining two lists with the same contents
Summary

In abort(), there's "dstates" and "rebased" that are identical, which
they seem to have been since 0806823370d8 (rebase: properly calculate
descendant set when aborting (issue3332), 2012-03-22). Let's
de-duplicate. I don't know what "dstates" means, but "rebased" makes
sense (it's the list of rebased revisions), so let's pick that.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Mar 16 2018, 1:36 AM
yuja accepted this revision.Mar 19 2018, 10:09 AM
This revision is now accepted and ready to land.Mar 19 2018, 10:09 AM
Closed by commit rHGa046d6890761: rebase: avoid defining two lists with the same contents (authored by martinvonz). · Explain WhyMar 19 2018, 10:15 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (14 lines)

Diff 7075

hgext/rebase.py

'''Restore the repository to its original state. Additional args: '''Restore the repository to its original state. Additional args:
activebookmark: the name of the bookmark that should be active after the activebookmark: the name of the bookmark that should be active after the
restore''' restore'''
try: try:
# If the first commits in the rebased set get skipped during the rebase, # If the first commits in the rebased set get skipped during the rebase,
# their values within the state mapping will be the dest rev id. The # their values within the state mapping will be the dest rev id. The
# dstates list must must not contain the dest rev (issue4896) # rebased list must must not contain the dest rev (issue4896)
dstates = [s for r, s in state.items() if s >= 0 and s != destmap[r]] rebased = [s for r, s in state.items() if s >= 0 and s != destmap[r]]
immutable = [d for d in dstates if not repo[d].mutable()] immutable = [d for d in rebased if not repo[d].mutable()]
cleanup = True cleanup = True
if immutable: if immutable:
repo.ui.warn(_("warning: can't clean up public changesets %s\n") repo.ui.warn(_("warning: can't clean up public changesets %s\n")
% ', '.join(str(repo[r]) for r in immutable), % ', '.join(str(repo[r]) for r in immutable),
hint=_("see 'hg help phases' for details")) hint=_("see 'hg help phases' for details"))
cleanup = False cleanup = False
descendants = set() descendants = set()
if dstates: if rebased:
descendants = set(repo.changelog.descendants(dstates)) descendants = set(repo.changelog.descendants(rebased))
if descendants - set(dstates): if descendants - set(rebased):
repo.ui.warn(_("warning: new changesets detected on destination " repo.ui.warn(_("warning: new changesets detected on destination "
"branch, can't strip\n")) "branch, can't strip\n"))
cleanup = False cleanup = False
if cleanup: if cleanup:
shouldupdate = False shouldupdate = False
rebased = [s for r, s in state.items()
if s >= 0 and s != destmap[r]]
if rebased: if rebased:
strippoints = [ strippoints = [
c.node() for c in repo.set('roots(%ld)', rebased)] c.node() for c in repo.set('roots(%ld)', rebased)]
updateifonnodes = set(rebased) updateifonnodes = set(rebased)
updateifonnodes.update(destmap.values()) updateifonnodes.update(destmap.values())
updateifonnodes.add(originalwd) updateifonnodes.add(originalwd)
shouldupdate = repo['.'].rev() in updateifonnodes shouldupdate = repo['.'].rev() in updateifonnodes