~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow only certain gitk exit codes as valid
[stgit]
/
stgit
/
commands
/
series.py
diff --git
a/stgit/commands/series.py
b/stgit/commands/series.py
index
4c6d07e
..
3c0816e
100644
(file)
--- a/
stgit/commands/series.py
+++ b/
stgit/commands/series.py
@@
-194,18
+194,17
@@
def func(parser, options, args):
if options.missing:
raise CmdException, '--graphical not supported with --missing'
if options.missing:
raise CmdException, '--graphical not supported with --missing'
+ gitk_args = []
if applied:
if applied:
- gitk_args = ' %s^..%s' % (git_id(crt_series, applied[0]),
- git_id(crt_series, applied[-1]))
- else:
- gitk_args = ''
-
+ gitk_args.append('%s^..%s'
+ % (git_id(crt_series, applied[0]),
+ git_id(crt_series, applied[-1])))
for p in unapplied:
patch_id = git_id(crt_series, p)
for p in unapplied:
patch_id = git_id(crt_series, p)
- gitk_args
+= ' %s^..%s' % (patch_id, patch_id
)
+ gitk_args
.append('%s^..%s' % (patch_id, patch_id)
)
- if os.system('gitk%s' % gitk_args) != 0:
- raise CmdException, 'gitk execution failed'
+ # discard the exit codes generated by SIGINT, SIGKILL, SIGTERM
+ Run('gitk', *gitk_args).returns([0, -2, -9, -15]).run()
else:
max_len = 0
if len(patches) > 0:
else:
max_len = 0
if len(patches) > 0: