Add the --reject option to fold

[stgit] / stgit / commands / imprt.py

diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py
index 4a4b7929f3ed3c02d56148e8cb2fe1f11668edac..aa750655467f25fc1c031505d3ae58fb97de1ecb 100644 (file)
--- a/stgit/commands/imprt.py
+++ b/stgit/commands/imprt.py
@@ -15,20 +15,20 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 """
 

-import sys, os, re, email
+import sys, os, re, email, tarfile

 from mailbox import UnixMailbox
 from StringIO import StringIO
 from mailbox import UnixMailbox
 from StringIO import StringIO

-from optparse import OptionParser, make_option
-
+from stgit.argparse import opt

 from stgit.commands.common import *
 from stgit.utils import *
 from stgit.out import *
 from stgit.commands.common import *
 from stgit.utils import *
 from stgit.out import *

-from stgit import stack, git
-
-
-help = 'import a GNU diff file as a new patch'
-usage = """%prog [options] [<file>|<url>]
+from stgit import argparse, stack, git

 
 

+name = 'import'
+help = 'Import a GNU diff file as a new patch'
+kind = 'patch'
+usage = ['[options] [<file>|<url>]']
+description = """

 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
 can be overridden with the '--name' option. The patch can either be a
 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
 can be overridden with the '--name' option. The patch can either be a


@@ -44,52 +44,46 @@ stack.
 The patch description has to be separated from the data with a '---'
 line."""
 
 The patch description has to be separated from the data with a '---'
 line."""
 

-directory = DirectoryHasRepository()
-options = [make_option('-m', '--mail',
-                       help = 'import the patch from a standard e-mail file',
-                       action = 'store_true'),
-           make_option('-M', '--mbox',
-                       help = 'import a series of patches from an mbox file',
-                       action = 'store_true'),
-           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',
-                       help = 'strip numbering and extension from patch name',
-                       action = 'store_true'),
-           make_option('-i', '--ignore',
-                       help = 'ignore the applied patches in the series',
-                       action = 'store_true'),
-           make_option('--replace',
-                       help = 'replace the unapplied patches in the series',
-                       action = 'store_true'),
-           make_option('-b', '--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'),
-           make_option('-p', '--showpatch',
-                       help = 'show the patch content in the editor buffer',
-                       action = 'store_true'),
-           make_option('-a', '--author', metavar = '"NAME <EMAIL>"',
-                       help = 'use "NAME <EMAIL>" as the author details'),
-           make_option('--authname',
-                       help = 'use AUTHNAME as the author name'),
-           make_option('--authemail',
-                       help = 'use AUTHEMAIL as the author e-mail'),
-           make_option('--authdate',
-                       help = 'use AUTHDATE as the author date'),
-           make_option('--commname',
-                       help = 'use COMMNAME as the committer name'),
-           make_option('--commemail',
-                       help = 'use COMMEMAIL as the committer e-mail')
-           ] + make_sign_options()
-
+args = [argparse.files]
+options = [
+    opt('-m', '--mail', action = 'store_true',
+        short = 'Import the patch from a standard e-mail file'),
+    opt('-M', '--mbox', action = 'store_true',
+        short = 'Import a series of patches from an mbox file'),
+    opt('-s', '--series', action = 'store_true',
+        short = 'Import a series of patches', long = """
+        Import a series of patches from a series file or a tar archive."""),
+    opt('-u', '--url', action = 'store_true',
+        short = 'Import a patch from a URL'),
+    opt('-n', '--name',
+        short = 'Use NAME as the patch name'),
+    opt('-p', '--strip', type = 'int', metavar = 'N',
+        short = 'Remove N leading slashes from diff paths (default 1)'),
+    opt('-t', '--stripname', action = 'store_true',
+        short = 'Strip numbering and extension from patch name'),
+    opt('-i', '--ignore', action = 'store_true',
+        short = 'Ignore the applied patches in the series'),
+    opt('--replace', action = 'store_true',
+        short = 'Replace the unapplied patches in the series'),
+    opt('-b', '--base', args = [argparse.commit],
+        short = 'Use BASE instead of HEAD for file importing'),
+    opt('--reject', action = 'store_true',
+        short = 'leave the rejected hunks in corresponding *.rej files'),
+    opt('-e', '--edit', action = 'store_true',
+        short = 'Invoke an editor for the patch description'),
+    opt('-d', '--showdiff', action = 'store_true',
+        short = 'Show the patch content in the editor buffer'),
+    opt('-a', '--author', metavar = '"NAME <EMAIL>"',
+        short = 'Use "NAME <EMAIL>" as the author details'),
+    opt('--authname',
+        short = 'Use AUTHNAME as the author name'),
+    opt('--authemail',
+        short = 'Use AUTHEMAIL as the author e-mail'),
+    opt('--authdate',
+        short = 'Use AUTHDATE as the author date'),
+    ] + argparse.sign_options()
+
+directory = DirectoryHasRepository(log = True)

 
 def __strip_patch_name(name):
     stripped = re.sub('^[0-9]+-(.*)$', '\g<1>', name)
 
 def __strip_patch_name(name):
     stripped = re.sub('^[0-9]+-(.*)$', '\g<1>', name)


@@ -112,7 +106,7 @@ def __create_patch(filename, message, author_name, author_email,
         patch = os.path.basename(filename)
     else:
         patch = ''
         patch = os.path.basename(filename)
     else:
         patch = ''

-    if options.strip:
+    if options.stripname:

         patch = __strip_patch_name(patch)
 
     if not patch:
         patch = __strip_patch_name(patch)
 
     if not patch:


@@ -136,8 +130,6 @@ def __create_patch(filename, message, author_name, author_email,
     if not message:
         can_edit = False
 
     if not message:
         can_edit = False
 

-    committer_name = committer_email = None
-

     if options.author:
         options.authname, options.authemail = name_email(options.author)
 
     if options.author:
         options.authname, options.authemail = name_email(options.author)
 


@@ -148,41 +140,65 @@ def __create_patch(filename, message, author_name, author_email,
         author_email = options.authemail
     if options.authdate:
         author_date = options.authdate
         author_email = options.authemail
     if options.authdate:
         author_date = options.authdate

-    if options.commname:
-        committer_name = options.commname
-    if options.commemail:
-        committer_email = options.commemail

 
     crt_series.new_patch(patch, message = message, can_edit = False,
                          author_name = author_name,
                          author_email = author_email,
 
     crt_series.new_patch(patch, message = message, can_edit = False,
                          author_name = author_name,
                          author_email = author_email,

-                         author_date = author_date,
-                         committer_name = committer_name,
-                         committer_email = committer_email)
+                         author_date = author_date)

 
     if not diff:
         out.warn('No diff found, creating empty patch')
     else:
         out.start('Importing patch "%s"' % patch)
         if options.base:
 
     if not diff:
         out.warn('No diff found, creating empty patch')
     else:
         out.start('Importing patch "%s"' % patch)
         if options.base:

-            git.apply_patch(diff = diff,
-                            base = git_id(crt_series, options.base))
+            base = git_id(crt_series, options.base)

         else:
         else:

-            git.apply_patch(diff = diff)
+            base = None
+        git.apply_patch(diff = diff, base = base, reject = options.reject,
+                        strip = options.strip)

         crt_series.refresh_patch(edit = options.edit,
         crt_series.refresh_patch(edit = options.edit,

-                                 show_patch = options.showpatch,
+                                 show_patch = options.showdiff,
+                                 author_date = author_date,

                                  sign_str = options.sign_str,
                                  backup = False)
         out.done()
 
                                  sign_str = options.sign_str,
                                  backup = False)
         out.done()
 

+def __mkpatchname(name, suffix):
+    if name.lower().endswith(suffix.lower()):
+        return name[:-len(suffix)]
+    return name
+
+def __get_handle_and_name(filename):
+    """Return a file object and a patch name derived from filename
+    """
+    # see if it's a gzip'ed or bzip2'ed patch
+    import bz2, gzip
+    for copen, ext in [(gzip.open, '.gz'), (bz2.BZ2File, '.bz2')]:
+        try:
+            f = copen(filename)
+            f.read(1)
+            f.seek(0)
+            return (f, __mkpatchname(filename, ext))
+        except IOError, e:
+            pass
+
+    # plain old file...
+    return (open(filename), filename)
+

 def __import_file(filename, options, patch = None):
     """Import a patch from a file or standard input
     """
 def __import_file(filename, options, patch = None):
     """Import a patch from a file or standard input
     """

+    pname = None

     if filename:
     if filename:

-        f = file(filename)
+        (f, pname) = __get_handle_and_name(filename)

     else:
         f = sys.stdin
 
     else:
         f = sys.stdin
 

+    if patch:
+        pname = patch
+    elif not pname:
+        pname = filename
+

     if options.mail:
         try:
             msg = email.message_from_file(f)
     if options.mail:
         try:
             msg = email.message_from_file(f)


@@ -192,16 +208,11 @@ def __import_file(filename, options, patch = None):
                  parse_mail(msg)
     else:
         message, author_name, author_email, author_date, diff = \
                  parse_mail(msg)
     else:
         message, author_name, author_email, author_date, diff = \

-                 parse_patch(f.read())
+                 parse_patch(f.read(), contains_diff = True)

 
     if filename:
         f.close()
 
 
     if filename:
         f.close()
 

-    if patch:
-        pname = patch
-    else:
-        pname = filename
-

     __create_patch(pname, message, author_name, author_email,
                    author_date, diff, options)
 
     __create_patch(pname, message, author_name, author_email,
                    author_date, diff, options)
 


@@ -211,6 +222,9 @@ def __import_series(filename, options):
     applied = crt_series.get_applied()
 
     if filename:
     applied = crt_series.get_applied()
 
     if filename:

+        if tarfile.is_tarfile(filename):
+            __import_tarfile(filename, options)
+            return

         f = file(filename)
         patchdir = os.path.dirname(filename)
     else:
         f = file(filename)
         patchdir = os.path.dirname(filename)
     else:


@@ -257,13 +271,51 @@ def __import_url(url, options):
     import tempfile
 
     if not url:
     import tempfile
 
     if not url:

-        parser.error('URL argument required')
+        raise CmdException('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)
 
 
     patch = os.path.basename(urllib.unquote(url))
     filename = os.path.join(tempfile.gettempdir(), patch)
     urllib.urlretrieve(url, filename)
     __import_file(filename, options)
 

+def __import_tarfile(tar, options):
+    """Import patch series from a tar archive
+    """
+    import tempfile
+    import shutil
+
+    if not tarfile.is_tarfile(tar):
+        raise CmdException, "%s is not a tarfile!" % tar
+
+    t = tarfile.open(tar, 'r')
+    names = t.getnames()
+
+    # verify paths in the tarfile are safe
+    for n in names:
+        if n.startswith('/'):
+            raise CmdException, "Absolute path found in %s" % tar
+        if n.find("..") > -1:
+            raise CmdException, "Relative path found in %s" % tar
+
+    # find the series file
+    seriesfile = '';
+    for m in names:
+        if m.endswith('/series') or m == 'series':
+            seriesfile = m
+            break
+    if seriesfile == '':
+        raise CmdException, "no 'series' file found in %s" % tar
+
+    # unpack into a tmp dir
+    tmpdir = tempfile.mkdtemp('.stg')
+    t.extractall(tmpdir)
+
+    # apply the series
+    __import_series(os.path.join(tmpdir, seriesfile), options)
+
+    # cleanup the tmpdir
+    shutil.rmtree(tmpdir)
+

 def func(parser, options, args):
     """Import a GNU diff file as a new patch
     """
 def func(parser, options, args):
     """Import a GNU diff file as a new patch
     """


@@ -279,6 +331,10 @@ def func(parser, options, args):
     else:
         filename = None
 
     else:
         filename = None
 

+    if not options.url and filename:
+        filename = os.path.abspath(filename)
+    directory.cd_to_topdir()
+

     if options.series:
         __import_series(filename, options)
     elif options.mbox:
     if options.series:
         __import_series(filename, options)
     elif options.mbox: