[PATCH 02 of 10] test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld
boris.feld at octobus.net
Sat Feb 9 17:03:19 EST 2019
# HG changeset patch
# User Boris Feld <boris.feld at octobus.net>
# Date 1549671583 -3600
# Sat Feb 09 01:19:43 2019 +0100
# Node ID c0b16be6b9b2d9535be8f1f2c91c5a8ebffa0b03
# Parent 1736fe7d07d8a96349dc678f7a7bcba29886d1a7
# EXP-Topic hook.txname
# Available At https://bitbucket.org/octobus/mercurial-devel/
# hg pull https://bitbucket.org/octobus/mercurial-devel/ -r c0b16be6b9b2
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
This makes the output easier to update and read.
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
@@ -66,9 +66,9 @@ Add two linear commits
$ cd ../clone
$ cat >> .hg/hgrc <<EOF
> [hooks]
- > pretxnchangegroup = sh -c "printenv.py pretxnchangegroup"
- > changegroup = sh -c "printenv.py changegroup"
- > incoming = sh -c "printenv.py incoming"
+ > pretxnchangegroup = sh -c "printenv.py --line pretxnchangegroup"
+ > changegroup = sh -c "printenv.py --line changegroup"
+ > incoming = sh -c "printenv.py --line incoming"
> EOF
Pull the new commits in the clone
@@ -81,18 +81,63 @@ Pull the new commits in the clone
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_NODE_LAST=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_PENDING=$TESTTMP/clone HG_SOURCE=pull HG_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
+ HG_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_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_NODE_LAST=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull HG_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
+ HG_TXNID=TXN:$ID$
+ HG_URL=file:$TESTTMP/repo
+
new changesets 27547f69f254:f838bfaca5c7
- changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_NODE_LAST=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
- incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_SOURCE=pull HG_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 HG_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 HG_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
+ HG_TXNID=TXN:$ID$
+ HG_URL=file:$TESTTMP/repo
+
+ incoming hook: HG_HOOKNAME=incoming
+ HG_HOOKTYPE=incoming
+ HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56
+ HG_SOURCE=pull
+ HG_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
+ HG_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
+ HG_TXNID=TXN:$ID$
+ HG_URL=file:$TESTTMP/repo
+
pullop.cgresult is 1
(run 'hg update' to get a working copy)
$ hg update
@@ -152,21 +197,86 @@ pullop.cgresult
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
- pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_NODE_LAST=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_PENDING=$TESTTMP/clone HG_SOURCE=pull HG_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
+ HG_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_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_NODE_LAST=5cd59d311f6508b8e0ed28a266756c859419c9f1 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull HG_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
+ HG_TXNID=TXN:$ID$
+ HG_URL=file:$TESTTMP/repo
+
new changesets b3325c91a4d9:5cd59d311f65
- changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_NODE_LAST=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
- incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
- incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_SOURCE=pull HG_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 HG_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 HG_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 HG_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 HG_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
+ HG_TXNID=TXN:$ID$
+ HG_URL=file:$TESTTMP/repo
+
+ incoming hook: HG_HOOKNAME=incoming
+ HG_HOOKTYPE=incoming
+ HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e
+ HG_SOURCE=pull
+ HG_TXNID=TXN:$ID$
+ HG_URL=file:$TESTTMP/repo
+
+ incoming hook: HG_HOOKNAME=incoming
+ HG_HOOKTYPE=incoming
+ HG_NODE=8a5212ebc8527f9fb821601504794e3eb11a1ed3
+ HG_SOURCE=pull
+ HG_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
+ HG_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
+ HG_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
+ HG_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
+ HG_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
@@ -226,18 +336,63 @@ pullop.cgresult
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (-1 heads)
- pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_NODE_LAST=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_PENDING=$TESTTMP/clone HG_SOURCE=pull HG_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
+ HG_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_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull HG_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
+ HG_TXNID=TXN:$ID$
+ HG_URL=file:$TESTTMP/repo
+
new changesets 71bd7b46de72:9d18e5bd9ab0
- changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_NODE_LAST=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
- incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE=pull HG_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 HG_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 HG_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
+ HG_TXNID=TXN:$ID$
+ HG_URL=file:$TESTTMP/repo
+
+ incoming hook: HG_HOOKNAME=incoming
+ HG_HOOKTYPE=incoming
+ HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4
+ HG_SOURCE=pull
+ HG_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
+ HG_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
+ HG_TXNID=TXN:$ID$
+ HG_URL=file:$TESTTMP/repo
+
pullop.cgresult is -2
(run 'hg update' to get a working copy)
$ hg log -G
More information about the Mercurial-devel
mailing list