This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9984

softstrip: move _bookmarkmovements() call to where it's needed
ClosedPublic

Authored by martinvonz on Feb 11 2021, 5:37 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGbeaa233e81f7: softstrip: move _bookmarkmovements() call to where it's needed
Summary

The call to _bookmarkmovements() is unrelated to the backup, so
let's move it after.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/repair.py (2 lines)

Diff 25619

mercurial/repair.py

def softstrip(ui, repo, nodelist, backup=True, topic=b'backup'): def softstrip(ui, repo, nodelist, backup=True, topic=b'backup'):
"""perform a "soft" strip using the archived phase""" """perform a "soft" strip using the archived phase"""
tostrip = [c.node() for c in repo.set(b'sort(%ln::)', nodelist)] tostrip = [c.node() for c in repo.set(b'sort(%ln::)', nodelist)]
if not tostrip: if not tostrip:
return None return None
newbmtarget, updatebm = _bookmarkmovements(repo, tostrip)
if backup: if backup:
node = tostrip[0] node = tostrip[0]
backupfile = _createstripbackup(repo, tostrip, node, topic) backupfile = _createstripbackup(repo, tostrip, node, topic)
newbmtarget, updatebm = _bookmarkmovements(repo, tostrip)
with repo.transaction(b'strip') as tr: with repo.transaction(b'strip') as tr:
phases.retractboundary(repo, tr, phases.archived, tostrip) phases.retractboundary(repo, tr, phases.archived, tostrip)
bmchanges = [(m, repo[newbmtarget].node()) for m in updatebm] bmchanges = [(m, repo[newbmtarget].node()) for m in updatebm]
repo._bookmarks.applychanges(repo, tr, bmchanges) repo._bookmarks.applychanges(repo, tr, bmchanges)
return backupfile return backupfile
def _bookmarkmovements(repo, tostrip): def _bookmarkmovements(repo, tostrip):