##// END OF EJS Templates
phases: inform transaction-related hooks that a phase was moved...
Pierre-Yves David -
r22940:e8031862 default
parent child Browse files
Show More
@@ -227,6 +227,7 b' class phasecache(object):'
227 self.dirty = True
227 self.dirty = True
228
228
229 tr.addfilegenerator('phase', ('phaseroots',), self._write)
229 tr.addfilegenerator('phase', ('phaseroots',), self._write)
230 tr.hookargs['phases_moved'] = '1'
230
231
231 def advanceboundary(self, repo, tr, targetphase, nodes):
232 def advanceboundary(self, repo, tr, targetphase, nodes):
232 # Be careful to preserve shallow-copied values: do not update
233 # Be careful to preserve shallow-copied values: do not update
@@ -224,7 +224,7 b' hg -R bundle://../full.hg verify'
224 adding manifests
224 adding manifests
225 adding file changes
225 adding file changes
226 added 9 changesets with 7 changes to 4 files (+1 heads)
226 added 9 changesets with 7 changes to 4 files (+1 heads)
227 changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_SOURCE=pull HG_URL=bundle:../full.hg
227 changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=bundle:../full.hg
228 (run 'hg heads' to see heads, 'hg merge' to merge)
228 (run 'hg heads' to see heads, 'hg merge' to merge)
229
229
230 Rollback empty
230 Rollback empty
@@ -247,7 +247,7 b' Pull full.hg into empty again (using -R;'
247 adding manifests
247 adding manifests
248 adding file changes
248 adding file changes
249 added 9 changesets with 7 changes to 4 files (+1 heads)
249 added 9 changesets with 7 changes to 4 files (+1 heads)
250 changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_SOURCE=pull HG_URL=bundle:empty+full.hg
250 changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=bundle:empty+full.hg
251 (run 'hg heads' to see heads, 'hg merge' to merge)
251 (run 'hg heads' to see heads, 'hg merge' to merge)
252
252
253 Create partial clones
253 Create partial clones
@@ -43,7 +43,7 b' The extension requires a repo (currently'
43 adding manifests
43 adding manifests
44 adding file changes
44 adding file changes
45 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)
46 changegroup hook: HG_PHASES_MOVED=1 HG_SOURCE=unbundle HG_URL=bundle:*/tests/bundles/rebase.hg (glob)
47 (run 'hg heads' to see heads, 'hg merge' to merge)
47 (run 'hg heads' to see heads, 'hg merge' to merge)
48
48
49 $ cd ..
49 $ cd ..
@@ -65,7 +65,7 b' clone --pull'
65 adding file changes
65 adding file changes
66 added 2 changesets with 2 changes to 2 files
66 added 2 changesets with 2 changes to 2 files
67 1 new obsolescence markers
67 1 new obsolescence markers
68 changegroup hook: HG_NEW_OBSMARKERS=1 HG_SOURCE=bundle2 HG_URL=bundle2
68 changegroup hook: HG_NEW_OBSMARKERS=1 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2
69 updating to branch default
69 updating to branch default
70 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
71 $ hg -R other log -G
71 $ hg -R other log -G
@@ -87,7 +87,7 b' pull'
87 adding file changes
87 adding file changes
88 added 1 changesets with 1 changes to 1 files (+1 heads)
88 added 1 changesets with 1 changes to 1 files (+1 heads)
89 1 new obsolescence markers
89 1 new obsolescence markers
90 changegroup hook: HG_NEW_OBSMARKERS=1 HG_SOURCE=bundle2 HG_URL=bundle2
90 changegroup hook: HG_NEW_OBSMARKERS=1 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2
91 (run 'hg heads' to see heads, 'hg merge' to merge)
91 (run 'hg heads' to see heads, 'hg merge' to merge)
92 $ hg -R other log -G
92 $ hg -R other log -G
93 o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F
93 o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F
@@ -158,8 +158,8 b' push'
158 $ hg -R main push other --rev eea13746799a --bookmark book_eea1
158 $ hg -R main push other --rev eea13746799a --bookmark book_eea1
159 pushing to other
159 pushing to other
160 searching for changes
160 searching for changes
161 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_PHASES_MOVED=1 HG_SOURCE=push HG_URL=push
162 changegroup hook: HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_SOURCE=bundle2 HG_URL=bundle2
162 changegroup hook: HG_BUNDLE2-EXP=1 HG_NEW_OBSMARKERS=1 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2
163 remote: adding changesets
163 remote: adding changesets
164 remote: adding manifests
164 remote: adding manifests
165 remote: adding file changes
165 remote: adding file changes
@@ -191,7 +191,7 b' pull over ssh'
191 added 1 changesets with 1 changes to 1 files (+1 heads)
191 added 1 changesets with 1 changes to 1 files (+1 heads)
192 1 new obsolescence markers
192 1 new obsolescence markers
193 updating bookmark book_02de
193 updating bookmark book_02de
194 changegroup hook: HG_NEW_OBSMARKERS=1 HG_SOURCE=bundle2 HG_URL=bundle2
194 changegroup hook: HG_NEW_OBSMARKERS=1 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2
195 (run 'hg heads' to see heads, 'hg merge' to merge)
195 (run 'hg heads' to see heads, 'hg merge' to merge)
196 $ hg -R other debugobsolete
196 $ hg -R other debugobsolete
197 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'}
@@ -213,7 +213,7 b' pull over http'
213 added 1 changesets with 1 changes to 1 files (+1 heads)
213 added 1 changesets with 1 changes to 1 files (+1 heads)
214 1 new obsolescence markers
214 1 new obsolescence markers
215 updating bookmark book_42cc
215 updating bookmark book_42cc
216 changegroup hook: HG_NEW_OBSMARKERS=1 HG_SOURCE=bundle2 HG_URL=bundle2
216 changegroup hook: HG_NEW_OBSMARKERS=1 HG_PHASES_MOVED=1 HG_SOURCE=bundle2 HG_URL=bundle2
217 (run 'hg heads .' to see heads, 'hg merge' to merge)
217 (run 'hg heads .' to see heads, 'hg merge' to merge)
218 $ cat main-error.log
218 $ cat main-error.log
219 $ hg -R other debugobsolete
219 $ hg -R other debugobsolete
@@ -87,7 +87,7 b' test generic hooks'
87 adding manifests
87 adding manifests
88 adding file changes
88 adding file changes
89 added 3 changesets with 2 changes to 2 files
89 added 3 changesets with 2 changes to 2 files
90 changegroup hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_SOURCE=pull HG_URL=file:$TESTTMP/a
90 changegroup hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/a
91 incoming hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_SOURCE=pull HG_URL=file:$TESTTMP/a
91 incoming hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_SOURCE=pull HG_URL=file:$TESTTMP/a
92 incoming hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_SOURCE=pull HG_URL=file:$TESTTMP/a
92 incoming hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_SOURCE=pull HG_URL=file:$TESTTMP/a
93 incoming hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_SOURCE=pull HG_URL=file:$TESTTMP/a
93 incoming hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_SOURCE=pull HG_URL=file:$TESTTMP/a
@@ -125,7 +125,7 b' pull'
125 adding manifests
125 adding manifests
126 adding file changes
126 adding file changes
127 added 1 changesets with 1 changes to 1 files
127 added 1 changesets with 1 changes to 1 files
128 changegroup hook: HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_URL=http://localhost:$HGPORT1/
128 changegroup hook: HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=http://localhost:$HGPORT1/
129 (run 'hg update' to get a working copy)
129 (run 'hg update' to get a working copy)
130 $ cd ..
130 $ cd ..
131
131
@@ -162,7 +162,7 b' pull without cacert'
162 adding manifests
162 adding manifests
163 adding file changes
163 adding file changes
164 added 1 changesets with 1 changes to 1 files
164 added 1 changesets with 1 changes to 1 files
165 changegroup hook: HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_URL=https://localhost:$HGPORT/
165 changegroup hook: HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=https://localhost:$HGPORT/
166 (run 'hg update' to get a working copy)
166 (run 'hg update' to get a working copy)
167 $ cd ..
167 $ cd ..
168
168
@@ -67,7 +67,7 b' expect success'
67 remote: adding manifests
67 remote: adding manifests
68 remote: adding file changes
68 remote: adding file changes
69 remote: added 1 changesets with 1 changes to 1 files
69 remote: added 1 changesets with 1 changes to 1 files
70 remote: changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http:*: (glob)
70 remote: changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_PHASES_MOVED=1 HG_SOURCE=serve HG_URL=remote:http:127.0.0.1:
71 % serve errors
71 % serve errors
72 $ hg rollback
72 $ hg rollback
73 repository tip rolled back to revision 0 (undo serve)
73 repository tip rolled back to revision 0 (undo serve)
@@ -83,7 +83,7 b' expect success, server lacks the httphea'
83 remote: adding manifests
83 remote: adding manifests
84 remote: adding file changes
84 remote: adding file changes
85 remote: added 1 changesets with 1 changes to 1 files
85 remote: added 1 changesets with 1 changes to 1 files
86 remote: changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http:*: (glob)
86 remote: changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_PHASES_MOVED=1 HG_SOURCE=serve HG_URL=remote:http:127.0.0.1:
87 % serve errors
87 % serve errors
88 $ hg rollback
88 $ hg rollback
89 repository tip rolled back to revision 0 (undo serve)
89 repository tip rolled back to revision 0 (undo serve)
@@ -99,7 +99,7 b' expect success, server lacks the unbundl'
99 remote: adding manifests
99 remote: adding manifests
100 remote: adding file changes
100 remote: adding file changes
101 remote: added 1 changesets with 1 changes to 1 files
101 remote: added 1 changesets with 1 changes to 1 files
102 remote: changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http:*: (glob)
102 remote: changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_PHASES_MOVED=1 HG_SOURCE=serve HG_URL=remote:http:127.0.0.1:
103 % serve errors
103 % serve errors
104 $ hg rollback
104 $ hg rollback
105 repository tip rolled back to revision 0 (undo serve)
105 repository tip rolled back to revision 0 (undo serve)
@@ -410,7 +410,7 b' stderr from remote commands should be pr'
410 Got arguments 1:user@dummy 2:hg -R local serve --stdio
410 Got arguments 1:user@dummy 2:hg -R local serve --stdio
411 Got arguments 1:user@dummy 2:hg -R $TESTTMP/local serve --stdio
411 Got arguments 1:user@dummy 2:hg -R $TESTTMP/local serve --stdio
412 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
412 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
413 changegroup-in-remote hook: HG_NODE=a28a9d1a809cab7d4e2fde4bee738a9ede948b60 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1
413 changegroup-in-remote hook: HG_NODE=a28a9d1a809cab7d4e2fde4bee738a9ede948b60 HG_PHASES_MOVED=1 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1
414 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
414 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
415 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
415 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
416 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
416 Got arguments 1:user@dummy 2:hg -R remote serve --stdio
@@ -97,7 +97,7 b' check for HTTP opener failures when cach'
97 adding manifests
97 adding manifests
98 adding file changes
98 adding file changes
99 added 1 changesets with 1 changes to 1 files
99 added 1 changesets with 1 changes to 1 files
100 changegroup hook: HG_NODE=4ac2e3648604439c580c69b09ec9d93a88d93432 HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/remote
100 changegroup hook: HG_NODE=4ac2e3648604439c580c69b09ec9d93a88d93432 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/remote
101 (run 'hg update' to get a working copy)
101 (run 'hg update' to get a working copy)
102
102
103 trying to push
103 trying to push
General Comments 0
You need to be logged in to leave comments. Login now