Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""
-import sys, os
+import sys, os, re
from optparse import OptionParser, make_option
from stgit.commands.common import *
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 overriden with the '--name' option. The patch can either be a
+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.
action = 'store_true'),
make_option('-n', '--name',
help = 'use NAME as the patch name'),
+ make_option('-s', '--series',
+ help = 'import a series of patches',
+ action = 'store_true'),
+ make_option('-i', '--ignore',
+ help = 'ignore the applied 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>"',
author information (if any).
"""
subject = body = ''
- authname = authemail = None
+ authname = authemail = authdate = None
- descr_lines = [line.strip() for line in descr.split('\n')]
+ descr_lines = [line.rstrip() for line in descr.split('\n')]
if not descr_lines:
raise CmdException, "Empty patch description"
- pos = 1
+ lasthdr = 0
end = len(descr_lines)
- # get the subject
- subject = descr_lines[0]
-
- # ignore the empty lines after subject
- while pos < end and descr_lines[pos] == '':
- pos += 1
-
- # check for a "From:" line
- if pos < end and re.match('from:\s+', descr_lines[pos], re.I):
- auth = re.findall('^.*?:\s+(.*)$', descr_lines[pos])[0]
- authname, authemail = name_email(auth)
- pos += 1
-
- # ignore the empty lines
- while pos < end and descr_lines[pos] == '':
- pos += 1
+ # Parse the patch header
+ for pos in range(0, end):
+ if not descr_lines[pos]:
+ continue
+ # check for a "From|Author:" line
+ if re.match('\s*(?:from|author):\s+', descr_lines[pos], re.I):
+ auth = re.findall('^.*?:\s+(.*)$', descr_lines[pos])[0]
+ authname, authemail = name_email(auth)
+ lasthdr = pos + 1
+ continue
+ # check for a "Date:" line
+ if re.match('\s*date:\s+', descr_lines[pos], re.I):
+ authdate = re.findall('^.*?:\s+(.*)$', descr_lines[pos])[0]
+ lasthdr = pos + 1
+ continue
+ if subject:
+ break
+ # get the subject
+ subject = descr_lines[pos]
+ lasthdr = pos + 1
# get the body
- body = reduce(lambda x, y: x + '\n' + y, descr_lines[pos:], '').strip()
+ if lasthdr < end:
+ body = reduce(lambda x, y: x + '\n' + y, descr_lines[lasthdr:], '')
- return (subject + '\n\n' + body, authname, authemail)
+ return (subject + body, authname, authemail, authdate)
def __parse_mail(filename = None):
"""Parse the input file in a mail format and return (description,
f.close()
# parse the description for author information
- descr, descr_authname, descr_authemail = __parse_description(descr)
+ descr, descr_authname, descr_authemail, descr_authdate = __parse_description(descr)
if descr_authname:
authname = descr_authname
if descr_authemail:
authemail = descr_authemail
+ if descr_authdate:
+ authdate = descr_authdate
return (descr, authname, authemail, authdate)
if filename:
f.close()
- descr, authname, authemail = __parse_description(descr)
+ descr, authname, authemail, authdate = __parse_description(descr)
# we don't yet have an agreed place for the creation date.
# Just return None
- return (descr, authname, authemail, None)
+ return (descr, authname, authemail, authdate)
-def func(parser, options, args):
- """Import a GNU diff file as a new patch
+def __import_patch(patch, filename, options):
+ """Import a patch from a file or standard input
"""
- if len(args) > 1:
- parser.error('incorrect number of arguments')
-
- check_local_changes()
- check_conflicts()
- check_head_top_equal()
-
- if 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
committer_name = committer_name,
committer_email = committer_email)
- print 'Importing patch %s...' % patch,
+ print 'Importing patch "%s"...' % patch,
sys.stdout.flush()
if options.base:
show_patch = options.showpatch)
print 'done'
+
+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:
+ f = sys.stdin
+ patchdir = ''
+
+ for line in f:
+ patch = re.sub('#.*$', '', line).strip()
+ if not patch:
+ continue
+ if options.ignore and patch in applied:
+ print 'Ignoring already applied patch "%s"' % patch
+ continue
+
+ patchfile = os.path.join(patchdir, patch)
+ __import_patch(patch, patchfile, options)
+
+def func(parser, options, args):
+ """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 len(args) == 1:
+ filename = args[0]
+ else:
+ filename = None
+
+ if options.series:
+ __import_series(filename, options)
+ else:
+ if options.name:
+ patch = options.name
+ elif filename:
+ patch = os.path.basename(filename)
+ else:
+ raise CmdException, 'Unknown patch name'
+
+ __import_patch(patch, filename, options)
+
print_crt_patch()