diff --git a/mercurial/patch.py b/mercurial/patch.py index 4aef71839337c5548eba07f6e76d9b002d31ad70_bWVyY3VyaWFsL3BhdGNoLnB5..f53dc0787424b7783d037e25f9bb7c694019715b_bWVyY3VyaWFsL3BhdGNoLnB5 100644 --- a/mercurial/patch.py +++ b/mercurial/patch.py @@ -491,7 +491,7 @@ self.files = {} self.created = 0 - def setfile(self, fname, data, mode): + def setfile(self, fname, data, mode, copied=None): if self.opener is None: root = tempfile.mkdtemp(prefix='hg-patch-') self.opener = scmutil.opener(root) @@ -499,8 +499,8 @@ fn = str(self.created) self.opener.write(fn, data) self.created += 1 - self.files[fname] = (fn, mode) + self.files[fname] = (fn, mode, copied) def getfile(self, fname): if fname not in self.files: raise IOError() @@ -503,9 +503,9 @@ def getfile(self, fname): if fname not in self.files: raise IOError() - fn, mode = self.files[fname] - return self.opener.read(fn), mode + fn, mode, copied = self.files[fname] + return self.opener.read(fn), mode, copied def close(self): if self.opener: @@ -535,7 +535,7 @@ data, mode = backend.getfile(self.fname) self.exists = True else: - data, mode = store.getfile(self.copysource) + data, mode = store.getfile(self.copysource)[:2] self.exists = backend.exists(self.fname) self.missing = False if data: @@ -1248,7 +1248,7 @@ continue data, mode = None, None if gp.op in ('RENAME', 'COPY'): - data, mode = store.getfile(gp.oldpath) + data, mode = store.getfile(gp.oldpath)[:2] if gp.mode: mode = gp.mode if gp.op == 'ADD':