Mercurial > hg
diff mercurial/localrepo.py @ 25229:451df92cec49
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 20 May 2015 15:29:32 -0500 |
| parents | bf6b476f3b36 2664f536a97e |
| children | 5095059340dc |
line wrap: on
line diff
--- a/mercurial/localrepo.py Sun May 17 22:42:47 2015 -0400 +++ b/mercurial/localrepo.py Wed May 20 15:29:32 2015 -0500 @@ -974,7 +974,7 @@ """will run pre-closing hooks""" pending = lambda: tr.writepending() and self.root or "" reporef().hook('pretxnclose', throw=True, pending=pending, - xnname=desc, **tr.hookargs) + txnname=desc, **tr.hookargs) tr = transaction.transaction(rp, self.sopener, vfsmap, "journal", @@ -984,7 +984,7 @@ validator=validate) trid = 'TXN:' + util.sha1("%s#%f" % (id(tr), time.time())).hexdigest() - tr.hookargs['TXNID'] = trid + tr.hookargs['txnid'] = trid # note: writing the fncache only during finalize mean that the file is # outdated when running hooks. As fncache is used for streaming clone, # this is not expected to break anything that happen during the hooks.