Mercurial > hg-stable
changeset 25218:00d905a12bb6 stable
localrepo: rename hook argument from TXNID to txnid (BC)
From the first (3.4 or d283517b260b), `TXNID` is passed to Python
hooks without lowering its name, but it is wrong.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Wed, 20 May 2015 04:34:27 +0900 |
| parents | ef4538ba67ef |
| children | 2664f536a97e |
| files | mercurial/localrepo.py tests/test-hook.t |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Sun May 17 22:09:37 2015 -0400 +++ b/mercurial/localrepo.py Wed May 20 04:34:27 2015 +0900 @@ -985,7 +985,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.
--- a/tests/test-hook.t Sun May 17 22:09:37 2015 -0400 +++ b/tests/test-hook.t Wed May 20 04:34:27 2015 +0900 @@ -1,6 +1,11 @@ commit hooks can see env vars (and post-transaction one are run unlocked) + $ cat > $TESTTMP/txnabort.checkargs.py <<EOF + > def showargs(ui, repo, hooktype, **kwargs): + > ui.write('%s python hook: %s\n' % (hooktype, ','.join(sorted(kwargs)))) + > EOF + $ hg init a $ cd a $ cat > .hg/hgrc <<EOF @@ -16,7 +21,8 @@ > pretxnopen = sh -c "HG_LOCAL= HG_TAG= python \"$TESTDIR/printenv.py\" pretxnopen" > pretxnclose = sh -c "HG_LOCAL= HG_TAG= python \"$TESTDIR/printenv.py\" pretxnclose" > txnclose = sh -c "HG_LOCAL= HG_TAG= python \"$TESTDIR/printenv.py\" txnclose" - > txnabort = sh -c "HG_LOCAL= HG_TAG= python \"$TESTDIR/printenv.py\" txnabort" + > txnabort.0 = python:$TESTTMP/txnabort.checkargs.py:showargs + > txnabort.1 = sh -c "HG_LOCAL= HG_TAG= python \"$TESTDIR/printenv.py\" txnabort" > txnclose.checklock = sh -c "hg debuglock > /dev/null" > EOF $ echo a > a @@ -164,6 +170,7 @@ 5:6f611f8018c1 pretxncommit.forbid hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$TESTTMP/a transaction abort! + txnabort python hook: txnid,txnname txnabort hook: HG_TXNID=TXN:* HG_TXNNAME=commit (glob) rollback completed abort: pretxncommit.forbid1 hook exited with status 1