Show More
@@ -21,7 +21,9 b' enable obsolescence' | |||||
21 | > publish=False |
|
21 | > publish=False | |
22 | > [hooks] |
|
22 | > [hooks] | |
23 | > changegroup = sh -c "HG_LOCAL= python \"$TESTDIR/printenv.py\" changegroup" |
|
23 | > changegroup = sh -c "HG_LOCAL= python \"$TESTDIR/printenv.py\" changegroup" | |
24 | > b2x-transactionclose = sh -c "HG_LOCAL= python \"$TESTDIR/printenv.py\" b2x-transactionclose" |
|
24 | > b2x-pretransactionclose.tip = printf 'pre-close-tip:'; hg log -r tip -T '{node|short} {phase} {bookmarks}\n' | |
|
25 | > b2x-transactionclose.tip = printf 'postclose-tip:'; hg log -r tip -T '{node|short} {phase} {bookmarks}\n' | |||
|
26 | > b2x-transactionclose.env = sh -c "HG_LOCAL= python \"$TESTDIR/printenv.py\" b2x-transactionclose" | |||
25 | > EOF |
|
27 | > EOF | |
26 |
|
28 | |||
27 | The extension requires a repo (currently unused) |
|
29 | The extension requires a repo (currently unused) | |
@@ -59,6 +61,8 b' clone --pull' | |||||
59 | adding file changes |
|
61 | adding file changes | |
60 | added 2 changesets with 2 changes to 2 files |
|
62 | added 2 changesets with 2 changes to 2 files | |
61 | 1 new obsolescence markers |
|
63 | 1 new obsolescence markers | |
|
64 | pre-close-tip:9520eea781bc public | |||
|
65 | postclose-tip:9520eea781bc draft | |||
62 | b2x-transactionclose hook: HG_NEW_OBSMARKERS=1 HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
|
66 | b2x-transactionclose hook: HG_NEW_OBSMARKERS=1 HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/main | |
63 | changegroup hook: HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
|
67 | changegroup hook: HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_SOURCE=pull HG_URL=file:$TESTTMP/main | |
64 | updating to branch default |
|
68 | updating to branch default | |
@@ -82,6 +86,8 b' pull' | |||||
82 | adding file changes |
|
86 | adding file changes | |
83 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
87 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
84 | 1 new obsolescence markers |
|
88 | 1 new obsolescence markers | |
|
89 | pre-close-tip:24b6387c8c8c public | |||
|
90 | postclose-tip:24b6387c8c8c draft | |||
85 | b2x-transactionclose hook: HG_NEW_OBSMARKERS=1 HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
|
91 | b2x-transactionclose hook: HG_NEW_OBSMARKERS=1 HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/main | |
86 | changegroup hook: HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
|
92 | changegroup hook: HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_SOURCE=pull HG_URL=file:$TESTTMP/main | |
87 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
93 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
@@ -102,6 +108,8 b' pull empty (with phase movement)' | |||||
102 | $ hg -R other pull -r 24b6387c8c8c |
|
108 | $ hg -R other pull -r 24b6387c8c8c | |
103 | pulling from $TESTTMP/main (glob) |
|
109 | pulling from $TESTTMP/main (glob) | |
104 | no changes found |
|
110 | no changes found | |
|
111 | pre-close-tip:000000000000 public | |||
|
112 | postclose-tip:24b6387c8c8c public | |||
105 | b2x-transactionclose hook: HG_NEW_OBSMARKERS=0 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
|
113 | b2x-transactionclose hook: HG_NEW_OBSMARKERS=0 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/main | |
106 | $ hg -R other log -G |
|
114 | $ hg -R other log -G | |
107 | o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F |
|
115 | o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
@@ -119,6 +127,8 b' pull empty' | |||||
119 | $ hg -R other pull -r 24b6387c8c8c |
|
127 | $ hg -R other pull -r 24b6387c8c8c | |
120 | pulling from $TESTTMP/main (glob) |
|
128 | pulling from $TESTTMP/main (glob) | |
121 | no changes found |
|
129 | no changes found | |
|
130 | pre-close-tip:24b6387c8c8c public | |||
|
131 | postclose-tip:24b6387c8c8c public | |||
122 | b2x-transactionclose hook: HG_NEW_OBSMARKERS=0 HG_SOURCE=pull HG_URL=file:$TESTTMP/main |
|
132 | b2x-transactionclose hook: HG_NEW_OBSMARKERS=0 HG_SOURCE=pull HG_URL=file:$TESTTMP/main | |
123 | $ hg -R other log -G |
|
133 | $ hg -R other log -G | |
124 | o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F |
|
134 | o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
@@ -156,6 +166,8 b' push' | |||||
156 | $ hg -R main push other --rev eea13746799a --bookmark book_eea1 |
|
166 | $ hg -R main push other --rev eea13746799a --bookmark book_eea1 | |
157 | pushing to other |
|
167 | pushing to other | |
158 | searching for changes |
|
168 | searching for changes | |
|
169 | pre-close-tip:eea13746799a draft | |||
|
170 | postclose-tip:eea13746799a public book_eea1 | |||
159 | b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1 HG_SOURCE=push HG_URL=push |
|
171 | b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1 HG_SOURCE=push HG_URL=push | |
160 | changegroup hook: HG_BUNDLE2-EXP=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_SOURCE=push HG_URL=push |
|
172 | changegroup hook: HG_BUNDLE2-EXP=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_SOURCE=push HG_URL=push | |
161 | remote: adding changesets |
|
173 | remote: adding changesets | |
@@ -189,6 +201,8 b' pull over ssh' | |||||
189 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
201 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
190 | 1 new obsolescence markers |
|
202 | 1 new obsolescence markers | |
191 | updating bookmark book_02de |
|
203 | updating bookmark book_02de | |
|
204 | pre-close-tip:02de42196ebe public | |||
|
205 | postclose-tip:02de42196ebe draft book_02de | |||
192 | b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=ssh://user@dummy/main |
|
206 | b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=ssh://user@dummy/main | |
193 | changegroup hook: HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_SOURCE=pull HG_URL=ssh://user@dummy/main |
|
207 | changegroup hook: HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_SOURCE=pull HG_URL=ssh://user@dummy/main | |
194 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
208 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
@@ -212,6 +226,8 b' pull over http' | |||||
212 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
226 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
213 | 1 new obsolescence markers |
|
227 | 1 new obsolescence markers | |
214 | updating bookmark book_42cc |
|
228 | updating bookmark book_42cc | |
|
229 | pre-close-tip:42ccdea3bb16 public | |||
|
230 | postclose-tip:42ccdea3bb16 draft book_42cc | |||
215 | b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/ |
|
231 | b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/ | |
216 | changegroup hook: HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/ |
|
232 | changegroup hook: HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/ | |
217 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
233 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
@@ -234,6 +250,8 b' push over ssh' | |||||
234 | remote: added 1 changesets with 1 changes to 1 files |
|
250 | remote: added 1 changesets with 1 changes to 1 files | |
235 | remote: 1 new obsolescence markers |
|
251 | remote: 1 new obsolescence markers | |
236 | updating bookmark book_5fdd |
|
252 | updating bookmark book_5fdd | |
|
253 | remote: pre-close-tip:5fddd98957c8 draft | |||
|
254 | remote: postclose-tip:5fddd98957c8 draft book_5fdd | |||
237 |
remote: b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_SOURCE=serve HG_URL=remote:ssh:127. |
|
255 | remote: b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1 | |
238 |
remote: changegroup hook: HG_BUNDLE2-EXP=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_SOURCE=serve HG_URL=remote:ssh:127. |
|
256 | remote: changegroup hook: HG_BUNDLE2-EXP=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1 | |
239 | $ hg -R other log -G |
|
257 | $ hg -R other log -G | |
@@ -469,6 +487,7 b' Doing the actual push: hook abort' | |||||
469 | $ hg -R main push other -r e7ec4e813ba6 |
|
487 | $ hg -R main push other -r e7ec4e813ba6 | |
470 | pushing to other |
|
488 | pushing to other | |
471 | searching for changes |
|
489 | searching for changes | |
|
490 | pre-close-tip:e7ec4e813ba6 draft | |||
472 | transaction abort! |
|
491 | transaction abort! | |
473 | rollback completed |
|
492 | rollback completed | |
474 | abort: b2x-pretransactionclose.failpush hook exited with status 1 |
|
493 | abort: b2x-pretransactionclose.failpush hook exited with status 1 | |
@@ -478,6 +497,7 b' Doing the actual push: hook abort' | |||||
478 | pushing to ssh://user@dummy/other |
|
497 | pushing to ssh://user@dummy/other | |
479 | searching for changes |
|
498 | searching for changes | |
480 | abort: b2x-pretransactionclose.failpush hook exited with status 1 |
|
499 | abort: b2x-pretransactionclose.failpush hook exited with status 1 | |
|
500 | remote: pre-close-tip:e7ec4e813ba6 draft | |||
481 | remote: transaction abort! |
|
501 | remote: transaction abort! | |
482 | remote: rollback completed |
|
502 | remote: rollback completed | |
483 | [255] |
|
503 | [255] |
General Comments 0
You need to be logged in to leave comments.
Login now