Support reading diff or log for given files/dirs in workspace (usage changed on

CHANGES

@@ -2,6 +2,11 @@
 Change log
 ==========
 
+Version 0.7 (2013-02-22)
+
+  - Support reading diff or log for given files/dirs in workspace (usage changed
+    on reading a patch file or two given files!)
+
 Version 0.6 (2013-02-20)
 
   - A few performance tuning and code clean up

README.rst

@@ -71,8 +71,10 @@ Read diff from local modification in a *Git/Mercurial/Svn* workspace:
     cdiff                       # view colored incremental udiff
     cdiff -s                    # view side by side
     cdiff -s -w 90              # use text width 90 other than default 80
+    cdiff -s file1 dir2         # view modification of given files/dirs only
 
-Read the log (e.g. ``git log -p``) in a *Git/Mercurial/Svn* workspace:
+Read the log with diff (e.g. ``git log -p``, ``svn log --diff``) in a
+*Git/Mercurial/Svn* workspace (note *--diff* option is new in svn 1.7.0):
 
 .. code:: sh
 
@@ -80,6 +82,7 @@ Read the log (e.g. ``git log -p``) in a *Git/Mercurial/Svn* workspace:
     cdiff -l
     cdiff -ls                   # equivalent to cdiff -l -s
     cdiff -ls -w90
+    cdiff -ls file1 dir2        # view log with diff of given files/dirs only
 
 Pipe in a diff:
 
@@ -88,21 +91,16 @@ Pipe in a diff:
     git log -p -2 | cdiff -s
     git show 15bfa5 | cdiff -s
     svn diff -r PREV | cdiff -s
+    diff -u foo bar | cdiff     # note cdiff only takes unified diff
+    diff -ur dir1 dir2 | cdiff  # read diff of two dirs
 
 View a diff (patch) file:
 
 .. code:: sh
 
-    cdiff foo.patch
-    cdiff foo.patch -s
-    cdiff foo.patch -s -w 90
-
-View diff between two files (wrapper of ``diff``):
-
-.. code:: sh
-
-    cdiff foo foo.new           # equivalent to diff -u foo foo.new | cdiff
-    cdiff foo foo.new -s
+    cdiff < foo.patch           # or cat foo.patch | cdiff
+    cdiff -s < foo.patch
+    cdiff -s -w 90 < foo.patch
 
 Redirect output to another patch file is safe:
 

cdiff.py

@@ -8,7 +8,7 @@ workspace, given patch or two files, or from stdin, with **side by side** and
 """
 
 META_INFO = {
-    'version'     : '0.6',
+    'version'     : '0.7',
     'license'     : 'BSD-3',
     'author'      : 'Matthew Wang',
     'email'       : 'mattwyl(@)gmail(.)com',
@@ -588,7 +588,7 @@ def markup_to_pager(stream, opts):
     color_diff = markup.markup(side_by_side=opts.side_by_side,
             width=opts.width)
 
-    # args stolen fron git source: github.com/git/git/blob/master/pager.c
+    # Args stolen from git source: github.com/git/git/blob/master/pager.c
     pager = subprocess.Popen(['less', '-FRSX'],
             stdin=subprocess.PIPE, stdout=sys.stdout)
     try:
@@ -610,18 +610,20 @@ def check_command_status(arguments):
         return False
 
 
-def revision_control_diff():
+def revision_control_diff(args):
     """Return diff from revision control system."""
     for _, ops in VCS_INFO.items():
         if check_command_status(ops['probe']):
-            return subprocess.Popen(ops['diff'], stdout=subprocess.PIPE).stdout
+            return subprocess.Popen(
+                    ops['diff'] + args, stdout=subprocess.PIPE).stdout
 
 
-def revision_control_log():
+def revision_control_log(args):
     """Return log from revision control system."""
     for _, ops in VCS_INFO.items():
         if check_command_status(ops['probe']):
-            return subprocess.Popen(ops['log'], stdout=subprocess.PIPE).stdout
+            return subprocess.Popen(
+                    ops['log'] + args, stdout=subprocess.PIPE).stdout
 
 
 def decode(line):
@@ -655,25 +657,13 @@ def main():
     opts, args = parser.parse_args()
 
     if opts.log:
-        diff_hdl = revision_control_log()
+        diff_hdl = revision_control_log(args)
         if not diff_hdl:
             sys.stderr.write(('*** Not in a supported workspace, supported '
                               'are: %s\n') % ', '.join(supported_vcs))
             return 1
-    elif len(args) > 2:
-        parser.print_help()
-        return 1
-    elif len(args) == 2:
-        diff_hdl = subprocess.Popen(['diff', '-u', args[0], args[1]],
-                stdout=subprocess.PIPE).stdout
-    elif len(args) == 1:
-        if IS_PY3:
-            # Python3 needs the newline='' to keep '\r' (DOS format)
-            diff_hdl = open(args[0], mode='rt', newline='')
-        else:
-            diff_hdl = open(args[0], mode='rt')
     elif sys.stdin.isatty():
-        diff_hdl = revision_control_diff()
+        diff_hdl = revision_control_diff(args)
         if not diff_hdl:
             sys.stderr.write(('*** Not in a supported workspace, supported '
                               'are: %s\n\n') % ', '.join(supported_vcs))

tests/regression.sh

@@ -33,9 +33,9 @@ function cmp_output()
     local cdiff_opt=${3:-""}
     local cmd
 
-    cmd=$(printf "%-8s $CDIFF %-25s %-20s " $PYTHON "$input" "$cdiff_opt")
+    cmd=$(printf "%-8s $CDIFF %-18s < %-25s " $PYTHON "$cdiff_opt" "$input")
     printf "$cmd"
-    if $cmd 2>/dev/null | diff -ubq $expected_out - >& /dev/null; then
+    if eval $cmd 2>/dev/null | diff -ubq $expected_out - >& /dev/null; then
         pass
         return 0
     else

tests/test_cdiff.py

@@ -447,10 +447,6 @@ class TestMain(unittest.TestCase):
                'cd %s; git add foo; git commit foo -m update' % self._ws]
         subprocess.call(cmd, stdout=subprocess.PIPE)
 
-    def test_too_many_args(self):
-        sys.argv = [sys.argv[0], 'a', 'b', 'c']
-        self.assertNotEqual(cdiff.main(), 0)
-
     def test_read_diff(self):
         sys.argv = sys.argv[:1]
         self._change_file('read_diff')