Fix earlier "import quilt patches" patch

[stgit] / stgit / commands / imprt.py

diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py
index 6baf426..0f7860b 100644 (file)
--- a/stgit/commands/imprt.py
+++ b/stgit/commands/imprt.py
@@ -53,6 +53,8 @@ options = [make_option('-m', '--mail',
                        action = 'store_true'),
            make_option('-n', '--name',
                        help = 'use NAME as the patch name'),
+           make_option('--base',
+                       help = 'use BASE instead of HEAD for file importing'),
            make_option('-e', '--edit',
                        help = 'invoke an editor for the patch description',
                        action = 'store_true'),
@@ -73,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)
@@ -85,7 +91,10 @@ def __parse_mail(filename = None):
     descr = authname = authemail = authdate = None
 
     # parse the headers
-    for line in f:
+    while True:
+        line = f.readline()
+        if not line:
+            break
         line = line.strip()
         if re.match('from:\s+', line, re.I):
             auth = re.findall('^.*?:\s+(.*)$', line)[0]
@@ -100,14 +109,18 @@ def __parse_mail(filename = None):
 
     # remove the '[*PATCH*]' expression in the subject
     if descr:
-        descr = re.findall('^(\[[^\s]*PATCH.*?\])?\s*(.*)$', descr)[0][1]
+        descr = re.findall('^(\[[^\s]*[Pp][Aa][Tt][Cc][Hh].*?\])?\s*(.*)$',
+                           descr)[0][1]
         descr += '\n\n'
     else:
         raise CmdException, 'Subject: line not found'
 
     # the rest of the patch description
-    for line in f:
-        if re.match('---\s*$', line) or re.match('diff -', line):
+    while True:
+        line = f.readline()
+        if not line:
+            break
+        if __end_descr(line):
             break
         else:
             descr += line
@@ -130,13 +143,17 @@ def __parse_patch(filename = None):
     authname = authemail = authdate = None
 
     descr = ''
-    for line in f:
+    while True:
+        line = f.readline()
+        if not line:
+            break
+
         # the first 'Signed-of-by:' is the author
         if not authname and re.match('signed-off-by:\s+', line, re.I):
             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
@@ -208,7 +225,23 @@ def import_file(parser, options, args):
     print 'Importing patch %s...' % patch,
     sys.stdout.flush()
 
-    git.apply_patch(filename)
+    if options.base:
+        orig_head = git.get_head()
+        git.switch(options.base)
+
+        try:
+            git.apply_patch(filename)
+        except git.GitException, ex:
+            print >> sys.stderr, '"git apply" failed'
+            git.switch(orig_head)
+            raise
+
+        top = crt_series.refresh_patch(commit_only = True)
+        git.switch(orig_head)
+        git.merge(options.base, orig_head, top)
+    else:
+        git.apply_patch(filename)
+
     crt_series.refresh_patch(edit = options.edit,
                              show_patch = options.showpatch)