Show More
@@ -26,6 +26,7 b' enable obsolescence' | |||||
26 | > [phases] |
|
26 | > [phases] | |
27 | > publish=False |
|
27 | > publish=False | |
28 | > [hooks] |
|
28 | > [hooks] | |
|
29 | > changegroup = sh -c "HG_LOCAL= HG_NODE= HG_TAG= python \"$TESTDIR/printenv.py\" changegroup" | |||
29 | > b2x-transactionclose = sh -c "HG_LOCAL= HG_NODE= HG_TAG= python \"$TESTDIR/printenv.py\" b2x-transactionclose" |
|
30 | > b2x-transactionclose = sh -c "HG_LOCAL= HG_NODE= HG_TAG= python \"$TESTDIR/printenv.py\" b2x-transactionclose" | |
30 | > EOF |
|
31 | > EOF | |
31 |
|
32 | |||
@@ -42,6 +43,7 b' The extension requires a repo (currently' | |||||
42 | adding manifests |
|
43 | adding manifests | |
43 | adding file changes |
|
44 | adding file changes | |
44 | added 8 changesets with 7 changes to 7 files (+3 heads) |
|
45 | added 8 changesets with 7 changes to 7 files (+3 heads) | |
|
46 | changegroup hook: HG_SOURCE=unbundle HG_URL=bundle:*/tests/bundles/rebase.hg (glob) | |||
45 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
47 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
46 |
|
48 | |||
47 | $ cd .. |
|
49 | $ cd .. | |
@@ -63,6 +65,7 b' clone --pull' | |||||
63 | adding file changes |
|
65 | adding file changes | |
64 | added 2 changesets with 2 changes to 2 files |
|
66 | added 2 changesets with 2 changes to 2 files | |
65 | 1 new obsolescence markers |
|
67 | 1 new obsolescence markers | |
|
68 | changegroup hook: HG_NEW_OBSMARKERS=1 HG_SOURCE=bundle2 HG_URL=bundle2 | |||
66 | updating to branch default |
|
69 | updating to branch default | |
67 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
70 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
68 | $ hg -R other log -G |
|
71 | $ hg -R other log -G | |
@@ -84,6 +87,7 b' pull' | |||||
84 | adding file changes |
|
87 | adding file changes | |
85 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
88 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
86 | 1 new obsolescence markers |
|
89 | 1 new obsolescence markers | |
|
90 | changegroup hook: HG_NEW_OBSMARKERS=1 HG_SOURCE=bundle2 HG_URL=bundle2 | |||
87 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
91 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
88 | $ hg -R other log -G |
|
92 | $ hg -R other log -G | |
89 | o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F |
|
93 | o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
@@ -155,6 +159,7 b' push' | |||||
155 | pushing to other |
|
159 | pushing to other | |
156 | searching for changes |
|
160 | searching for changes | |
157 | b2x-transactionclose hook: HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_SOURCE=push HG_URL=push |
|
161 | b2x-transactionclose hook: HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_SOURCE=push HG_URL=push | |
|
162 | changegroup hook: HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_SOURCE=bundle2 HG_URL=bundle2 | |||
158 | remote: adding changesets |
|
163 | remote: adding changesets | |
159 | remote: adding manifests |
|
164 | remote: adding manifests | |
160 | remote: adding file changes |
|
165 | remote: adding file changes | |
@@ -186,6 +191,7 b' pull over ssh' | |||||
186 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
191 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
187 | 1 new obsolescence markers |
|
192 | 1 new obsolescence markers | |
188 | updating bookmark book_02de |
|
193 | updating bookmark book_02de | |
|
194 | changegroup hook: HG_NEW_OBSMARKERS=1 HG_SOURCE=bundle2 HG_URL=bundle2 | |||
189 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
195 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
190 | $ hg -R other debugobsolete |
|
196 | $ hg -R other debugobsolete | |
191 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
197 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
@@ -207,6 +213,7 b' pull over http' | |||||
207 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
213 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
208 | 1 new obsolescence markers |
|
214 | 1 new obsolescence markers | |
209 | updating bookmark book_42cc |
|
215 | updating bookmark book_42cc | |
|
216 | changegroup hook: HG_NEW_OBSMARKERS=1 HG_SOURCE=bundle2 HG_URL=bundle2 | |||
210 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
217 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
211 | $ cat main-error.log |
|
218 | $ cat main-error.log | |
212 | $ hg -R other debugobsolete |
|
219 | $ hg -R other debugobsolete | |
@@ -228,6 +235,7 b' push over ssh' | |||||
228 | remote: 1 new obsolescence markers |
|
235 | remote: 1 new obsolescence markers | |
229 | updating bookmark book_5fdd |
|
236 | updating bookmark book_5fdd | |
230 | remote: b2x-transactionclose hook: HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1 |
|
237 | remote: b2x-transactionclose hook: HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1 | |
|
238 | remote: changegroup hook: HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_SOURCE=bundle2 HG_URL=bundle2 | |||
231 | $ hg -R other log -G |
|
239 | $ hg -R other log -G | |
232 | o 6:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_5fdd C |
|
240 | o 6:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_5fdd C | |
233 | | |
|
241 | | | |
@@ -454,6 +462,7 b' Doing the actual push: hook abort' | |||||
454 | searching for changes |
|
462 | searching for changes | |
455 | transaction abort! |
|
463 | transaction abort! | |
456 | rollback completed |
|
464 | rollback completed | |
|
465 | changegroup hook: HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=0 HG_SOURCE=bundle2 HG_URL=bundle2 | |||
457 | abort: b2x-pretransactionclose.failpush hook exited with status 1 |
|
466 | abort: b2x-pretransactionclose.failpush hook exited with status 1 | |
458 | [255] |
|
467 | [255] | |
459 |
|
468 | |||
@@ -463,6 +472,7 b' Doing the actual push: hook abort' | |||||
463 | abort: b2x-pretransactionclose.failpush hook exited with status 1 |
|
472 | abort: b2x-pretransactionclose.failpush hook exited with status 1 | |
464 | remote: transaction abort! |
|
473 | remote: transaction abort! | |
465 | remote: rollback completed |
|
474 | remote: rollback completed | |
|
475 | remote: changegroup hook: HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=0 HG_SOURCE=bundle2 HG_URL=bundle2 | |||
466 | [255] |
|
476 | [255] | |
467 |
|
477 | |||
468 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 |
|
478 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 |
General Comments 0
You need to be logged in to leave comments.
Login now