equal
deleted
inserted
replaced
14 import scmutil, util, extensions, hook, error, revset |
14 import scmutil, util, extensions, hook, error, revset |
15 import match as matchmod |
15 import match as matchmod |
16 import merge as mergemod |
16 import merge as mergemod |
17 import tags as tagsmod |
17 import tags as tagsmod |
18 from lock import release |
18 from lock import release |
19 import weakref, errno, os, time, inspect |
19 import weakref, errno, os, time, inspect, random |
20 import branchmap, pathutil |
20 import branchmap, pathutil |
21 import namespaces |
21 import namespaces |
22 propertycache = util.propertycache |
22 propertycache = util.propertycache |
23 filecache = scmutil.filecache |
23 filecache = scmutil.filecache |
24 |
24 |
958 if self.svfs.exists("journal"): |
958 if self.svfs.exists("journal"): |
959 raise error.RepoError( |
959 raise error.RepoError( |
960 _("abandoned transaction found"), |
960 _("abandoned transaction found"), |
961 hint=_("run 'hg recover' to clean up transaction")) |
961 hint=_("run 'hg recover' to clean up transaction")) |
962 |
962 |
|
963 idbase = "%.40f#%f" % (random.random(), time.time()) |
|
964 txnid = 'TXN:' + util.sha1(idbase).hexdigest() |
963 self.hook('pretxnopen', throw=True, txnname=desc) |
965 self.hook('pretxnopen', throw=True, txnname=desc) |
964 |
966 |
965 self._writejournal(desc) |
967 self._writejournal(desc) |
966 renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] |
968 renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()] |
967 if report: |
969 if report: |
982 "undo", |
984 "undo", |
983 aftertrans(renames), |
985 aftertrans(renames), |
984 self.store.createmode, |
986 self.store.createmode, |
985 validator=validate) |
987 validator=validate) |
986 |
988 |
987 trid = 'TXN:' + util.sha1("%s#%f" % (id(tr), time.time())).hexdigest() |
989 tr.hookargs['txnid'] = txnid |
988 tr.hookargs['txnid'] = trid |
|
989 # note: writing the fncache only during finalize mean that the file is |
990 # note: writing the fncache only during finalize mean that the file is |
990 # outdated when running hooks. As fncache is used for streaming clone, |
991 # outdated when running hooks. As fncache is used for streaming clone, |
991 # this is not expected to break anything that happen during the hooks. |
992 # this is not expected to break anything that happen during the hooks. |
992 tr.addfinalize('flush-fncache', self.store.write) |
993 tr.addfinalize('flush-fncache', self.store.write) |
993 def txnclosehook(tr2): |
994 def txnclosehook(tr2): |