equal
deleted
inserted
replaced
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): |