Mercurial > public > mercurial-scm > hg-stable
diff mercurial/localrepo.py @ 33440:ec306bc6915b
dirstate: update backup functions to take full backup filename
Update the dirstate functions so that the caller supplies the full backup
filename rather than just a prefix and suffix.
The localrepo code was already hard-coding the fact that the backup name must
be (exactly prefix + "dirstate" + suffix): it relied on this in _journalfiles()
and undofiles(). Making the caller responsible for specifying the full backup
name removes the need for the localrepo code to assume that dirstate._filename
is always "dirstate".
Differential Revision: https://phab.mercurial-scm.org/D68
| author | Adam Simpkins <simpkins@fb.com> |
|---|---|
| date | Wed, 12 Jul 2017 15:24:07 -0700 |
| parents | 0720e6265c8a |
| children | e44d54260c32 |
line wrap: on
line diff
--- a/mercurial/localrepo.py Thu Jul 13 09:51:50 2017 -0700 +++ b/mercurial/localrepo.py Wed Jul 12 15:24:07 2017 -0700 @@ -1202,7 +1202,7 @@ else: # discard all changes (including ones already written # out) in this transaction - repo.dirstate.restorebackup(None, prefix='journal.') + repo.dirstate.restorebackup(None, 'journal.dirstate') repo.invalidate(clearfilecache=True) @@ -1262,7 +1262,7 @@ @unfilteredmethod def _writejournal(self, desc): - self.dirstate.savebackup(None, prefix='journal.') + self.dirstate.savebackup(None, 'journal.dirstate') self.vfs.write("journal.branch", encoding.fromlocal(self.dirstate.branch())) self.vfs.write("journal.desc", @@ -1350,7 +1350,7 @@ # prevent dirstateguard from overwriting already restored one dsguard.close() - self.dirstate.restorebackup(None, prefix='undo.') + self.dirstate.restorebackup(None, 'undo.dirstate') try: branch = self.vfs.read('undo.branch') self.dirstate.setbranch(encoding.tolocal(branch))