From: Catalin Marinas Date: Wed, 2 Sep 2009 17:01:26 +0000 (+0100) Subject: Import git show output easily X-Git-Tag: v0.15-rc3~4 X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/ef8871fd6c5a8cc249d0f2cd51e0b8d57e125ed8 Import git show output easily This patch modifies the import command to check for standard 'git show' output and parse it accordingly. Signed-off-by: Catalin Marinas --- diff --git a/stgit/commands/common.py b/stgit/commands/common.py index d38d263..0d39148 100644 --- a/stgit/commands/common.py +++ b/stgit/commands/common.py @@ -355,6 +355,7 @@ def __parse_description(descr): lasthdr = 0 end = len(descr_lines) + descr_strip = 0 # Parse the patch header for pos in range(0, end): @@ -374,12 +375,16 @@ def __parse_description(descr): if subject: break # get the subject - subject = descr_lines[pos] + subject = descr_lines[pos][descr_strip:] + if re.match('commit [\da-f]{40}$', subject): + # 'git show' output, look for the real subject + subject = '' + descr_strip = 4 lasthdr = pos + 1 # get the body if lasthdr < end: - body = reduce(lambda x, y: x + '\n' + y, descr_lines[lasthdr:], '') + body = '\n' + '\n'.join(l[descr_strip:] for l in descr_lines[lasthdr:]) return (subject + body, authname, authemail, authdate)