This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9985

softstrip: fix a reference to an undefined variable
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGcd9154343160: softstrip: fix a reference to an undefined variable
Summary

backupfile wasn't defined if no backup was requested. Let's set it
to None by default, which matches what regular repair.strip()
does.

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

martinvonz created this revision.Feb 11 2021, 5:37 PM
pulkit accepted this revision.Feb 14 2021, 10:14 AM
This revision is now accepted and ready to land.Feb 14 2021, 10:14 AM
martinvonz added a commit: rHGcd9154343160: softstrip: fix a reference to an undefined variable.Feb 14 2021, 11:05 AM
Closed by commit rHGcd9154343160: softstrip: fix a reference to an undefined variable (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/repair.py (1 line)

Diff 25620

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
backupfile = None
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) 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]