This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5457

shelve: drop unnecessary backup of narrowspec
ClosedPublic

Authored by martinvonz on Dec 19 2018, 12:59 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe5d37558098a: shelve: drop unnecessary backup of narrowspec
Summary

I mechanically added the backup code everywhere in ad24b581e4d9
(narrow: call narrowspec.{save,restore,clear}backup directly,
2018-08-03), but I can't think of a reason it would be needed in the
shelve code, so let's drop it.

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.Dec 19 2018, 12:59 PM
Closed by commit rHGe5d37558098a: shelve: drop unnecessary backup of narrowspec (authored by martinvonz). · Explain WhyDec 20 2018, 7:02 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/shelve.py (4 lines)

Diff 12917

hgext/shelve.py

cmdutil, cmdutil,
discovery, discovery,
error, error,
exchange, exchange,
hg, hg,
lock as lockmod, lock as lockmod,
mdiff, mdiff,
merge, merge,
narrowspec,
node as nodemod, node as nodemod,
patch, patch,
phases, phases,
pycompat, pycompat,
registrar, registrar,
repair, repair,
scmutil, scmutil,
templatefilters, templatefilters,
def _restoreactivebookmark(repo, mark): def _restoreactivebookmark(repo, mark):
if mark: if mark:
bookmarks.activate(repo, mark) bookmarks.activate(repo, mark)
def _aborttransaction(repo, tr): def _aborttransaction(repo, tr):
'''Abort current transaction for shelve/unshelve, but keep dirstate '''Abort current transaction for shelve/unshelve, but keep dirstate
''' '''
dirstatebackupname = 'dirstate.shelve' dirstatebackupname = 'dirstate.shelve'
narrowspecbackupname = 'narrowspec.shelve'
repo.dirstate.savebackup(tr, dirstatebackupname) repo.dirstate.savebackup(tr, dirstatebackupname)
narrowspec.savebackup(repo, narrowspecbackupname)
tr.abort() tr.abort()
narrowspec.restorebackup(repo, narrowspecbackupname)
repo.dirstate.restorebackup(None, dirstatebackupname) repo.dirstate.restorebackup(None, dirstatebackupname)
def getshelvename(repo, parent, opts): def getshelvename(repo, parent, opts):
"""Decide on the name this shelve is going to have""" """Decide on the name this shelve is going to have"""
def gennames(): def gennames():
yield label yield label
for i in itertools.count(1): for i in itertools.count(1):
yield '%s-%02d' % (label, i) yield '%s-%02d' % (label, i)