Mercurial > hg

comparison tests/test-bundle2-multiple-changegroups.t @ 41638:e8a71ed9c373

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t` This makes the output easier to update and read.
author Boris Feld <boris.feld@octobus.net>
date Sat, 09 Feb 2019 01:19:43 +0100
parents 3e3f4c03876b
children 94faa2e84094
comparison
equal deleted inserted replaced
41637:252cc56c9ff6 41638:e8a71ed9c373
64 $ hg commit -A -m C -q 64 $ hg commit -A -m C -q
65 65
66 $ cd ../clone 66 $ cd ../clone
67 $ cat >> .hg/hgrc <<EOF 67 $ cat >> .hg/hgrc <<EOF
68 > [hooks] 68 > [hooks]
69 > pretxnchangegroup = sh -c "printenv.py pretxnchangegroup" 69 > pretxnchangegroup = sh -c "printenv.py --line pretxnchangegroup"
70 > changegroup = sh -c "printenv.py changegroup" 70 > changegroup = sh -c "printenv.py --line changegroup"
71 > incoming = sh -c "printenv.py incoming" 71 > incoming = sh -c "printenv.py --line incoming"
72 > EOF 72 > EOF
73 73
74 Pull the new commits in the clone 74 Pull the new commits in the clone
75 75
76 $ hg pull 76 $ hg pull
79 remote: changegroup1 79 remote: changegroup1
80 adding changesets 80 adding changesets
81 adding manifests 81 adding manifests
82 adding file changes 82 adding file changes
83 added 1 changesets with 1 changes to 1 files 83 added 1 changesets with 1 changes to 1 files
84 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 84 pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup
85 HG_HOOKTYPE=pretxnchangegroup
86 HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56
87 HG_NODE_LAST=27547f69f25460a52fff66ad004e58da7ad3fb56
88 HG_PENDING=$TESTTMP/clone
89 HG_SOURCE=pull
90 HG_TXNID=TXN:$ID$
91 HG_URL=file:$TESTTMP/repo
92
85 remote: changegroup2 93 remote: changegroup2
86 adding changesets 94 adding changesets
87 adding manifests 95 adding manifests
88 adding file changes 96 adding file changes
89 added 1 changesets with 1 changes to 1 files 97 added 1 changesets with 1 changes to 1 files
90 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 98 pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup
99 HG_HOOKTYPE=pretxnchangegroup
100 HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757
101 HG_NODE_LAST=f838bfaca5c7226600ebcfd84f3c3c13a28d3757
102 HG_PENDING=$TESTTMP/clone
103 HG_PHASES_MOVED=1
104 HG_SOURCE=pull
105 HG_TXNID=TXN:$ID$
106 HG_URL=file:$TESTTMP/repo
107
91 new changesets 27547f69f254:f838bfaca5c7 108 new changesets 27547f69f254:f838bfaca5c7
92 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 109 changegroup hook: HG_HOOKNAME=changegroup
93 incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo 110 HG_HOOKTYPE=changegroup
94 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 111 HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56
95 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 112 HG_NODE_LAST=27547f69f25460a52fff66ad004e58da7ad3fb56
113 HG_SOURCE=pull
114 HG_TXNID=TXN:$ID$
115 HG_URL=file:$TESTTMP/repo
116
117 incoming hook: HG_HOOKNAME=incoming
118 HG_HOOKTYPE=incoming
119 HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56
120 HG_SOURCE=pull
121 HG_TXNID=TXN:$ID$
122 HG_URL=file:$TESTTMP/repo
123
124 changegroup hook: HG_HOOKNAME=changegroup
125 HG_HOOKTYPE=changegroup
126 HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757
127 HG_NODE_LAST=f838bfaca5c7226600ebcfd84f3c3c13a28d3757
128 HG_PHASES_MOVED=1
129 HG_SOURCE=pull
130 HG_TXNID=TXN:$ID$
131 HG_URL=file:$TESTTMP/repo
132
133 incoming hook: HG_HOOKNAME=incoming
134 HG_HOOKTYPE=incoming
135 HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757
136 HG_PHASES_MOVED=1
137 HG_SOURCE=pull
138 HG_TXNID=TXN:$ID$
139 HG_URL=file:$TESTTMP/repo
140
96 pullop.cgresult is 1 141 pullop.cgresult is 1
97 (run 'hg update' to get a working copy) 142 (run 'hg update' to get a working copy)
98 $ hg update 143 $ hg update
99 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 144 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
100 $ hg log -G 145 $ hg log -G
150 remote: changegroup1 195 remote: changegroup1
151 adding changesets 196 adding changesets
152 adding manifests 197 adding manifests
153 adding file changes 198 adding file changes
154 added 2 changesets with 2 changes to 2 files (+1 heads) 199 added 2 changesets with 2 changes to 2 files (+1 heads)
155 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 200 pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup
201 HG_HOOKTYPE=pretxnchangegroup
202 HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e
203 HG_NODE_LAST=8a5212ebc8527f9fb821601504794e3eb11a1ed3
204 HG_PENDING=$TESTTMP/clone
205 HG_SOURCE=pull
206 HG_TXNID=TXN:$ID$
207 HG_URL=file:$TESTTMP/repo
208
156 remote: changegroup2 209 remote: changegroup2
157 adding changesets 210 adding changesets
158 adding manifests 211 adding manifests
159 adding file changes 212 adding file changes
160 added 3 changesets with 3 changes to 3 files (+1 heads) 213 added 3 changesets with 3 changes to 3 files (+1 heads)
161 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 214 pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup
215 HG_HOOKTYPE=pretxnchangegroup
216 HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46
217 HG_NODE_LAST=5cd59d311f6508b8e0ed28a266756c859419c9f1
218 HG_PENDING=$TESTTMP/clone
219 HG_PHASES_MOVED=1
220 HG_SOURCE=pull
221 HG_TXNID=TXN:$ID$
222 HG_URL=file:$TESTTMP/repo
223
162 new changesets b3325c91a4d9:5cd59d311f65 224 new changesets b3325c91a4d9:5cd59d311f65
163 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 225 changegroup hook: HG_HOOKNAME=changegroup
164 incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo 226 HG_HOOKTYPE=changegroup
165 incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo 227 HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e
166 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 228 HG_NODE_LAST=8a5212ebc8527f9fb821601504794e3eb11a1ed3
167 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 229 HG_SOURCE=pull
168 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 230 HG_TXNID=TXN:$ID$
169 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 231 HG_URL=file:$TESTTMP/repo
232
233 incoming hook: HG_HOOKNAME=incoming
234 HG_HOOKTYPE=incoming
235 HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e
236 HG_SOURCE=pull
237 HG_TXNID=TXN:$ID$
238 HG_URL=file:$TESTTMP/repo
239
240 incoming hook: HG_HOOKNAME=incoming
241 HG_HOOKTYPE=incoming
242 HG_NODE=8a5212ebc8527f9fb821601504794e3eb11a1ed3
243 HG_SOURCE=pull
244 HG_TXNID=TXN:$ID$
245 HG_URL=file:$TESTTMP/repo
246
247 changegroup hook: HG_HOOKNAME=changegroup
248 HG_HOOKTYPE=changegroup
249 HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46
250 HG_NODE_LAST=5cd59d311f6508b8e0ed28a266756c859419c9f1
251 HG_PHASES_MOVED=1
252 HG_SOURCE=pull
253 HG_TXNID=TXN:$ID$
254 HG_URL=file:$TESTTMP/repo
255
256 incoming hook: HG_HOOKNAME=incoming
257 HG_HOOKTYPE=incoming
258 HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46
259 HG_PHASES_MOVED=1
260 HG_SOURCE=pull
261 HG_TXNID=TXN:$ID$
262 HG_URL=file:$TESTTMP/repo
263
264 incoming hook: HG_HOOKNAME=incoming
265 HG_HOOKTYPE=incoming
266 HG_NODE=1d14c3ce6ac0582d2809220d33e8cd7a696e0156
267 HG_PHASES_MOVED=1
268 HG_SOURCE=pull
269 HG_TXNID=TXN:$ID$
270 HG_URL=file:$TESTTMP/repo
271
272 incoming hook: HG_HOOKNAME=incoming
273 HG_HOOKTYPE=incoming
274 HG_NODE=5cd59d311f6508b8e0ed28a266756c859419c9f1
275 HG_PHASES_MOVED=1
276 HG_SOURCE=pull
277 HG_TXNID=TXN:$ID$
278 HG_URL=file:$TESTTMP/repo
279
170 pullop.cgresult is 3 280 pullop.cgresult is 3
171 (run 'hg heads' to see heads, 'hg merge' to merge) 281 (run 'hg heads' to see heads, 'hg merge' to merge)
172 $ hg log -G 282 $ hg log -G
173 o 7:5cd59d311f65 public test H 283 o 7:5cd59d311f65 public test H
174 | 284 |
224 remote: changegroup1 334 remote: changegroup1
225 adding changesets 335 adding changesets
226 adding manifests 336 adding manifests
227 adding file changes 337 adding file changes
228 added 1 changesets with 0 changes to 0 files (-1 heads) 338 added 1 changesets with 0 changes to 0 files (-1 heads)
229 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 339 pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup
340 HG_HOOKTYPE=pretxnchangegroup
341 HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4
342 HG_NODE_LAST=71bd7b46de72e69a32455bf88d04757d542e6cf4
343 HG_PENDING=$TESTTMP/clone
344 HG_SOURCE=pull
345 HG_TXNID=TXN:$ID$
346 HG_URL=file:$TESTTMP/repo
347
230 remote: changegroup2 348 remote: changegroup2
231 adding changesets 349 adding changesets
232 adding manifests 350 adding manifests
233 adding file changes 351 adding file changes
234 added 1 changesets with 1 changes to 1 files 352 added 1 changesets with 1 changes to 1 files
235 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 353 pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup
354 HG_HOOKTYPE=pretxnchangegroup
355 HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84
356 HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84
357 HG_PENDING=$TESTTMP/clone
358 HG_PHASES_MOVED=1
359 HG_SOURCE=pull
360 HG_TXNID=TXN:$ID$
361 HG_URL=file:$TESTTMP/repo
362
236 new changesets 71bd7b46de72:9d18e5bd9ab0 363 new changesets 71bd7b46de72:9d18e5bd9ab0
237 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 364 changegroup hook: HG_HOOKNAME=changegroup
238 incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo 365 HG_HOOKTYPE=changegroup
239 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 366 HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4
240 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 367 HG_NODE_LAST=71bd7b46de72e69a32455bf88d04757d542e6cf4
368 HG_SOURCE=pull
369 HG_TXNID=TXN:$ID$
370 HG_URL=file:$TESTTMP/repo
371
372 incoming hook: HG_HOOKNAME=incoming
373 HG_HOOKTYPE=incoming
374 HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4
375 HG_SOURCE=pull
376 HG_TXNID=TXN:$ID$
377 HG_URL=file:$TESTTMP/repo
378
379 changegroup hook: HG_HOOKNAME=changegroup
380 HG_HOOKTYPE=changegroup
381 HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84
382 HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84
383 HG_PHASES_MOVED=1
384 HG_SOURCE=pull
385 HG_TXNID=TXN:$ID$
386 HG_URL=file:$TESTTMP/repo
387
388 incoming hook: HG_HOOKNAME=incoming
389 HG_HOOKTYPE=incoming
390 HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84
391 HG_PHASES_MOVED=1
392 HG_SOURCE=pull
393 HG_TXNID=TXN:$ID$
394 HG_URL=file:$TESTTMP/repo
395
241 pullop.cgresult is -2 396 pullop.cgresult is -2
242 (run 'hg update' to get a working copy) 397 (run 'hg update' to get a working copy)
243 $ hg log -G 398 $ hg log -G
244 o 9:9d18e5bd9ab0 public test H 399 o 9:9d18e5bd9ab0 public test H
245 | 400 |