help = 'Use FILE as a template'),
make_option('-b', '--branch',
help = 'use BRANCH instead of the default one'),
+ make_option('-O', '--diff-opts',
+ help = 'options to pass to git-diff'),
make_option('-s', '--stdout',
help = 'dump the patches to the standard output',
action = 'store_true')]
if options.dir:
dirname = options.dir
else:
- dirname = 'patches-%s' % crt_series.get_branch()
+ dirname = 'patches-%s' % crt_series.get_name()
if not options.branch and git.local_changes():
- print 'Warning: local changes in the tree. ' \
- 'You might want to commit them first'
+ out.warn('Local changes in the tree;'
+ ' you might want to commit them first')
if not options.stdout:
if not os.path.isdir(dirname):
os.makedirs(dirname)
series = file(os.path.join(dirname, 'series'), 'w+')
+ if options.diff_opts:
+ diff_flags = options.diff_opts.split()
+ else:
+ diff_flags = []
+
applied = crt_series.get_applied()
if len(args) != 0:
patches = parse_patches(args, applied)
f = open(pfile, 'w+')
if options.stdout and num > 1:
- print '-------------------------------------------------------------------------------'
+ print '-'*79
print patch.get_name()
- print '-------------------------------------------------------------------------------'
+ print '-'*79
# write description
f.write(descr)
# write the diff
git.diff(rev1 = patch.get_bottom(),
rev2 = patch.get_top(),
- out_fd = f)
+ out_fd = f,
+ diff_flags = diff_flags )
if not options.stdout:
f.close()
patch_no += 1