Add "stg id" support for "{public}" ref

[stgit] / stgit / commands / diff.py

diff --git a/stgit/commands/diff.py b/stgit/commands/diff.py
index 4f3e2c4..568651c 100644 (file)
--- a/stgit/commands/diff.py
+++ b/stgit/commands/diff.py
@@ -17,35 +17,35 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
 import sys, os
-from optparse import OptionParser, make_option
 from pydoc import pager
-
+from stgit.argparse import opt
 from stgit.commands.common import *
 from stgit.utils import *
 from stgit.out import *
 from stgit import argparse, stack, git
+from stgit.lib import git as gitlib
 
-help = 'show the tree diff'
-usage = """%prog [options] [<files or dirs>]
-
+help = 'Show the tree diff'
+kind = 'wc'
+usage = ['[options] [<files or dirs>]']
+description = """
 Show the diff (default) or diffstat between the current working copy
 or a tree-ish object and another tree-ish object (defaulting to HEAD).
 File names can also be given to restrict the diff output. The
-tree-ish object can be an StGIT patch, a standard git commit, tag or
-tree. In addition to these, the command also supports '{base}',
-representing the bottom of the current stack.
+tree-ish object has the format accepted by the linkstg:id[] command."""
 
-rev = '[branch:](<patch>|{base}) | <tree-ish>'
-"""
+args = [argparse.known_files, argparse.dirty_files]
+options = [
+    opt('-r', '--range', metavar = 'rev1[..[rev2]]', dest = 'revs',
+        args = [argparse.patch_range(argparse.applied_patches,
+                                     argparse.unapplied_patches,
+                                     argparse.hidden_patches)],
+        short = 'Show the diff between revisions'),
+    opt('-s', '--stat', action = 'store_true',
+        short = 'Show the stat instead of the diff'),
+    ] + argparse.diff_opts_option()
 
-directory = DirectoryHasRepository()
-options = [make_option('-r', '--range',
-                       metavar = 'rev1[..[rev2]]', dest = 'revs',
-                       help = 'show the diff between revisions'),
-           make_option('-s', '--stat',
-                       help = 'show the stat instead of the diff',
-                       action = 'store_true')
-           ] + argparse.diff_opts_option()
+directory = DirectoryHasRepository(log = False)
 
 def func(parser, options, args):
     """Show the tree diff
@@ -72,7 +72,7 @@ def func(parser, options, args):
                         rev2 and git_id(crt_series, rev2),
                         diff_flags = options.diff_flags)
     if options.stat:
-        out.stdout_raw(git.diffstat(diff_str) + '\n')
+        out.stdout_raw(gitlib.diffstat(diff_str) + '\n')
     else:
         if diff_str:
             pager(diff_str)