##// END OF EJS Templates
largefiles: always consider updatelfiles 'checked' parameter set...
Mads Kiilerich -
r24788:b8c3a099 default
parent child Browse files
Show More
@@ -437,7 +437,7 b' def downloadlfiles(ui, repo, rev=None):'
437 return totalsuccess, totalmissing
437 return totalsuccess, totalmissing
438
438
439 def updatelfiles(ui, repo, filelist=None, printmessage=None,
439 def updatelfiles(ui, repo, filelist=None, printmessage=None,
440 normallookup=False, checked=False):
440 normallookup=False):
441 '''Update largefiles according to standins in the working directory
441 '''Update largefiles according to standins in the working directory
442
442
443 If ``printmessage`` is other than ``None``, it means "print (or
443 If ``printmessage`` is other than ``None``, it means "print (or
@@ -464,10 +464,7 b' def updatelfiles(ui, repo, filelist=None'
464 shutil.copyfile(abslfile, abslfile + '.orig')
464 shutil.copyfile(abslfile, abslfile + '.orig')
465 util.unlinkpath(absstandin + '.orig')
465 util.unlinkpath(absstandin + '.orig')
466 expecthash = lfutil.readstandin(repo, lfile)
466 expecthash = lfutil.readstandin(repo, lfile)
467 if (expecthash != '' and
467 if expecthash != '':
468 (checked or
469 not os.path.exists(abslfile) or
470 expecthash != lfutil.hashfile(abslfile))):
471 if lfile not in repo[None]: # not switched to normal file
468 if lfile not in repo[None]: # not switched to normal file
472 util.unlinkpath(abslfile, ignoremissing=True)
469 util.unlinkpath(abslfile, ignoremissing=True)
473 # use normallookup() to allocate an entry in largefiles
470 # use normallookup() to allocate an entry in largefiles
@@ -1348,7 +1348,7 b' def mergeupdate(orig, repo, node, branch'
1348 filelist.extend(s.deleted + s.removed)
1348 filelist.extend(s.deleted + s.removed)
1349
1349
1350 lfcommands.updatelfiles(repo.ui, repo, filelist=filelist,
1350 lfcommands.updatelfiles(repo.ui, repo, filelist=filelist,
1351 normallookup=partial, checked=True)
1351 normallookup=partial)
1352
1352
1353 return result
1353 return result
1354 finally:
1354 finally:
General Comments 0
You need to be logged in to leave comments. Login now