Allow 'show' and 'id' to work on non-StGIT branches (bug #10011)

[stgit] / stgit / commands / show.py

diff --git a/stgit/commands/show.py b/stgit/commands/show.py
index e4e70a5a50131a8543aa7ef928c1217de182dd35..72d1be387f02678011ba3fb67202cfd1d4f2e673 100644 (file)
--- a/stgit/commands/show.py
+++ b/stgit/commands/show.py
@@ -39,38 +39,36 @@ options = [make_option('-b', '--branch',
            make_option('-u', '--unapplied',
                        help = 'show the unapplied patches',
                        action = 'store_true'),
            make_option('-u', '--unapplied',
                        help = 'show the unapplied patches',
                        action = 'store_true'),

-           make_option('-O', '--diff-opts',
-                       help = 'options to pass to git-diff')]
+           make_option('-O', '--show-opts',
+                       help = 'options to pass to "git show"')]

 
 
 def func(parser, options, args):
     """Show commit log and diff
     """
 
 
 def func(parser, options, args):
     """Show commit log and diff
     """

-    applied = crt_series.get_applied()
-    unapplied = crt_series.get_unapplied()
-

     if options.applied:
     if options.applied:

-        patches = applied
+        patches = crt_series.get_applied()

     elif options.unapplied:
     elif options.unapplied:

-        patches = unapplied
+        patches = crt_series.get_unapplied()

     elif len(args) == 0:
         patches = ['HEAD']
     else:
     elif len(args) == 0:
         patches = ['HEAD']
     else:

-        if len(args) == 1 and args[0].find('..') == -1 \
-               and not crt_series.patch_exists(args[0]):
-            # it might be just a commit id
+        if len(args) == 1 and args[0].find('..') == -1:
+            # single patch or commit id

             patches = args
         else:
             patches = args
         else:

-            patches = parse_patches(args, applied + unapplied +\
-                                crt_series.get_hidden(), len(applied))
+            applied = crt_series.get_applied()
+            unapplied = crt_series.get_unapplied()
+            patches = parse_patches(args, applied + unapplied + \
+                                    crt_series.get_hidden(), len(applied))

 
 

-    if options.diff_opts:
-        diff_flags = options.diff_opts.split()
+    if options.show_opts:
+        show_flags = options.show_opts.split()

     else:
     else:

-        diff_flags = []
+        show_flags = []

 
     commit_ids = [git_id(crt_series, patch) for patch in patches]
 
     commit_ids = [git_id(crt_series, patch) for patch in patches]

-    commit_str = '\n'.join([git.pretty_commit(commit_id, diff_flags=diff_flags)
+    commit_str = '\n'.join([git.pretty_commit(commit_id, flags = show_flags)

                             for commit_id in commit_ids])
     if commit_str:
         pager(commit_str)
                             for commit_id in commit_ids])
     if commit_str:
         pager(commit_str)