{"thread":{"id":"20825","subject":"[StGit PATCH] Import git show output easily","startedAt":"2009-09-02T17:50:55Z","lastAt":"2009-09-02T20:54:53Z","messageCount":3,"participants":["Catalin Marinas","Gustav Hållberg"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"122314","messageId":"20090902175039.21633.25294.stgit@pc1117.cambridge.arm.com","threadId":"20825","inReplyTo":null,"subject":"[StGit PATCH] Import git show output easily","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@arm.com","sentAt":"2009-09-02T17:50:55Z","receivedAt":"2009-09-02T17:50:55Z","isPatch":true,"sender":{"key":"catalin.marinas@arm.com","avatar":null},"body":"This patch modifies the import command to check for standard 'git show'\noutput and parse it accordingly.\n\nSigned-off-by: Catalin Marinas <catalin.marinas@gmail.com>\n---\n stgit/commands/common.py |    9 +++++++--\n 1 files changed, 7 insertions(+), 2 deletions(-)\n\ndiff --git a/stgit/commands/common.py b/stgit/commands/common.py\nindex d38d263..0d39148 100644\n--- a/stgit/commands/common.py\n+++ b/stgit/commands/common.py\n@@ -355,6 +355,7 @@ def __parse_description(descr):\n \n     lasthdr = 0\n     end = len(descr_lines)\n+    descr_strip = 0\n \n     # Parse the patch header\n     for pos in range(0, end):\n@@ -374,12 +375,16 @@ def __parse_description(descr):\n         if subject:\n             break\n         # get the subject\n-        subject = descr_lines[pos]\n+        subject = descr_lines[pos][descr_strip:]\n+        if re.match('commit [\\da-f]{40}$', subject):\n+            # 'git show' output, look for the real subject\n+            subject = ''\n+            descr_strip = 4\n         lasthdr = pos + 1\n \n     # get the body\n     if lasthdr < end:\n-        body = reduce(lambda x, y: x + '\\n' + y, descr_lines[lasthdr:], '')\n+        body = '\\n' + '\\n'.join(l[descr_strip:] for l in descr_lines[lasthdr:])\n \n     return (subject + body, authname, authemail, authdate)\n \n"},{"id":"122332","messageId":"a1e915350909021351l315358a0s9d8c076440bc0fb7@mail.gmail.com","threadId":"20825","inReplyTo":"20090902175039.21633.25294.stgit@pc1117.cambridge.arm.com","subject":"Re: [StGit PATCH] Import git show output easily","fromName":"Gustav Hållberg","fromEmail":"gustav@gmail.com","sentAt":"2009-09-02T20:51:40Z","receivedAt":"2009-09-02T20:51:40Z","isPatch":true,"sender":{"key":"gustav@gmail.com","avatar":null},"body":"Somewhat related:\n\nIt would really rock if stg import could handle the regular patch \"-p<N>\" flag.\nIn particular, I miss -p0 as some broken versioning systems default to\nsuch output.\n\n- Gustav\n"},{"id":"122333","messageId":"b0943d9e0909021354y3c795265p693131b44928e0fe@mail.gmail.com","threadId":"20825","inReplyTo":"a1e915350909021351l315358a0s9d8c076440bc0fb7@mail.gmail.com","subject":"Re: [StGit PATCH] Import git show output easily","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2009-09-02T20:54:53Z","receivedAt":"2009-09-02T20:54:53Z","isPatch":true,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"2009/9/2 Gustav Hållberg <gustav@gmail.com>:\n> It would really rock if stg import could handle the regular patch \"-p<N>\" flag.\n> In particular, I miss -p0 as some broken versioning systems default to\n> such output.\n\nIt's probably just a matter of passing the right flag to git-apply.\nI'll try to have a look before -rc3.\n\n-- \nCatalin\n"}]}