hgext/largefiles/lfcommands.py
changeset 18294 65cec7fa5472
parent 18144 e16982a74bf7
parent 18292 40185df018d7
child 18574 4db9e31ae605
child 18722 f0aa8bbffe60
equal deleted inserted replaced
18293:1f35d6737ed8 18294:65cec7fa5472
   488     cache.'''
   488     cache.'''
   489     ret = 0
   489     ret = 0
   490     abslfile = repo.wjoin(lfile)
   490     abslfile = repo.wjoin(lfile)
   491     absstandin = repo.wjoin(lfutil.standin(lfile))
   491     absstandin = repo.wjoin(lfutil.standin(lfile))
   492     if os.path.exists(absstandin):
   492     if os.path.exists(absstandin):
   493         if os.path.exists(absstandin+'.orig'):
   493         if os.path.exists(absstandin + '.orig') and os.path.exists(abslfile):
   494             shutil.copyfile(abslfile, abslfile+'.orig')
   494             shutil.copyfile(abslfile, abslfile + '.orig')
   495         expecthash = lfutil.readstandin(repo, lfile)
   495         expecthash = lfutil.readstandin(repo, lfile)
   496         if (expecthash != '' and
   496         if (expecthash != '' and
   497             (not os.path.exists(abslfile) or
   497             (not os.path.exists(abslfile) or
   498              expecthash != lfutil.hashfile(abslfile))):
   498              expecthash != lfutil.hashfile(abslfile))):
   499             if not lfutil.copyfromcache(repo, expecthash, lfile):
   499             if not lfutil.copyfromcache(repo, expecthash, lfile):