equal
deleted
inserted
replaced
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') |