Refactor message printing

[stgit] / stgit / commands / imprt.py

diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py
index 9c97498..0089a8b 100644 (file)
--- a/stgit/commands/imprt.py
+++ b/stgit/commands/imprt.py
@@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 import sys, os, re, email
 from email.Header import decode_header, make_header
 from mailbox import UnixMailbox
+from StringIO import StringIO
 from optparse import OptionParser, make_option
 
 from stgit.commands.common import *
@@ -26,7 +27,7 @@ from stgit import stack, git
 
 
 help = 'import a GNU diff file as a new patch'
-usage = """%prog [options] [<file>]
+usage = """%prog [options] [<file>|<url>]
 
 Create a new patch and apply the given GNU diff file (or the standard
 input). By default, the file name is used as the patch name but this
@@ -52,6 +53,9 @@ options = [make_option('-m', '--mail',
            make_option('-s', '--series',
                        help = 'import a series of patches',
                        action = 'store_true'),
+           make_option('-u', '--url',
+                       help = 'import a patch from a URL',
+                       action = 'store_true'),
            make_option('-n', '--name',
                        help = 'use NAME as the patch name'),
            make_option('-t', '--strip',
@@ -166,7 +170,7 @@ def __parse_mail(msg):
 
     # remove the '[*PATCH*]' expression in the subject
     if descr:
-        descr = re.findall('^(\[[^\s]*[Pp][Aa][Tt][Cc][Hh].*?\])?\s*(.*)$',
+        descr = re.findall('^(\[.*?[Pp][Aa][Tt][Cc][Hh].*?\])?\s*(.*)$',
                            descr)[0][1]
         descr += '\n\n'
     else:
@@ -224,20 +228,34 @@ def __parse_patch(fobj):
     # Just return None
     return (descr, authname, authemail, authdate, diff)
 
-def __create_patch(patch, message, author_name, author_email,
+def __create_patch(filename, message, author_name, author_email,
                    author_date, diff, options):
     """Create a new patch on the stack
     """
-    if not diff:
-        raise CmdException, 'No diff found inside the patch'
+    if options.name:
+        patch = options.name
+    elif filename:
+        patch = os.path.basename(filename)
+    else:
+        patch = ''
+    if options.strip:
+        patch = __strip_patch_name(patch)
 
     if not patch:
-        patch = make_patch_name(message, crt_series.patch_exists,
-                                alternative = not (options.ignore
-                                                   or options.replace))
+        if options.ignore or options.replace:
+            unacceptable_name = lambda name: False
+        else:
+            unacceptable_name = crt_series.patch_exists
+        patch = make_patch_name(message, unacceptable_name)
+    else:
+        # fix possible invalid characters in the patch name
+        patch = re.sub('[^\w.]+', '-', patch).strip('-')
+
+    if not diff:
+        raise CmdException, 'No diff found inside the patch'
 
     if options.ignore and patch in crt_series.get_applied():
-        print 'Ignoring already applied patch "%s"' % patch
+        out.info('Ignoring already applied patch "%s"' % patch)
         return
     if options.replace and patch in crt_series.get_unapplied():
         crt_series.delete_patch(patch)
@@ -271,20 +289,16 @@ def __create_patch(patch, message, author_name, author_email,
                          committer_name = committer_name,
                          committer_email = committer_email)
 
-    print 'Importing patch "%s"...' % patch,
-    sys.stdout.flush()
-
+    out.start('Importing patch "%s"' % patch)
     if options.base:
         git.apply_patch(diff = diff, base = git_id(options.base))
     else:
         git.apply_patch(diff = diff)
-
     crt_series.refresh_patch(edit = options.edit,
                              show_patch = options.showpatch)
+    out.done()
 
-    print 'done'    
-
-def __import_file(patch, filename, options):
+def __import_file(filename, options, patch = None):
     """Import a patch from a file or standard input
     """
     if filename:
@@ -306,7 +320,12 @@ def __import_file(patch, filename, options):
     if filename:
         f.close()
 
-    __create_patch(patch, message, author_name, author_email,
+    if patch:
+        pname = patch
+    else:
+        pname = filename
+
+    __create_patch(pname, message, author_name, author_email,
                    author_date, diff, options)
 
 def __import_series(filename, options):
@@ -326,12 +345,9 @@ def __import_series(filename, options):
         if not patch:
             continue
         patchfile = os.path.join(patchdir, patch)
-
-        if options.strip:
-            patch = __strip_patch_name(patch)
         patch = __replace_slashes_with_dashes(patch);
 
-        __import_file(patch, patchfile, options)
+        __import_file(patchfile, options, patch)
 
     if filename:
         f.close()
@@ -342,7 +358,7 @@ def __import_mbox(filename, options):
     if filename:
         f = file(filename, 'rb')
     else:
-        f = sys.stdin
+        f = StringIO(sys.stdin.read())
 
     try:
         mbox = UnixMailbox(f, email.message_from_file)
@@ -355,8 +371,21 @@ def __import_mbox(filename, options):
         __create_patch(None, message, author_name, author_email,
                        author_date, diff, options)
 
-    if filename:
-        f.close()
+    f.close()
+
+def __import_url(url, options):
+    """Import a patch from a URL
+    """
+    import urllib
+    import tempfile
+
+    if not url:
+        parser.error('URL argument required')
+
+    patch = os.path.basename(urllib.unquote(url))
+    filename = os.path.join(tempfile.gettempdir(), patch)
+    urllib.urlretrieve(url, filename)
+    __import_file(filename, options)
 
 def func(parser, options, args):
     """Import a GNU diff file as a new patch
@@ -377,16 +406,9 @@ def func(parser, options, args):
         __import_series(filename, options)
     elif options.mbox:
         __import_mbox(filename, options)
+    elif options.url:
+        __import_url(filename, options)
     else:
-        if options.name:
-            patch = options.name
-        elif filename:
-            patch = os.path.basename(filename)
-        else:
-            patch = ''
-        if options.strip:
-            patch = __strip_patch_name(patch)
-
-        __import_file(patch, filename, options)
+        __import_file(filename, options)
 
     print_crt_patch()