Mercurial > hg

comparison hgext/shelve.py @ 41008:e5d37558098a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
shelve: drop unnecessary backup of narrowspec 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. Differential Revision: https://phab.mercurial-scm.org/D5457
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 05 Dec 2018 15:37:03 -0800
parents a06dc62f1c82
children 0bd56c291359
comparison
equal deleted inserted replaced
41007:a06dc62f1c82 41008:e5d37558098a
39 exchange, 39 exchange,
40 hg, 40 hg,
41 lock as lockmod, 41 lock as lockmod,
42 mdiff, 42 mdiff,
43 merge, 43 merge,
44 narrowspec,
45 node as nodemod, 44 node as nodemod,
46 patch, 45 patch,
47 phases, 46 phases,
48 pycompat, 47 pycompat,
49 registrar, 48 registrar,
325 324
326 def _aborttransaction(repo, tr): 325 def _aborttransaction(repo, tr):
327 '''Abort current transaction for shelve/unshelve, but keep dirstate 326 '''Abort current transaction for shelve/unshelve, but keep dirstate
328 ''' 327 '''
329 dirstatebackupname = 'dirstate.shelve' 328 dirstatebackupname = 'dirstate.shelve'
330 narrowspecbackupname = 'narrowspec.shelve'
331 repo.dirstate.savebackup(tr, dirstatebackupname) 329 repo.dirstate.savebackup(tr, dirstatebackupname)
332 narrowspec.savebackup(repo, narrowspecbackupname)
333 tr.abort() 330 tr.abort()
334 narrowspec.restorebackup(repo, narrowspecbackupname)
335 repo.dirstate.restorebackup(None, dirstatebackupname) 331 repo.dirstate.restorebackup(None, dirstatebackupname)
336 332
337 def getshelvename(repo, parent, opts): 333 def getshelvename(repo, parent, opts):
338 """Decide on the name this shelve is going to have""" 334 """Decide on the name this shelve is going to have"""
339 def gennames(): 335 def gennames():