webdiff 0.16.0__tar.gz → 1.0.1__tar.gz

webdiff-1.0.1/PKG-INFO

@@ -0,0 +1,210 @@
+Metadata-Version: 2.1
+Name: webdiff
+Version: 1.0.1
+Summary: Two-column web-based git difftool
+Home-page: https://github.com/danvk/webdiff/
+Author: Dan Vanderkam
+Author-email: danvdk@gmail.com
+Classifier: Environment :: Console
+Classifier: Environment :: Web Environment
+Classifier: Framework :: Flask
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Topic :: Software Development :: Version Control
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: binaryornot
+Requires-Dist: flask==2.2.2
+Requires-Dist: pillow
+Requires-Dist: requests
+Requires-Dist: PyGithub==1.55
+Requires-Dist: unidiff==0.7.4
+Requires-Dist: Werkzeug==2.2.2
+
+# git webdiff
+
+Two-column web-based git difftool.
+
+<p align="center">
+  <a href="https://pypi.org/project/webdiff/" target="_blank"><img alt="PyPI - Version" src="https://img.shields.io/pypi/v/webdiff" /></a>
+  <a href="https://dl.circleci.com/status-badge/redirect/gh/danvk/webdiff/tree/master" target="_blank"><img alt="CircleCI 📝" src="https://dl.circleci.com/status-badge/img/gh/danvk/webdiff/tree/master.svg?style=svg" /></a>
+  <a href="https://github.com/danvk/webdiff/blob/master/LICENSE" target="_blank"><img alt="License: Apache2 📝" src="https://img.shields.io/github/license/danvk/webdiff" /></a>
+  <a href="https://github.com/sponsors/danvk" target="_blank"><img alt="Sponsor: On GitHub 💸" src="https://img.shields.io/badge/sponsor-on_github_💸-21bb42.svg" /></a>
+</p>
+
+Features include:
+
+* Side-by-side (two column) diff view
+* Runs in the browser of your choice on any platform.
+* Syntax highlighting via highlight.js
+* Step back and forth through multiple files in a single diff
+* Rich support for image diffs
+
+<!-- These are absolute URLs so that they display on pypi.org -->
+<!-- This is `git webdiff 05157bba^..05157bba`, in this repo -->
+![Screenshot of webdiff in action](https://raw.githubusercontent.com/danvk/webdiff/master/images/webdiff.png)
+
+<!-- This is `git webdiff c80f969^..c80f969` in the dygraphs-dpxdt repo -->
+![Screenshot of image diffs](https://raw.githubusercontent.com/danvk/webdiff/master/images/webdiff-images.png)
+
+## Installation
+
+    pip install webdiff
+
+or, if you prefer [Homebrew]:
+
+    brew install danvk/webdiff/webdiff
+
+(the latter will also install [ImageMagick] as a recommended dependency.)
+
+## Usage
+
+Instead of running "git diff", run:
+
+    git webdiff
+
+You can also start webdiff via:
+
+    git webdiff [args]
+
+You can pass all the same arguments that you would to `git diff`, e.g.
+`1234..5678` or `HEAD`.
+
+`webdiff` can also be invoked directly to diff two directories or files:
+
+    webdiff <left_dir> <right_dir>
+    webdiff <left_file> <right_file>
+
+You can also use `webdiff` to view GitHub pull requests:
+
+    webdiff https://github.com/owner/repo/pull/123
+    webdiff '#123'  # if you're in a git repo with a github remote
+
+This will download the files relevant to the Pull Request and run `webdiff`.
+
+If you run into GitHub API quota limits or you'd like to use webdiff with
+private repos, you can set your credentials in a `.githubrc` file:
+
+    user.login: yourusername
+    user.token: your-personal-access-tokens
+
+Make sure you chmod this file to only be readable by yourself. You can generate
+a personal access token for webdiff via github.com → profile → Settings →
+Personal access tokens. Make sure to grant all the "repo" privileges.
+
+## Configuration
+
+webdiff can be configured via [`git config`][git config]. To change the syntax highlighting theme, for example:
+
+    git config webdiff.theme rainbow
+
+(You can find a list of supported themes in the [themes] directory.)
+
+As with any git configuration setting, these can be set globally or per-repo.
+
+Options are:
+
+| Setting        | Default       | Notes  |
+| -------------- | ------------- | ------ |
+| webdiff.theme  | googlecode    | Syntax highlighting theme (see [themes] directory). |
+| webdiff.port   | -1            | Port on which to serve webdiff. Default is random open port. This can be overridden with the `--port` command line flag or the `WEBDIFF_PORT` environment variable. |
+| webdiff.host   | localhost     | Host name on which to serve the webdiff UI. Use `0.0.0.0` to serve publicly. The special value `<hostname>` uses your computer's network name. This can be overridden with the `--host` command line flag or the `WEBDIFF_HOST` environment variable. |
+| webdiff.maxDiffWidth | 100 | Maximum length of lines in the diff display. After this width, lines will wrap. |
+| webdiff.unified | 8 | Lines of context to display by default (`git diff -U`) |
+| webdiff.extraDirDiffArgs | "" | Any extra arguments to pass to `git diff` when diffing directories. |
+| webdiff.extraFileDiffArgs | "" | Any extra arguments to pass to `git diff` when diffing files. |
+| webdiff.openBrowser | true | Whether to automatically open the browser UI when you run webdiff. |
+| webdiff.maxLinesForSyntax | 10000 | Maximum lines in file to do syntax highlighting. |
+| webdiff.colors.delete | #fee | CSS background color for delete (left) lines |
+| webdiff.colors.insert | #efe | CSS background color for insert (right) lines |
+| webdiff.colors.charDelete | #fcc | CSS background color for deleted characters in a delete (left) line |
+| webdiff.colors.charInsert | #cfc | CSS background color for inserted characters in an insert (right) line |
+
+## Development
+
+    python3 -m venv venv
+    source venv/bin/activate
+    pip install -r requirements.txt
+    cd ts
+    yarn
+    # see https://github.com/webpack/webpack/issues/14532
+    NODE_OPTIONS=--openssl-legacy-provider webpack
+
+Then from the root directory:
+
+    PYTHONPATH=. ./webdiff/app.py testdata/dygraphsjs/{left,right}
+
+or to launch in debug mode:
+
+    ./test.sh $(pwd)/testdata/manyfiles/{left,right}
+
+(or any other directory in testdata)
+
+To run the Python tests:
+
+    pytest
+
+To format the code, run:
+
+    ./scripts/black.sh
+    cd ts
+    yarn prettier
+
+To debug `git webdiff`, run:
+
+    WEBDIFF_CONFIG=$(pwd)/testing.cfg ./webdiff/gitwebdiff.py
+
+To iterate on the PyPI package, run:
+
+    # from outside the webdiff virtualenv:
+    pip3 uninstall webdiff
+
+    # from inside the webdiff virtualenv, adjust for current version
+    python setup.py sdist
+    mkdir /tmp/webdiff-test
+    cp dist/webdiff-?.?.?.tar.gz /tmp/webdiff-test
+
+    deactivate
+    cd /tmp/webdiff-test
+    pip3 install webdiff-?.?.?.tar.gz
+
+To publish to pypitest:
+
+    pip install --upgrade wheel setuptools twine
+    python setup.py sdist bdist_wheel
+    twine upload -r testpypi dist/*
+
+And to the real pypi:
+
+    twine upload dist/*
+
+See [pypirc][] docs for details on setting up `~/.pypirc`.
+
+## Implementation notes
+
+webdiff doesn't calculate any diffs itself. Instead, it relies on `git diff`. This is possible because `git diff` has a `--no-index` mode that allows it to operate outside of a git repository. Of course, this means that you need to have `git` installed to use webdiff!
+
+When you run `webdiff dir1 dir2`, webdiff runs:
+
+    git diff --raw --no-index dir1 dir2
+
+To ask `git` which files are adds, removes, renames and changes. Then, when it's serving the web UI for a particular diff, it runs:
+
+    git diff --no-index (diff args) file1 file2
+
+This produces a patch, which is what the web UI renders. (It also needs both full files for syntax highlighting.)
+
+When you run `git webdiff (args)`, it runs:
+
+    git difftool -d -x webdiff (args)
+
+This tells `git` to set up two directories and invoke `webdiff leftdir rightdir`.
+
+There's one complication involving symlinks. `git difftool -d` may fill one of the sides (typically the right) with symlinks. This is faster than copying files, but unfortunately `git diff --no-index` does not resolve these symlinks. To make this work, if a directory contains symlinks, webdiff makes a copy of it before diffing. For file diffs, it resolves the symlink before passing it to `git diff --no-index`. The upshot is that you can run `git webdiff`, edit a file, reload the browser window and see the changes.
+
+[pypirc]: https://packaging.python.org/specifications/pypirc/
+[Homebrew]: https://brew.sh/
+[ImageMagick]: https://imagemagick.org/index.php
+[git config]: https://git-scm.com/docs/git-config
+[themes]: http://example.com

webdiff-1.0.1/README.md

@@ -0,0 +1,186 @@
+# git webdiff
+
+Two-column web-based git difftool.
+
+<p align="center">
+  <a href="https://pypi.org/project/webdiff/" target="_blank"><img alt="PyPI - Version" src="https://img.shields.io/pypi/v/webdiff" /></a>
+  <a href="https://dl.circleci.com/status-badge/redirect/gh/danvk/webdiff/tree/master" target="_blank"><img alt="CircleCI 📝" src="https://dl.circleci.com/status-badge/img/gh/danvk/webdiff/tree/master.svg?style=svg" /></a>
+  <a href="https://github.com/danvk/webdiff/blob/master/LICENSE" target="_blank"><img alt="License: Apache2 📝" src="https://img.shields.io/github/license/danvk/webdiff" /></a>
+  <a href="https://github.com/sponsors/danvk" target="_blank"><img alt="Sponsor: On GitHub 💸" src="https://img.shields.io/badge/sponsor-on_github_💸-21bb42.svg" /></a>
+</p>
+
+Features include:
+
+* Side-by-side (two column) diff view
+* Runs in the browser of your choice on any platform.
+* Syntax highlighting via highlight.js
+* Step back and forth through multiple files in a single diff
+* Rich support for image diffs
+
+<!-- These are absolute URLs so that they display on pypi.org -->
+<!-- This is `git webdiff 05157bba^..05157bba`, in this repo -->
+![Screenshot of webdiff in action](https://raw.githubusercontent.com/danvk/webdiff/master/images/webdiff.png)
+
+<!-- This is `git webdiff c80f969^..c80f969` in the dygraphs-dpxdt repo -->
+![Screenshot of image diffs](https://raw.githubusercontent.com/danvk/webdiff/master/images/webdiff-images.png)
+
+## Installation
+
+    pip install webdiff
+
+or, if you prefer [Homebrew]:
+
+    brew install danvk/webdiff/webdiff
+
+(the latter will also install [ImageMagick] as a recommended dependency.)
+
+## Usage
+
+Instead of running "git diff", run:
+
+    git webdiff
+
+You can also start webdiff via:
+
+    git webdiff [args]
+
+You can pass all the same arguments that you would to `git diff`, e.g.
+`1234..5678` or `HEAD`.
+
+`webdiff` can also be invoked directly to diff two directories or files:
+
+    webdiff <left_dir> <right_dir>
+    webdiff <left_file> <right_file>
+
+You can also use `webdiff` to view GitHub pull requests:
+
+    webdiff https://github.com/owner/repo/pull/123
+    webdiff '#123'  # if you're in a git repo with a github remote
+
+This will download the files relevant to the Pull Request and run `webdiff`.
+
+If you run into GitHub API quota limits or you'd like to use webdiff with
+private repos, you can set your credentials in a `.githubrc` file:
+
+    user.login: yourusername
+    user.token: your-personal-access-tokens
+
+Make sure you chmod this file to only be readable by yourself. You can generate
+a personal access token for webdiff via github.com → profile → Settings →
+Personal access tokens. Make sure to grant all the "repo" privileges.
+
+## Configuration
+
+webdiff can be configured via [`git config`][git config]. To change the syntax highlighting theme, for example:
+
+    git config webdiff.theme rainbow
+
+(You can find a list of supported themes in the [themes] directory.)
+
+As with any git configuration setting, these can be set globally or per-repo.
+
+Options are:
+
+| Setting        | Default       | Notes  |
+| -------------- | ------------- | ------ |
+| webdiff.theme  | googlecode    | Syntax highlighting theme (see [themes] directory). |
+| webdiff.port   | -1            | Port on which to serve webdiff. Default is random open port. This can be overridden with the `--port` command line flag or the `WEBDIFF_PORT` environment variable. |
+| webdiff.host   | localhost     | Host name on which to serve the webdiff UI. Use `0.0.0.0` to serve publicly. The special value `<hostname>` uses your computer's network name. This can be overridden with the `--host` command line flag or the `WEBDIFF_HOST` environment variable. |
+| webdiff.maxDiffWidth | 100 | Maximum length of lines in the diff display. After this width, lines will wrap. |
+| webdiff.unified | 8 | Lines of context to display by default (`git diff -U`) |
+| webdiff.extraDirDiffArgs | "" | Any extra arguments to pass to `git diff` when diffing directories. |
+| webdiff.extraFileDiffArgs | "" | Any extra arguments to pass to `git diff` when diffing files. |
+| webdiff.openBrowser | true | Whether to automatically open the browser UI when you run webdiff. |
+| webdiff.maxLinesForSyntax | 10000 | Maximum lines in file to do syntax highlighting. |
+| webdiff.colors.delete | #fee | CSS background color for delete (left) lines |
+| webdiff.colors.insert | #efe | CSS background color for insert (right) lines |
+| webdiff.colors.charDelete | #fcc | CSS background color for deleted characters in a delete (left) line |
+| webdiff.colors.charInsert | #cfc | CSS background color for inserted characters in an insert (right) line |
+
+## Development
+
+    python3 -m venv venv
+    source venv/bin/activate
+    pip install -r requirements.txt
+    cd ts
+    yarn
+    # see https://github.com/webpack/webpack/issues/14532
+    NODE_OPTIONS=--openssl-legacy-provider webpack
+
+Then from the root directory:
+
+    PYTHONPATH=. ./webdiff/app.py testdata/dygraphsjs/{left,right}
+
+or to launch in debug mode:
+
+    ./test.sh $(pwd)/testdata/manyfiles/{left,right}
+
+(or any other directory in testdata)
+
+To run the Python tests:
+
+    pytest
+
+To format the code, run:
+
+    ./scripts/black.sh
+    cd ts
+    yarn prettier
+
+To debug `git webdiff`, run:
+
+    WEBDIFF_CONFIG=$(pwd)/testing.cfg ./webdiff/gitwebdiff.py
+
+To iterate on the PyPI package, run:
+
+    # from outside the webdiff virtualenv:
+    pip3 uninstall webdiff
+
+    # from inside the webdiff virtualenv, adjust for current version
+    python setup.py sdist
+    mkdir /tmp/webdiff-test
+    cp dist/webdiff-?.?.?.tar.gz /tmp/webdiff-test
+
+    deactivate
+    cd /tmp/webdiff-test
+    pip3 install webdiff-?.?.?.tar.gz
+
+To publish to pypitest:
+
+    pip install --upgrade wheel setuptools twine
+    python setup.py sdist bdist_wheel
+    twine upload -r testpypi dist/*
+
+And to the real pypi:
+
+    twine upload dist/*
+
+See [pypirc][] docs for details on setting up `~/.pypirc`.
+
+## Implementation notes
+
+webdiff doesn't calculate any diffs itself. Instead, it relies on `git diff`. This is possible because `git diff` has a `--no-index` mode that allows it to operate outside of a git repository. Of course, this means that you need to have `git` installed to use webdiff!
+
+When you run `webdiff dir1 dir2`, webdiff runs:
+
+    git diff --raw --no-index dir1 dir2
+
+To ask `git` which files are adds, removes, renames and changes. Then, when it's serving the web UI for a particular diff, it runs:
+
+    git diff --no-index (diff args) file1 file2
+
+This produces a patch, which is what the web UI renders. (It also needs both full files for syntax highlighting.)
+
+When you run `git webdiff (args)`, it runs:
+
+    git difftool -d -x webdiff (args)
+
+This tells `git` to set up two directories and invoke `webdiff leftdir rightdir`.
+
+There's one complication involving symlinks. `git difftool -d` may fill one of the sides (typically the right) with symlinks. This is faster than copying files, but unfortunately `git diff --no-index` does not resolve these symlinks. To make this work, if a directory contains symlinks, webdiff makes a copy of it before diffing. For file diffs, it resolves the symlink before passing it to `git diff --no-index`. The upshot is that you can run `git webdiff`, edit a file, reload the browser window and see the changes.
+
+[pypirc]: https://packaging.python.org/specifications/pypirc/
+[Homebrew]: https://brew.sh/
+[ImageMagick]: https://imagemagick.org/index.php
+[git config]: https://git-scm.com/docs/git-config
+[themes]: http://example.com

{webdiff-0.16.0 → webdiff-1.0.1}/setup.py

@@ -6,7 +6,7 @@ with open('README.md', encoding='utf8') as fh:
 
 
 setup(name='webdiff',
-      version='0.16.0',
+      version='1.0.1',
       description='Two-column web-based git difftool',
       long_description=long_description,
       long_description_content_type='text/markdown',
@@ -25,7 +25,9 @@ setup(name='webdiff',
           'flask==2.2.2',
           'pillow',
           'requests',
-          'PyGithub==1.55'
+          'PyGithub==1.55',
+          'unidiff==0.7.4',
+          'Werkzeug==2.2.2',
       ],
       include_package_data=True,
       package_data = {

{webdiff-0.16.0 → webdiff-1.0.1}/webdiff/app.py

@@ -4,7 +4,6 @@
 For usage, see README.md.
 '''
 
-from __future__ import print_function
 from binaryornot.check import is_binary
 import logging
 import mimetypes
@@ -30,8 +29,9 @@ from flask import (
 from webdiff import diff
 from webdiff import util
 from webdiff import argparser
+from webdiff import options
 
-VERSION = '0.16.0'
+VERSION = '1.0.1'
 
 
 def determine_path():
@@ -61,6 +61,7 @@ app = Flask(__name__)
 app.config.from_object(Config)
 app.config.from_envvar('WEBDIFF_CONFIG', silent=True)
 
+GIT_CONFIG = {}
 DIFF = None
 PORT = None
 HOSTNAME = 'localhost'
@@ -192,7 +193,11 @@ def file_diff(idx):
     idx = int(idx)
     pairs = diff.get_thin_list(DIFF)
     return render_template(
-        'file_diff.html', idx=idx, has_magick=util.is_imagemagick_available(), pairs=pairs
+        'file_diff.html',
+        idx=idx,
+        has_magick=util.is_imagemagick_available(),
+        pairs=pairs,
+        git_config=GIT_CONFIG,
     )
 
 
@@ -202,6 +207,16 @@ def thick_diff(idx):
     return jsonify(diff.get_thick_dict(DIFF[idx]))
 
 
+@app.route('/diff/<int:idx>', methods=['POST'])
+def get_diff_ops(idx):
+    idx = int(idx)
+    options = request.json.get('options')
+    extra_args = GIT_CONFIG['webdiff']['extraFileDiffArgs']
+    if extra_args:
+        options += extra_args.split(' ')
+    return jsonify(diff.get_diff_ops(DIFF[idx], options))
+
+
 @app.route('/favicon.ico')
 def favicon():
     return send_from_directory(
@@ -211,6 +226,18 @@ def favicon():
     )
 
 
+@app.route('/theme.css')
+def theme():
+    theme = GIT_CONFIG['webdiff']['theme']
+    theme_dir = os.path.dirname(theme)
+    theme_file = os.path.basename(theme)
+    return send_from_directory(
+        os.path.join(*([app.root_path, 'static/css/themes'] + ([theme_dir] if theme_dir else []))),
+        theme_file + '.css',
+        mimetype='text/css',
+    )
+
+
 # See https://stackoverflow.com/a/69812984/388951
 exiting = False
 
@@ -250,7 +277,8 @@ def kill():
 def open_browser():
     global PORT
     global HOSTNAME
-    if not 'NO_OPEN_BROWSER' in app.config:
+    global GIT_CONFIG
+    if GIT_CONFIG['webdiff']['openBrowser']:
         if is_hot_reload():
             log.debug('Skipping browser open on reload')
         else:
@@ -262,12 +290,17 @@ def usage_and_die():
     sys.exit(1)
 
 
-def pick_a_port(args):
-    if 'port' in args != -1:
+def pick_a_port(args, webdiff_config):
+    if 'port' in args:
         return args['port']
 
-    if os.environ.get('WEBDIFF_PORT'):
-        return int(os.environ.get('WEBDIFF_PORT'))
+    env_port = os.environ.get('WEBDIFF_PORT')
+    if env_port:
+        return int(env_port)
+
+    # gitconfig
+    if webdiff_config['port'] != -1:
+        return webdiff_config['port']
 
     sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     sock.bind(('localhost', 0))
@@ -290,25 +323,34 @@ def is_webdiff_from_head():
 
 
 def run():
-    global DIFF, PORT, HOSTNAME
+    global DIFF, PORT, HOSTNAME, GIT_CONFIG
     try:
         parsed_args = argparser.parse(sys.argv[1:], VERSION)
     except argparser.UsageError as e:
         sys.stderr.write('Error: %s\n\n' % e)
         usage_and_die()
 
-    DIFF = argparser.diff_for_args(parsed_args)
+    GIT_CONFIG = options.get_config()
+    WEBDIFF_CONFIG = GIT_CONFIG['webdiff']
+    DIFF = argparser.diff_for_args(parsed_args, WEBDIFF_CONFIG)
 
     if app.config['TESTING'] or app.config['DEBUG']:
-        sys.stderr.write('Diff:\n%s' % DIFF)
-
-    PORT = pick_a_port(parsed_args)
-
-    if app.config.get('USE_HOSTNAME'):
+        sys.stderr.write('Invoked as: %s\n' % sys.argv)
+        sys.stderr.write('Args: %s\n' % parsed_args)
+        sys.stderr.write('Diff: %s\n' % DIFF)
+        sys.stderr.write('GitConfig: %s\n' % GIT_CONFIG)
+
+    PORT = pick_a_port(parsed_args, WEBDIFF_CONFIG)
+    HOSTNAME = (
+        parsed_args.get('host')
+        or os.environ.get('WEBDIFF_HOST')
+        or WEBDIFF_CONFIG['host']
+    )
+    if HOSTNAME == '<hostname>':
         _hostname = platform.node()
         # platform.node will return empty string if it can't find the hostname
         if not _hostname:
-            sys.stderr.write('Warning: hostname could not be determined')
+            sys.stderr.write('Warning: hostname could not be determined\n')
         else:
             HOSTNAME = _hostname
 

{webdiff-0.16.0 → webdiff-1.0.1}/webdiff/argparser.py

@@ -31,15 +31,23 @@ def parse(args, version=None):
     """Returns {port, dirs: [], files: [], pr: {owner, repo, number}}."""
     parser = argparse.ArgumentParser(description='Run webdiff.', usage=USAGE)
     parser.add_argument('--version', action='version', version='webdiff %s' % version)
+    parser.add_argument(
+        '--host', type=str,
+        help="Host name on which to serve webdiff UI. Default is localhost.",
+        default=None
+    )
     parser.add_argument('--port', '-p', type=int, help="Port to run webdiff on.", default=-1)
     parser.add_argument(
         'dirs', type=str, nargs='+', help="Directories to diff, or a github pull request URL."
     )
     args = parser.parse_args(args=args)
 
+    # TODO: convert out to a dataclass
     out = {}
     if args.port != -1:
         out['port'] = args.port
+    if args.host:
+        out['host'] = args.host
 
     if len(args.dirs) > 2:
         raise UsageError('You must specify two files/dirs (got %d)' % len(args.dirs))
@@ -54,8 +62,8 @@ def parse(args, version=None):
         # Or perhaps something simpler like '#292'?
         m = re.match(PULL_REQUEST_NUM_RE, args.dirs[0])
         if m:
-            num = int(m.group(1))
-            owner, repo, num = github_fetcher.get_pr_repo(num)
+            num = m.group(1)
+            owner, repo, num = github_fetcher.get_pr_repo(int(num))
 
         if not owner:
             raise UsageError(
@@ -87,16 +95,21 @@ def parse(args, version=None):
 
 # TODO: move into dirdiff?
 def _shim_for_file_diff(a_file, b_file):
-    '''Sets A_DIR, B_DIR and DIFF to do a one-file diff.'''
+    '''Returns a LocalFileDiff object for a one-file diff.'''
     return LocalFileDiff(
-        os.path.dirname(a_file), a_file, os.path.dirname(b_file), b_file, False
-    )  # probably not a move
+        a_root=os.path.dirname(a_file),
+        a_path=a_file,
+        b_root=os.path.dirname(b_file),
+        b_path=b_file,
+        is_move=False,  # probably not a move
+    )
 
 
-def diff_for_args(args):
+def diff_for_args(args, webdiff_config):
     '''Returns a list of Diff objects for parsed command line args.'''
     if 'dirs' in args:
-        return dirdiff.diff(*args['dirs'])
+        # return dirdiff.diff(*args['dirs'])
+        return dirdiff.gitdiff(*args['dirs'], webdiff_config)
 
     if 'files' in args:
         return [_shim_for_file_diff(*args['files'])]