add git webshow; fix spacing bug for mixed binary/text diffs (#207)

Author: danvk

README.md

@@ -69,6 +69,12 @@ 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.
 
+You can also use `git webshow` in place of `git show` to show a single commit:
+
+    git webshow HEAD
+
+`git webshow REF` is shorthand for `git webdiff REF^..REF`.
+
 ## Configuration
 
 webdiff can be configured via [`git config`][git config]. To change the syntax highlighting theme, for example:

pyproject.toml

@@ -38,6 +38,7 @@ ruff = "^0.4.6"
 [tool.poetry.scripts]
 webdiff = "webdiff.app:run"
 git-webdiff = "webdiff.gitwebdiff:run"
+git-webshow = "webdiff.gitwebshow:run"
 
 [tool.ruff]
 line-length = 88

ts/FileList.tsx

@@ -15,6 +15,7 @@ export interface Props {
 export function FileList(props: Props) {
   const {filePairs, selectedIndex, fileChangeHandler} = props;
 
+  const anyWithDiffstats = filePairs.some(fp => fp.num_add !== null || fp.num_delete !== null);
   const maxDelta = React.useMemo(() => {
     return Math.max(1, ...filePairs.map(fp => (fp.num_add ?? 0) + (fp.num_delete ?? 0)));
   }, [filePairs]);
@@ -35,7 +36,13 @@ export function FileList(props: Props) {
       );
     return (
       <li key={idx}>
-        <SparkChart maxDelta={maxDelta} numAdd={filePair.num_add} numDelete={filePair.num_delete} />
+        {anyWithDiffstats ? (
+          <SparkChart
+            maxDelta={maxDelta}
+            numAdd={filePair.num_add}
+            numDelete={filePair.num_delete}
+          />
+        ) : null}
         <span title={filePair.type} className={`diff ${filePair.type}`} />
         {content}
       </li>
@@ -52,17 +59,14 @@ interface SparkChartProps {
 
 function SparkChart(props: SparkChartProps) {
   const {numAdd, numDelete, maxDelta} = props;
-  if (numAdd === null || numDelete === null) {
-    return null;
-  }
   return (
     <div className="spark">
-      {numDelete > 0 && (
+      {numDelete !== null && numDelete > 0 && (
         <div
           className="delete"
           style={{width: `${Math.round((100 * numDelete) / maxDelta)}%`}}></div>
       )}
-      {numAdd > 0 && (
+      {numAdd !== null && numAdd > 0 && (
         <div className="add" style={{width: `${Math.round((100 * numAdd) / maxDelta)}%`}}></div>
       )}
     </div>

webdiff/gitwebdiff.py

@@ -11,21 +11,21 @@ def any_nonflag_args(args):
     return len([x for x in args if not x.startswith('-')]) > 0
 
 
-def run():
+def run(argv):
     if os.environ.get('DEBUG'):
-        sys.stderr.write(f'git webdiff invoked as: {sys.argv}\n')
+        sys.stderr.write(f'git webdiff invoked as: {argv}\n')
 
     try:
         cmd = (
             'webdiff'
             if not os.environ.get('DEBUG')
             else os.path.join(os.path.curdir, 'test.sh')
         )
-        subprocess.call(f'git difftool -d -x {cmd}'.split(' ') + sys.argv[1:])
+        subprocess.call(f'git difftool -d -x {cmd}'.split(' ') + argv[1:])
     except KeyboardInterrupt:
         # Don't raise an exception to the user when sigint is received
         pass
 
 
 if __name__ == '__main__':
-    run()
+    run(sys.argv)

webdiff/gitwebshow.py

@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+"""git webshow REF is shorthand for git webdiff REF^..REF."""
+
+import os
+import sys
+
+from webdiff import gitwebdiff
+
+
+def run():
+    if os.environ.get('DEBUG'):
+        sys.stderr.write(f'git webshow invoked as: {sys.argv}\n')
+
+    obj = sys.argv.pop()
+
+    gitwebdiff.run([*sys.argv, f'{obj}^..{obj}'])
+
+
+if __name__ == '__main__':
+    run()