~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix "series -d" when the patch description is empty
[stgit]
/
stgit
/
commands
/
series.py
diff --git
a/stgit/commands/series.py
b/stgit/commands/series.py
index
a843307
..
58c706c
100644
(file)
--- a/
stgit/commands/series.py
+++ b/
stgit/commands/series.py
@@
-33,20
+33,29
@@
prefixed with a '>'. Empty patches are prefixed with a '0'."""
options = [make_option('-b', '--branch',
help = 'use BRANCH instead of the default one'),
options = [make_option('-b', '--branch',
help = 'use BRANCH instead of the default one'),
+ make_option('-c', '--count',
+ help = 'print the number of patches in the series',
+ action = 'store_true'),
make_option('-d', '--description',
make_option('-d', '--description',
- help = 'show a sho
w
description for each patch',
+ help = 'show a sho
rt
description for each patch',
action = 'store_true'),
make_option('-e', '--empty',
help = 'check whether patches are empty '
'(much slower)',
action = 'store_true'),
make_option('-e', '--empty',
help = 'check whether patches are empty '
'(much slower)',
- action = 'store_true') ]
+ action = 'store_true'),
+ make_option('-s', '--short',
+ help = 'list just the patches around the topmost patch',
+ action = 'store_true'),
+ make_option('-g', '--graphical',
+ help = 'run gitk instead of printing',
+ action = 'store_true')]
def __get_description(patch):
"""Extract and return a patch's short description
"""
p = crt_series.get_patch(patch)
def __get_description(patch):
"""Extract and return a patch's short description
"""
p = crt_series.get_patch(patch)
- descr =
p.get_description(
).strip()
+ descr =
(p.get_description() or ''
).strip()
descr_lines = descr.split('\n')
return descr_lines[0].rstrip()
descr_lines = descr.split('\n')
return descr_lines[0].rstrip()
@@
-66,17
+75,43
@@
def func(parser, options, args):
applied = crt_series.get_applied()
unapplied = crt_series.get_unapplied()
applied = crt_series.get_applied()
unapplied = crt_series.get_unapplied()
+
+ if options.count:
+ print len(applied) + len(unapplied)
+ return
+
+ if options.short:
+ if len(applied) > 5:
+ applied = applied[-6:]
+ if len(unapplied) > 5:
+ unapplied = unapplied[:5]
+
patches = applied + unapplied
patches = applied + unapplied
+ if not patches:
+ return
+
+ if options.graphical:
+ if applied:
+ gitk_args = ' %s^..%s' % (git_id(applied[0]), git_id(applied[-1]))
+ else:
+ gitk_args = ''
- max_len = 0
- if len(patches) > 0:
- max_len = max([len(i) for i in patches])
+ for p in unapplied:
+ patch_id = git_id(p)
+ gitk_args += ' %s^..%s' % (patch_id, patch_id)
+
+ if os.system('gitk%s' % gitk_args) != 0:
+ raise CmdException, 'gitk execution failed'
+ else:
+ max_len = 0
+ if len(patches) > 0:
+ max_len = max([len(i) for i in patches])
- if len(applied) > 0:
- for p in applied [0:-1]:
- __print_patch(p, '+ ', '0 ', max_len, options)
+
if len(applied) > 0:
+
for p in applied [0:-1]:
+
__print_patch(p, '+ ', '0 ', max_len, options)
- __print_patch(applied[-1], '> ', '0>', max_len, options)
+
__print_patch(applied[-1], '> ', '0>', max_len, options)
- for p in unapplied:
- __print_patch(p, '- ', '0 ', max_len, options)
+
for p in unapplied:
+
__print_patch(p, '- ', '0 ', max_len, options)