513 for (src, dest) in copiedfiles: |
513 for (src, dest) in copiedfiles: |
514 if (lfutil.shortname in src and |
514 if (lfutil.shortname in src and |
515 dest.startswith(repo.wjoin(lfutil.shortname))): |
515 dest.startswith(repo.wjoin(lfutil.shortname))): |
516 srclfile = src.replace(repo.wjoin(lfutil.standin('')), '') |
516 srclfile = src.replace(repo.wjoin(lfutil.standin('')), '') |
517 destlfile = dest.replace(repo.wjoin(lfutil.standin('')), '') |
517 destlfile = dest.replace(repo.wjoin(lfutil.standin('')), '') |
518 destlfiledir = os.path.dirname(destlfile) or '.' |
518 destlfiledir = os.path.dirname(repo.wjoin(destlfile)) or '.' |
519 if not os.path.isdir(destlfiledir): |
519 if not os.path.isdir(destlfiledir): |
520 os.makedirs(destlfiledir) |
520 os.makedirs(destlfiledir) |
521 if rename: |
521 if rename: |
522 os.rename(repo.wjoin(srclfile), repo.wjoin(destlfile)) |
522 os.rename(repo.wjoin(srclfile), repo.wjoin(destlfile)) |
523 lfdirstate.remove(srclfile) |
523 lfdirstate.remove(srclfile) |
524 else: |
524 else: |
525 util.copyfile(srclfile, destlfile) |
525 util.copyfile(repo.wjoin(srclfile), |
|
526 repo.wjoin(destlfile)) |
|
527 |
526 lfdirstate.add(destlfile) |
528 lfdirstate.add(destlfile) |
527 lfdirstate.write() |
529 lfdirstate.write() |
528 except util.Abort, e: |
530 except util.Abort, e: |
529 if str(e) != 'no files to copy': |
531 if str(e) != 'no files to copy': |
530 raise e |
532 raise e |