Show More
@@ -827,6 +827,8 b' class pulloperation(object):' | |||
|
827 | 827 | """get appropriate pull transaction, creating it if needed""" |
|
828 | 828 | if self._tr is None: |
|
829 | 829 | self._tr = self.repo.transaction(self._trname) |
|
830 | self._tr.hookargs['source'] = 'pull' | |
|
831 | self._tr.hookargs['url'] = self.remote.url() | |
|
830 | 832 | return self._tr |
|
831 | 833 | |
|
832 | 834 | def closetransaction(self): |
@@ -59,7 +59,7 b' clone --pull' | |||
|
59 | 59 | adding file changes |
|
60 | 60 | added 2 changesets with 2 changes to 2 files |
|
61 | 61 | 1 new obsolescence markers |
|
62 |
changegroup hook: HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_SOURCE= |
|
|
62 | changegroup hook: HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_SOURCE=pull HG_URL=file:$TESTTMP/main | |
|
63 | 63 | updating to branch default |
|
64 | 64 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
65 | 65 | $ hg -R other log -G |
@@ -81,7 +81,7 b' pull' | |||
|
81 | 81 | adding file changes |
|
82 | 82 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
83 | 83 | 1 new obsolescence markers |
|
84 |
changegroup hook: HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_SOURCE= |
|
|
84 | changegroup hook: HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_SOURCE=pull HG_URL=file:$TESTTMP/main | |
|
85 | 85 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
86 | 86 | $ hg -R other log -G |
|
87 | 87 | o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F |
@@ -185,7 +185,7 b' pull over ssh' | |||
|
185 | 185 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
186 | 186 | 1 new obsolescence markers |
|
187 | 187 | updating bookmark book_02de |
|
188 |
changegroup hook: HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_SOURCE= |
|
|
188 | changegroup hook: HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_SOURCE=pull HG_URL=ssh://user@dummy/main | |
|
189 | 189 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
190 | 190 | $ hg -R other debugobsolete |
|
191 | 191 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
@@ -207,7 +207,7 b' pull over http' | |||
|
207 | 207 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
208 | 208 | 1 new obsolescence markers |
|
209 | 209 | updating bookmark book_42cc |
|
210 |
changegroup hook: HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_SOURCE= |
|
|
210 | changegroup hook: HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/ | |
|
211 | 211 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
212 | 212 | $ cat main-error.log |
|
213 | 213 | $ hg -R other debugobsolete |
@@ -82,17 +82,17 b' Pull the new commits in the clone' | |||
|
82 | 82 | adding manifests |
|
83 | 83 | adding file changes |
|
84 | 84 | added 1 changesets with 1 changes to 1 files |
|
85 |
pretxnchangegroup hook: HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_PENDING=$TESTTMP/clone HG_SOURCE= |
|
|
85 | pretxnchangegroup hook: HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_PENDING=$TESTTMP/clone HG_SOURCE=pull HG_URL=file:$TESTTMP/repo | |
|
86 | 86 | remote: changegroup2 |
|
87 | 87 | adding changesets |
|
88 | 88 | adding manifests |
|
89 | 89 | adding file changes |
|
90 | 90 | added 1 changesets with 1 changes to 1 files |
|
91 |
pretxnchangegroup hook: HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE= |
|
|
92 |
changegroup hook: HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_SOURCE= |
|
|
93 |
incoming hook: HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_SOURCE= |
|
|
94 |
changegroup hook: HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PHASES_MOVED=1 HG_SOURCE= |
|
|
95 |
incoming hook: HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PHASES_MOVED=1 HG_SOURCE= |
|
|
91 | pretxnchangegroup hook: HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/repo | |
|
92 | changegroup hook: HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_SOURCE=pull HG_URL=file:$TESTTMP/repo | |
|
93 | incoming hook: HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_SOURCE=pull HG_URL=file:$TESTTMP/repo | |
|
94 | changegroup hook: HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/repo | |
|
95 | incoming hook: HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/repo | |
|
96 | 96 | pullop.cgresult is 1 |
|
97 | 97 | (run 'hg update' to get a working copy) |
|
98 | 98 | $ hg update |
@@ -152,20 +152,20 b' pullop.cgresult' | |||
|
152 | 152 | adding manifests |
|
153 | 153 | adding file changes |
|
154 | 154 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
155 |
pretxnchangegroup hook: HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_PENDING=$TESTTMP/clone HG_SOURCE= |
|
|
155 | pretxnchangegroup hook: HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_PENDING=$TESTTMP/clone HG_SOURCE=pull HG_URL=file:$TESTTMP/repo | |
|
156 | 156 | remote: changegroup2 |
|
157 | 157 | adding changesets |
|
158 | 158 | adding manifests |
|
159 | 159 | adding file changes |
|
160 | 160 | added 3 changesets with 3 changes to 3 files (+1 heads) |
|
161 |
pretxnchangegroup hook: HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE= |
|
|
162 |
changegroup hook: HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_SOURCE= |
|
|
163 |
incoming hook: HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_SOURCE= |
|
|
164 |
incoming hook: HG_NODE=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_SOURCE= |
|
|
165 |
changegroup hook: HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_PHASES_MOVED=1 HG_SOURCE= |
|
|
166 |
incoming hook: HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_PHASES_MOVED=1 HG_SOURCE= |
|
|
167 |
incoming hook: HG_NODE=1d14c3ce6ac0582d2809220d33e8cd7a696e0156 HG_PHASES_MOVED=1 HG_SOURCE= |
|
|
168 |
incoming hook: HG_NODE=5cd59d311f6508b8e0ed28a266756c859419c9f1 HG_PHASES_MOVED=1 HG_SOURCE= |
|
|
161 | pretxnchangegroup hook: HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/repo | |
|
162 | changegroup hook: HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_SOURCE=pull HG_URL=file:$TESTTMP/repo | |
|
163 | incoming hook: HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_SOURCE=pull HG_URL=file:$TESTTMP/repo | |
|
164 | incoming hook: HG_NODE=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_SOURCE=pull HG_URL=file:$TESTTMP/repo | |
|
165 | changegroup hook: HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/repo | |
|
166 | incoming hook: HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/repo | |
|
167 | incoming hook: HG_NODE=1d14c3ce6ac0582d2809220d33e8cd7a696e0156 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/repo | |
|
168 | incoming hook: HG_NODE=5cd59d311f6508b8e0ed28a266756c859419c9f1 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/repo | |
|
169 | 169 | pullop.cgresult is 3 |
|
170 | 170 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
171 | 171 | $ hg log -G |
@@ -225,17 +225,17 b' pullop.cgresult' | |||
|
225 | 225 | adding manifests |
|
226 | 226 | adding file changes |
|
227 | 227 | added 1 changesets with 0 changes to 0 files (-1 heads) |
|
228 |
pretxnchangegroup hook: HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_PENDING=$TESTTMP/clone HG_SOURCE= |
|
|
228 | pretxnchangegroup hook: HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_PENDING=$TESTTMP/clone HG_SOURCE=pull HG_URL=file:$TESTTMP/repo | |
|
229 | 229 | remote: changegroup2 |
|
230 | 230 | adding changesets |
|
231 | 231 | adding manifests |
|
232 | 232 | adding file changes |
|
233 | 233 | added 1 changesets with 1 changes to 1 files |
|
234 |
pretxnchangegroup hook: HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE= |
|
|
235 |
changegroup hook: HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE= |
|
|
236 |
incoming hook: HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE= |
|
|
237 |
changegroup hook: HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PHASES_MOVED=1 HG_SOURCE= |
|
|
238 |
incoming hook: HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PHASES_MOVED=1 HG_SOURCE= |
|
|
234 | pretxnchangegroup hook: HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/repo | |
|
235 | changegroup hook: HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE=pull HG_URL=file:$TESTTMP/repo | |
|
236 | incoming hook: HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE=pull HG_URL=file:$TESTTMP/repo | |
|
237 | changegroup hook: HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/repo | |
|
238 | incoming hook: HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_URL=file:$TESTTMP/repo | |
|
239 | 239 | pullop.cgresult is -2 |
|
240 | 240 | (run 'hg update' to get a working copy) |
|
241 | 241 | $ hg log -G |
General Comments 0
You need to be logged in to leave comments.
Login now