Add new --diff-opts/-O flag to diff- and status-related commands.

[stgit] / stgit / commands / diff.py

diff --git a/stgit/commands/diff.py b/stgit/commands/diff.py
index b66c75bb9c7a53a691cf336055d7be057163bede..f8b19f8868fa33df995364638086d7a0db29f4bc 100644 (file)
--- a/stgit/commands/diff.py
+++ b/stgit/commands/diff.py
@@ -44,9 +44,8 @@ shows the specified patch (defaulting to the current one)."""
 options = [make_option('-r', '--range',
                        metavar = 'rev1[..[rev2]]', dest = 'revs',
                        help = 'show the diff between revisions'),
 options = [make_option('-r', '--range',
                        metavar = 'rev1[..[rev2]]', dest = 'revs',
                        help = 'show the diff between revisions'),

-           make_option('--binary',
-                       help = 'output a diff even for binary files',
-                       action = 'store_true'),
+           make_option('-O', '--diff-opts',
+                       help = 'options to pass to git-diff'),

            make_option('-s', '--stat',
                        help = 'show the stat instead of the diff',
                        action = 'store_true')]
            make_option('-s', '--stat',
                        help = 'show the stat instead of the diff',
                        action = 'store_true')]


@@ -79,8 +78,8 @@ def func(parser, options, args):
         rev1 = 'HEAD'
         rev2 = None
 
         rev1 = 'HEAD'
         rev2 = None
 

-    if options.binary:
-        diff_flags = [ '--binary' ]
+    if options.diff_opts:
+        diff_flags = options.diff_opts.split()

     else:
         diff_flags = []
 
     else:
         diff_flags = []