##// END OF EJS Templates
largefiles: respect the rev when reading standins in copytostore() (issue3630)...
Matt Harbison -
r17877:92bbb21d stable
parent child Browse files
Show More
@@ -215,7 +215,7 b' def copyfromcache(repo, hash, filename):'
215 return True
215 return True
216
216
217 def copytostore(repo, rev, file, uploaded=False):
217 def copytostore(repo, rev, file, uploaded=False):
218 hash = readstandin(repo, file)
218 hash = readstandin(repo, file, rev)
219 if instore(repo, hash):
219 if instore(repo, hash):
220 return
220 return
221 copytostoreabsolute(repo, repo.wjoin(file), hash)
221 copytostoreabsolute(repo, repo.wjoin(file), hash)
@@ -6,6 +6,7 b''
6 > share =
6 > share =
7 > graphlog =
7 > graphlog =
8 > mq =
8 > mq =
9 > convert =
9 > [largefiles]
10 > [largefiles]
10 > minsize = 0.5
11 > minsize = 0.5
11 > patterns = **.other
12 > patterns = **.other
@@ -274,6 +275,46 b' round-trip: converting back to a normal '
274
275
275 $ cd ..
276 $ cd ..
276
277
278 $ hg convert largefiles-repo
279 assuming destination largefiles-repo-hg
280 initializing destination largefiles-repo-hg repository
281 scanning source...
282 sorting...
283 converting...
284 6 add large, normal1
285 5 add sub/*
286 4 rename sub/ to stuff/
287 3 add normal3, modify sub/*
288 2 remove large, normal3
289 1 merge
290 0 add anotherlarge (should be a largefile)
291
292 $ hg -R largefiles-repo-hg glog --template "{rev}:{node|short} {desc|firstline}\n"
293 o 6:17126745edfd add anotherlarge (should be a largefile)
294 |
295 o 5:9cc5aa7204f0 merge
296 |\
297 | o 4:a5a02de7a8e4 remove large, normal3
298 | |
299 | o 3:55759520c76f add normal3, modify sub/*
300 | |
301 o | 2:261ad3f3f037 rename sub/ to stuff/
302 |/
303 o 1:334e5237836d add sub/*
304 |
305 o 0:d4892ec57ce2 add large, normal1
306
307 $ hg -R largefiles-repo-hg verify --large --lfa
308 checking changesets
309 checking manifests
310 crosschecking files in changesets and manifests
311 checking files
312 8 files, 7 changesets, 12 total revisions
313 searching 7 changesets for largefiles
314 verified existence of 6 revisions of 4 largefiles
315 $ hg -R largefiles-repo-hg showconfig paths
316
317
277 Avoid a traceback if a largefile isn't available (issue3519)
318 Avoid a traceback if a largefile isn't available (issue3519)
278
319
279 Ensure the largefile can be cached in the source if necessary
320 Ensure the largefile can be cached in the source if necessary
General Comments 0
You need to be logged in to leave comments. Login now