mercurial-scm/hg: comparison mercurial/patch.py

equal deleted inserted replaced

-:3cacc232f27f
+:d0c2cc11e611
 def setmode(self, mode):
 islink = mode & 020000
 isexec = mode & 0100
 self.mode = (islink, isexec)
+def copy(self):
+other = patchmeta(self.path)
+other.oldpath = self.oldpath
+other.mode = self.mode
+other.op = self.op
+other.binary = self.binary
+return other
 def __repr__(self):
 return "<patchmeta %s %r>" % (self.op, self.path)
 def readgitpatch(lr):
 """extract git-style metadata about patches from <patchname>"""
 unidesc = re.compile('@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))? @@')
 contextdesc = re.compile('(---|\*\*\*) (\d+)(,(\d+))? (---|\*\*\*)')
 eolmodes = ['strict', 'crlf', 'lf', 'auto']
 class patchfile(object):
-def __init__(self, ui, fname, backend, store, mode, create, remove,
+def __init__(self, ui, gp, backend, store, eolmode='strict'):
-eolmode='strict', copysource=None):
+self.fname = gp.path
-self.fname = fname
 self.eolmode = eolmode
 self.eol = None
 self.backend = backend
 self.ui = ui
 self.lines = []
 self.exists = False
 self.missing = True
-self.mode = mode
+self.mode = gp.mode
-self.copysource = copysource
+self.copysource = gp.oldpath
-self.create = create
+self.create = gp.op in ('ADD', 'COPY', 'RENAME')
-self.remove = remove
+self.remove = gp.op == 'DELETE'
 try:
-if copysource is None:
+if self.copysource is None:
-data, mode = backend.getfile(fname)
+data, mode = backend.getfile(self.fname)
 self.exists = True
 else:
-data, mode = store.getfile(copysource)
+data, mode = store.getfile(self.copysource)
-self.exists = backend.exists(fname)
+self.exists = backend.exists(self.fname)
 self.missing = False
 if data:
 self.lines = data.splitlines(True)
 if self.mode is None:
 self.mode = mode
 if l.endswith('\r\n'):
 l = l[:-2] + '\n'
 nlines.append(l)
 self.lines = nlines
 except IOError:
-if create:
+if self.create:
 self.missing = False
 if self.mode is None:
 self.mode = (False, False)
 if self.missing:
 self.ui.warn(_("unable to find '%s' for patching\n") % self.fname)
 while i < pathlen - 1 and path[i] == '/':
 i += 1
 count -= 1
 return path[:i].lstrip(), path[i:].rstrip()
-def selectfile(backend, afile_orig, bfile_orig, hunk, strip, gp):
+def makepatchmeta(backend, afile_orig, bfile_orig, hunk, strip):
-if gp:
-# Git patches do not play games. Excluding copies from the
-# following heuristic avoids a lot of confusion
-fname = pathstrip(gp.path, strip - 1)[1]
-create = gp.op in ('ADD', 'COPY', 'RENAME')
-remove = gp.op == 'DELETE'
-return fname, create, remove
 nulla = afile_orig == "/dev/null"
 nullb = bfile_orig == "/dev/null"
 create = nulla and hunk.starta == 0 and hunk.lena == 0
 remove = nullb and hunk.startb == 0 and hunk.lenb == 0
 abase, afile = pathstrip(afile_orig, strip)
 elif not nulla:
 fname = afile
 else:
 raise PatchError(_("undefined source and destination files"))
-return fname, create, remove
+gp = patchmeta(fname)
+if create:
+gp.op = 'ADD'
+elif remove:
+gp.op = 'DELETE'
+return gp
 def scangitpatch(lr, firstline):
 """
 Git patches can emit:
 - rename a to b
 context = True
 h = hunk(x, hunknum + 1, lr, context)
 hunknum += 1
 if emitfile:
 emitfile = False
-yield 'file', (afile, bfile, h, gp)
+yield 'file', (afile, bfile, h, gp and gp.copy() or None)
 yield 'hunk', h
 elif x.startswith('diff --git'):
 m = gitre.match(x)
 if not m:
 continue
 if gitpatches is None:
 # scan whole input for git metadata
 gitpatches = [('a/' + gp.path, 'b/' + gp.path, gp) for gp
 in scangitpatch(lr, x)]
-yield 'git', [g[2] for g in gitpatches
+yield 'git', [g[2].copy() for g in gitpatches
 if g[2].op in ('COPY', 'RENAME')]
 gitpatches.reverse()
 afile = 'a/' + m.group(1)
 bfile = 'b/' + m.group(2)
 while afile != gitpatches[-1][0] and bfile != gitpatches[-1][1]:
 gp = gitpatches.pop()[2]
-yield 'file', ('a/' + gp.path, 'b/' + gp.path, None, gp)
+yield 'file', ('a/' + gp.path, 'b/' + gp.path, None, gp.copy())
 gp = gitpatches[-1][2]
 # copy/rename + modify should modify target, not source
 if gp.op in ('COPY', 'DELETE', 'RENAME', 'ADD') or gp.mode:
 afile = bfile
 newfile = True
 state = BFILE
 hunknum = 0
 while gitpatches:
 gp = gitpatches.pop()[2]
-yield 'file', ('a/' + gp.path, 'b/' + gp.path, None, gp)
+yield 'file', ('a/' + gp.path, 'b/' + gp.path, None, gp.copy())
 def applydiff(ui, fp, backend, store, strip=1, eolmode='strict'):
 """Reads a patch from fp and tries to apply it.
 Returns 0 for a clean patch, -1 if any rejects were found and 1 if
 elif state == 'file':
 if current_file:
 rejects += current_file.close()
 current_file = None
 afile, bfile, first_hunk, gp = values
-copysource = None
 if gp:
 path = pstrip(gp.path)
+gp.path = pstrip(gp.path)
 if gp.oldpath:
-copysource = pstrip(gp.oldpath)
+gp.oldpath = pstrip(gp.oldpath)
-if gp.op == 'RENAME':
+else:
-backend.unlink(copysource)
+gp = makepatchmeta(backend, afile, bfile, first_hunk, strip)
-if not first_hunk:
+if gp.op == 'RENAME':
-if gp.op == 'DELETE':
+backend.unlink(gp.oldpath)
-backend.unlink(path)
-continue
-data, mode = None, None
-if gp.op in ('RENAME', 'COPY'):
-data, mode = store.getfile(copysource)
-if gp.mode:
-mode = gp.mode
-if gp.op == 'ADD':
-# Added files without content have no hunk and
-# must be created
-data = ''
-if data or mode:
-if (gp.op in ('ADD', 'RENAME', 'COPY')
-and backend.exists(path)):
-raise PatchError(_("cannot create %s: destination "
-"already exists") % path)
-backend.setfile(path, data, mode, copysource)
 if not first_hunk:
+if gp.op == 'DELETE':
+backend.unlink(gp.path)
+continue
+data, mode = None, None
+if gp.op in ('RENAME', 'COPY'):
+data, mode = store.getfile(gp.oldpath)
+if gp.mode:
+mode = gp.mode
+if gp.op == 'ADD':
+# Added files without content have no hunk and
+# must be created
+data = ''
+if data or mode:
+if (gp.op in ('ADD', 'RENAME', 'COPY')
+and backend.exists(gp.path)):
+raise PatchError(_("cannot create %s: destination "
+"already exists") % gp.path)
+backend.setfile(gp.path, data, mode, gp.oldpath)
 continue
 try:
-mode = gp and gp.mode or None
+current_file = patcher(ui, gp, backend, store,
-current_file, create, remove = selectfile(
+eolmode=eolmode)
-backend, afile, bfile, first_hunk, strip, gp)
-current_file = patcher(ui, current_file, backend, store, mode,
-create, remove, eolmode=eolmode,
-copysource=copysource)
 except PatchError, inst:
 ui.warn(str(inst) + '\n')
 current_file = None
 rejects += 1
 continue
 changed = set()
 for state, values in iterhunks(fp):
 if state == 'file':
 afile, bfile, first_hunk, gp = values
 if gp:
-changed.add(pathstrip(gp.path, strip - 1)[1])
+gp.path = pathstrip(gp.path, strip - 1)[1]
-if gp.op == 'RENAME':
+if gp.oldpath:
-changed.add(pathstrip(gp.oldpath, strip - 1)[1])
+gp.oldpath = pathstrip(gp.oldpath, strip - 1)[1]
-if not first_hunk:
+else:
-continue
+gp = makepatchmeta(backend, afile, bfile, first_hunk, strip)
-current_file, create, remove = selectfile(
+changed.add(gp.path)
-backend, afile, bfile, first_hunk, strip, gp)
+if gp.op == 'RENAME':
-changed.add(current_file)
+changed.add(gp.oldpath)
 elif state not in ('hunk', 'git'):
 raise util.Abort(_('unsupported parser state: %s') % state)
 return changed
 finally:
 fp.close()

changeset 14566	d0c2cc11e611
parent 14565	3cacc232f27f
child 14609	f53dc0787424