This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5389

shelve: drop unnecessary backup of dirstate for phase-based case
ClosedPublic

Authored by martinvonz on Dec 5 2018, 6:44 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd7e44da4dc70: shelve: drop unnecessary backup of dirstate for phase-based case
Summary

Regular shelve has a hack using an uncommitted transaction that's then
aborted at the end of the operation. It preserves the dirstate across
the abort, however, by saving a backup copy of it. Phase-based shelve
instead commits the transaction, so the hack shouldn't be necessary
there.

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
Mhgext/shelve.py (3 lines)

Diff 12749

hgext/shelve.py

s = repo.status(match=scmutil.match(repo[None], pats, opts), s = repo.status(match=scmutil.match(repo[None], pats, opts),
unknown=True) unknown=True)
if s.unknown: if s.unknown:
extra['shelve_unknown'] = '\0'.join(s.unknown) extra['shelve_unknown'] = '\0'.join(s.unknown)
repo[None].add(s.unknown) repo[None].add(s.unknown)
def _finishshelve(repo): def _finishshelve(repo):
if phases.supportinternal(repo): if phases.supportinternal(repo):
backupname = 'dirstate.shelve'
tr = repo.currenttransaction() tr = repo.currenttransaction()
repo.dirstate.savebackup(tr, backupname)
tr.close() tr.close()
repo.dirstate.restorebackup(None, backupname)
else: else:
_aborttransaction(repo) _aborttransaction(repo)
def createcmd(ui, repo, pats, opts): def createcmd(ui, repo, pats, opts):
"""subcommand that creates a new shelve""" """subcommand that creates a new shelve"""
with repo.wlock(): with repo.wlock():
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
return _docreatecmd(ui, repo, pats, opts) return _docreatecmd(ui, repo, pats, opts)