| phillco | |
| durin42 |
| hg-reviewers |
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".
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/shelve.py (5 lines) | |||
| M | mercurial/dirstate.py (25 lines) | |||
| M | mercurial/dirstateguard.py (17 lines) | |||
| M | mercurial/localrepo.py (6 lines) |
| def _restoreactivebookmark(repo, mark): | def _restoreactivebookmark(repo, mark): | ||||
| if mark: | if mark: | ||||
| bookmarks.activate(repo, mark) | bookmarks.activate(repo, mark) | ||||
| def _aborttransaction(repo): | def _aborttransaction(repo): | ||||
| '''Abort current transaction for shelve/unshelve, but keep dirstate | '''Abort current transaction for shelve/unshelve, but keep dirstate | ||||
| ''' | ''' | ||||
| tr = repo.currenttransaction() | tr = repo.currenttransaction() | ||||
| repo.dirstate.savebackup(tr, suffix='.shelve') | backupname = 'dirstate.shelve' | ||||
| repo.dirstate.savebackup(tr, backupname) | |||||
| tr.abort() | tr.abort() | ||||
| repo.dirstate.restorebackup(None, suffix='.shelve') | repo.dirstate.restorebackup(None, backupname) | ||||
| def createcmd(ui, repo, pats, opts): | def createcmd(ui, repo, pats, opts): | ||||
| """subcommand that creates a new shelve""" | """subcommand that creates a new shelve""" | ||||
| with repo.wlock(): | with repo.wlock(): | ||||
| cmdutil.checkunfinished(repo) | cmdutil.checkunfinished(repo) | ||||
| return _docreatecmd(ui, repo, pats, opts) | return _docreatecmd(ui, repo, pats, opts) | ||||
| def getshelvename(repo, parent, opts): | def getshelvename(repo, parent, opts): | ||||
| return [f for f in dmap if match(f)] | return [f for f in dmap if match(f)] | ||||
| def _actualfilename(self, tr): | def _actualfilename(self, tr): | ||||
| if tr: | if tr: | ||||
| return self._pendingfilename | return self._pendingfilename | ||||
| else: | else: | ||||
| return self._filename | return self._filename | ||||
| def savebackup(self, tr, suffix='', prefix=''): | def savebackup(self, tr, backupname): | ||||
| '''Save current dirstate into backup file with suffix''' | '''Save current dirstate into backup file''' | ||||
| assert len(suffix) > 0 or len(prefix) > 0 | |||||
| filename = self._actualfilename(tr) | filename = self._actualfilename(tr) | ||||
| assert backupname != filename | |||||
| # use '_writedirstate' instead of 'write' to write changes certainly, | # use '_writedirstate' instead of 'write' to write changes certainly, | ||||
| # because the latter omits writing out if transaction is running. | # because the latter omits writing out if transaction is running. | ||||
| # output file will be used to create backup of dirstate at this point. | # output file will be used to create backup of dirstate at this point. | ||||
| if self._dirty or not self._opener.exists(filename): | if self._dirty or not self._opener.exists(filename): | ||||
| self._writedirstate(self._opener(filename, "w", atomictemp=True, | self._writedirstate(self._opener(filename, "w", atomictemp=True, | ||||
| checkambig=True)) | checkambig=True)) | ||||
| if tr: | if tr: | ||||
| # ensure that subsequent tr.writepending returns True for | # ensure that subsequent tr.writepending returns True for | ||||
| # changes written out above, even if dirstate is never | # changes written out above, even if dirstate is never | ||||
| # changed after this | # changed after this | ||||
| tr.addfilegenerator('dirstate', (self._filename,), | tr.addfilegenerator('dirstate', (self._filename,), | ||||
| self._writedirstate, location='plain') | self._writedirstate, location='plain') | ||||
| # ensure that pending file written above is unlinked at | # ensure that pending file written above is unlinked at | ||||
| # failure, even if tr.writepending isn't invoked until the | # failure, even if tr.writepending isn't invoked until the | ||||
| # end of this transaction | # end of this transaction | ||||
| tr.registertmp(filename, location='plain') | tr.registertmp(filename, location='plain') | ||||
| backupname = prefix + self._filename + suffix | |||||
| assert backupname != filename | |||||
| self._opener.tryunlink(backupname) | self._opener.tryunlink(backupname) | ||||
| # hardlink backup is okay because _writedirstate is always called | # hardlink backup is okay because _writedirstate is always called | ||||
| # with an "atomictemp=True" file. | # with an "atomictemp=True" file. | ||||
| util.copyfile(self._opener.join(filename), | util.copyfile(self._opener.join(filename), | ||||
| self._opener.join(backupname), hardlink=True) | self._opener.join(backupname), hardlink=True) | ||||
| def restorebackup(self, tr, suffix='', prefix=''): | def restorebackup(self, tr, backupname): | ||||
| '''Restore dirstate by backup file with suffix''' | '''Restore dirstate by backup file''' | ||||
| assert len(suffix) > 0 or len(prefix) > 0 | |||||
| # this "invalidate()" prevents "wlock.release()" from writing | # this "invalidate()" prevents "wlock.release()" from writing | ||||
| # changes of dirstate out after restoring from backup file | # changes of dirstate out after restoring from backup file | ||||
| self.invalidate() | self.invalidate() | ||||
| filename = self._actualfilename(tr) | filename = self._actualfilename(tr) | ||||
| # using self._filename to avoid having "pending" in the backup filename | self._opener.rename(backupname, filename, checkambig=True) | ||||
| self._opener.rename(prefix + self._filename + suffix, filename, | |||||
| checkambig=True) | def clearbackup(self, tr, backupname): | ||||
| '''Clear backup file''' | |||||
| def clearbackup(self, tr, suffix='', prefix=''): | self._opener.unlink(backupname) | ||||
| '''Clear backup file with suffix''' | |||||
| assert len(suffix) > 0 or len(prefix) > 0 | |||||
| # using self._filename to avoid having "pending" in the backup filename | |||||
| self._opener.unlink(prefix + self._filename + suffix) | |||||
| This just removes the backup file at ``close()`` before ``release()``. | This just removes the backup file at ``close()`` before ``release()``. | ||||
| ''' | ''' | ||||
| def __init__(self, repo, name): | def __init__(self, repo, name): | ||||
| self._repo = repo | self._repo = repo | ||||
| self._active = False | self._active = False | ||||
| self._closed = False | self._closed = False | ||||
| self._suffix = '.backup.%s.%d' % (name, id(self)) | self._backupname = 'dirstate.backup.%s.%d' % (name, id(self)) | ||||
| repo.dirstate.savebackup(repo.currenttransaction(), self._suffix) | repo.dirstate.savebackup(repo.currenttransaction(), self._backupname) | ||||
| self._active = True | self._active = True | ||||
| def __del__(self): | def __del__(self): | ||||
| if self._active: # still active | if self._active: # still active | ||||
| # this may occur, even if this class is used correctly: | # this may occur, even if this class is used correctly: | ||||
| # for example, releasing other resources like transaction | # for example, releasing other resources like transaction | ||||
| # may raise exception before ``dirstateguard.release`` in | # may raise exception before ``dirstateguard.release`` in | ||||
| # ``release(tr, ....)``. | # ``release(tr, ....)``. | ||||
| self._abort() | self._abort() | ||||
| def close(self): | def close(self): | ||||
| if not self._active: # already inactivated | if not self._active: # already inactivated | ||||
| msg = (_("can't close already inactivated backup: dirstate%s") | msg = (_("can't close already inactivated backup: %s") | ||||
| % self._suffix) | % self._backupname) | ||||
| raise error.Abort(msg) | raise error.Abort(msg) | ||||
| self._repo.dirstate.clearbackup(self._repo.currenttransaction(), | self._repo.dirstate.clearbackup(self._repo.currenttransaction(), | ||||
| self._suffix) | self._backupname) | ||||
| self._active = False | self._active = False | ||||
| self._closed = True | self._closed = True | ||||
| def _abort(self): | def _abort(self): | ||||
| self._repo.dirstate.restorebackup(self._repo.currenttransaction(), | self._repo.dirstate.restorebackup(self._repo.currenttransaction(), | ||||
| self._suffix) | self._backupname) | ||||
| self._active = False | self._active = False | ||||
| def release(self): | def release(self): | ||||
| if not self._closed: | if not self._closed: | ||||
| if not self._active: # already inactivated | if not self._active: # already inactivated | ||||
| msg = (_("can't release already inactivated backup:" | msg = (_("can't release already inactivated backup: %s") | ||||
| " dirstate%s") | % self._backupname) | ||||
| % self._suffix) | |||||
| raise error.Abort(msg) | raise error.Abort(msg) | ||||
| self._abort() | self._abort() | ||||
| # in-memory changes aren't written out at closing | # in-memory changes aren't written out at closing | ||||
| # transaction, if tr.addfilegenerator (via | # transaction, if tr.addfilegenerator (via | ||||
| # dirstate.write or so) isn't invoked while | # dirstate.write or so) isn't invoked while | ||||
| # transaction running | # transaction running | ||||
| repo.dirstate.write(None) | repo.dirstate.write(None) | ||||
| else: | else: | ||||
| # discard all changes (including ones already written | # discard all changes (including ones already written | ||||
| # out) in this transaction | # out) in this transaction | ||||
| repo.dirstate.restorebackup(None, prefix='journal.') | repo.dirstate.restorebackup(None, 'journal.dirstate') | ||||
| repo.invalidate(clearfilecache=True) | repo.invalidate(clearfilecache=True) | ||||
| tr = transaction.transaction(rp, self.svfs, vfsmap, | tr = transaction.transaction(rp, self.svfs, vfsmap, | ||||
| "journal", | "journal", | ||||
| "undo", | "undo", | ||||
| aftertrans(renames), | aftertrans(renames), | ||||
| self.store.createmode, | self.store.createmode, | ||||
| (self.vfs, 'journal.bookmarks'), | (self.vfs, 'journal.bookmarks'), | ||||
| (self.svfs, 'journal.phaseroots')) | (self.svfs, 'journal.phaseroots')) | ||||
| def undofiles(self): | def undofiles(self): | ||||
| return [(vfs, undoname(x)) for vfs, x in self._journalfiles()] | return [(vfs, undoname(x)) for vfs, x in self._journalfiles()] | ||||
| @unfilteredmethod | @unfilteredmethod | ||||
| def _writejournal(self, desc): | def _writejournal(self, desc): | ||||
| self.dirstate.savebackup(None, prefix='journal.') | self.dirstate.savebackup(None, 'journal.dirstate') | ||||
| self.vfs.write("journal.branch", | self.vfs.write("journal.branch", | ||||
| encoding.fromlocal(self.dirstate.branch())) | encoding.fromlocal(self.dirstate.branch())) | ||||
| self.vfs.write("journal.desc", | self.vfs.write("journal.desc", | ||||
| "%d\n%s\n" % (len(self), desc)) | "%d\n%s\n" % (len(self), desc)) | ||||
| self.vfs.write("journal.bookmarks", | self.vfs.write("journal.bookmarks", | ||||
| self.vfs.tryread("bookmarks")) | self.vfs.tryread("bookmarks")) | ||||
| self.svfs.write("journal.phaseroots", | self.svfs.write("journal.phaseroots", | ||||
| self.svfs.tryread("phaseroots")) | self.svfs.tryread("phaseroots")) | ||||
| self.invalidate() | self.invalidate() | ||||
| parentgone = (parents[0] not in self.changelog.nodemap or | parentgone = (parents[0] not in self.changelog.nodemap or | ||||
| parents[1] not in self.changelog.nodemap) | parents[1] not in self.changelog.nodemap) | ||||
| if parentgone: | if parentgone: | ||||
| # prevent dirstateguard from overwriting already restored one | # prevent dirstateguard from overwriting already restored one | ||||
| dsguard.close() | dsguard.close() | ||||
| self.dirstate.restorebackup(None, prefix='undo.') | self.dirstate.restorebackup(None, 'undo.dirstate') | ||||
| try: | try: | ||||
| branch = self.vfs.read('undo.branch') | branch = self.vfs.read('undo.branch') | ||||
| self.dirstate.setbranch(encoding.tolocal(branch)) | self.dirstate.setbranch(encoding.tolocal(branch)) | ||||
| except IOError: | except IOError: | ||||
| ui.warn(_('named branch could not be reset: ' | ui.warn(_('named branch could not be reset: ' | ||||
| 'current branch is still \'%s\'\n') | 'current branch is still \'%s\'\n') | ||||
| % self.dirstate.branch()) | % self.dirstate.branch()) | ||||