Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 21702:99db956b88ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Sun, 01 Jun 2014 16:01:01 -0700
parents e87d2a12d41b 99ba1d082287
children a2ca9dcb4b77
comparison
equal deleted inserted replaced
21694:c08a22bfa16e 21702:99db956b88ab
861 raise error.RepoError( 861 raise error.RepoError(
862 _("abandoned transaction found"), 862 _("abandoned transaction found"),
863 hint=_("run 'hg recover' to clean up transaction")) 863 hint=_("run 'hg recover' to clean up transaction"))
864 864
865 def onclose(): 865 def onclose():
866 self.store.write(tr) 866 self.store.write(self._transref())
867 867
868 self._writejournal(desc) 868 self._writejournal(desc)
869 renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] 869 renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()]
870 rp = report and report or self.ui.warn 870 rp = report and report or self.ui.warn
871 tr = transaction.transaction(rp, self.sopener, 871 tr = transaction.transaction(rp, self.sopener,