Fix the patch argument parsing for the "show" command

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/stgit/commands/show.py b/stgit/commands/show.py
index 3887b739148b230178485e4c13c38aac569d6008..895943a8e1f137d37ad13aca6000e06c58983a60 100644 (file)
--- a/stgit/commands/show.py
+++ b/stgit/commands/show.py
@@ -51,15 +51,15 @@ def func(parser, options, args):
         patches = crt_series.get_unapplied()
     elif len(args) == 0:
         patches = ['HEAD']
         patches = crt_series.get_unapplied()
     elif len(args) == 0:
         patches = ['HEAD']

+    elif '..' in ' '.join(args):
+        # patch ranges
+        applied = crt_series.get_applied()
+        unapplied = crt_series.get_unapplied()
+        patches = parse_patches(args, applied + unapplied + \
+                                crt_series.get_hidden(), len(applied))

     else:
     else:

-        if len(args) == 1 or args[0].find('..') == -1:
-            # single patch or one/more commit ids
-            patches = args
-        else:
-            applied = crt_series.get_applied()
-            unapplied = crt_series.get_unapplied()
-            patches = parse_patches(args, applied + unapplied + \
-                                    crt_series.get_hidden(), len(applied))
+        # individual patches or commit ids
+        patches = args

 
     commit_ids = [git_id(crt_series, patch) for patch in patches]
     commit_str = '\n'.join([git.pretty_commit(commit_id,
 
     commit_ids = [git_id(crt_series, patch) for patch in patches]
     commit_str = '\n'.join([git.pretty_commit(commit_id,