A typo prevented the previous patch for this (commit
9d15ccd85e36ef5cd554aaf98f1c37ef0433697f) from working (edit is never used,
you should have set options.edit). Ah, nice Python! No var declarations and
these are the effects (yes, I reproduced this).
However, if the description is left empty, refresh_patch will again invoke
the editor. Also, with --showpatch, the first invocation shows the topmost
patch, not the one to be imported.
So better stop new_patch from invoking the editor, and call it only on
refresh.
Btw, clean the old unused "edit" parameter of Series.new_patch.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
message, author_name, author_email, author_date = \
__parse_patch(filename)
message, author_name, author_email, author_date = \
__parse_patch(filename)
- # new_patch() will invoke the editor in this case
+ # refresh_patch() will invoke the editor in this case, with correct
+ # patch content
# override the automatically parsed settings
if options.authname:
# override the automatically parsed settings
if options.authname:
if options.commemail:
committer_email = options.commemail
if options.commemail:
committer_email = options.commemail
- crt_series.new_patch(patch, message = message,
+ crt_series.new_patch(patch, message = message, can_edit = False,
author_name = author_name,
author_email = author_email,
author_date = author_date,
author_name = author_name,
author_email = author_email,
author_date = author_date,
- def new_patch(self, name, message = None, edit = False, show_patch = False,
+ def new_patch(self, name, message = None, can_edit = True, show_patch = False,
author_name = None, author_email = None, author_date = None,
committer_name = None, committer_email = None):
"""Creates a new patch
author_name = None, author_email = None, author_date = None,
committer_name = None, committer_email = None):
"""Creates a new patch
if self.__patch_applied(name) or self.__patch_unapplied(name):
raise StackException, 'Patch "%s" already exists' % name
if self.__patch_applied(name) or self.__patch_unapplied(name):
raise StackException, 'Patch "%s" already exists' % name
+ if not message and can_edit:
descr = edit_file(self, None, \
'Please enter the description for patch "%s" ' \
'above.' % name, show_patch)
descr = edit_file(self, None, \
'Please enter the description for patch "%s" ' \
'above.' % name, show_patch)