Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 41372:390ef056081b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: slightly simplify check for removed parents in _rollback() Differential Revision: https://phab.mercurial-scm.org/D5692
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 24 Jan 2019 16:25:19 -0800
parents 876494fd967d
children 13a6dd952ffe
comparison
equal deleted inserted replaced
41371:608c15f76f50 41372:390ef056081b
2009 self.vfs.rename('undo.bookmarks', 'bookmarks', checkambig=True) 2009 self.vfs.rename('undo.bookmarks', 'bookmarks', checkambig=True)
2010 if self.svfs.exists('undo.phaseroots'): 2010 if self.svfs.exists('undo.phaseroots'):
2011 self.svfs.rename('undo.phaseroots', 'phaseroots', checkambig=True) 2011 self.svfs.rename('undo.phaseroots', 'phaseroots', checkambig=True)
2012 self.invalidate() 2012 self.invalidate()
2013 2013
2014 parentgone = (parents[0] not in self.changelog.nodemap or 2014 parentgone = any(p not in self.changelog.nodemap for p in parents)
2015 parents[1] not in self.changelog.nodemap)
2016 if parentgone: 2015 if parentgone:
2017 # prevent dirstateguard from overwriting already restored one 2016 # prevent dirstateguard from overwriting already restored one
2018 dsguard.close() 2017 dsguard.close()
2019 2018
2020 narrowspec.restorebackup(self, 'undo.narrowspec') 2019 narrowspec.restorebackup(self, 'undo.narrowspec')