Merge pull request #33 from bakfile:ChanceNCounter/bak-diff-using-program

Closes #32

Author: ChanceNCounter

bak/__main__.py

@@ -65,7 +65,9 @@ def bak_off(filename, quietly):
 
 
 @bak.command("show", help="View a .bakfile in an external program")
-@click.option("--using", "--in", help="Program to open (default: $PAGER or less)", required=False)
+@click.option("--using", "--in",
+              help="Program to open (default: $PAGER or less)",
+              required=False)
 @click.argument("filename", required=True, type=click.Path(exists=True))
 def bak_print(filename, using):
     commands.bak_print_cmd(filename, using)
@@ -83,9 +85,12 @@ def bak_get(to_where_you_once_belonged):
 
 
 @bak.command("diff")
+@click.option("--using", "--in",
+              help="Program to use instead of system diff",
+              required=False)
 @click.argument("filename", required=True, type=click.Path(exists=True))
-def bak_diff(filename):
-    commands.bak_diff_cmd(filename)
+def bak_diff(filename, using):
+    commands.bak_diff_cmd(filename, command=using)
 
 
 if __name__ == "__main__":

bak/commands/__init__.py

@@ -247,7 +247,8 @@ def bak_getfile_cmd(bak_to_get: (str, bakfile.BakFile)):
         click.echo(bak_to_get.bakfile_loc)
 
 
-def bak_diff_cmd(filename):
-    # TODO configurable diff executable
+def bak_diff_cmd(filename, command='diff'):
+    # TODO write tests for this (mildly tricky)
     bak_to_diff = _get_bakfile_entry(expandpath(filename))
-    call(['diff', bak_to_diff.bakfile_loc, bak_to_diff.orig_abspath])
+    call([command if command else 'diff',
+          bak_to_diff.bakfile_loc, bak_to_diff.orig_abspath])