Show More
@@ -245,9 +245,9 b' def copyfromcache(repo, hash, filename):' | |||
|
245 | 245 | return False |
|
246 | 246 | return True |
|
247 | 247 | |
|
248 | def copytostore(repo, rev, file, uploaded=False): | |
|
248 | def copytostore(repo, revorctx, file, uploaded=False): | |
|
249 | 249 | wvfs = repo.wvfs |
|
250 | hash = readstandin(repo, file, rev) | |
|
250 | hash = readstandin(repo, file, revorctx) | |
|
251 | 251 | if instore(repo, hash): |
|
252 | 252 | return |
|
253 | 253 | if wvfs.exists(file): |
@@ -263,7 +263,7 b' def copyalltostore(repo, node):' | |||
|
263 | 263 | for filename in ctx.files(): |
|
264 | 264 | realfile = splitstandin(filename) |
|
265 | 265 | if realfile is not None and filename in ctx.manifest(): |
|
266 |
copytostore(repo, ctx |
|
|
266 | copytostore(repo, ctx, realfile) | |
|
267 | 267 | |
|
268 | 268 | def copytostoreabsolute(repo, file, hash): |
|
269 | 269 | if inusercache(repo.ui, hash): |
@@ -485,6 +485,11 b' def markcommitted(orig, ctx, node):' | |||
|
485 | 485 | lfdirstate.write() |
|
486 | 486 | |
|
487 | 487 | # As part of committing, copy all of the largefiles into the cache. |
|
488 | # | |
|
489 | # Using "node" instead of "ctx" implies additional "repo[node]" | |
|
490 | # lookup while copyalltostore(), but can omit redundant check for | |
|
491 | # files comming from the 2nd parent, which should exist in store | |
|
492 | # at merging. | |
|
488 | 493 | copyalltostore(repo, node) |
|
489 | 494 | |
|
490 | 495 | def getlfilestoupdate(oldstandins, newstandins): |
@@ -1354,7 +1354,7 b' def overridecat(orig, ui, repo, file1, *' | |||
|
1354 | 1354 | data = repo.wwritedata(f, data) |
|
1355 | 1355 | fp.write(data) |
|
1356 | 1356 | else: |
|
1357 |
hash = lfutil.readstandin(repo, lf, ctx |
|
|
1357 | hash = lfutil.readstandin(repo, lf, ctx) | |
|
1358 | 1358 | if not lfutil.inusercache(repo.ui, hash): |
|
1359 | 1359 | store = storefactory.openstore(repo) |
|
1360 | 1360 | success, missing = store.get([(lf, hash)]) |
@@ -1405,7 +1405,7 b' def mergeupdate(orig, repo, node, branch' | |||
|
1405 | 1405 | lfutil.writestandin(repo, standin, lfhash, |
|
1406 | 1406 | lfutil.getexecutable(lfileabs)) |
|
1407 | 1407 | if (standin in pctx and |
|
1408 |
lfhash == lfutil.readstandin(repo, lfile, |
|
|
1408 | lfhash == lfutil.readstandin(repo, lfile, pctx)): | |
|
1409 | 1409 | oldclean.add(lfile) |
|
1410 | 1410 | for lfile in s.added: |
|
1411 | 1411 | lfutil.updatestandin(repo, lfutil.standin(lfile)) |
General Comments 0
You need to be logged in to leave comments.
Login now