##// END OF EJS Templates
largefiles: remove all uses of os.path.relpath for 2.4 compatibility
Benjamin Pollack -
r15323:19368c54 stable
parent child Browse files
Show More
@@ -298,8 +298,7 b' def override_copy(orig, ui, repo, pats, '
298
298
299 def makestandin(relpath):
299 def makestandin(relpath):
300 path = scmutil.canonpath(repo.root, repo.getcwd(), relpath)
300 path = scmutil.canonpath(repo.root, repo.getcwd(), relpath)
301 return os.path.join(os.path.relpath('.', repo.getcwd()),
301 return os.path.join(repo.wjoin(lfutil.standin(path)))
302 lfutil.standin(path))
303
302
304 fullpats = scmutil.expandpats(pats)
303 fullpats = scmutil.expandpats(pats)
305 dest = fullpats[-1]
304 dest = fullpats[-1]
@@ -397,12 +396,10 b' def override_copy(orig, ui, repo, pats, '
397 os.makedirs(destlfiledir)
396 os.makedirs(destlfiledir)
398 if rename:
397 if rename:
399 os.rename(srclfile, destlfile)
398 os.rename(srclfile, destlfile)
400 lfdirstate.remove(os.path.relpath(srclfile,
399 lfdirstate.remove(repo.wjoin(srclfile))
401 repo.root))
402 else:
400 else:
403 util.copyfile(srclfile, destlfile)
401 util.copyfile(srclfile, destlfile)
404 lfdirstate.add(os.path.relpath(destlfile,
402 lfdirstate.add(repo.wjoin(destlfile))
405 repo.root))
406 lfdirstate.write()
403 lfdirstate.write()
407 except util.Abort, e:
404 except util.Abort, e:
408 if str(e) != 'no files to copy':
405 if str(e) != 'no files to copy':
General Comments 0
You need to be logged in to leave comments. Login now