[PATCH 7 of 7] hook: add hook name information to external hook
Jun Wu
quark at fb.com
Fri Mar 31 13:48:36 EDT 2017
This series looks straightforward to me. I have marked pre-reviewed except
for Patch 1 where I think using "HG_TXNID" is more consistent.
Excerpts from Pierre-Yves David's message of 2017-03-31 12:17:22 +0200:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
> # Date 1490954036 -7200
> # Fri Mar 31 11:53:56 2017 +0200
> # Node ID ce04d3eb4be0c920a21a6d14d2d71941ba3615d3
> # Parent 67387fa9e82e6a84ab801ebdb28c8faa50e652ff
> # EXP-Topic hookname
> # Available At https://www.mercurial-scm.org/repo/users/marmoute/mercurial/
> # hg pull https://www.mercurial-scm.org/repo/users/marmoute/mercurial/ -r ce04d3eb4be0
> hook: add hook name information to external hook
>
> While we are here, we can also add the hook name information to external hook.
>
> diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
> --- a/mercurial/help/config.txt
> +++ b/mercurial/help/config.txt
> @@ -844,9 +844,10 @@ Example ``.hg/hgrc``::
> Most hooks are run with environment variables set that give useful
> additional information. For each hook below, the environment variables
> it is passed are listed with names of the form ``$HG_foo``. The
> -``$HG_HOOKTYPE`` variable is set for all hooks. It contains the type of
> -hook which triggered the run. In the example about this will be
> -``$HG_HOOKTYPE=incoming``.
> +``$HG_HOOKTYPE`` and ``$HG_HOOKNAME`` variables are set for all hooks.
> +their respectively contains the type of hook which triggered the run and
> +the full name of the hooks in the config. In the example about this will
> +be ``$HG_HOOKTYPE=incoming`` and ``$HG_HOOKNAME=incoming.email``.
>
> ``changegroup``
> Run after a changegroup has been added via push, pull or unbundle. ID of the
> diff --git a/mercurial/hook.py b/mercurial/hook.py
> --- a/mercurial/hook.py
> +++ b/mercurial/hook.py
> @@ -127,6 +127,7 @@ def _exthook(ui, repo, htype, name, cmd,
> if tr and tr.writepending():
> env['HG_PENDING'] = repo.root
> env['HG_HOOKTYPE'] = htype
> + env['HG_HOOKNAME'] = name
>
> for k, v in args.iteritems():
> if callable(v):
> diff --git a/tests/test-bundle.t b/tests/test-bundle.t
> --- a/tests/test-bundle.t
> +++ b/tests/test-bundle.t
> @@ -232,7 +232,7 @@ hg -R bundle://../full.hg verify
> adding manifests
> adding file changes
> added 9 changesets with 7 changes to 4 files (+1 heads)
> - changegroup hook: HG_HOOKTYPE=changegroup HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=bundle:../full.hg
> + changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=bundle:../full.hg
> (run 'hg heads' to see heads, 'hg merge' to merge)
>
> Rollback empty
> @@ -255,7 +255,7 @@ Pull full.hg into empty again (using -R;
> adding manifests
> adding file changes
> added 9 changesets with 7 changes to 4 files (+1 heads)
> - changegroup hook: HG_HOOKTYPE=changegroup HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=bundle:empty+full.hg
> + changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=bundle:empty+full.hg
> (run 'hg heads' to see heads, 'hg merge' to merge)
>
> Cannot produce streaming clone bundles with "hg bundle"
> diff --git a/tests/test-bundle2-exchange.t b/tests/test-bundle2-exchange.t
> --- a/tests/test-bundle2-exchange.t
> +++ b/tests/test-bundle2-exchange.t
> @@ -41,7 +41,7 @@ The extension requires a repo (currently
> $ hg commit -m 'a'
> pre-close-tip:3903775176ed draft
> postclose-tip:3903775176ed draft
> - txnclose hook: HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 TXNID=TXN:$ID$ HG_TXNNAME=commit
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 TXNID=TXN:$ID$ HG_TXNNAME=commit
>
> $ hg unbundle $TESTDIR/bundles/rebase.hg
> adding changesets
> @@ -50,7 +50,7 @@ The extension requires a repo (currently
> added 8 changesets with 7 changes to 7 files (+3 heads)
> pre-close-tip:02de42196ebe draft
> postclose-tip:02de42196ebe draft
> - txnclose hook: HG_HOOKTYPE=txnclose HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=unbundle TXNID=TXN:$ID$ HG_TXNNAME=unbundle
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=unbundle TXNID=TXN:$ID$ HG_TXNNAME=unbundle
> bundle:*/tests/bundles/rebase.hg HG_URL=bundle:*/tests/bundles/rebase.hg (glob)
> (run 'hg heads' to see heads, 'hg merge' to merge)
>
> @@ -64,18 +64,18 @@ Add more obsolescence information
> $ hg -R main debugobsolete -d '0 0' 1111111111111111111111111111111111111111 `getmainid 9520eea781bc`
> pre-close-tip:02de42196ebe draft
> postclose-tip:02de42196ebe draft
> - txnclose hook: HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
> $ hg -R main debugobsolete -d '0 0' 2222222222222222222222222222222222222222 `getmainid 24b6387c8c8c`
> pre-close-tip:02de42196ebe draft
> postclose-tip:02de42196ebe draft
> - txnclose hook: HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
>
> clone --pull
>
> $ hg -R main phase --public cd010b8cd998
> pre-close-tip:02de42196ebe draft
> postclose-tip:02de42196ebe draft
> - txnclose hook: HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 TXNID=TXN:$ID$ HG_TXNNAME=phase
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 TXNID=TXN:$ID$ HG_TXNNAME=phase
> $ hg clone main other --pull --rev 9520eea781bc
> adding changesets
> adding manifests
> @@ -84,7 +84,7 @@ clone --pull
> 1 new obsolescence markers
> pre-close-tip:9520eea781bc draft
> postclose-tip:9520eea781bc draft
> - txnclose hook: HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=9520eea781bcca16c1e15acc0ba14335a0e8e5ba HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_TXNNAME=pull
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=9520eea781bcca16c1e15acc0ba14335a0e8e5ba HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_TXNNAME=pull
> file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob)
> updating to branch default
> 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
> @@ -101,7 +101,7 @@ pull
> $ hg -R main phase --public 9520eea781bc
> pre-close-tip:02de42196ebe draft
> postclose-tip:02de42196ebe draft
> - txnclose hook: HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 TXNID=TXN:$ID$ HG_TXNNAME=phase
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 TXNID=TXN:$ID$ HG_TXNNAME=phase
> $ hg -R other pull -r 24b6387c8c8c
> pulling from $TESTTMP/main (glob)
> searching for changes
> @@ -112,7 +112,7 @@ pull
> 1 new obsolescence markers
> pre-close-tip:24b6387c8c8c draft
> postclose-tip:24b6387c8c8c draft
> - txnclose hook: HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_NODE_LAST=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_TXNNAME=pull
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_NODE_LAST=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_TXNNAME=pull
> file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob)
> (run 'hg heads' to see heads, 'hg merge' to merge)
> $ hg -R other log -G
> @@ -131,13 +131,13 @@ pull empty (with phase movement)
> $ hg -R main phase --public 24b6387c8c8c
> pre-close-tip:02de42196ebe draft
> postclose-tip:02de42196ebe draft
> - txnclose hook: HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 TXNID=TXN:$ID$ HG_TXNNAME=phase
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 TXNID=TXN:$ID$ HG_TXNNAME=phase
> $ hg -R other pull -r 24b6387c8c8c
> pulling from $TESTTMP/main (glob)
> no changes found
> pre-close-tip:24b6387c8c8c public
> postclose-tip:24b6387c8c8c public
> - txnclose hook: HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=0 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_TXNNAME=pull
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=0 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_TXNNAME=pull
> file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob)
> $ hg -R other log -G
> o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits at gmail.com> F
> @@ -157,7 +157,7 @@ pull empty
> no changes found
> pre-close-tip:24b6387c8c8c public
> postclose-tip:24b6387c8c8c public
> - txnclose hook: HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=0 HG_SOURCE=pull TXNID=TXN:$ID$ HG_TXNNAME=pull
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=0 HG_SOURCE=pull TXNID=TXN:$ID$ HG_TXNNAME=pull
> file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob)
> $ hg -R other log -G
> o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits at gmail.com> F
> @@ -175,69 +175,69 @@ add extra data to test their exchange du
> $ hg -R main bookmark --rev eea13746799a book_eea1
> pre-close-tip:02de42196ebe draft
> postclose-tip:02de42196ebe draft
> - txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> + txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> $ hg -R main debugobsolete -d '0 0' 3333333333333333333333333333333333333333 `getmainid eea13746799a`
> pre-close-tip:02de42196ebe draft
> postclose-tip:02de42196ebe draft
> - txnclose hook: HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
> $ hg -R main bookmark --rev 02de42196ebe book_02de
> pre-close-tip:02de42196ebe draft book_02de
> postclose-tip:02de42196ebe draft book_02de
> - txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> + txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> $ hg -R main debugobsolete -d '0 0' 4444444444444444444444444444444444444444 `getmainid 02de42196ebe`
> pre-close-tip:02de42196ebe draft book_02de
> postclose-tip:02de42196ebe draft book_02de
> - txnclose hook: HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
> $ hg -R main bookmark --rev 42ccdea3bb16 book_42cc
> pre-close-tip:02de42196ebe draft book_02de
> postclose-tip:02de42196ebe draft book_02de
> - txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> + txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> $ hg -R main debugobsolete -d '0 0' 5555555555555555555555555555555555555555 `getmainid 42ccdea3bb16`
> pre-close-tip:02de42196ebe draft book_02de
> postclose-tip:02de42196ebe draft book_02de
> - txnclose hook: HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
> $ hg -R main bookmark --rev 5fddd98957c8 book_5fdd
> pre-close-tip:02de42196ebe draft book_02de
> postclose-tip:02de42196ebe draft book_02de
> - txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> + txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> $ hg -R main debugobsolete -d '0 0' 6666666666666666666666666666666666666666 `getmainid 5fddd98957c8`
> pre-close-tip:02de42196ebe draft book_02de
> postclose-tip:02de42196ebe draft book_02de
> - txnclose hook: HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
> $ hg -R main bookmark --rev 32af7686d403 book_32af
> pre-close-tip:02de42196ebe draft book_02de
> postclose-tip:02de42196ebe draft book_02de
> - txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> + txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> $ hg -R main debugobsolete -d '0 0' 7777777777777777777777777777777777777777 `getmainid 32af7686d403`
> pre-close-tip:02de42196ebe draft book_02de
> postclose-tip:02de42196ebe draft book_02de
> - txnclose hook: HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
>
> $ hg -R other bookmark --rev cd010b8cd998 book_eea1
> pre-close-tip:24b6387c8c8c public
> postclose-tip:24b6387c8c8c public
> - txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> + txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> $ hg -R other bookmark --rev cd010b8cd998 book_02de
> pre-close-tip:24b6387c8c8c public
> postclose-tip:24b6387c8c8c public
> - txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> + txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> $ hg -R other bookmark --rev cd010b8cd998 book_42cc
> pre-close-tip:24b6387c8c8c public
> postclose-tip:24b6387c8c8c public
> - txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> + txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> $ hg -R other bookmark --rev cd010b8cd998 book_5fdd
> pre-close-tip:24b6387c8c8c public
> postclose-tip:24b6387c8c8c public
> - txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> + txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> $ hg -R other bookmark --rev cd010b8cd998 book_32af
> pre-close-tip:24b6387c8c8c public
> postclose-tip:24b6387c8c8c public
> - txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> + txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
>
> $ hg -R main phase --public eea13746799a
> pre-close-tip:02de42196ebe draft book_02de
> postclose-tip:02de42196ebe draft book_02de
> - txnclose hook: HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 TXNID=TXN:$ID$ HG_TXNNAME=phase
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 TXNID=TXN:$ID$ HG_TXNNAME=phase
>
> push
> $ hg -R main push other --rev eea13746799a --bookmark book_eea1
> @@ -256,11 +256,11 @@ push
> remote: lock: free
> remote: wlock: free
> remote: postclose-tip:eea13746799a public book_eea1
> - remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_NODE_LAST=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1 HG_SOURCE=push TXNID=TXN:$ID$ HG_TXNNAME=push HG_URL=file:$TESTTMP/other
> + remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_NODE_LAST=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1 HG_SOURCE=push TXNID=TXN:$ID$ HG_TXNNAME=push HG_URL=file:$TESTTMP/other
> updating bookmark book_eea1
> pre-close-tip:02de42196ebe draft book_02de
> postclose-tip:02de42196ebe draft book_02de
> - txnclose hook: HG_HOOKTYPE=txnclose HG_SOURCE=push-response TXNID=TXN:$ID$ HG_TXNNAME=push-response
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_SOURCE=push-response TXNID=TXN:$ID$ HG_TXNNAME=push-response
> file:/*/$TESTTMP/other HG_URL=file:$TESTTMP/other (glob)
> $ hg -R other log -G
> o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits at gmail.com> book_eea1 G
> @@ -289,7 +289,7 @@ pull over ssh
> updating bookmark book_02de
> pre-close-tip:02de42196ebe draft book_02de
> postclose-tip:02de42196ebe draft book_02de
> - txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_NODE_LAST=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_TXNNAME=pull
> + txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_NODE_LAST=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_TXNNAME=pull
> ssh://user@dummy/main HG_URL=ssh://user@dummy/main
> (run 'hg heads' to see heads, 'hg merge' to merge)
> $ hg -R other debugobsolete
> @@ -314,7 +314,7 @@ pull over http
> updating bookmark book_42cc
> pre-close-tip:42ccdea3bb16 draft book_42cc
> postclose-tip:42ccdea3bb16 draft book_42cc
> - txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_NODE_LAST=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_TXNNAME=pull
> + txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_NODE_LAST=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_TXNNAME=pull
> http://localhost:$HGPORT/ HG_URL=http://localhost:$HGPORT/
> (run 'hg heads .' to see heads, 'hg merge' to merge)
> $ cat main-error.log
> @@ -340,11 +340,11 @@ push over ssh
> remote: lock: free
> remote: wlock: free
> remote: postclose-tip:5fddd98957c8 draft book_5fdd
> - remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_NODE_LAST=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_SOURCE=serve TXNID=TXN:$ID$ HG_TXNNAME=serve HG_URL=remote:ssh:$LOCALIP
> + remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_NODE_LAST=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_SOURCE=serve TXNID=TXN:$ID$ HG_TXNNAME=serve HG_URL=remote:ssh:$LOCALIP
> updating bookmark book_5fdd
> pre-close-tip:02de42196ebe draft book_02de
> postclose-tip:02de42196ebe draft book_02de
> - txnclose hook: HG_HOOKTYPE=txnclose HG_SOURCE=push-response TXNID=TXN:$ID$ HG_TXNNAME=push-response
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_SOURCE=push-response TXNID=TXN:$ID$ HG_TXNNAME=push-response
> ssh://user@dummy/other HG_URL=ssh://user@dummy/other
> $ hg -R other log -G
> o 6:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits at gmail.com> book_5fdd C
> @@ -377,7 +377,7 @@ push over http
> $ hg -R main phase --public 32af7686d403
> pre-close-tip:02de42196ebe draft book_02de
> postclose-tip:02de42196ebe draft book_02de
> - txnclose hook: HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 TXNID=TXN:$ID$ HG_TXNNAME=phase
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 TXNID=TXN:$ID$ HG_TXNNAME=phase
> $ hg -R main push http://localhost:$HGPORT2/ -r 32af7686d403 --bookmark book_32af
> pushing to http://localhost:$HGPORT2/
> searching for changes
> @@ -394,11 +394,11 @@ push over http
> remote: lock: free
> remote: wlock: free
> remote: postclose-tip:32af7686d403 public book_32af
> - remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=32af7686d403cf45b5d95f2d70cebea587ac806a HG_NODE_LAST=32af7686d403cf45b5d95f2d70cebea587ac806a HG_PHASES_MOVED=1 HG_SOURCE=serve TXNID=TXN:$ID$ HG_TXNNAME=serve HG_URL=remote:http:$LOCALIP:
> + remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=32af7686d403cf45b5d95f2d70cebea587ac806a HG_NODE_LAST=32af7686d403cf45b5d95f2d70cebea587ac806a HG_PHASES_MOVED=1 HG_SOURCE=serve TXNID=TXN:$ID$ HG_TXNNAME=serve HG_URL=remote:http:$LOCALIP:
> updating bookmark book_32af
> pre-close-tip:02de42196ebe draft book_02de
> postclose-tip:02de42196ebe draft book_02de
> - txnclose hook: HG_HOOKTYPE=txnclose HG_SOURCE=push-response TXNID=TXN:$ID$ HG_TXNNAME=push-response
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_SOURCE=push-response TXNID=TXN:$ID$ HG_TXNNAME=push-response
> http://localhost:$HGPORT2/ HG_URL=http://localhost:$HGPORT2/
> $ cat other-error.log
>
> @@ -486,7 +486,7 @@ Setting up
> $ hg ci -m 'I'
> pre-close-tip:e7ec4e813ba6 draft
> postclose-tip:e7ec4e813ba6 draft
> - txnclose hook: HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=commit
> + txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=commit
> $ hg id
> e7ec4e813ba6 tip
> $ cd ..
> diff --git a/tests/test-bundle2-multiple-changegroups.t b/tests/test-bundle2-multiple-changegroups.t
> --- a/tests/test-bundle2-multiple-changegroups.t
> +++ b/tests/test-bundle2-multiple-changegroups.t
> @@ -81,17 +81,17 @@ Pull the new commits in the clone
> adding manifests
> adding file changes
> added 1 changesets with 1 changes to 1 files
> - pretxnchangegroup hook: HG_HOOKTYPE=pretxnchangegroup HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_NODE_LAST=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_PENDING=$TESTTMP/clone HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> + pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_NODE_LAST=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_PENDING=$TESTTMP/clone HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> remote: changegroup2
> adding changesets
> adding manifests
> adding file changes
> added 1 changesets with 1 changes to 1 files
> - pretxnchangegroup hook: HG_HOOKTYPE=pretxnchangegroup HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_NODE_LAST=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> - changegroup hook: HG_HOOKTYPE=changegroup HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_NODE_LAST=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> - incoming hook: HG_HOOKTYPE=incoming HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> - changegroup hook: HG_HOOKTYPE=changegroup HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_NODE_LAST=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> - incoming hook: HG_HOOKTYPE=incoming HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> + pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_NODE_LAST=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> + changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_NODE_LAST=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> + incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> + changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_NODE_LAST=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> + incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> pullop.cgresult is 1
> (run 'hg update' to get a working copy)
> $ hg update
> @@ -151,20 +151,20 @@ pullop.cgresult
> adding manifests
> adding file changes
> added 2 changesets with 2 changes to 2 files (+1 heads)
> - pretxnchangegroup hook: HG_HOOKTYPE=pretxnchangegroup HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_NODE_LAST=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_PENDING=$TESTTMP/clone HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> + pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_NODE_LAST=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_PENDING=$TESTTMP/clone HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> remote: changegroup2
> adding changesets
> adding manifests
> adding file changes
> added 3 changesets with 3 changes to 3 files (+1 heads)
> - pretxnchangegroup hook: HG_HOOKTYPE=pretxnchangegroup HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_NODE_LAST=5cd59d311f6508b8e0ed28a266756c859419c9f1 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> - changegroup hook: HG_HOOKTYPE=changegroup HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_NODE_LAST=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> - incoming hook: HG_HOOKTYPE=incoming HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> - incoming hook: HG_HOOKTYPE=incoming HG_NODE=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> - changegroup hook: HG_HOOKTYPE=changegroup HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_NODE_LAST=5cd59d311f6508b8e0ed28a266756c859419c9f1 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> - incoming hook: HG_HOOKTYPE=incoming HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> - incoming hook: HG_HOOKTYPE=incoming HG_NODE=1d14c3ce6ac0582d2809220d33e8cd7a696e0156 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> - incoming hook: HG_HOOKTYPE=incoming HG_NODE=5cd59d311f6508b8e0ed28a266756c859419c9f1 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> + pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_NODE_LAST=5cd59d311f6508b8e0ed28a266756c859419c9f1 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> + changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_NODE_LAST=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> + incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> + incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> + changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_NODE_LAST=5cd59d311f6508b8e0ed28a266756c859419c9f1 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> + incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> + incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=1d14c3ce6ac0582d2809220d33e8cd7a696e0156 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> + incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=5cd59d311f6508b8e0ed28a266756c859419c9f1 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> pullop.cgresult is 3
> (run 'hg heads' to see heads, 'hg merge' to merge)
> $ hg log -G
> @@ -224,17 +224,17 @@ pullop.cgresult
> adding manifests
> adding file changes
> added 1 changesets with 0 changes to 0 files (-1 heads)
> - pretxnchangegroup hook: HG_HOOKTYPE=pretxnchangegroup HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_NODE_LAST=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_PENDING=$TESTTMP/clone HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> + pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_NODE_LAST=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_PENDING=$TESTTMP/clone HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> remote: changegroup2
> adding changesets
> adding manifests
> adding file changes
> added 1 changesets with 1 changes to 1 files
> - pretxnchangegroup hook: HG_HOOKTYPE=pretxnchangegroup HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> - changegroup hook: HG_HOOKTYPE=changegroup HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_NODE_LAST=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> - incoming hook: HG_HOOKTYPE=incoming HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> - changegroup hook: HG_HOOKTYPE=changegroup HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> - incoming hook: HG_HOOKTYPE=incoming HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> + pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> + changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_NODE_LAST=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> + incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> + changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> + incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PHASES_MOVED=1 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
> pullop.cgresult is -2
> (run 'hg update' to get a working copy)
> $ hg log -G
> diff --git a/tests/test-hook.t b/tests/test-hook.t
> --- a/tests/test-hook.t
> +++ b/tests/test-hook.t
> @@ -29,14 +29,14 @@ commit hooks can see env vars
> $ echo a > a
> $ hg add a
> $ hg commit -m a
> - precommit hook: HG_HOOKTYPE=precommit HG_PARENT1=0000000000000000000000000000000000000000
> - pretxnopen hook: HG_HOOKTYPE=pretxnopen TXNID=TXN:$ID$ HG_TXNNAME=commit
> - pretxncommit hook: HG_HOOKTYPE=pretxncommit HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 HG_PENDING=$TESTTMP/a
> + precommit hook: HG_HOOKNAME=precommit HG_HOOKTYPE=precommit HG_PARENT1=0000000000000000000000000000000000000000
> + pretxnopen hook: HG_HOOKNAME=pretxnopen HG_HOOKTYPE=pretxnopen TXNID=TXN:$ID$ HG_TXNNAME=commit
> + pretxncommit hook: HG_HOOKNAME=pretxncommit HG_HOOKTYPE=pretxncommit HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 HG_PENDING=$TESTTMP/a
> 0:cb9a9f314b8b
> - pretxnclose hook: HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/a HG_PHASES_MOVED=1 TXNID=TXN:$ID$ HG_TXNNAME=commit
> - txnclose hook: HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 TXNID=TXN:$ID$ HG_TXNNAME=commit
> - commit hook: HG_HOOKTYPE=commit HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000
> - commit.b hook: HG_HOOKTYPE=commit HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000
> + pretxnclose hook: HG_HOOKNAME=pretxnclose HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/a HG_PHASES_MOVED=1 TXNID=TXN:$ID$ HG_TXNNAME=commit
> + txnclose hook: HG_HOOKNAME=txnclose HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 TXNID=TXN:$ID$ HG_TXNNAME=commit
> + commit hook: HG_HOOKNAME=commit HG_HOOKTYPE=commit HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000
> + commit.b hook: HG_HOOKNAME=commit.b HG_HOOKTYPE=commit HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000
>
> $ hg clone . ../b
> updating to branch default
> @@ -57,65 +57,65 @@ pretxncommit and commit hooks can see bo
> $ cd ../a
> $ echo b >> a
> $ hg commit -m a1 -d "1 0"
> - precommit hook: HG_HOOKTYPE=precommit HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
> - pretxnopen hook: HG_HOOKTYPE=pretxnopen TXNID=TXN:$ID$ HG_TXNNAME=commit
> - pretxncommit hook: HG_HOOKTYPE=pretxncommit HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$TESTTMP/a
> + precommit hook: HG_HOOKNAME=precommit HG_HOOKTYPE=precommit HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
> + pretxnopen hook: HG_HOOKNAME=pretxnopen HG_HOOKTYPE=pretxnopen TXNID=TXN:$ID$ HG_TXNNAME=commit
> + pretxncommit hook: HG_HOOKNAME=pretxncommit HG_HOOKTYPE=pretxncommit HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$TESTTMP/a
> 1:ab228980c14d
> - pretxnclose hook: HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/a TXNID=TXN:$ID$ HG_TXNNAME=commit
> - txnclose hook: HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=commit
> - commit hook: HG_HOOKTYPE=commit HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
> - commit.b hook: HG_HOOKTYPE=commit HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
> + pretxnclose hook: HG_HOOKNAME=pretxnclose HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/a TXNID=TXN:$ID$ HG_TXNNAME=commit
> + txnclose hook: HG_HOOKNAME=txnclose HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=commit
> + commit hook: HG_HOOKNAME=commit HG_HOOKTYPE=commit HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
> + commit.b hook: HG_HOOKNAME=commit.b HG_HOOKTYPE=commit HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
> $ hg update -C 0
> 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> $ echo b > b
> $ hg add b
> $ hg commit -m b -d '1 0'
> - precommit hook: HG_HOOKTYPE=precommit HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
> - pretxnopen hook: HG_HOOKTYPE=pretxnopen TXNID=TXN:$ID$ HG_TXNNAME=commit
> - pretxncommit hook: HG_HOOKTYPE=pretxncommit HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$TESTTMP/a
> + precommit hook: HG_HOOKNAME=precommit HG_HOOKTYPE=precommit HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
> + pretxnopen hook: HG_HOOKNAME=pretxnopen HG_HOOKTYPE=pretxnopen TXNID=TXN:$ID$ HG_TXNNAME=commit
> + pretxncommit hook: HG_HOOKNAME=pretxncommit HG_HOOKTYPE=pretxncommit HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$TESTTMP/a
> 2:ee9deb46ab31
> - pretxnclose hook: HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/a TXNID=TXN:$ID$ HG_TXNNAME=commit
> + pretxnclose hook: HG_HOOKNAME=pretxnclose HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/a TXNID=TXN:$ID$ HG_TXNNAME=commit
> created new head
> - txnclose hook: HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=commit
> - commit hook: HG_HOOKTYPE=commit HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
> - commit.b hook: HG_HOOKTYPE=commit HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
> + txnclose hook: HG_HOOKNAME=txnclose HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=commit
> + commit hook: HG_HOOKNAME=commit HG_HOOKTYPE=commit HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
> + commit.b hook: HG_HOOKNAME=commit.b HG_HOOKTYPE=commit HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
> $ hg merge 1
> 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> (branch merge, don't forget to commit)
> $ hg commit -m merge -d '2 0'
> - precommit hook: HG_HOOKTYPE=precommit HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
> - pretxnopen hook: HG_HOOKTYPE=pretxnopen TXNID=TXN:$ID$ HG_TXNNAME=commit
> - pretxncommit hook: HG_HOOKTYPE=pretxncommit HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd HG_PENDING=$TESTTMP/a
> + precommit hook: HG_HOOKNAME=precommit HG_HOOKTYPE=precommit HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
> + pretxnopen hook: HG_HOOKNAME=pretxnopen HG_HOOKTYPE=pretxnopen TXNID=TXN:$ID$ HG_TXNNAME=commit
> + pretxncommit hook: HG_HOOKNAME=pretxncommit HG_HOOKTYPE=pretxncommit HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd HG_PENDING=$TESTTMP/a
> 3:07f3376c1e65
> - pretxnclose hook: HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/a TXNID=TXN:$ID$ HG_TXNNAME=commit
> - txnclose hook: HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=commit
> - commit hook: HG_HOOKTYPE=commit HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
> - commit.b hook: HG_HOOKTYPE=commit HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
> + pretxnclose hook: HG_HOOKNAME=pretxnclose HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/a TXNID=TXN:$ID$ HG_TXNNAME=commit
> + txnclose hook: HG_HOOKNAME=txnclose HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=commit
> + commit hook: HG_HOOKNAME=commit HG_HOOKTYPE=commit HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
> + commit.b hook: HG_HOOKNAME=commit.b HG_HOOKTYPE=commit HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd
>
> test generic hooks
>
> $ hg id
> - pre-identify hook: HG_ARGS=id HG_HOOKTYPE=pre-identify HG_OPTS={'bookmarks': None, 'branch': None, 'id': None, 'insecure': None, 'num': None, 'remotecmd': '', 'rev': '', 'ssh': '', 'tags': None} HG_PATS=[]
> + pre-identify hook: HG_ARGS=id HG_HOOKNAME=pre-identify HG_HOOKTYPE=pre-identify HG_OPTS={'bookmarks': None, 'branch': None, 'id': None, 'insecure': None, 'num': None, 'remotecmd': '', 'rev': '', 'ssh': '', 'tags': None} HG_PATS=[]
> abort: pre-identify hook exited with status 1
> [255]
> $ hg cat b
> - pre-cat hook: HG_ARGS=cat b HG_HOOKTYPE=pre-cat HG_OPTS={'decode': None, 'exclude': [], 'include': [], 'output': '', 'rev': ''} HG_PATS=['b']
> + pre-cat hook: HG_ARGS=cat b HG_HOOKNAME=pre-cat HG_HOOKTYPE=pre-cat HG_OPTS={'decode': None, 'exclude': [], 'include': [], 'output': '', 'rev': ''} HG_PATS=['b']
> b
> - post-cat hook: HG_ARGS=cat b HG_HOOKTYPE=post-cat HG_OPTS={'decode': None, 'exclude': [], 'include': [], 'output': '', 'rev': ''} HG_PATS=['b'] HG_RESULT=0
> + post-cat hook: HG_ARGS=cat b HG_HOOKNAME=post-cat HG_HOOKTYPE=post-cat HG_OPTS={'decode': None, 'exclude': [], 'include': [], 'output': '', 'rev': ''} HG_PATS=['b'] HG_RESULT=0
>
> $ cd ../b
> $ hg pull ../a
> pulling from ../a
> searching for changes
> - prechangegroup hook: HG_HOOKTYPE=prechangegroup HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a
> + prechangegroup hook: HG_HOOKNAME=prechangegroup HG_HOOKTYPE=prechangegroup HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a
> adding changesets
> adding manifests
> adding file changes
> added 3 changesets with 2 changes to 2 files
> - changegroup hook: HG_HOOKTYPE=changegroup HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_NODE_LAST=07f3376c1e655977439df2a814e3cc14b27abac2 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a
> - incoming hook: HG_HOOKTYPE=incoming HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a
> - incoming hook: HG_HOOKTYPE=incoming HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a
> - incoming hook: HG_HOOKTYPE=incoming HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a
> + changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_NODE_LAST=07f3376c1e655977439df2a814e3cc14b27abac2 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a
> + incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a
> + incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a
> + incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a
> (run 'hg update' to get a working copy)
>
> tag hooks can see env vars
> @@ -126,19 +126,19 @@ tag hooks can see env vars
> > tag = sh -c "HG_PARENT1= HG_PARENT2= printenv.py tag"
> > EOF
> $ hg tag -d '3 0' a
> - pretag hook: HG_HOOKTYPE=pretag HG_LOCAL=0 HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_TAG=a
> - precommit hook: HG_HOOKTYPE=precommit HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
> - pretxnopen hook: HG_HOOKTYPE=pretxnopen TXNID=TXN:$ID$ HG_TXNNAME=commit
> - pretxncommit hook: HG_HOOKTYPE=pretxncommit HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PENDING=$TESTTMP/a
> + pretag hook: HG_HOOKNAME=pretag HG_HOOKTYPE=pretag HG_LOCAL=0 HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_TAG=a
> + precommit hook: HG_HOOKNAME=precommit HG_HOOKTYPE=precommit HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
> + pretxnopen hook: HG_HOOKNAME=pretxnopen HG_HOOKTYPE=pretxnopen TXNID=TXN:$ID$ HG_TXNNAME=commit
> + pretxncommit hook: HG_HOOKNAME=pretxncommit HG_HOOKTYPE=pretxncommit HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PENDING=$TESTTMP/a
> 4:539e4b31b6dc
> - pretxnclose hook: HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/a TXNID=TXN:$ID$ HG_TXNNAME=commit
> - tag hook: HG_HOOKTYPE=tag HG_LOCAL=0 HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_TAG=a
> - txnclose hook: HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=commit
> - commit hook: HG_HOOKTYPE=commit HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
> - commit.b hook: HG_HOOKTYPE=commit HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
> + pretxnclose hook: HG_HOOKNAME=pretxnclose HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/a TXNID=TXN:$ID$ HG_TXNNAME=commit
> + tag hook: HG_HOOKNAME=tag HG_HOOKTYPE=tag HG_LOCAL=0 HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_TAG=a
> + txnclose hook: HG_HOOKNAME=txnclose HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=commit
> + commit hook: HG_HOOKNAME=commit HG_HOOKTYPE=commit HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
> + commit.b hook: HG_HOOKNAME=commit.b HG_HOOKTYPE=commit HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2
> $ hg tag -l la
> - pretag hook: HG_HOOKTYPE=pretag HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=la
> - tag hook: HG_HOOKTYPE=tag HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=la
> + pretag hook: HG_HOOKNAME=pretag HG_HOOKTYPE=pretag HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=la
> + tag hook: HG_HOOKNAME=tag HG_HOOKTYPE=tag HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=la
>
> pretag hook can forbid tagging
>
> @@ -146,13 +146,13 @@ pretag hook can forbid tagging
> > pretag.forbid = sh -c "printenv.py pretag.forbid 1"
> > EOF
> $ hg tag -d '4 0' fa
> - pretag hook: HG_HOOKTYPE=pretag HG_LOCAL=0 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fa
> - pretag.forbid hook: HG_HOOKTYPE=pretag HG_LOCAL=0 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fa
> + pretag hook: HG_HOOKNAME=pretag HG_HOOKTYPE=pretag HG_LOCAL=0 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fa
> + pretag.forbid hook: HG_HOOKNAME=pretag.forbid HG_HOOKTYPE=pretag HG_LOCAL=0 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fa
> abort: pretag.forbid hook exited with status 1
> [255]
> $ hg tag -l fla
> - pretag hook: HG_HOOKTYPE=pretag HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fla
> - pretag.forbid hook: HG_HOOKTYPE=pretag HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fla
> + pretag hook: HG_HOOKNAME=pretag HG_HOOKTYPE=pretag HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fla
> + pretag.forbid hook: HG_HOOKNAME=pretag.forbid HG_HOOKTYPE=pretag HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fla
> abort: pretag.forbid hook exited with status 1
> [255]
>
> @@ -168,15 +168,15 @@ more there after
> $ hg -q tip
> 4:539e4b31b6dc
> $ hg commit -m 'fail' -d '4 0'
> - precommit hook: HG_HOOKTYPE=precommit HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
> - pretxnopen hook: HG_HOOKTYPE=pretxnopen TXNID=TXN:$ID$ HG_TXNNAME=commit
> - pretxncommit hook: HG_HOOKTYPE=pretxncommit HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$TESTTMP/a
> + precommit hook: HG_HOOKNAME=precommit HG_HOOKTYPE=precommit HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
> + pretxnopen hook: HG_HOOKNAME=pretxnopen HG_HOOKTYPE=pretxnopen TXNID=TXN:$ID$ HG_TXNNAME=commit
> + pretxncommit hook: HG_HOOKNAME=pretxncommit HG_HOOKTYPE=pretxncommit HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$TESTTMP/a
> 5:6f611f8018c1
> 5:6f611f8018c1
> - pretxncommit.forbid hook: HG_HOOKTYPE=pretxncommit HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$TESTTMP/a
> + pretxncommit.forbid hook: HG_HOOKNAME=pretxncommit.forbid1 HG_HOOKTYPE=pretxncommit HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$TESTTMP/a
> transaction abort!
> txnabort python hook: txnid,txnname
> - txnabort hook: HG_HOOKTYPE=txnabort TXNID=TXN:$ID$ HG_TXNNAME=commit
> + txnabort hook: HG_HOOKNAME=txnabort.1 HG_HOOKTYPE=txnabort TXNID=TXN:$ID$ HG_TXNNAME=commit
> rollback completed
> abort: pretxncommit.forbid1 hook exited with status 1
> [255]
> @@ -204,8 +204,8 @@ precommit hook can prevent commit
> > precommit.forbid = sh -c "printenv.py precommit.forbid 1"
> > EOF
> $ hg commit -m 'fail' -d '4 0'
> - precommit hook: HG_HOOKTYPE=precommit HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
> - precommit.forbid hook: HG_HOOKTYPE=precommit HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
> + precommit hook: HG_HOOKNAME=precommit HG_HOOKTYPE=precommit HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
> + precommit.forbid hook: HG_HOOKNAME=precommit.forbid HG_HOOKTYPE=precommit HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
> abort: precommit.forbid hook exited with status 1
> [255]
> $ hg -q tip
> @@ -217,7 +217,7 @@ preupdate hook can prevent update
> > preupdate = sh -c "printenv.py preupdate"
> > EOF
> $ hg update 1
> - preupdate hook: HG_HOOKTYPE=preupdate HG_PARENT1=ab228980c14d
> + preupdate hook: HG_HOOKNAME=preupdate HG_HOOKTYPE=preupdate HG_PARENT1=ab228980c14d
> 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
>
> update hook
> @@ -226,8 +226,8 @@ update hook
> > update = sh -c "printenv.py update"
> > EOF
> $ hg update
> - preupdate hook: HG_HOOKTYPE=preupdate HG_PARENT1=539e4b31b6dc
> - update hook: HG_ERROR=0 HG_HOOKTYPE=update HG_PARENT1=539e4b31b6dc
> + preupdate hook: HG_HOOKNAME=preupdate HG_HOOKTYPE=preupdate HG_PARENT1=539e4b31b6dc
> + update hook: HG_ERROR=0 HG_HOOKNAME=update HG_HOOKTYPE=update HG_PARENT1=539e4b31b6dc
> 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
>
> pushkey hook
> @@ -241,10 +241,10 @@ pushkey hook
> pushing to ../a
> searching for changes
> no changes found
> - pretxnopen hook: HG_HOOKTYPE=pretxnopen TXNID=TXN:$ID$ HG_TXNNAME=push
> - pretxnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/a HG_SOURCE=push TXNID=TXN:$ID$ HG_TXNNAME=push HG_URL=file:$TESTTMP/a
> - pushkey hook: HG_HOOKTYPE=pushkey HG_KEY=foo HG_NAMESPACE=bookmarks HG_NEW=0000000000000000000000000000000000000000 HG_RET=1
> - txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_HOOKTYPE=txnclose HG_SOURCE=push TXNID=TXN:$ID$ HG_TXNNAME=push HG_URL=file:$TESTTMP/a
> + pretxnopen hook: HG_HOOKNAME=pretxnopen HG_HOOKTYPE=pretxnopen TXNID=TXN:$ID$ HG_TXNNAME=push
> + pretxnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_HOOKNAME=pretxnclose HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/a HG_SOURCE=push TXNID=TXN:$ID$ HG_TXNNAME=push HG_URL=file:$TESTTMP/a
> + pushkey hook: HG_HOOKNAME=pushkey HG_HOOKTYPE=pushkey HG_KEY=foo HG_NAMESPACE=bookmarks HG_NEW=0000000000000000000000000000000000000000 HG_RET=1
> + txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_HOOKNAME=txnclose HG_HOOKTYPE=txnclose HG_SOURCE=push TXNID=TXN:$ID$ HG_TXNNAME=push HG_URL=file:$TESTTMP/a
> exporting bookmark foo
> [1]
> $ cd ../a
> @@ -255,15 +255,15 @@ listkeys hook
> > listkeys = sh -c "printenv.py listkeys"
> > EOF
> $ hg bookmark -r null bar
> - pretxnopen hook: HG_HOOKTYPE=pretxnopen TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> - pretxnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/a TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> - txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> + pretxnopen hook: HG_HOOKNAME=pretxnopen HG_HOOKTYPE=pretxnopen TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> + pretxnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=pretxnclose HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/a TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> + txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> $ cd ../b
> $ hg pull -B bar ../a
> pulling from ../a
> - listkeys hook: HG_HOOKTYPE=listkeys HG_NAMESPACE=bookmarks HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'}
> + listkeys hook: HG_HOOKNAME=listkeys HG_HOOKTYPE=listkeys HG_NAMESPACE=bookmarks HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'}
> no changes found
> - listkeys hook: HG_HOOKTYPE=listkeys HG_NAMESPACE=phases HG_VALUES={'cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b': '1', 'publishing': 'True'}
> + listkeys hook: HG_HOOKNAME=listkeys HG_HOOKTYPE=listkeys HG_NAMESPACE=phases HG_VALUES={'cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b': '1', 'publishing': 'True'}
> adding remote bookmark bar
> $ cd ../a
>
> @@ -277,11 +277,11 @@ test that prepushkey can prevent incomin
> $ hg push -B baz ../a
> pushing to ../a
> searching for changes
> - listkeys hook: HG_HOOKTYPE=listkeys HG_NAMESPACE=phases HG_VALUES={'cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b': '1', 'publishing': 'True'}
> - listkeys hook: HG_HOOKTYPE=listkeys HG_NAMESPACE=bookmarks HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'}
> + listkeys hook: HG_HOOKNAME=listkeys HG_HOOKTYPE=listkeys HG_NAMESPACE=phases HG_VALUES={'cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b': '1', 'publishing': 'True'}
> + listkeys hook: HG_HOOKNAME=listkeys HG_HOOKTYPE=listkeys HG_NAMESPACE=bookmarks HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'}
> no changes found
> - pretxnopen hook: HG_HOOKTYPE=pretxnopen TXNID=TXN:$ID$ HG_TXNNAME=push
> - prepushkey.forbid hook: HG_BUNDLE2=1 HG_HOOKTYPE=prepushkey HG_KEY=baz HG_NAMESPACE=bookmarks HG_NEW=0000000000000000000000000000000000000000 HG_SOURCE=push TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a
> + pretxnopen hook: HG_HOOKNAME=pretxnopen HG_HOOKTYPE=pretxnopen TXNID=TXN:$ID$ HG_TXNNAME=push
> + prepushkey.forbid hook: HG_BUNDLE2=1 HG_HOOKNAME=prepushkey HG_HOOKTYPE=prepushkey HG_KEY=baz HG_NAMESPACE=bookmarks HG_NEW=0000000000000000000000000000000000000000 HG_SOURCE=push TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a
> pushkey-abort: prepushkey hook exited with status 1
> abort: exporting bookmark baz failed!
> [255]
> @@ -293,13 +293,13 @@ test that prelistkeys can prevent listin
> > prelistkeys = sh -c "printenv.py prelistkeys.forbid 1"
> > EOF
> $ hg bookmark -r null quux
> - pretxnopen hook: HG_HOOKTYPE=pretxnopen TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> - pretxnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/a TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> - txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> + pretxnopen hook: HG_HOOKNAME=pretxnopen HG_HOOKTYPE=pretxnopen TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> + pretxnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=pretxnclose HG_HOOKTYPE=pretxnclose HG_PENDING=$TESTTMP/a TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> + txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose HG_HOOKTYPE=txnclose TXNID=TXN:$ID$ HG_TXNNAME=bookmark
> $ cd ../b
> $ hg pull -B quux ../a
> pulling from ../a
> - prelistkeys.forbid hook: HG_HOOKTYPE=prelistkeys HG_NAMESPACE=bookmarks
> + prelistkeys.forbid hook: HG_HOOKNAME=prelistkeys HG_HOOKTYPE=prelistkeys HG_NAMESPACE=bookmarks
> abort: prelistkeys hook exited with status 1
> [255]
> $ cd ../a
> @@ -317,7 +317,7 @@ prechangegroup hook can prevent incoming
> $ hg pull ../a
> pulling from ../a
> searching for changes
> - prechangegroup.forbid hook: HG_HOOKTYPE=prechangegroup HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a
> + prechangegroup.forbid hook: HG_HOOKNAME=prechangegroup.forbid HG_HOOKTYPE=prechangegroup HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a
> abort: prechangegroup.forbid hook exited with status 1
> [255]
>
> @@ -337,7 +337,7 @@ incoming changes no longer there after
> adding file changes
> added 1 changesets with 1 changes to 1 files
> 4:539e4b31b6dc
> - pretxnchangegroup.forbid hook: HG_HOOKTYPE=pretxnchangegroup HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_NODE_LAST=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$TESTTMP/b HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a
> + pretxnchangegroup.forbid hook: HG_HOOKNAME=pretxnchangegroup.forbid1 HG_HOOKTYPE=pretxnchangegroup HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_NODE_LAST=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$TESTTMP/b HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a
> transaction abort!
> rollback completed
> abort: pretxnchangegroup.forbid1 hook exited with status 1
> @@ -356,8 +356,8 @@ outgoing hooks can see env vars
> $ hg pull ../a
> pulling from ../a
> searching for changes
> - preoutgoing hook: HG_HOOKTYPE=preoutgoing HG_SOURCE=pull
> - outgoing hook: HG_HOOKTYPE=outgoing HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_SOURCE=pull
> + preoutgoing hook: HG_HOOKNAME=preoutgoing HG_HOOKTYPE=preoutgoing HG_SOURCE=pull
> + outgoing hook: HG_HOOKNAME=outgoing HG_HOOKTYPE=outgoing HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_SOURCE=pull
> adding changesets
> adding manifests
> adding file changes
> @@ -375,8 +375,8 @@ preoutgoing hook can prevent outgoing ch
> $ hg pull ../a
> pulling from ../a
> searching for changes
> - preoutgoing hook: HG_HOOKTYPE=preoutgoing HG_SOURCE=pull
> - preoutgoing.forbid hook: HG_HOOKTYPE=preoutgoing HG_SOURCE=pull
> + preoutgoing hook: HG_HOOKNAME=preoutgoing HG_HOOKTYPE=preoutgoing HG_SOURCE=pull
> + preoutgoing.forbid hook: HG_HOOKNAME=preoutgoing.forbid HG_HOOKTYPE=preoutgoing HG_SOURCE=pull
> abort: preoutgoing.forbid hook exited with status 1
> [255]
>
> @@ -389,8 +389,8 @@ outgoing hooks work for local clones
> > outgoing = sh -c "printenv.py outgoing"
> > EOF
> $ hg clone a c
> - preoutgoing hook: HG_HOOKTYPE=preoutgoing HG_SOURCE=clone
> - outgoing hook: HG_HOOKTYPE=outgoing HG_NODE=0000000000000000000000000000000000000000 HG_SOURCE=clone
> + preoutgoing hook: HG_HOOKNAME=preoutgoing HG_HOOKTYPE=preoutgoing HG_SOURCE=clone
> + outgoing hook: HG_HOOKNAME=outgoing HG_HOOKTYPE=outgoing HG_NODE=0000000000000000000000000000000000000000 HG_SOURCE=clone
> updating to branch default
> 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
> $ rm -rf c
> @@ -401,8 +401,8 @@ preoutgoing hook can prevent outgoing ch
> > preoutgoing.forbid = sh -c "printenv.py preoutgoing.forbid 1"
> > EOF
> $ hg clone a zzz
> - preoutgoing hook: HG_HOOKTYPE=preoutgoing HG_SOURCE=clone
> - preoutgoing.forbid hook: HG_HOOKTYPE=preoutgoing HG_SOURCE=clone
> + preoutgoing hook: HG_HOOKNAME=preoutgoing HG_HOOKTYPE=preoutgoing HG_SOURCE=clone
> + preoutgoing.forbid hook: HG_HOOKNAME=preoutgoing.forbid HG_HOOKTYPE=preoutgoing HG_SOURCE=clone
> abort: preoutgoing.forbid hook exited with status 1
> [255]
>
> @@ -775,7 +775,7 @@ This also creates the `to` repo for the
> > post-init = sh -c "printenv.py post-init"
> > EOF
> $ HGRCPATH=hgrc-with-post-init-hook hg init to
> - post-init hook: HG_ARGS=init to HG_HOOKTYPE=post-init HG_OPTS={'insecure': None, 'remotecmd': '', 'ssh': ''} HG_PATS=['to'] HG_RESULT=0
> + post-init hook: HG_ARGS=init to HG_HOOKNAME=post-init HG_HOOKTYPE=post-init HG_OPTS={'insecure': None, 'remotecmd': '', 'ssh': ''} HG_PATS=['to'] HG_RESULT=0
>
> new commits must be visible in pretxnchangegroup (issue3428)
>
> diff --git a/tests/test-http-bundle1.t b/tests/test-http-bundle1.t
> --- a/tests/test-http-bundle1.t
> +++ b/tests/test-http-bundle1.t
> @@ -138,7 +138,7 @@ pull
> adding manifests
> adding file changes
> added 1 changesets with 1 changes to 1 files
> - changegroup hook: HG_HOOKTYPE=changegroup HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=http://localhost:$HGPORT1/
> + changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=http://localhost:$HGPORT1/
> (run 'hg update' to get a working copy)
> $ cd ..
>
> diff --git a/tests/test-http.t b/tests/test-http.t
> --- a/tests/test-http.t
> +++ b/tests/test-http.t
> @@ -129,7 +129,7 @@ pull
> adding manifests
> adding file changes
> added 1 changesets with 1 changes to 1 files
> - changegroup hook: HG_HOOKTYPE=changegroup HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=http://localhost:$HGPORT1/
> + changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=http://localhost:$HGPORT1/
> (run 'hg update' to get a working copy)
> $ cd ..
>
> diff --git a/tests/test-https.t b/tests/test-https.t
> --- a/tests/test-https.t
> +++ b/tests/test-https.t
> @@ -223,7 +223,7 @@ pull without cacert
> adding manifests
> adding file changes
> added 1 changesets with 1 changes to 1 files
> - changegroup hook: HG_HOOKTYPE=changegroup HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=https://localhost:$HGPORT/
> + changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=https://localhost:$HGPORT/
> (run 'hg update' to get a working copy)
> $ cd ..
>
> diff --git a/tests/test-push-http-bundle1.t b/tests/test-push-http-bundle1.t
> --- a/tests/test-push-http-bundle1.t
> +++ b/tests/test-push-http-bundle1.t
> @@ -79,7 +79,7 @@ expect success
> remote: adding manifests
> remote: adding file changes
> remote: added 1 changesets with 1 changes to 1 files
> - remote: changegroup hook: HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP:
> + remote: changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP:
> % serve errors
> $ hg rollback
> repository tip rolled back to revision 0 (undo serve)
> @@ -95,7 +95,7 @@ expect success, server lacks the httphea
> remote: adding manifests
> remote: adding file changes
> remote: added 1 changesets with 1 changes to 1 files
> - remote: changegroup hook: HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP:
> + remote: changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP:
> % serve errors
> $ hg rollback
> repository tip rolled back to revision 0 (undo serve)
> @@ -111,7 +111,7 @@ expect success, server lacks the unbundl
> remote: adding manifests
> remote: adding file changes
> remote: added 1 changesets with 1 changes to 1 files
> - remote: changegroup hook: HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP:
> + remote: changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP:
> % serve errors
> $ hg rollback
> repository tip rolled back to revision 0 (undo serve)
> diff --git a/tests/test-push-http.t b/tests/test-push-http.t
> --- a/tests/test-push-http.t
> +++ b/tests/test-push-http.t
> @@ -69,8 +69,8 @@ expect success
> remote: adding manifests
> remote: adding file changes
> remote: added 1 changesets with 1 changes to 1 files
> - remote: pushkey hook: HG_HOOKTYPE=pushkey HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_OLD=1 HG_RET=1
> - remote: changegroup hook: HG_BUNDLE2=1 HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP:
> + remote: pushkey hook: HG_HOOKNAME=pushkey HG_HOOKTYPE=pushkey HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_OLD=1 HG_RET=1
> + remote: changegroup hook: HG_BUNDLE2=1 HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP:
> % serve errors
> $ hg rollback
> repository tip rolled back to revision 0 (undo serve)
> @@ -86,8 +86,8 @@ expect success, server lacks the httphea
> remote: adding manifests
> remote: adding file changes
> remote: added 1 changesets with 1 changes to 1 files
> - remote: pushkey hook: HG_HOOKTYPE=pushkey HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_OLD=1 HG_RET=1
> - remote: changegroup hook: HG_BUNDLE2=1 HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP:
> + remote: pushkey hook: HG_HOOKNAME=pushkey HG_HOOKTYPE=pushkey HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_OLD=1 HG_RET=1
> + remote: changegroup hook: HG_BUNDLE2=1 HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP:
> % serve errors
> $ hg rollback
> repository tip rolled back to revision 0 (undo serve)
> @@ -103,8 +103,8 @@ expect success, server lacks the unbundl
> remote: adding manifests
> remote: adding file changes
> remote: added 1 changesets with 1 changes to 1 files
> - remote: pushkey hook: HG_HOOKTYPE=pushkey HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_OLD=1 HG_RET=1
> - remote: changegroup hook: HG_BUNDLE2=1 HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP:
> + remote: pushkey hook: HG_HOOKNAME=pushkey HG_HOOKTYPE=pushkey HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_OLD=1 HG_RET=1
> + remote: changegroup hook: HG_BUNDLE2=1 HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP:
> % serve errors
> $ hg rollback
> repository tip rolled back to revision 0 (undo serve)
> @@ -125,7 +125,7 @@ expect push success, phase change failur
> remote: adding manifests
> remote: adding file changes
> remote: added 1 changesets with 1 changes to 1 files
> - remote: prepushkey hook: HG_BUNDLE2=1 HG_HOOKTYPE=prepushkey HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_OLD=1 HG_PENDING=$TESTTMP/test HG_PHASES_MOVED=1 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP:
> + remote: prepushkey hook: HG_BUNDLE2=1 HG_HOOKNAME=prepushkey HG_HOOKTYPE=prepushkey HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_OLD=1 HG_PENDING=$TESTTMP/test HG_PHASES_MOVED=1 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP:
> remote: pushkey-abort: prepushkey hook exited with status 1
> remote: transaction abort!
> remote: rollback completed
> @@ -145,7 +145,7 @@ expect phase change success
> remote: adding manifests
> remote: adding file changes
> remote: added 1 changesets with 1 changes to 1 files
> - remote: prepushkey hook: HG_BUNDLE2=1 HG_HOOKTYPE=prepushkey HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_OLD=1 HG_PENDING=$TESTTMP/test HG_PHASES_MOVED=1 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP:
> + remote: prepushkey hook: HG_BUNDLE2=1 HG_HOOKNAME=prepushkey HG_HOOKTYPE=prepushkey HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_OLD=1 HG_PENDING=$TESTTMP/test HG_PHASES_MOVED=1 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP:
> % serve errors
> $ hg rollback
> repository tip rolled back to revision 0 (undo serve)
> diff --git a/tests/test-ssh-bundle1.t b/tests/test-ssh-bundle1.t
> --- a/tests/test-ssh-bundle1.t
> +++ b/tests/test-ssh-bundle1.t
> @@ -494,7 +494,7 @@ debug output
> Got arguments 1:user at dummy 2:hg -R local serve --stdio
> Got arguments 1:user at dummy 2:hg -R $TESTTMP/local serve --stdio
> Got arguments 1:user at dummy 2:hg -R remote serve --stdio
> - changegroup-in-remote hook: HG_HOOKTYPE=changegroup HG_NODE=a28a9d1a809cab7d4e2fde4bee738a9ede948b60 HG_NODE_LAST=a28a9d1a809cab7d4e2fde4bee738a9ede948b60 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:ssh:$LOCALIP
> + changegroup-in-remote hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=a28a9d1a809cab7d4e2fde4bee738a9ede948b60 HG_NODE_LAST=a28a9d1a809cab7d4e2fde4bee738a9ede948b60 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:ssh:$LOCALIP
> Got arguments 1:user at dummy 2:hg -R remote serve --stdio
> Got arguments 1:user at dummy 2:hg -R remote serve --stdio
> Got arguments 1:user at dummy 2:hg -R remote serve --stdio
> @@ -504,7 +504,7 @@ debug output
> Got arguments 1:user at dummy 2:hg -R remote serve --stdio
> Got arguments 1:user at dummy 2:hg -R remote serve --stdio
> Got arguments 1:user at dummy 2:hg -R remote serve --stdio
> - changegroup-in-remote hook: HG_HOOKTYPE=changegroup HG_NODE=1383141674ec756a6056f6a9097618482fe0f4a6 HG_NODE_LAST=1383141674ec756a6056f6a9097618482fe0f4a6 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:ssh:$LOCALIP
> + changegroup-in-remote hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=1383141674ec756a6056f6a9097618482fe0f4a6 HG_NODE_LAST=1383141674ec756a6056f6a9097618482fe0f4a6 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:ssh:$LOCALIP
> Got arguments 1:user at dummy 2:hg -R remote serve --stdio
> Got arguments 1:user at dummy 2:hg init 'a repo'
> Got arguments 1:user at dummy 2:hg -R 'a repo' serve --stdio
> @@ -512,7 +512,7 @@ debug output
> Got arguments 1:user at dummy 2:hg -R 'a repo' serve --stdio
> Got arguments 1:user at dummy 2:hg -R 'a repo' serve --stdio
> Got arguments 1:user at dummy 2:hg -R remote serve --stdio
> - changegroup-in-remote hook: HG_HOOKTYPE=changegroup HG_NODE=65c38f4125f9602c8db4af56530cc221d93b8ef8 HG_NODE_LAST=65c38f4125f9602c8db4af56530cc221d93b8ef8 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:ssh:$LOCALIP
> + changegroup-in-remote hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=65c38f4125f9602c8db4af56530cc221d93b8ef8 HG_NODE_LAST=65c38f4125f9602c8db4af56530cc221d93b8ef8 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:ssh:$LOCALIP
> Got arguments 1:user at dummy 2:hg -R remote serve --stdio
>
> remote hook failure is attributed to remote
> diff --git a/tests/test-ssh.t b/tests/test-ssh.t
> --- a/tests/test-ssh.t
> +++ b/tests/test-ssh.t
> @@ -498,7 +498,7 @@ debug output
> Got arguments 1:user at dummy 2:hg -R local serve --stdio
> Got arguments 1:user at dummy 2:hg -R $TESTTMP/local serve --stdio
> Got arguments 1:user at dummy 2:hg -R remote serve --stdio
> - changegroup-in-remote hook: HG_BUNDLE2=1 HG_HOOKTYPE=changegroup HG_NODE=a28a9d1a809cab7d4e2fde4bee738a9ede948b60 HG_NODE_LAST=a28a9d1a809cab7d4e2fde4bee738a9ede948b60 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:ssh:$LOCALIP
> + changegroup-in-remote hook: HG_BUNDLE2=1 HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=a28a9d1a809cab7d4e2fde4bee738a9ede948b60 HG_NODE_LAST=a28a9d1a809cab7d4e2fde4bee738a9ede948b60 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:ssh:$LOCALIP
> Got arguments 1:user at dummy 2:hg -R remote serve --stdio
> Got arguments 1:user at dummy 2:hg -R remote serve --stdio
> Got arguments 1:user at dummy 2:hg -R remote serve --stdio
> @@ -508,7 +508,7 @@ debug output
> Got arguments 1:user at dummy 2:hg -R remote serve --stdio
> Got arguments 1:user at dummy 2:hg -R remote serve --stdio
> Got arguments 1:user at dummy 2:hg -R remote serve --stdio
> - changegroup-in-remote hook: HG_BUNDLE2=1 HG_HOOKTYPE=changegroup HG_NODE=1383141674ec756a6056f6a9097618482fe0f4a6 HG_NODE_LAST=1383141674ec756a6056f6a9097618482fe0f4a6 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:ssh:$LOCALIP
> + changegroup-in-remote hook: HG_BUNDLE2=1 HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=1383141674ec756a6056f6a9097618482fe0f4a6 HG_NODE_LAST=1383141674ec756a6056f6a9097618482fe0f4a6 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:ssh:$LOCALIP
> Got arguments 1:user at dummy 2:hg -R remote serve --stdio
> Got arguments 1:user at dummy 2:hg init 'a repo'
> Got arguments 1:user at dummy 2:hg -R 'a repo' serve --stdio
> @@ -516,7 +516,7 @@ debug output
> Got arguments 1:user at dummy 2:hg -R 'a repo' serve --stdio
> Got arguments 1:user at dummy 2:hg -R 'a repo' serve --stdio
> Got arguments 1:user at dummy 2:hg -R remote serve --stdio
> - changegroup-in-remote hook: HG_BUNDLE2=1 HG_HOOKTYPE=changegroup HG_NODE=65c38f4125f9602c8db4af56530cc221d93b8ef8 HG_NODE_LAST=65c38f4125f9602c8db4af56530cc221d93b8ef8 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:ssh:$LOCALIP
> + changegroup-in-remote hook: HG_BUNDLE2=1 HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=65c38f4125f9602c8db4af56530cc221d93b8ef8 HG_NODE_LAST=65c38f4125f9602c8db4af56530cc221d93b8ef8 HG_SOURCE=serve TXNID=TXN:$ID$ HG_URL=remote:ssh:$LOCALIP
> Got arguments 1:user at dummy 2:hg -R remote serve --stdio
>
> remote hook failure is attributed to remote
> diff --git a/tests/test-static-http.t b/tests/test-static-http.t
> --- a/tests/test-static-http.t
> +++ b/tests/test-static-http.t
> @@ -64,7 +64,7 @@ check for HTTP opener failures when cach
> adding manifests
> adding file changes
> added 1 changesets with 1 changes to 1 files
> - changegroup hook: HG_HOOKTYPE=changegroup HG_NODE=4ac2e3648604439c580c69b09ec9d93a88d93432 HG_NODE_LAST=4ac2e3648604439c580c69b09ec9d93a88d93432 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=http://localhost:$HGPORT/remote
> + changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=4ac2e3648604439c580c69b09ec9d93a88d93432 HG_NODE_LAST=4ac2e3648604439c580c69b09ec9d93a88d93432 HG_SOURCE=pull TXNID=TXN:$ID$ HG_URL=http://localhost:$HGPORT/remote
> (run 'hg update' to get a working copy)
>
> trying to push
More information about the Mercurial-devel
mailing list