Show More
@@ -20,8 +20,8 b' enable obsolescence' | |||||
20 | > [phases] |
|
20 | > [phases] | |
21 | > publish=False |
|
21 | > publish=False | |
22 | > [hooks] |
|
22 | > [hooks] | |
23 |
> changegroup = sh -c "HG_LOCAL= |
|
23 | > changegroup = sh -c "HG_LOCAL= python \"$TESTDIR/printenv.py\" changegroup" | |
24 |
> b2x-transactionclose = sh -c "HG_LOCAL= |
|
24 | > b2x-transactionclose = sh -c "HG_LOCAL= python \"$TESTDIR/printenv.py\" b2x-transactionclose" | |
25 | > EOF |
|
25 | > EOF | |
26 |
|
26 | |||
27 | The extension requires a repo (currently unused) |
|
27 | The extension requires a repo (currently unused) | |
@@ -37,7 +37,7 b' The extension requires a repo (currently' | |||||
37 | adding manifests |
|
37 | adding manifests | |
38 | adding file changes |
|
38 | adding file changes | |
39 | added 8 changesets with 7 changes to 7 files (+3 heads) |
|
39 | added 8 changesets with 7 changes to 7 files (+3 heads) | |
40 |
changegroup hook: HG_PHASES_MOVED=1 HG_SOURCE=unbundle HG_URL=bundle: |
|
40 | changegroup hook: HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_PHASES_MOVED=1 HG_SOURCE=unbundle HG_URL=bundle:/home/pyd/src/mercurial-dev/tests/bundles/rebase.hg | |
41 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
41 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
42 |
|
42 | |||
43 | $ cd .. |
|
43 | $ cd .. | |
@@ -59,7 +59,7 b' clone --pull' | |||||
59 | adding file changes |
|
59 | adding file changes | |
60 | added 2 changesets with 2 changes to 2 files |
|
60 | added 2 changesets with 2 changes to 2 files | |
61 | 1 new obsolescence markers |
|
61 | 1 new obsolescence markers | |
62 | changegroup hook: HG_NEW_OBSMARKERS=1 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2 |
|
62 | changegroup hook: HG_NEW_OBSMARKERS=1 HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2 | |
63 | updating to branch default |
|
63 | updating to branch default | |
64 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
64 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
65 | $ hg -R other log -G |
|
65 | $ hg -R other log -G | |
@@ -81,7 +81,7 b' pull' | |||||
81 | adding file changes |
|
81 | adding file changes | |
82 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
82 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
83 | 1 new obsolescence markers |
|
83 | 1 new obsolescence markers | |
84 | changegroup hook: HG_NEW_OBSMARKERS=1 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2 |
|
84 | changegroup hook: HG_NEW_OBSMARKERS=1 HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2 | |
85 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
85 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
86 | $ hg -R other log -G |
|
86 | $ hg -R other log -G | |
87 | o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F |
|
87 | o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
@@ -152,8 +152,8 b' push' | |||||
152 | $ hg -R main push other --rev eea13746799a --bookmark book_eea1 |
|
152 | $ hg -R main push other --rev eea13746799a --bookmark book_eea1 | |
153 | pushing to other |
|
153 | pushing to other | |
154 | searching for changes |
|
154 | searching for changes | |
155 | b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_PHASES_MOVED=1 HG_SOURCE=push HG_URL=push |
|
155 | 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 | |
156 | changegroup hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2 |
|
156 | changegroup hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2 | |
157 | remote: adding changesets |
|
157 | remote: adding changesets | |
158 | remote: adding manifests |
|
158 | remote: adding manifests | |
159 | remote: adding file changes |
|
159 | remote: adding file changes | |
@@ -185,7 +185,7 b' pull over ssh' | |||||
185 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
185 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
186 | 1 new obsolescence markers |
|
186 | 1 new obsolescence markers | |
187 | updating bookmark book_02de |
|
187 | updating bookmark book_02de | |
188 | changegroup hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2 |
|
188 | changegroup hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2 | |
189 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
189 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
190 | $ hg -R other debugobsolete |
|
190 | $ hg -R other debugobsolete | |
191 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
191 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
@@ -207,7 +207,7 b' pull over http' | |||||
207 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
207 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
208 | 1 new obsolescence markers |
|
208 | 1 new obsolescence markers | |
209 | updating bookmark book_42cc |
|
209 | updating bookmark book_42cc | |
210 | changegroup hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2 |
|
210 | changegroup hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2 | |
211 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
211 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
212 | $ cat main-error.log |
|
212 | $ cat main-error.log | |
213 | $ hg -R other debugobsolete |
|
213 | $ hg -R other debugobsolete | |
@@ -228,8 +228,8 b' push over ssh' | |||||
228 | remote: added 1 changesets with 1 changes to 1 files |
|
228 | remote: added 1 changesets with 1 changes to 1 files | |
229 | remote: 1 new obsolescence markers |
|
229 | remote: 1 new obsolescence markers | |
230 | updating bookmark book_5fdd |
|
230 | updating bookmark book_5fdd | |
231 | remote: b2x-transactionclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1 |
|
231 | 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 | |
232 | remote: changegroup hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_SOURCE=bundle2 HG_URL=bundle2 |
|
232 | remote: changegroup hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_SOURCE=bundle2 HG_URL=bundle2 | |
233 | $ hg -R other log -G |
|
233 | $ hg -R other log -G | |
234 | o 6:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_5fdd C |
|
234 | o 6:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_5fdd C | |
235 | | |
|
235 | | | |
@@ -456,7 +456,7 b' Doing the actual push: hook abort' | |||||
456 | searching for changes |
|
456 | searching for changes | |
457 | transaction abort! |
|
457 | transaction abort! | |
458 | rollback completed |
|
458 | rollback completed | |
459 | changegroup hook: HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=0 HG_SOURCE=bundle2 HG_URL=bundle2 |
|
459 | changegroup hook: HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=0 HG_NODE=e7ec4e813ba6b07be2a0516ce1a74bb4e503f91a HG_SOURCE=bundle2 HG_URL=bundle2 | |
460 | abort: b2x-pretransactionclose.failpush hook exited with status 1 |
|
460 | abort: b2x-pretransactionclose.failpush hook exited with status 1 | |
461 | [255] |
|
461 | [255] | |
462 |
|
462 | |||
@@ -466,7 +466,7 b' Doing the actual push: hook abort' | |||||
466 | abort: b2x-pretransactionclose.failpush hook exited with status 1 |
|
466 | abort: b2x-pretransactionclose.failpush hook exited with status 1 | |
467 | remote: transaction abort! |
|
467 | remote: transaction abort! | |
468 | remote: rollback completed |
|
468 | remote: rollback completed | |
469 | remote: changegroup hook: HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=0 HG_SOURCE=bundle2 HG_URL=bundle2 |
|
469 | remote: changegroup hook: HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=0 HG_NODE=e7ec4e813ba6b07be2a0516ce1a74bb4e503f91a HG_SOURCE=bundle2 HG_URL=bundle2 | |
470 | [255] |
|
470 | [255] | |
471 |
|
471 | |||
472 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 |
|
472 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 |
General Comments 0
You need to be logged in to leave comments.
Login now