Show More
@@ -74,8 +74,8 b' expect success' | |||||
74 | $ cat >> .hg/hgrc <<EOF |
|
74 | $ cat >> .hg/hgrc <<EOF | |
75 | > allow_push = * |
|
75 | > allow_push = * | |
76 | > [hooks] |
|
76 | > [hooks] | |
77 | > changegroup = sh -c "printenv.py changegroup 0" |
|
77 | > changegroup = sh -c "printenv.py --line changegroup 0" | |
78 | > pushkey = sh -c "printenv.py pushkey 0" |
|
78 | > pushkey = sh -c "printenv.py --line pushkey 0" | |
79 | > txnclose-phase.test = sh $TESTTMP/hook.sh |
|
79 | > txnclose-phase.test = sh $TESTTMP/hook.sh | |
80 | > EOF |
|
80 | > EOF | |
81 | $ req "--debug --config extensions.blackbox=" |
|
81 | $ req "--debug --config extensions.blackbox=" | |
@@ -94,8 +94,15 b' expect success' | |||||
94 | remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public |
|
94 | remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public | |
95 | remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh |
|
95 | remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh | |
96 | remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public |
|
96 | remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public | |
97 | remote: running hook changegroup: sh -c "printenv.py changegroup 0" |
|
97 | remote: running hook changegroup: sh -c "printenv.py --line changegroup 0" | |
98 | remote: changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) |
|
98 | remote: changegroup hook: HG_HOOKNAME=changegroup | |
|
99 | remote: HG_HOOKTYPE=changegroup | |||
|
100 | remote: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
101 | remote: HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
102 | remote: HG_SOURCE=serve | |||
|
103 | remote: HG_TXNID=TXN:$ID$ | |||
|
104 | remote: HG_URL=remote:http:$LOCALIP: (glob) | |||
|
105 | remote: | |||
99 | % serve errors |
|
106 | % serve errors | |
100 | $ hg rollback |
|
107 | $ hg rollback | |
101 | repository tip rolled back to revision 0 (undo serve) |
|
108 | repository tip rolled back to revision 0 (undo serve) | |
@@ -114,8 +121,15 b' expect success' | |||||
114 | remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public |
|
121 | remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public | |
115 | remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh |
|
122 | remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh | |
116 | remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public |
|
123 | remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public | |
117 | remote: running hook changegroup: sh -c "printenv.py changegroup 0" |
|
124 | remote: running hook changegroup: sh -c "printenv.py --line changegroup 0" | |
118 | remote: changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) |
|
125 | remote: changegroup hook: HG_HOOKNAME=changegroup | |
|
126 | remote: HG_HOOKTYPE=changegroup | |||
|
127 | remote: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
128 | remote: HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
129 | remote: HG_SOURCE=serve | |||
|
130 | remote: HG_TXNID=TXN:$ID$ | |||
|
131 | remote: HG_URL=remote:http:$LOCALIP: (glob) | |||
|
132 | remote: | |||
119 | % serve errors |
|
133 | % serve errors | |
120 | $ hg rollback |
|
134 | $ hg rollback | |
121 | repository tip rolled back to revision 0 (undo serve) |
|
135 | repository tip rolled back to revision 0 (undo serve) | |
@@ -125,8 +139,8 b' expect success' | |||||
125 | $ cat >> .hg/hgrc <<EOF |
|
139 | $ cat >> .hg/hgrc <<EOF | |
126 | > allow_push = * |
|
140 | > allow_push = * | |
127 | > [hooks] |
|
141 | > [hooks] | |
128 | > changegroup = sh -c "printenv.py changegroup 0" |
|
142 | > changegroup = sh -c "printenv.py --line changegroup 0" | |
129 | > pushkey = sh -c "printenv.py pushkey 0" |
|
143 | > pushkey = sh -c "printenv.py --line pushkey 0" | |
130 | > txnclose-phase.test = sh $TESTTMP/hook.sh |
|
144 | > txnclose-phase.test = sh $TESTTMP/hook.sh | |
131 | > EOF |
|
145 | > EOF | |
132 | $ req |
|
146 | $ req | |
@@ -138,7 +152,15 b' expect success' | |||||
138 | remote: added 1 changesets with 1 changes to 1 files |
|
152 | remote: added 1 changesets with 1 changes to 1 files | |
139 | remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public |
|
153 | remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public | |
140 | remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public |
|
154 | remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public | |
141 | remote: changegroup hook: HG_BUNDLE2=1 HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) |
|
155 | remote: changegroup hook: HG_BUNDLE2=1 | |
|
156 | remote: HG_HOOKNAME=changegroup | |||
|
157 | remote: HG_HOOKTYPE=changegroup | |||
|
158 | remote: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
159 | remote: HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
160 | remote: HG_SOURCE=serve | |||
|
161 | remote: HG_TXNID=TXN:$ID$ | |||
|
162 | remote: HG_URL=remote:http:$LOCALIP: (glob) | |||
|
163 | remote: | |||
142 | % serve errors |
|
164 | % serve errors | |
143 | $ hg rollback |
|
165 | $ hg rollback | |
144 | repository tip rolled back to revision 0 (undo serve) |
|
166 | repository tip rolled back to revision 0 (undo serve) | |
@@ -157,8 +179,16 b' expect success, server lacks the httphea' | |||||
157 | remote: added 1 changesets with 1 changes to 1 files |
|
179 | remote: added 1 changesets with 1 changes to 1 files | |
158 | remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public |
|
180 | remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public | |
159 | remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public |
|
181 | remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public | |
160 | remote: changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) (bundle1 !) |
|
182 | remote: changegroup hook: HG_HOOKNAME=changegroup (no-bundle2 !) | |
161 | remote: changegroup hook: HG_BUNDLE2=1 HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) (bundle2 !) |
|
183 | remote: changegroup hook: HG_BUNDLE2=1 (bundle2 !) | |
|
184 | remote: HG_HOOKNAME=changegroup (bundle2 !) | |||
|
185 | remote: HG_HOOKTYPE=changegroup | |||
|
186 | remote: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
187 | remote: HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
188 | remote: HG_SOURCE=serve | |||
|
189 | remote: HG_TXNID=TXN:$ID$ | |||
|
190 | remote: HG_URL=remote:http:$LOCALIP: (glob) | |||
|
191 | remote: | |||
162 | % serve errors |
|
192 | % serve errors | |
163 | $ hg rollback |
|
193 | $ hg rollback | |
164 | repository tip rolled back to revision 0 (undo serve) |
|
194 | repository tip rolled back to revision 0 (undo serve) | |
@@ -176,8 +206,16 b' expect success, server lacks the unbundl' | |||||
176 | remote: added 1 changesets with 1 changes to 1 files |
|
206 | remote: added 1 changesets with 1 changes to 1 files | |
177 | remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public |
|
207 | remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public | |
178 | remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public |
|
208 | remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public | |
179 | remote: changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) (bundle1 !) |
|
209 | remote: changegroup hook: HG_HOOKNAME=changegroup (no-bundle2 !) | |
180 | remote: changegroup hook: HG_BUNDLE2=1 HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) (bundle2 !) |
|
210 | remote: changegroup hook: HG_BUNDLE2=1 (bundle2 !) | |
|
211 | remote: HG_HOOKNAME=changegroup (bundle2 !) | |||
|
212 | remote: HG_HOOKTYPE=changegroup | |||
|
213 | remote: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
214 | remote: HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
215 | remote: HG_SOURCE=serve | |||
|
216 | remote: HG_TXNID=TXN:$ID$ | |||
|
217 | remote: HG_URL=remote:http:$LOCALIP: (glob) | |||
|
218 | remote: | |||
181 | % serve errors |
|
219 | % serve errors | |
182 | $ hg rollback |
|
220 | $ hg rollback | |
183 | repository tip rolled back to revision 0 (undo serve) |
|
221 | repository tip rolled back to revision 0 (undo serve) | |
@@ -209,6 +247,14 b' has no parameter' | |||||
209 | remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public |
|
247 | remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public | |
210 | remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public |
|
248 | remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public | |
211 | remote: changegroup hook: * (glob) |
|
249 | remote: changegroup hook: * (glob) | |
|
250 | remote: HG_HOOKNAME=changegroup (bundle2 !) | |||
|
251 | remote: HG_HOOKTYPE=changegroup | |||
|
252 | remote: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
253 | remote: HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
254 | remote: HG_SOURCE=serve | |||
|
255 | remote: HG_TXNID=TXN:$ID$ | |||
|
256 | remote: HG_URL=remote:http:$LOCALIP: (glob) | |||
|
257 | remote: | |||
212 | % serve errors |
|
258 | % serve errors | |
213 | $ hg rollback |
|
259 | $ hg rollback | |
214 | repository tip rolled back to revision 0 (undo serve) |
|
260 | repository tip rolled back to revision 0 (undo serve) | |
@@ -221,7 +267,7 b' Test pushing to a publishing repository ' | |||||
221 | > push_ssl = false |
|
267 | > push_ssl = false | |
222 | > allow_push = * |
|
268 | > allow_push = * | |
223 | > [hooks] |
|
269 | > [hooks] | |
224 | > prepushkey = sh -c "printenv.py prepushkey 1" |
|
270 | > prepushkey = sh -c "printenv.py --line prepushkey 1" | |
225 | > [devel] |
|
271 | > [devel] | |
226 | > legacy.exchange=phases |
|
272 | > legacy.exchange=phases | |
227 | > EOF |
|
273 | > EOF | |
@@ -253,7 +299,21 b' and fails the entire push.' | |||||
253 | remote: adding manifests |
|
299 | remote: adding manifests | |
254 | remote: adding file changes |
|
300 | remote: adding file changes | |
255 | remote: added 1 changesets with 1 changes to 1 files |
|
301 | remote: added 1 changesets with 1 changes to 1 files | |
256 | 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 HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) |
|
302 | remote: prepushkey hook: HG_BUNDLE2=1 | |
|
303 | remote: HG_HOOKNAME=prepushkey | |||
|
304 | remote: HG_HOOKTYPE=prepushkey | |||
|
305 | remote: HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
306 | remote: HG_NAMESPACE=phases | |||
|
307 | remote: HG_NEW=0 | |||
|
308 | remote: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
309 | remote: HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
310 | remote: HG_OLD=1 | |||
|
311 | remote: HG_PENDING=$TESTTMP/test | |||
|
312 | remote: HG_PHASES_MOVED=1 | |||
|
313 | remote: HG_SOURCE=serve | |||
|
314 | remote: HG_TXNID=TXN:$ID$ | |||
|
315 | remote: HG_URL=remote:http:$LOCALIP: (glob) | |||
|
316 | remote: | |||
257 | remote: pushkey-abort: prepushkey hook exited with status 1 |
|
317 | remote: pushkey-abort: prepushkey hook exited with status 1 | |
258 | remote: transaction abort! |
|
318 | remote: transaction abort! | |
259 | remote: rollback completed |
|
319 | remote: rollback completed | |
@@ -267,7 +327,7 b' Now remove the failing prepushkey hook.' | |||||
267 |
|
327 | |||
268 | $ cat >> .hg/hgrc <<EOF |
|
328 | $ cat >> .hg/hgrc <<EOF | |
269 | > [hooks] |
|
329 | > [hooks] | |
270 | > prepushkey = sh -c "printenv.py prepushkey 0" |
|
330 | > prepushkey = sh -c "printenv.py --line prepushkey 0" | |
271 | > EOF |
|
331 | > EOF | |
272 |
|
332 | |||
273 | We don't need to test bundle1 because it succeeded above. |
|
333 | We don't need to test bundle1 because it succeeded above. | |
@@ -280,7 +340,21 b" We don't need to test bundle1 because it" | |||||
280 | remote: adding manifests |
|
340 | remote: adding manifests | |
281 | remote: adding file changes |
|
341 | remote: adding file changes | |
282 | remote: added 1 changesets with 1 changes to 1 files |
|
342 | remote: added 1 changesets with 1 changes to 1 files | |
283 | 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 HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) |
|
343 | remote: prepushkey hook: HG_BUNDLE2=1 | |
|
344 | remote: HG_HOOKNAME=prepushkey | |||
|
345 | remote: HG_HOOKTYPE=prepushkey | |||
|
346 | remote: HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
347 | remote: HG_NAMESPACE=phases | |||
|
348 | remote: HG_NEW=0 | |||
|
349 | remote: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
350 | remote: HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
351 | remote: HG_OLD=1 | |||
|
352 | remote: HG_PENDING=$TESTTMP/test | |||
|
353 | remote: HG_PHASES_MOVED=1 | |||
|
354 | remote: HG_SOURCE=serve | |||
|
355 | remote: HG_TXNID=TXN:$ID$ | |||
|
356 | remote: HG_URL=remote:http:$LOCALIP: (glob) | |||
|
357 | remote: | |||
284 | % serve errors |
|
358 | % serve errors | |
285 | #endif |
|
359 | #endif | |
286 |
|
360 | |||
@@ -293,7 +367,7 b' Now do a variant of the above, except on' | |||||
293 | > [phases] |
|
367 | > [phases] | |
294 | > publish = false |
|
368 | > publish = false | |
295 | > [hooks] |
|
369 | > [hooks] | |
296 | > prepushkey = sh -c "printenv.py prepushkey 1" |
|
370 | > prepushkey = sh -c "printenv.py --line prepushkey 1" | |
297 | > EOF |
|
371 | > EOF | |
298 |
|
372 | |||
299 | #if bundle1 |
|
373 | #if bundle1 | |
@@ -304,7 +378,13 b' Now do a variant of the above, except on' | |||||
304 | remote: adding manifests |
|
378 | remote: adding manifests | |
305 | remote: adding file changes |
|
379 | remote: adding file changes | |
306 | remote: added 1 changesets with 1 changes to 1 files |
|
380 | remote: added 1 changesets with 1 changes to 1 files | |
307 | remote: prepushkey hook: HG_HOOKNAME=prepushkey HG_HOOKTYPE=prepushkey HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_OLD=1 |
|
381 | remote: prepushkey hook: HG_HOOKNAME=prepushkey | |
|
382 | remote: HG_HOOKTYPE=prepushkey | |||
|
383 | remote: HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
384 | remote: HG_NAMESPACE=phases | |||
|
385 | remote: HG_NEW=0 | |||
|
386 | remote: HG_OLD=1 | |||
|
387 | remote: | |||
308 | remote: pushkey-abort: prepushkey hook exited with status 1 |
|
388 | remote: pushkey-abort: prepushkey hook exited with status 1 | |
309 | updating ba677d0156c1 to public failed! |
|
389 | updating ba677d0156c1 to public failed! | |
310 | % serve errors |
|
390 | % serve errors | |
@@ -318,7 +398,21 b' Now do a variant of the above, except on' | |||||
318 | remote: adding manifests |
|
398 | remote: adding manifests | |
319 | remote: adding file changes |
|
399 | remote: adding file changes | |
320 | remote: added 1 changesets with 1 changes to 1 files |
|
400 | remote: added 1 changesets with 1 changes to 1 files | |
321 | 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 HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) |
|
401 | remote: prepushkey hook: HG_BUNDLE2=1 | |
|
402 | remote: HG_HOOKNAME=prepushkey | |||
|
403 | remote: HG_HOOKTYPE=prepushkey | |||
|
404 | remote: HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
405 | remote: HG_NAMESPACE=phases | |||
|
406 | remote: HG_NEW=0 | |||
|
407 | remote: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
408 | remote: HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
409 | remote: HG_OLD=1 | |||
|
410 | remote: HG_PENDING=$TESTTMP/test | |||
|
411 | remote: HG_PHASES_MOVED=1 | |||
|
412 | remote: HG_SOURCE=serve | |||
|
413 | remote: HG_TXNID=TXN:$ID$ | |||
|
414 | remote: HG_URL=remote:http:$LOCALIP: (glob) | |||
|
415 | remote: | |||
322 | remote: pushkey-abort: prepushkey hook exited with status 1 |
|
416 | remote: pushkey-abort: prepushkey hook exited with status 1 | |
323 | remote: transaction abort! |
|
417 | remote: transaction abort! | |
324 | remote: rollback completed |
|
418 | remote: rollback completed | |
@@ -331,7 +425,7 b' Make phases updates work' | |||||
331 |
|
425 | |||
332 | $ cat >> .hg/hgrc <<EOF |
|
426 | $ cat >> .hg/hgrc <<EOF | |
333 | > [hooks] |
|
427 | > [hooks] | |
334 | > prepushkey = sh -c "printenv.py prepushkey 0" |
|
428 | > prepushkey = sh -c "printenv.py --line prepushkey 0" | |
335 | > EOF |
|
429 | > EOF | |
336 |
|
430 | |||
337 | #if bundle1 |
|
431 | #if bundle1 | |
@@ -339,7 +433,13 b' Make phases updates work' | |||||
339 | pushing to http://localhost:$HGPORT/ |
|
433 | pushing to http://localhost:$HGPORT/ | |
340 | searching for changes |
|
434 | searching for changes | |
341 | no changes found |
|
435 | no changes found | |
342 | remote: prepushkey hook: HG_HOOKNAME=prepushkey HG_HOOKTYPE=prepushkey HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_OLD=1 |
|
436 | remote: prepushkey hook: HG_HOOKNAME=prepushkey | |
|
437 | remote: HG_HOOKTYPE=prepushkey | |||
|
438 | remote: HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
439 | remote: HG_NAMESPACE=phases | |||
|
440 | remote: HG_NEW=0 | |||
|
441 | remote: HG_OLD=1 | |||
|
442 | remote: | |||
343 | % serve errors |
|
443 | % serve errors | |
344 | [1] |
|
444 | [1] | |
345 | #endif |
|
445 | #endif | |
@@ -352,7 +452,21 b' Make phases updates work' | |||||
352 | remote: adding manifests |
|
452 | remote: adding manifests | |
353 | remote: adding file changes |
|
453 | remote: adding file changes | |
354 | remote: added 1 changesets with 1 changes to 1 files |
|
454 | remote: added 1 changesets with 1 changes to 1 files | |
355 | 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 HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) |
|
455 | remote: prepushkey hook: HG_BUNDLE2=1 | |
|
456 | remote: HG_HOOKNAME=prepushkey | |||
|
457 | remote: HG_HOOKTYPE=prepushkey | |||
|
458 | remote: HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
459 | remote: HG_NAMESPACE=phases | |||
|
460 | remote: HG_NEW=0 | |||
|
461 | remote: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
462 | remote: HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 | |||
|
463 | remote: HG_OLD=1 | |||
|
464 | remote: HG_PENDING=$TESTTMP/test | |||
|
465 | remote: HG_PHASES_MOVED=1 | |||
|
466 | remote: HG_SOURCE=serve | |||
|
467 | remote: HG_TXNID=TXN:$ID$ | |||
|
468 | remote: HG_URL=remote:http:$LOCALIP: (glob) | |||
|
469 | remote: | |||
356 | % serve errors |
|
470 | % serve errors | |
357 | #endif |
|
471 | #endif | |
358 |
|
472 |
General Comments 0
You need to be logged in to leave comments.
Login now