contrib/vim: Add vim syntax highlighting for StGit commit messages

[stgit] / stgit / commands / diff.py

diff --git a/stgit/commands/diff.py b/stgit/commands/diff.py
index 7d2f719..05bf297 100644 (file)
--- a/stgit/commands/diff.py
+++ b/stgit/commands/diff.py
@@ -27,16 +27,12 @@ from stgit.lib import git as gitlib
 
 help = 'Show the tree diff'
 kind = 'wc'
-usage = ['[options] [<files or dirs>]']
+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.
-
-rev = '[branch:](<patch>|{base}) | <tree-ish>'"""
+tree-ish object has the format accepted by the linkstg:id[] command."""
 
 args = [argparse.known_files, argparse.dirty_files]
 options = [
@@ -72,7 +68,9 @@ def func(parser, options, args):
         rev1 = 'HEAD'
         rev2 = None
 
-    diff_str = git.diff(args, git_id(crt_series, rev1),
+    if not options.stat:
+        options.diff_flags.extend(color_diff_flags())
+    diff_str = git.diff(args, rev1 and git_id(crt_series, rev1),
                         rev2 and git_id(crt_series, rev2),
                         diff_flags = options.diff_flags)
     if options.stat: