# [PATCH] Fix earlier "import quilt patches" patch 2 messages from 2005-09-24 to 2005-09-24. Participants: Paolo 'Blaisorblade' Giarrusso, Catalin Marinas. Thread: https://gitlist.dev/t/1933 ## Paolo 'Blaisorblade' Giarrusso, 2005-09-24 10:46 Subject: [PATCH] Fix earlier "import quilt patches" patch Message-ID: <20050924104622.17274.18611.stgit@zion.home.lan> URL: https://gitlist.dev/e/20050924104622.17274.18611.stgit%40zion.home.lan ``` From: Paolo 'Blaisorblade' Giarrusso I forgot to update all cases - I updated __parse_mail, not __parse_patch, so refactor together this duplication and use the fixed version. Btw, I don't like those regexps - they'd match in the middle of line too. What about adding ^ to their beginning like for the "^Index: " regexp? Signed-off-by: Paolo 'Blaisorblade' Giarrusso --- stgit/commands/imprt.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py --- a/stgit/commands/imprt.py +++ b/stgit/commands/imprt.py @@ -75,6 +75,10 @@ options = [make_option('-m', '--mail', help = 'use COMMEMAIL as the committer e-mail')] +def __end_descr(line): + return re.match('---\s*$', line) or re.match('diff -', line) or \ + re.match('^Index: ', line) + def __parse_mail(filename = None): """Parse the input file in a mail format and return (description, authname, authemail, authdate) @@ -116,8 +120,7 @@ def __parse_mail(filename = None): line = f.readline() if not line: break - if re.match('---\s*$', line) or re.match('diff -', line) or \ - re.match('^Index: ', line): + if __end_descr(line): break else: descr += line @@ -150,7 +153,7 @@ def __parse_patch(filename = None): auth = re.findall('^.*?:\s+(.*)$', line)[0] authname, authemail = name_email(auth) - if re.match('---\s*$', line) or re.match('diff -', line): + if __end_descr(line): break else: descr += line ``` ## Catalin Marinas, 2005-09-24 19:47 Subject: Re: [PATCH] Fix earlier "import quilt patches" patch Message-ID: URL: https://gitlist.dev/e/b0943d9e0509241247b2a5c75%40mail.gmail.com In-Reply-To: <20050924104622.17274.18611.stgit@zion.home.lan> ``` On 24/09/05, Paolo 'Blaisorblade' Giarrusso wrote: > I forgot to update all cases - I updated __parse_mail, not __parse_patch, so > refactor together this duplication and use the fixed version. Thanks. I'll apply it tomorrow. > Btw, I don't like those regexps - they'd match in the middle of line too. What > about adding ^ to their beginning like for the "^Index: " regexp? Python's re.match() only matches from the beginning of the line, so ^ is not needed. Catalin -- Catalin ```