--- a/mercurial/patch.py Sat Oct 06 15:30:15 2007 -0300
+++ b/mercurial/patch.py Sat Oct 06 15:30:15 2007 -0300
@@ -151,7 +151,6 @@
self.oldpath = None
self.mode = None
self.op = 'MODIFY'
- self.copymod = False
self.lineno = 0
self.binary = False
@@ -182,7 +181,6 @@
elif gp:
if line.startswith('--- '):
if gp.op in ('COPY', 'RENAME'):
- gp.copymod = True
dopatch |= GP_FILTER
gitpatches.append(gp)
gp = None
@@ -858,7 +856,7 @@
(dopatch, gitpatches) = readgitpatch(fp, firstline)
for gp in gitpatches:
- if gp.copymod:
+ if gp.op in ('COPY', 'RENAME'):
copyfile(gp.oldpath, gp.path, basedir=cwd)
fp.seek(pos)
@@ -1030,15 +1028,13 @@
for f in patches:
ctype, gp = patches[f]
if ctype == 'RENAME':
- copies.append((gp.oldpath, gp.path, gp.copymod))
+ copies.append((gp.oldpath, gp.path))
removes[gp.oldpath] = 1
elif ctype == 'COPY':
- copies.append((gp.oldpath, gp.path, gp.copymod))
+ copies.append((gp.oldpath, gp.path))
elif ctype == 'DELETE':
removes[gp.path] = 1
- for src, dst, after in copies:
- if not after:
- copyfile(src, dst, repo.root)
+ for src, dst in copies:
repo.copy(src, dst)
removes = removes.keys()
if removes: