@@ -3678,7 +3678,7 @@
msgs = []
def tryone(ui, hunk, parents):
- tmpname, message, user, date, branch, nodeid, p1, p2 = \
+ tmpname, message, user, date, branch, nodeid, p1, p2, amends = \
patch.extract(ui, hunk)
if not tmpname:
@@ -157,7 +157,7 @@
patch can be a normal patch or contained in an email message.
- return tuple (filename, message, user, date, branch, node, p1, p2).
+ return tuple (filename, message, user, date, branch, node, p1, p2, amends).
Any item in the returned tuple can be None. If filename is None,
fileobj did not contain a patch. Caller must unlink filename when done.'''
@@ -183,6 +183,7 @@
date = None
nodeid = None
branch = None
+ amends = None
parents = []
if subject:
@@ -233,6 +234,8 @@
nodeid = line[10:]
elif line.startswith("# Parent "):
parents.append(line[9:].lstrip())
+ elif line.startswith("# Amends "):
+ amends = line[9:].lstrip()
elif not line.startswith("# "):
hgpatchheader = False
elif line == '---':
@@ -257,10 +260,10 @@
tmpfp.close()
if not diffs_seen:
os.unlink(tmpname)
- return None, message, user, date, branch, None, None, None
+ return None, message, user, date, branch, None, None, None, None
p1 = parents and parents.pop(0) or None
p2 = parents and parents.pop(0) or None
- return tmpname, message, user, date, branch, nodeid, p1, p2
+ return tmpname, message, user, date, branch, nodeid, p1, p2, amends
class patchmeta(object):
"""Patched file metadata