Show More
@@ -43,32 +43,66 b' store.' | |||||
43 |
|
43 | |||
44 | $ hg init ../repo2 |
|
44 | $ hg init ../repo2 | |
45 | $ mv .hg/store/lfs .hg/store/lfs_ |
|
45 | $ mv .hg/store/lfs .hg/store/lfs_ | |
46 |
$ hg push ../repo2 - |
|
46 | $ hg push ../repo2 --debug | |
|
47 | http auth: user foo, password *** | |||
47 | pushing to ../repo2 |
|
48 | pushing to ../repo2 | |
|
49 | http auth: user foo, password *** | |||
|
50 | query 1; heads | |||
48 | searching for changes |
|
51 | searching for changes | |
|
52 | 1 total queries in *s (glob) | |||
|
53 | listing keys for "phases" | |||
|
54 | checking for updated bookmarks | |||
|
55 | listing keys for "bookmarks" | |||
|
56 | lfs: computing set of blobs to upload | |||
49 | lfs: uploading 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b (12 bytes) |
|
57 | lfs: uploading 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b (12 bytes) | |
50 | lfs: processed: 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b |
|
58 | lfs: processed: 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b | |
51 | lfs: uploaded 1 files (12 bytes) |
|
59 | lfs: uploaded 1 files (12 bytes) | |
52 | 1 changesets found |
|
60 | 1 changesets found | |
53 | uncompressed size of bundle content: |
|
61 | list of changesets: | |
54 | * (changelog) (glob) |
|
62 | 99a7098854a3984a5c9eab0fc7a2906697b7cb5c | |
55 | * (manifests) (glob) |
|
63 | bundle2-output-bundle: "HG20", 4 parts total | |
56 | * a (glob) |
|
64 | bundle2-output-part: "replycaps" 191 bytes payload | |
|
65 | bundle2-output-part: "check:heads" streamed payload | |||
|
66 | bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload | |||
|
67 | bundle2-output-part: "phase-heads" 24 bytes payload | |||
|
68 | bundle2-input-bundle: with-transaction | |||
|
69 | bundle2-input-part: "replycaps" supported | |||
|
70 | bundle2-input-part: total payload size 191 | |||
|
71 | bundle2-input-part: "check:heads" supported | |||
|
72 | bundle2-input-part: total payload size 20 | |||
|
73 | bundle2-input-part: "changegroup" (params: 1 mandatory) supported | |||
57 | adding changesets |
|
74 | adding changesets | |
|
75 | add changeset 99a7098854a3 | |||
58 | adding manifests |
|
76 | adding manifests | |
59 | adding file changes |
|
77 | adding file changes | |
|
78 | adding a revisions | |||
60 | added 1 changesets with 1 changes to 1 files |
|
79 | added 1 changesets with 1 changes to 1 files | |
61 | calling hook pretxnchangegroup.lfs: hgext.lfs.checkrequireslfs |
|
80 | calling hook pretxnchangegroup.lfs: hgext.lfs.checkrequireslfs | |
|
81 | bundle2-input-part: total payload size 617 | |||
|
82 | bundle2-input-part: "phase-heads" supported | |||
|
83 | bundle2-input-part: total payload size 24 | |||
|
84 | bundle2-input-bundle: 3 parts total | |||
|
85 | updating the branch cache | |||
|
86 | bundle2-output-bundle: "HG20", 1 parts total | |||
|
87 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |||
|
88 | bundle2-input-bundle: no-transaction | |||
|
89 | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | |||
|
90 | bundle2-input-bundle: 0 parts total | |||
|
91 | listing keys for "phases" | |||
62 | $ mv .hg/store/lfs_ .hg/store/lfs |
|
92 | $ mv .hg/store/lfs_ .hg/store/lfs | |
63 |
|
93 | |||
64 | Clear the cache to force a download |
|
94 | Clear the cache to force a download | |
65 | $ rm -rf `hg config lfs.usercache` |
|
95 | $ rm -rf `hg config lfs.usercache` | |
66 | $ cd ../repo2 |
|
96 | $ cd ../repo2 | |
67 |
$ hg update tip - |
|
97 | $ hg update tip --debug | |
|
98 | http auth: user foo, password *** | |||
68 | resolving manifests |
|
99 | resolving manifests | |
|
100 | branchmerge: False, force: False, partial: False | |||
|
101 | ancestor: 000000000000, local: 000000000000+, remote: 99a7098854a3 | |||
69 | lfs: downloading 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b (12 bytes) |
|
102 | lfs: downloading 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b (12 bytes) | |
70 | lfs: adding 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b to the usercache |
|
103 | lfs: adding 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b to the usercache | |
71 | lfs: processed: 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b |
|
104 | lfs: processed: 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b | |
|
105 | a: remote created -> g | |||
72 | getting a |
|
106 | getting a | |
73 | lfs: found 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b in the local lfs store |
|
107 | lfs: found 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b in the local lfs store | |
74 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
108 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -79,9 +113,18 b' When the server has some blobs already' | |||||
79 | $ echo ANOTHER-LARGE-FILE > c |
|
113 | $ echo ANOTHER-LARGE-FILE > c | |
80 | $ echo ANOTHER-LARGE-FILE2 > d |
|
114 | $ echo ANOTHER-LARGE-FILE2 > d | |
81 | $ hg commit -m b-and-c -A b c d |
|
115 | $ hg commit -m b-and-c -A b c d | |
82 |
$ hg push ../repo1 - |
|
116 | $ hg push ../repo1 --debug | |
|
117 | http auth: user foo, password *** | |||
83 | pushing to ../repo1 |
|
118 | pushing to ../repo1 | |
|
119 | http auth: user foo, password *** | |||
|
120 | query 1; heads | |||
84 | searching for changes |
|
121 | searching for changes | |
|
122 | all remote heads known locally | |||
|
123 | listing keys for "phases" | |||
|
124 | checking for updated bookmarks | |||
|
125 | listing keys for "bookmarks" | |||
|
126 | listing keys for "bookmarks" | |||
|
127 | lfs: computing set of blobs to upload | |||
85 | lfs: need to transfer 2 objects (39 bytes) |
|
128 | lfs: need to transfer 2 objects (39 bytes) | |
86 | lfs: uploading 37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19 (20 bytes) |
|
129 | lfs: uploading 37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19 (20 bytes) | |
87 | lfs: processed: 37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19 |
|
130 | lfs: processed: 37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19 | |
@@ -89,16 +132,49 b' When the server has some blobs already' | |||||
89 | lfs: processed: d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 |
|
132 | lfs: processed: d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 | |
90 | lfs: uploaded 2 files (39 bytes) |
|
133 | lfs: uploaded 2 files (39 bytes) | |
91 | 1 changesets found |
|
134 | 1 changesets found | |
92 | uncompressed size of bundle content: |
|
135 | list of changesets: | |
|
136 | dfca2c9e2ef24996aa61ba2abd99277d884b3d63 | |||
|
137 | bundle2-output-bundle: "HG20", 5 parts total | |||
|
138 | bundle2-output-part: "replycaps" 191 bytes payload | |||
|
139 | bundle2-output-part: "check:phases" 24 bytes payload | |||
|
140 | bundle2-output-part: "check:heads" streamed payload | |||
|
141 | bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload | |||
|
142 | bundle2-output-part: "phase-heads" 24 bytes payload | |||
|
143 | bundle2-input-bundle: with-transaction | |||
|
144 | bundle2-input-part: "replycaps" supported | |||
|
145 | bundle2-input-part: total payload size 191 | |||
|
146 | bundle2-input-part: "check:phases" supported | |||
|
147 | bundle2-input-part: total payload size 24 | |||
|
148 | bundle2-input-part: "check:heads" supported | |||
|
149 | bundle2-input-part: total payload size 20 | |||
|
150 | bundle2-input-part: "changegroup" (params: 1 mandatory) supported | |||
93 | adding changesets |
|
151 | adding changesets | |
|
152 | add changeset dfca2c9e2ef2 | |||
94 | adding manifests |
|
153 | adding manifests | |
95 | adding file changes |
|
154 | adding file changes | |
|
155 | adding b revisions | |||
|
156 | adding c revisions | |||
|
157 | adding d revisions | |||
96 | added 1 changesets with 3 changes to 3 files |
|
158 | added 1 changesets with 3 changes to 3 files | |
|
159 | bundle2-input-part: total payload size 1315 | |||
|
160 | bundle2-input-part: "phase-heads" supported | |||
|
161 | bundle2-input-part: total payload size 24 | |||
|
162 | bundle2-input-bundle: 4 parts total | |||
|
163 | updating the branch cache | |||
|
164 | bundle2-output-bundle: "HG20", 1 parts total | |||
|
165 | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | |||
|
166 | bundle2-input-bundle: no-transaction | |||
|
167 | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | |||
|
168 | bundle2-input-bundle: 0 parts total | |||
|
169 | listing keys for "phases" | |||
97 |
|
170 | |||
98 | Clear the cache to force a download |
|
171 | Clear the cache to force a download | |
99 | $ rm -rf `hg config lfs.usercache` |
|
172 | $ rm -rf `hg config lfs.usercache` | |
100 |
$ hg --repo ../repo1 update tip - |
|
173 | $ hg --repo ../repo1 update tip --debug | |
|
174 | http auth: user foo, password *** | |||
101 | resolving manifests |
|
175 | resolving manifests | |
|
176 | branchmerge: False, force: False, partial: False | |||
|
177 | ancestor: 99a7098854a3, local: 99a7098854a3+, remote: dfca2c9e2ef2 | |||
102 | lfs: need to transfer 2 objects (39 bytes) |
|
178 | lfs: need to transfer 2 objects (39 bytes) | |
103 | lfs: downloading 37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19 (20 bytes) |
|
179 | lfs: downloading 37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19 (20 bytes) | |
104 | lfs: adding 37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19 to the usercache |
|
180 | lfs: adding 37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19 to the usercache | |
@@ -106,10 +182,13 b' Clear the cache to force a download' | |||||
106 | lfs: downloading d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 (19 bytes) |
|
182 | lfs: downloading d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 (19 bytes) | |
107 | lfs: adding d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 to the usercache |
|
183 | lfs: adding d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 to the usercache | |
108 | lfs: processed: d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 |
|
184 | lfs: processed: d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 | |
|
185 | b: remote created -> g | |||
109 | getting b |
|
186 | getting b | |
110 | lfs: found 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b in the local lfs store |
|
187 | lfs: found 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b in the local lfs store | |
|
188 | c: remote created -> g | |||
111 | getting c |
|
189 | getting c | |
112 | lfs: found d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 in the local lfs store |
|
190 | lfs: found d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 in the local lfs store | |
|
191 | d: remote created -> g | |||
113 | getting d |
|
192 | getting d | |
114 | lfs: found 37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19 in the local lfs store |
|
193 | lfs: found 37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19 in the local lfs store | |
115 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
194 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -122,8 +201,11 b' Test a corrupt file download, but clear ' | |||||
122 | $ rm ../repo1/.hg/store/lfs/objects/d1/1e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 |
|
201 | $ rm ../repo1/.hg/store/lfs/objects/d1/1e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 | |
123 | $ rm ../repo1/* |
|
202 | $ rm ../repo1/* | |
124 |
|
203 | |||
125 |
$ hg --repo ../repo1 update -C tip - |
|
204 | $ hg --repo ../repo1 update -C tip --debug | |
|
205 | http auth: user foo, password *** | |||
126 | resolving manifests |
|
206 | resolving manifests | |
|
207 | branchmerge: False, force: True, partial: False | |||
|
208 | ancestor: dfca2c9e2ef2+, local: dfca2c9e2ef2+, remote: dfca2c9e2ef2 | |||
127 | lfs: downloading d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 (19 bytes) |
|
209 | lfs: downloading d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 (19 bytes) | |
128 | abort: corrupt remote lfs object: d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 |
|
210 | abort: corrupt remote lfs object: d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 | |
129 | [255] |
|
211 | [255] | |
@@ -141,9 +223,18 b' Test a corrupted file upload' | |||||
141 | $ echo 'another lfs blob' > b |
|
223 | $ echo 'another lfs blob' > b | |
142 | $ hg ci -m 'another blob' |
|
224 | $ hg ci -m 'another blob' | |
143 | $ echo 'damage' > .hg/store/lfs/objects/e6/59058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0 |
|
225 | $ echo 'damage' > .hg/store/lfs/objects/e6/59058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0 | |
144 |
$ hg push - |
|
226 | $ hg push --debug ../repo1 | |
|
227 | http auth: user foo, password *** | |||
145 | pushing to ../repo1 |
|
228 | pushing to ../repo1 | |
|
229 | http auth: user foo, password *** | |||
|
230 | query 1; heads | |||
146 | searching for changes |
|
231 | searching for changes | |
|
232 | all remote heads known locally | |||
|
233 | listing keys for "phases" | |||
|
234 | checking for updated bookmarks | |||
|
235 | listing keys for "bookmarks" | |||
|
236 | listing keys for "bookmarks" | |||
|
237 | lfs: computing set of blobs to upload | |||
147 | lfs: uploading e659058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0 (17 bytes) |
|
238 | lfs: uploading e659058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0 (17 bytes) | |
148 | abort: detected corrupt lfs object: e659058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0 |
|
239 | abort: detected corrupt lfs object: e659058e26b07b39d2a9c7145b3f99b41f797b6621c8076600e9cb7ee88291f0 | |
149 | (run hg verify) |
|
240 | (run hg verify) | |
@@ -152,7 +243,8 b' Test a corrupted file upload' | |||||
152 | Archive will prefetch blobs in a group |
|
243 | Archive will prefetch blobs in a group | |
153 |
|
244 | |||
154 | $ rm -rf .hg/store/lfs `hg config lfs.usercache` |
|
245 | $ rm -rf .hg/store/lfs `hg config lfs.usercache` | |
155 |
$ hg archive - |
|
246 | $ hg archive --debug -r 1 ../archive | |
|
247 | http auth: user foo, password *** | |||
156 | lfs: need to transfer 3 objects (51 bytes) |
|
248 | lfs: need to transfer 3 objects (51 bytes) | |
157 | lfs: downloading 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b (12 bytes) |
|
249 | lfs: downloading 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b (12 bytes) | |
158 | lfs: adding 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b to the usercache |
|
250 | lfs: adding 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b to the usercache | |
@@ -178,7 +270,8 b' Archive will prefetch blobs in a group' | |||||
178 | Cat will prefetch blobs in a group |
|
270 | Cat will prefetch blobs in a group | |
179 |
|
271 | |||
180 | $ rm -rf .hg/store/lfs `hg config lfs.usercache` |
|
272 | $ rm -rf .hg/store/lfs `hg config lfs.usercache` | |
181 |
$ hg cat - |
|
273 | $ hg cat --debug -r 1 a b c | |
|
274 | http auth: user foo, password *** | |||
182 | lfs: need to transfer 2 objects (31 bytes) |
|
275 | lfs: need to transfer 2 objects (31 bytes) | |
183 | lfs: downloading 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b (12 bytes) |
|
276 | lfs: downloading 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b (12 bytes) | |
184 | lfs: adding 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b to the usercache |
|
277 | lfs: adding 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b to the usercache | |
@@ -198,7 +291,8 b' Revert will prefetch blobs in a group' | |||||
198 | $ rm -rf .hg/store/lfs |
|
291 | $ rm -rf .hg/store/lfs | |
199 | $ rm -rf `hg config lfs.usercache` |
|
292 | $ rm -rf `hg config lfs.usercache` | |
200 | $ rm * |
|
293 | $ rm * | |
201 |
$ hg revert --all -r 1 - |
|
294 | $ hg revert --all -r 1 --debug | |
|
295 | http auth: user foo, password *** | |||
202 | adding a |
|
296 | adding a | |
203 | reverting b |
|
297 | reverting b | |
204 | reverting c |
|
298 | reverting c | |
@@ -226,7 +320,11 b' Check error message when the remote miss' | |||||
226 | $ hg commit -m b b |
|
320 | $ hg commit -m b b | |
227 | $ rm -rf .hg/store/lfs |
|
321 | $ rm -rf .hg/store/lfs | |
228 | $ rm -rf `hg config lfs.usercache` |
|
322 | $ rm -rf `hg config lfs.usercache` | |
229 | $ hg update -C '.^' |
|
323 | $ hg update -C '.^' --debug | |
|
324 | http auth: user foo, password *** | |||
|
325 | resolving manifests | |||
|
326 | branchmerge: False, force: True, partial: False | |||
|
327 | ancestor: 62fdbaf221c6+, local: 62fdbaf221c6+, remote: ef0564edf47e | |||
230 | abort: LFS server error. Remote object for "b" not found:(.*)! (re) |
|
328 | abort: LFS server error. Remote object for "b" not found:(.*)! (re) | |
231 | [255] |
|
329 | [255] | |
232 |
|
330 | |||
@@ -265,8 +363,14 b' Check error message when object does not' | |||||
265 | #endif |
|
363 | #endif | |
266 |
|
364 | |||
267 | $ cd $TESTTMP |
|
365 | $ cd $TESTTMP | |
268 | $ hg clone test test2 |
|
366 | $ hg --debug clone test test2 | |
|
367 | http auth: user foo, password *** | |||
|
368 | linked 6 files | |||
|
369 | http auth: user foo, password *** | |||
269 | updating to branch default |
|
370 | updating to branch default | |
|
371 | resolving manifests | |||
|
372 | branchmerge: False, force: False, partial: False | |||
|
373 | ancestor: 000000000000, local: 000000000000+, remote: d2a338f184a8 | |||
270 | abort: LFS server error. Remote object for "a" not found:(.*)! (re) |
|
374 | abort: LFS server error. Remote object for "a" not found:(.*)! (re) | |
271 | [255] |
|
375 | [255] | |
272 |
|
376 |
General Comments 0
You need to be logged in to leave comments.
Login now