# HG changeset patch # User Pierre-Yves David <pierre-yves.david@fb.com> # Date 1444248325 25200 # Wed Oct 07 13:05:25 2015 -0700 # Node ID dd2f5e01480624a2fd75e4702ef7ec7fd97e831f # Parent 1f14920a892c99183b36458a329ebb30d1e99a2d import: allow processing of extra part header after import As we have a way for extension to add more header, we need a way for them to actually process them. We add a basic hook point to do extra work after the import have been committed. diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -834,6 +834,7 @@ ## facility to let extension process additional data into an import patch # list of identifier to be executed in order extrapreimport = [] # run before commit +extrapostimport = [] # run after commit # mapping from identifier to actual import function # # 'preimport' are run before the commit is made and are provided the following @@ -846,6 +847,10 @@ # mutation of in memory commit and more. Feel free to rework the code to get # there. extrapreimportmap = {} +# 'postimport' are run after the commit is made and are provided the following +# argument: +# - ctx: the changectx created by import. +extrapostimportmap = {} def tryimportone(ui, repo, hunk, parents, opts, msgs, updatefunc): """Utility function used by commands.import to import a single patch @@ -974,6 +979,8 @@ n = repo.commit(message, opts.get('user') or user, opts.get('date') or date, match=m, editor=editor, extra=extra) + for idfunc in extrapostimport: + extrapostimportmap[idfunc](repo[n]) finally: repo.ui.restoreconfig(allowemptyback) dsguard.close() diff --git a/tests/test-import.t b/tests/test-import.t --- a/tests/test-import.t +++ b/tests/test-import.t @@ -1516,10 +1516,15 @@ > def processfoo(repo, data, extra, opts): > if 'foo' in data: > extra['foo'] = data['foo'] + > def postimport(ctx): + > if 'foo' in ctx.extra(): + > ctx.repo().ui.write('imported-foo: %s\n' % ctx.extra()['foo']) > > mercurial.patch.patchheadermap.append(('Foo', 'foo')) > mercurial.cmdutil.extrapreimport.append('foo') > mercurial.cmdutil.extrapreimportmap['foo'] = processfoo + > mercurial.cmdutil.extrapostimport.append('foo') + > mercurial.cmdutil.extrapostimportmap['foo'] = postimport > EOF $ printf "[extensions]\nparseextra=$TESTTMP/parseextra.py" >> $HGRCPATH $ hg up -C tip @@ -1542,6 +1547,7 @@ > EOF $ hg import $TESTTMP/foo.patch applying $TESTTMP/foo.patch + imported-foo: bar $ hg log --debug -r . | grep extra extra: branch=default extra: foo=bar