Show More
@@ -686,23 +686,18 b' def overridecopy(orig, ui, repo, pats, o' | |||
|
686 | 686 | else: |
|
687 | 687 | listpats.append(makestandin(pat)) |
|
688 | 688 | |
|
689 | try: | |
|
690 | origcopyfile = util.copyfile | |
|
691 | copiedfiles = [] | |
|
692 | def overridecopyfile(src, dest, *args, **kwargs): | |
|
693 |
|
|
|
694 | dest.startswith(repo.wjoin(lfutil.shortname))): | |
|
695 | destlfile = dest.replace(lfutil.shortname, '') | |
|
696 | if not opts['force'] and os.path.exists(destlfile): | |
|
697 | raise IOError('', | |
|
698 | _('destination largefile already exists')) | |
|
699 | copiedfiles.append((src, dest)) | |
|
700 | origcopyfile(src, dest, *args, **kwargs) | |
|
701 | ||
|
702 | util.copyfile = overridecopyfile | |
|
689 | copiedfiles = [] | |
|
690 | def overridecopyfile(orig, src, dest, *args, **kwargs): | |
|
691 | if (lfutil.shortname in src and | |
|
692 | dest.startswith(repo.wjoin(lfutil.shortname))): | |
|
693 | destlfile = dest.replace(lfutil.shortname, '') | |
|
694 | if not opts['force'] and os.path.exists(destlfile): | |
|
695 | raise IOError('', | |
|
696 | _('destination largefile already exists')) | |
|
697 | copiedfiles.append((src, dest)) | |
|
698 | orig(src, dest, *args, **kwargs) | |
|
699 | with extensions.wrappedfunction(util, 'copyfile', overridecopyfile): | |
|
703 | 700 | result += orig(ui, repo, listpats, opts, rename) |
|
704 | finally: | |
|
705 | util.copyfile = origcopyfile | |
|
706 | 701 | |
|
707 | 702 | lfdirstate = lfutil.openlfdirstate(ui, repo) |
|
708 | 703 | for (src, dest) in copiedfiles: |
General Comments 0
You need to be logged in to leave comments.
Login now