Merge branch 'stable'

[stgit] / stgit / commands / patches.py

diff --git a/stgit/commands/patches.py b/stgit/commands/patches.py
index 7da74ba846997acfe46cf1962304e3bdda61ee98..54fac21306d7dfaef6bd630058588421f3fb7648 100644 (file)
--- a/stgit/commands/patches.py
+++ b/stgit/commands/patches.py
@@ -16,23 +16,30 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
 import sys, os
 """
 
 import sys, os

-from optparse import OptionParser, make_option

 from pydoc import pager
 from pydoc import pager

-
+from stgit.argparse import opt

 from stgit.commands.common import *
 from stgit.utils import *
 from stgit.commands.common import *
 from stgit.utils import *

-from stgit import stack, git
-
-
-help = 'show the patches modifying a file'
-usage = """%prog [options] <file> [<file>...]
-
-Show the applied patches modifying the given files. The '--diff'
-option also lists the patch log and the diff for the given files."""
-
-options = [make_option('-d', '--diff',
-                       help = 'show the diff for the given files',
-                       action = 'store_true')]
+from stgit.out import *
+from stgit import argparse, stack, git
+
+help = 'Show the applied patches modifying a file'
+kind = 'stack'
+usage = ['[options] [<files or dirs>]']
+description = """
+Show the applied patches modifying the given files. Without arguments,
+it shows the patches affected by the local tree modifications. The
+'--diff' option also lists the patch log and the diff for the given
+files."""
+
+args = [argparse.known_files]
+options = [
+    opt('-d', '--diff', action = 'store_true',
+        short = 'Show the diff for the given files'),
+    opt('-b', '--branch', args = [argparse.stg_branches],
+        short = 'Use BRANCH instead of the default branch')]
+
+directory = DirectoryHasRepository(log = False)

 
 diff_tmpl = \
           '-------------------------------------------------------------------------------\n' \
 
 diff_tmpl = \
           '-------------------------------------------------------------------------------\n' \


@@ -45,14 +52,22 @@ diff_tmpl = \
 def func(parser, options, args):
     """Show the patches modifying a file
     """
 def func(parser, options, args):
     """Show the patches modifying a file
     """

-    if len(args) < 1:
-        parser.error('incorrect number of arguments')
+    if not args:
+        files = [path for (stat,path) in git.tree_status(verbose = True)]
+        # git.tree_status returns absolute paths
+    else:
+        files = git.ls_files(args)
+    directory.cd_to_topdir()
+
+    if not files:
+        raise CmdException, 'No files specified or no local changes'

 
     applied = crt_series.get_applied()
     if not applied:
         raise CmdException, 'No patches applied'
 
 
     applied = crt_series.get_applied()
     if not applied:
         raise CmdException, 'No patches applied'
 

-    revs = git.modifying_revs(args, git_id('base'))
+    revs = git.modifying_revs(files, crt_series.get_base(),
+                              crt_series.get_head())

     revs.reverse()
 
     # build the patch/revision mapping
     revs.reverse()
 
     # build the patch/revision mapping


@@ -69,10 +84,10 @@ def func(parser, options, args):
             if options.diff:
                 diff_output += diff_tmpl \
                                % (patch.get_name(), patch.get_description(),
             if options.diff:
                 diff_output += diff_tmpl \
                                % (patch.get_name(), patch.get_description(),

-                                  git.diff(args, patch.get_bottom(),
+                                  git.diff(files, patch.get_bottom(),

                                            patch.get_top()))
             else:
                                            patch.get_top()))
             else:

-                print patch.get_name()
+                out.stdout(patch.get_name())

 
     if options.diff:
         pager(diff_output)
 
     if options.diff:
         pager(diff_output)