This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8490

hooks: provide access to transaction changes for internal hooks
ClosedPublic

Authored by joerg.sonnenberger on Apr 30 2020, 9:24 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG09da5cf44772: hooks: provide access to transaction changes for internal hooks
Summary

External hooks are skipped here as the environment often has a size
limit in the low MBs and that can easily be reached by larger
transactions.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

joerg.sonnenberger added a comment.Apr 30 2020, 9:29 PM

This is part of a change discussed on IRC to make hooks more useful, e.g. providing better access to which changesets have been obsoleted or making it possible to avoid per changeset hooks with *-phase with a follow-up option to always compute the phase markers. I have some small potential concerns about the environmental size this can have for external hooks, so I'm also open for the idea of providing this argument only for internal hooks.

marmoute requested changes to this revision.May 1 2020, 9:59 AM
marmoute added a subscriber: marmoute.

Yeah, I don't think we can blindy pass it to shell hooks because ENVIRON might explode. Lets start with providing this for python hook only, and we can devise better way to do this for shell hook (maybe a files with content to parse ?)

This revision now requires changes to proceed.May 1 2020, 9:59 AM
joerg.sonnenberger retitled this revision from hooks: provide access to transaction changes for hooks to hooks: provide access to transaction changes for internal hooks.May 1 2020, 12:11 PM
joerg.sonnenberger edited the summary of this revision. (Show Details)
joerg.sonnenberger updated this revision to Diff 21267.
joerg.sonnenberger added a commit: rHG09da5cf44772: hooks: provide access to transaction changes for internal hooks.May 14 2020, 4:30 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG09da5cf44772: hooks: provide access to transaction changes for internal hooks (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hook.py (4 lines)
Mmercurial/localrepo.py (1 line)
Mtests/test-hook.t (2 lines)

Diff 21377

mercurial/hook.py

tr = repo.currenttransaction() tr = repo.currenttransaction()
repo.dirstate.write(tr) repo.dirstate.write(tr)
if tr and tr.writepending(): if tr and tr.writepending():
env[b'HG_PENDING'] = repo.root env[b'HG_PENDING'] = repo.root
env[b'HG_HOOKTYPE'] = htype env[b'HG_HOOKTYPE'] = htype
env[b'HG_HOOKNAME'] = name env[b'HG_HOOKNAME'] = name
for k, v in pycompat.iteritems(args): for k, v in pycompat.iteritems(args):
# transaction changes can accumulate MBs of data, so skip it
# for external hooks
if k == b'changes':
continue
if callable(v): if callable(v):
v = v() v = v()
if isinstance(v, (dict, list)): if isinstance(v, (dict, list)):
v = stringutil.pprint(v) v = stringutil.pprint(v)
env[b'HG_' + k.upper()] = v env[b'HG_' + k.upper()] = v
if ui.configbool(b'hooks', b'tonative.%s' % name, False): if ui.configbool(b'hooks', b'tonative.%s' % name, False):
oldcmd = cmd oldcmd = cmd

mercurial/localrepo.py

) )
tr.changes[b'origrepolen'] = len(self) tr.changes[b'origrepolen'] = len(self)
tr.changes[b'obsmarkers'] = set() tr.changes[b'obsmarkers'] = set()
tr.changes[b'phases'] = [] tr.changes[b'phases'] = []
tr.changes[b'bookmarks'] = {} tr.changes[b'bookmarks'] = {}
tr.hookargs[b'txnid'] = txnid tr.hookargs[b'txnid'] = txnid
tr.hookargs[b'txnname'] = desc tr.hookargs[b'txnname'] = desc
tr.hookargs[b'changes'] = tr.changes
# note: writing the fncache only during finalize mean that the file is # note: writing the fncache only during finalize mean that the file is
# outdated when running hooks. As fncache is used for streaming clone, # outdated when running hooks. As fncache is used for streaming clone,
# this is not expected to break anything that happen during the hooks. # this is not expected to break anything that happen during the hooks.
tr.addfinalize(b'flush-fncache', self.store.write) tr.addfinalize(b'flush-fncache', self.store.write)
def txnclosehook(tr2): def txnclosehook(tr2):
"""To be run if transaction is successful, will schedule a hook run """To be run if transaction is successful, will schedule a hook run
""" """

tests/test-hook.t

5:6f611f8018c1 5:6f611f8018c1
pretxncommit.forbid hook: HG_HOOKNAME=pretxncommit.forbid1 pretxncommit.forbid hook: HG_HOOKNAME=pretxncommit.forbid1
HG_HOOKTYPE=pretxncommit HG_HOOKTYPE=pretxncommit
HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567
HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
HG_PENDING=$TESTTMP/a HG_PENDING=$TESTTMP/a
transaction abort! transaction abort!
txnabort Python hook: txnid,txnname txnabort Python hook: changes,txnid,txnname
txnabort hook: HG_HOOKNAME=txnabort.1 txnabort hook: HG_HOOKNAME=txnabort.1
HG_HOOKTYPE=txnabort HG_HOOKTYPE=txnabort
HG_TXNID=TXN:$ID$ HG_TXNID=TXN:$ID$
HG_TXNNAME=commit HG_TXNNAME=commit
rollback completed rollback completed
abort: pretxncommit.forbid1 hook exited with status 1 abort: pretxncommit.forbid1 hook exited with status 1
[255] [255]