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
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',
return stripped
+def __split_descr_diff(string):
+ """Return the description and the diff from the given string
+ """
+ descr = diff = ''
+ top = True
+
+ for line in string.split('\n'):
+ if top:
+ if not __end_descr(line):
+ descr += line + '\n'
+ continue
+ else:
+ top = False
+ diff += line + '\n'
+
+ return (descr.rstrip(), diff)
+
def __parse_description(descr):
"""Parse the patch description and return the new description and
author information (if any).
if descr:
descr = re.findall('^(\[.*?[Pp][Aa][Tt][Cc][Hh].*?\])?\s*(.*)$',
descr)[0][1]
- descr += '\n\n'
else:
raise CmdException, 'Subject: line not found'
# the rest of the message
- if msg.is_multipart():
- # this is assuming that the first part is the patch
- # description and the second part is the attached patch
- descr += msg.get_payload(0).get_payload(decode = True)
- diff = msg.get_payload(1).get_payload(decode = True)
- else:
- diff = msg.get_payload(decode = True)
-
- for line in diff.split('\n'):
- if __end_descr(line):
- break
- descr += line + '\n'
-
- descr.rstrip()
+ msg_text = ''
+ for part in msg.walk():
+ if part.get_content_type() == 'text/plain':
+ msg_text += part.get_payload(decode = True)
+
+ rem_descr, diff = __split_descr_diff(msg_text)
+ if rem_descr:
+ descr += '\n\n' + rem_descr
+ if not diff:
+ out.warn('Message does not contain any diff')
# parse the description for author information
descr, descr_authname, descr_authemail, descr_authdate = \
"""Parse the input file and return (description, authname,
authemail, authdate, diff)
"""
- descr = ''
- while True:
- line = fobj.readline()
- if not line:
- break
-
- if __end_descr(line):
- break
- else:
- descr += line
- descr.rstrip()
-
- diff = fobj.read()
-
+ descr, diff = __split_descr_diff(fobj.read())
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, 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)
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:
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):
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()
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
"""
__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()