Forbid the "series --all --short" combination.

That combination would otherwise simply augment with hidden patches
the display we would have with --short, which does not seem useful,
but can be confusing.

Signed-off-by: Yann Dirson <ydirson@altern.org>

diff --git a/stgit/commands/series.py b/stgit/commands/series.py
index 0b3efe0b3366f13602a38d15ccabd8bafe235350..9e0b0ff79a963315df6ad74378139c9e0f39c3b1 100644 (file)
--- a/stgit/commands/series.py
+++ b/stgit/commands/series.py
@@ -109,6 +109,9 @@ def func(parser, options, args):
     """
     global crt_series
 
     """
     global crt_series
 

+    if options.all and options.short:
+        raise CmdException, 'combining --all and --short is meaningless'
+    

     # current series patches
     if options.invisible:
         applied = unapplied = []
     # current series patches
     if options.invisible:
         applied = unapplied = []