Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""
-import sys, os
+import sys, os, re, email
+from mailbox import UnixMailbox
+from StringIO import StringIO
from optparse import OptionParser, make_option
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>|<commit>]
+usage = """%prog [options] [<file>|<url>]
-Create a new patch and import the given GNU diff file (defaulting to
-the standard input) or a given commit object into it. By default, the
-file name is used as the patch name but this can be overriden with the
-'--name' option.
+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
+normal file with the description at the top or it can have standard
+mail format, the Subject, From and Date headers being used for
+generating the patch information. The command can also read series and
+mbox files.
-The patch file can either be a normal file with the description at the
-top or it can have standard mail format, the Subject, From and Date
-headers being used for generating the patch information. The patch
-description has to be separated from the data with a '---' line. For a
-normal file, if no author information is given, the first
-'Signed-off-by:' line is used.
+If a patch does not apply cleanly, the failed diff is written to the
+.stgit-failed.patch file and an empty StGIT patch is added to the
+stack.
-When a commit object is imported, the log and author information are
-those of the commit object. Passing the '--reverse' option will cancel
-an existing commit object."""
+The patch description has to be separated from the data with a '---'
+line."""
options = [make_option('-m', '--mail',
help = 'import the patch from a standard e-mail file',
action = 'store_true'),
- make_option('-c', '--commit',
- help = 'import a commit object as a patch',
+ make_option('-M', '--mbox',
+ help = 'import a series of patches from an mbox file',
action = 'store_true'),
- make_option('--reverse',
- help = 'reverse the commit object before importing',
+ 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('-s', '--showpatch',
+ make_option('-p', '--showpatch',
help = 'show the patch content in the editor buffer',
action = 'store_true'),
make_option('-a', '--author', metavar = '"NAME <EMAIL>"',
make_option('--commname',
help = 'use COMMNAME as the committer name'),
make_option('--commemail',
- help = 'use COMMEMAIL as the committer e-mail')]
+ help = 'use COMMEMAIL as the committer e-mail')
+ ] + make_sign_options()
-def __parse_mail(filename = None):
- """Parse the input file in a mail format and return (description,
- authname, authemail, authdate)
- """
- if filename:
- f = file(filename)
- else:
- f = sys.stdin
+def __strip_patch_name(name):
+ stripped = re.sub('^[0-9]+-(.*)$', '\g<1>', name)
+ stripped = re.sub('^(.*)\.(diff|patch)$', '\g<1>', stripped)
- descr = authname = authemail = authdate = None
+ return stripped
- # parse the headers
- for line in f:
- line = line.strip()
- if re.match('from:\s+', line, re.I):
- auth = re.findall('^.*?:\s+(.*)$', line)[0]
- authname, authemail = name_email(auth)
- elif re.match('date:\s+', line, re.I):
- authdate = re.findall('^.*?:\s+(.*)$', line)[0]
- elif re.match('subject:\s+', line, re.I):
- descr = re.findall('^.*?:\s+(.*)$', line)[0]
- elif line == '':
- # end of headers
- break
-
- # remove the '[*PATCH*]' expression in the subject
- if descr:
- descr = re.findall('^(\[[^\s]*PATCH.*?\])?\s*(.*)$', descr)[0][1]
- descr += '\n\n'
- else:
- raise CmdException, 'Subject: line not found'
+def __replace_slashes_with_dashes(name):
+ stripped = name.replace('/', '-')
- # the rest of the patch description
- for line in f:
- if re.match('---\s*$', line) or re.match('diff -', line):
- break
- else:
- descr += line
- descr.rstrip()
+ return stripped
- if filename:
- f.close()
-
- return (descr, authname, authemail, authdate)
-
-def __parse_patch(filename = None):
- """Parse the input file and return (description, authname,
- authemail, authdate)
+def __create_patch(filename, message, author_name, author_email,
+ author_date, diff, options):
+ """Create a new patch on the stack
"""
- if filename:
- f = file(filename)
- else:
- f = sys.stdin
-
- authname = authemail = authdate = None
-
- descr = ''
- for line in f:
- # 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):
- break
- else:
- descr += line
- descr.rstrip()
-
- if descr == '':
- descr = None
-
- if filename:
- f.close()
-
- return (descr, authname, authemail, authdate)
-
-def import_file(parser, options, args):
- """Import a GNU diff file as a new patch
- """
- if len(args) > 1:
- parser.error('incorrect number of arguments')
- elif len(args) == 1:
- filename = args[0]
- else:
- filename = None
-
if options.name:
patch = options.name
elif filename:
patch = os.path.basename(filename)
else:
- raise CmdException, 'Unkown patch name'
-
- # the defaults
- message = author_name = author_email = author_date = committer_name = \
- committer_email = None
-
- if options.author:
- options.authname, options.authemail = name_email(options.author)
+ patch = ''
+ if options.strip:
+ patch = __strip_patch_name(patch)
- if options.mail:
- message, author_name, author_email, author_date = \
- __parse_mail(filename)
+ if not patch:
+ 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:
- message, author_name, author_email, author_date = \
- __parse_patch(filename)
+ # fix possible invalid characters in the patch name
+ patch = re.sub('[^\w.]+', '-', patch).strip('-')
+
+ if options.ignore and patch in crt_series.get_applied():
+ out.info('Ignoring already applied patch "%s"' % patch)
+ return
+ if options.replace and patch in crt_series.get_unapplied():
+ crt_series.delete_patch(patch)
# refresh_patch() will invoke the editor in this case, with correct
# patch content
if not message:
can_edit = False
+ committer_name = committer_email = None
+
+ if options.author:
+ options.authname, options.authemail = name_email(options.author)
+
# override the automatically parsed settings
if options.authname:
author_name = options.authname
committer_name = committer_name,
committer_email = committer_email)
- print 'Importing patch %s...' % patch,
- sys.stdout.flush()
+ 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(options.base))
+ else:
+ git.apply_patch(diff = diff)
+ crt_series.refresh_patch(edit = options.edit,
+ show_patch = options.showpatch,
+ sign_str = options.sign_str)
+ out.done()
+
+def __import_file(filename, options, patch = None):
+ """Import a patch from a file or standard input
+ """
+ if filename:
+ f = file(filename)
+ else:
+ f = sys.stdin
- git.apply_patch(filename)
- crt_series.refresh_patch(edit = options.edit,
- show_patch = options.showpatch)
+ if options.mail:
+ try:
+ msg = email.message_from_file(f)
+ except Exception, ex:
+ raise CmdException, 'error parsing the e-mail file: %s' % str(ex)
+ message, author_name, author_email, author_date, diff = \
+ parse_mail(msg)
+ else:
+ message, author_name, author_email, author_date, diff = \
+ parse_patch(f)
- print 'done'
- print_crt_patch()
+ if filename:
+ f.close()
-def import_commit(parser, options, args):
- """Import a commit object as a new patch
- """
- if len(args) != 1:
- parser.error('incorrect number of arguments')
+ if patch:
+ pname = patch
+ else:
+ pname = filename
- commit_id = args[0]
+ __create_patch(pname, message, author_name, author_email,
+ author_date, diff, options)
- if options.name:
- patch = options.name
+def __import_series(filename, options):
+ """Import a series of patches
+ """
+ applied = crt_series.get_applied()
+
+ if filename:
+ f = file(filename)
+ patchdir = os.path.dirname(filename)
else:
- raise CmdException, 'Unkown patch name'
+ f = sys.stdin
+ patchdir = ''
- commit = git.Commit(commit_id)
+ for line in f:
+ patch = re.sub('#.*$', '', line).strip()
+ if not patch:
+ continue
+ patchfile = os.path.join(patchdir, patch)
+ patch = __replace_slashes_with_dashes(patch);
+
+ __import_file(patchfile, options, patch)
+
+ if filename:
+ f.close()
- if not options.reverse:
- bottom = commit.get_parent()
- top = commit_id
+def __import_mbox(filename, options):
+ """Import a series from an mbox file
+ """
+ if filename:
+ f = file(filename, 'rb')
else:
- bottom = commit_id
- top = commit.get_parent()
+ f = StringIO(sys.stdin.read())
- message = commit.get_log()
- author_name, author_email, author_date = \
- name_email_date(commit.get_author())
+ try:
+ mbox = UnixMailbox(f, email.message_from_file)
+ except Exception, ex:
+ raise CmdException, 'error parsing the mbox file: %s' % str(ex)
- print 'Importing commit %s...' % commit_id,
- sys.stdout.flush()
+ for msg in mbox:
+ message, author_name, author_email, author_date, diff = \
+ parse_mail(msg)
+ __create_patch(None, message, author_name, author_email,
+ author_date, diff, options)
- crt_series.new_patch(patch, message = message, can_edit = False,
- unapplied = True, bottom = bottom, top = top,
- author_name = author_name,
- author_email = author_email,
- author_date = author_date)
- crt_series.push_patch(patch)
+ f.close()
- print 'done'
- print_crt_patch()
+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 or a commit object as a new patch
+ """Import a GNU diff file as a new patch
"""
+ if len(args) > 1:
+ parser.error('incorrect number of arguments')
+
check_local_changes()
check_conflicts()
check_head_top_equal()
- if options.commit:
- import_commit(parser, options, args)
+ if len(args) == 1:
+ filename = args[0]
+ else:
+ filename = None
+
+ if options.series:
+ __import_series(filename, options)
+ elif options.mbox:
+ __import_mbox(filename, options)
+ elif options.url:
+ __import_url(filename, options)
else:
- import_file(parser, options, args)
+ __import_file(filename, options)
+
+ print_crt_patch()
~mdw / stgit / blobdiff