resolves icdiff module usage

.gitignore

@@ -0,0 +1,93 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Python template
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# dotenv
+.env
+
+# virtualenv
+.venv/
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+
+# Rope project settings
+.ropeproject
+

.travis.yml

@@ -0,0 +1,8 @@
+language: python
+sudo: false
+
+python:
+  - "2.7"
+
+script:
+  - ./test.sh python2

ChangeLog

@@ -1,3 +1,17 @@
+1.9.1
+	Works as python API. For example
+	>>> from icdiff import diff
+	>>> diff(pre, post)
+	python 3.x bug fixes
+
+
+1.9.0
+	Fix setup.py by symlinking icdiff to icdiff.py
+
+1.8.2
+	Add short flags for --highlight (-H), --line-numbers (-N), and --whole-file (-W).
+	Fix use with bash process substitution and other special files
+
 1.8.1
 	Updated remaining copy of unicode test file (b/1)
 

README.md

@@ -2,16 +2,18 @@
 
 Improved colored diff
 
+![screenshot](http://www.jefftk.com/icdiff-css-demo.png)
+
 ## Installation
 
-Download the [latest](releases/latest) `icdiff` binary and put it on your PATH.
+Download the [latest](https://github.com/jeffkaufman/icdiff/releases) `icdiff` binary and put it on your PATH.
 
 Alternatively, install with pip:
 ```
   pip install git+https://github.com/jeffkaufman/icdiff.git
 ```
 
-##Usage
+## Usage
 
 ```sh
 icdiff [options] left_file right_file
@@ -27,13 +29,13 @@ Show differences between files in a two column view.
                         only
   --encoding=ENCODING   specify the file encoding; defaults to utf8
   --head=HEAD           consider only the first N lines of each file
-  --highlight           color by changing the background color instead of the
+  -H, --highlight       color by changing the background color instead of the
                         foreground color.  Very fast, ugly, displays all
                         changes
   -L LABELS, --label=LABELS
                         override file labels with arbitrary tags. Use twice,
                         one for each file
-  --line-numbers        generate output with line numbers
+  -N, --line-numbers    generate output with line numbers
   --no-bold             use non-bold colors; recommended for with solarized
   --no-headers          don't label the left and right sides with their file
                         names
@@ -49,7 +51,7 @@ Show differences between files in a two column view.
   -U NUM, --unified=NUM, --numlines=NUM
                         how many lines of context to print; can't be combined
                         with --whole-file
-  --whole-file          show the whole file instead of just changed lines and
+  -W, --whole-file      show the whole file instead of just changed lines and
                         context
 ```
 
@@ -78,6 +80,21 @@ To try it out, run:
 svn diff --diff-cmd icdiff
 ```
 
+## Using with Mercurial
+
+Add the following to your `~/.hgrc`:
+
+```sh
+[extensions]
+extdiff=
+
+[extdiff]
+cmd.icdiff=icdiff
+opts.icdiff=--recursive --line-numbers
+```
+
+Or check more [in-depth setup instructions](http://ianobermiller.com/blog/2016/07/14/side-by-side-diffs-for-mercurial-hg-icdiff-revisited/).
+
 ## Running tests
 
 ```sh

icdiff

@@ -16,13 +16,13 @@ import os
 import sys
 import errno
 import difflib
-from optparse import Option, OptionParser
+from optparse import Option, OptionParser, BadOptionError
 import re
 import filecmp
 import unicodedata
 import codecs
 
-__version__ = "1.8.1"
+__version__ = "1.9.1"
 
 color_codes = {
     "red":     '\033[0;31m',
@@ -40,6 +40,7 @@ color_codes = {
     "cyan_bold":    '\033[1;36m',
 }
 
+
 class ConsoleDiff(object):
     """Console colored side by side comparison with change highlights.
 
@@ -114,7 +115,7 @@ class ConsoleDiff(object):
             line = line.replace(' ', '\0')
             # expand tabs into spaces
             line = line.expandtabs(self._tabsize)
-            # relace spaces from expanded tabs back into tab characters
+            # replace spaces from expanded tabs back into tab characters
             # (we'll replace them with markup after we do differencing)
             line = line.replace(' ', '\t')
             return line.replace('\0', ' ').rstrip('\n')
@@ -123,7 +124,7 @@ class ConsoleDiff(object):
         return fromlines, tolines
 
     def _display_len(self, s):
-        # Handle wide characters like chinese.
+        # Handle wide characters like Chinese.
         def width(c):
             if ((isinstance(c, type(u"")) and
                  unicodedata.east_asian_width(c) == 'W')):
@@ -407,11 +408,13 @@ class ConsoleDiff(object):
 def simple_colorize(s, chosen_color):
     return "%s%s%s" % (color_codes[chosen_color], s, color_codes["none"])
 
+
 def replace_all(replacements, string):
     for search, replace in replacements.items():
         string = string.replace(search, replace)
     return string
 
+
 class MultipleOption(Option):
     ACTIONS = Option.ACTIONS + ("extend",)
     STORE_ACTIONS = Option.STORE_ACTIONS + ("extend",)
@@ -425,9 +428,24 @@ class MultipleOption(Option):
             Option.take_action(self, action, dest, opt, value, values, parser)
 
 
-def start():
+class PassThroughOptionParser(OptionParser):
+
+    def _process_long_opt(self, rargs, values):
+        try:
+            OptionParser._process_long_opt(self, rargs, values)
+        except BadOptionError as err:
+            self.largs.append(err.opt_str)
+
+    def _process_short_opts(self, rargs, values):
+        try:
+            OptionParser._process_short_opts(self, rargs, values)
+        except BadOptionError as err:
+            self.largs.append(err.opt_str)
+
+
+def get_options():
     # If you change any of these, also update README.
-    parser = OptionParser(usage="usage: %prog [options] left_file right_file",
+    parser = PassThroughOptionParser(usage="usage: %prog [options] left_file right_file",
                           version="icdiff version %s" % __version__,
                           description="Show differences between files in a "
                           "two column view.",
@@ -439,7 +457,7 @@ def start():
                       help="specify the file encoding; defaults to utf8")
     parser.add_option("--head", default=0,
                       help="consider only the first N lines of each file")
-    parser.add_option("--highlight", default=False,
+    parser.add_option("-H", "--highlight", default=False,
                       action="store_true",
                       help="color by changing the background color instead of "
                       "the foreground color.  Very fast, ugly, displays all "
@@ -450,7 +468,7 @@ def start():
                       dest='labels',
                       help="override file labels with arbitrary tags. "
                       "Use twice, one for each file")
-    parser.add_option("--line-numbers", default=False,
+    parser.add_option("-N", "--line-numbers", default=False,
                       action="store_true",
                       help="generate output with line numbers")
     parser.add_option("--no-bold", default=False,
@@ -480,19 +498,12 @@ def start():
                       metavar="NUM",
                       help="how many lines of context to print; "
                       "can't be combined with --whole-file")
-    parser.add_option("--whole-file", default=False,
+    parser.add_option("-W", "--whole-file", default=False,
                       action="store_true",
                       help="show the whole file instead of just changed "
                       "lines and context")
 
     (options, args) = parser.parse_args()
-
-    if len(args) != 2:
-        parser.print_help()
-        sys.exit()
-
-    a, b = args
-
     if not options.cols:
         def ioctl_GWINSZ(fd):
             try:
@@ -509,8 +520,21 @@ def start():
             options.cols = cr[1]
         else:
             options.cols = 80
+    return options, args, parser
+
+
+def validate_has_two_arguments(parser, args):
+    if len(args) != 2:
+        parser.print_help()
+        sys.exit()
+
+
+def start():
+    options, args, parser = get_options()
+    validate_has_two_arguments(parser, args)
+    a, b = args
+    diff(a, b, options=options)
 
-    diff(options, a, b)
 
 def codec_print(s, options):
     s = "%s\n" % s
@@ -520,15 +544,29 @@ def codec_print(s, options):
         sys.stdout.write(s.encode(options.output_encoding))
 
 
-def diff(options, a, b):
+def diff(a, b, options=None):
+    if options is None:
+        options = get_options()[0]
+
     def print_meta(s):
         codec_print(simple_colorize(s, "magenta"), options)
 
-    if os.path.isfile(a) and os.path.isfile(b):
-        if not filecmp.cmp(a, b, shallow=False):
-            diff_files(options, a, b)
+    # Don't use os.path.isfile; it returns False for file-like entities like
+    # bash's process substitution (/dev/fd/N).
+    is_a_file = not os.path.isdir(a)
+    is_b_file = not os.path.isdir(b)
+
+    if is_a_file and is_b_file:
+        try:
+            if not filecmp.cmp(a, b, shallow=False):
+                diff_files(options, a, b)
+        except OSError as ex:
+            if ex.errno == errno.ENOENT:
+                print_meta("error: file '%s' was not found" % ex.filename)
+            else:
+                raise ex
 
-    elif os.path.isdir(a) and os.path.isdir(b):
+    elif not is_a_file and not is_b_file:
         a_contents = set(os.listdir(a))
         b_contents = set(os.listdir(b))
 
@@ -538,15 +576,15 @@ def diff(options, a, b):
             elif child not in a_contents:
                 print_meta("Only in %s: %s" % (b, child))
             elif options.recursive:
-                diff(options,
-                     os.path.join(a, child),
-                     os.path.join(b, child))
-    elif os.path.isdir(a) and os.path.isfile(b):
+                diff(os.path.join(a, child),
+                     os.path.join(b, child), options)
+    elif not is_a_file and is_b_file:
         print_meta("File %s is a directory while %s is a file" % (a, b))
 
-    elif os.path.isfile(a) and os.path.isdir(b):
+    elif is_a_file and not is_b_file:
         print_meta("File %s is a file while %s is a directory" % (a, b))
 
+
 def read_file(fname, options):
     try:
         with codecs.open(fname, encoding=options.encoding, mode="rb") as inf:
@@ -609,3 +647,4 @@ if __name__ == "__main__":
             pass
         else:
             raise
+

icdiff.py

@@ -0,0 +1 @@
+icdiff