Merge branch 'log' of https://github.com/myint/cdiff

README.rst

     cdiff -s                    # view side by side
     cdiff -s -w 90              # use text width 90 other than default 80
 
+Read the log (e.g. ``git log -p``) in a svn, git, or hg workspace:
+
+.. code:: sh
+
+    cd proj-workspace
+    cdiff -l
+
 Pipe in a diff:
 
 .. code:: sh

cdiff.py

     raise SystemExit("*** Requires python >= 2.5.0")
 IS_PY3 = sys.hexversion >= 0x03000000
 
-import os
 import re
 import subprocess
 import errno
 
 # Keys for checking and values for diffing.
 REVISION_CONTROL = (
-    (['git', 'rev-parse'], ['git', 'diff']),
-    (['svn', 'info'], ['svn', 'diff']),
-    (['hg', 'summary'], ['hg', 'diff'])
+    (['git', 'rev-parse'], ['git', 'diff'], ['git', 'log', '--patch']),
+    (['svn', 'info'],      ['svn', 'diff'], ['svn', 'log', '--diff']),
+    (['hg',  'summary'],   ['hg',  'diff'], ['hg',  'log', '--patch'])
 )
 
 
 
 def revision_control_diff():
     """Return diff from revision control system."""
-    for check, diff in REVISION_CONTROL:
+    for check, diff, _ in REVISION_CONTROL:
         if check_command_status(check):
             return subprocess.Popen(diff, stdout=subprocess.PIPE).stdout
 
 
+def revision_control_log():
+    """Return log from revision control system."""
+    for check, _, log in REVISION_CONTROL:
+        if check_command_status(check):
+            return subprocess.Popen(log, stdout=subprocess.PIPE).stdout
+
+
 def decode(line):
     """Decode UTF-8 if necessary."""
     try:
 def main():
     import optparse
 
-    supported_vcs = [check[0] for check, _ in REVISION_CONTROL]
+    supported_vcs = [check[0][0] for check in REVISION_CONTROL]
 
     usage = """
   %prog [options]
             help='show in side-by-side mode')
     parser.add_option('-w', '--width', type='int', default=80, metavar='N',
             help='set text width (side-by-side mode only), default is 80')
+    parser.add_option('-l', '--log', action='store_true',
+                      help='show log from revision control (git, svn, hg)')
     opts, args = parser.parse_args()
 
-    if len(args) > 2:
+    if opts.log:
+        diff_hdl = revision_control_log()
+        if not diff_hdl:
+            sys.stderr.write(('*** Not in a supported workspace, supported '
+                              'are: %s\n\n') % ', '.join(supported_vcs))
+            parser.print_help()
+            return 1
+    elif len(args) > 2:
         parser.print_help()
         return 1
     elif len(args) == 2:

setup.py

 
 from __future__ import with_statement
 from distutils.core import setup
-import os
 from cdiff import META_INFO as _meta
 
 import sys