pyDiffTools 0.1.28__tar.gz → 0.1.30__tar.gz

{pydifftools-0.1.28/pyDiffTools.egg-info → pydifftools-0.1.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyDiffTools
-Version: 0.1.28
+Version: 0.1.30
 Summary: Diff tools
 Author: J M Franck
 License: Copyright (c) 2015, jmfranck
@@ -34,6 +34,8 @@ License: Copyright (c) 2015, jmfranck
         
 Description-Content-Type: text/x-rst
 License-File: LICENSE.md
+Requires-Dist: numpy
+Requires-Dist: Pillow
 Requires-Dist: selenium
 Requires-Dist: fuzzywuzzy[speedup]
 Requires-Dist: PyYAML>=6.0
@@ -41,11 +43,14 @@ Requires-Dist: watchdog
 Requires-Dist: pydot
 Requires-Dist: python-dateutil
 Requires-Dist: jinja2
+Requires-Dist: ipykernel
+Requires-Dist: matplotlib
 Requires-Dist: nbformat
 Requires-Dist: nbconvert
 Requires-Dist: pygments
 Requires-Dist: ansi2html
 Requires-Dist: lxml
+Requires-Dist: PySide6
 Dynamic: license-file
 
 pydifftools
@@ -106,10 +111,32 @@ included are (listed in order of fun/utility):
   ``_build``/``_display`` directories; with ``--watch`` it starts the HTTP
   server and automatically rebuilds the staged fragments whenever you edit
   a ``.qmd`` file.
-- `pydifft gd [git diff args...]` shows the same Qt review table as the old
+- ``pydifft tree`` (or ``git tree`` with the alias installed) opens the last
+  40 commits across all branches, in Git date order. Use the down arrow
+  below the history to add the next 40 commits. Colors follow
+  first-parent ancestry; merged branches join the receiving branch.
+  Tags and branch tips have vector icon badges; hashes appear on hover.
+  Click any part of a commit row
+  to compare with the working directory, or right-click to copy its hash
+  or set a commit as the comparison endpoint. The right-click menu can restore
+  the working-directory endpoint. Diff window titles show the equivalent
+  arguments, preferring tags, then branch names, then six-character hashes.
+  Run ``pydifft tree --install`` to add the matching ``git tree`` alias.
+- ``pydifft gd`` (or ``git gd`` with the alias installed) reviews unstaged
+  changes, like bare ``git diff``.
+  ``pydifft gd [git diff args...]`` shows the same Qt review table as the old
   ``git_gd_qt.py`` helper before launching ``git difftool`` for a selected
-  file.  Run ``pydifft gd --install`` to add the matching ``git gd`` alias
-  to your global git config.
+  file.
+  Image rows are scored in the background and displayed as normalized
+  ``rgb X.X a X.X`` RMS changes; RGB change orders the image rows as scores
+  arrive.
+  Raster images open in a Qt viewer that aligns the old and new image,
+  displays their RGB difference, and uses up/down controls to switch
+  among the original, difference, and aligned new image. Images with an
+  alpha channel are displayed over a checkerboard; when transparency
+  changes, an additional red/blue alpha-difference view is included.
+  Run ``pydifft gd --install`` to add the matching ``git gd`` alias to
+  your global git config.
 - `pydifft qmdinit [directory]` scaffolds a new Quarto-style project using
   the bundled templates and example ``project1`` hierarchy, then downloads
   MathJax into ``_template/mathjax`` so the builder can run immediately.
@@ -120,12 +147,20 @@ included are (listed in order of fun/utility):
   wrapping, ideal for when you are
   working on manuscripts that you
   are version tracking with git.
+  Headers, fenced code blocks, and Pandoc tables retain their formatting.
+  Display-math delimiters get their own lines while equation contents retain
+  their wrapping; inline-math boundaries are preferred places to wrap prose.
 - `pydifft wmatch` ("whitespace match"): a script that matches whitespace between two text files.
 
     * pandoc can convert between markdown/latex/word, but doing this messes with your whitespace and gvimdiff comparisons.
 
     * this allows you to use an original file with good whitespace formatting as a "template" that you can match other (e.g. pandoc converted file) onto another
 
+    * changed prose lines exceeding 1.5 times the nearby reference width are
+      wrapped using the same sentence and punctuation rules as ``wr``.
+      Existing surrounding line breaks are retained; the fallback width is
+      80 columns when the reference provides too little prose.
+
 - `pydifft wd` ("word diff"): generate "track changes" word files starting from pandoc markdown in a git history.  Assuming that you have copied diff-doc.js (copied + licensed from elsewhere) into your home directory, this will use pandoc to convert the markdown files to MS Word, then use the MS Word comparison tool to generate a document where all relevant changes are shown with "track changes."
 
     * by default, this uses the file `template.docx` in the current directory as a pandoc word template

{pydifftools-0.1.28 → pydifftools-0.1.30}/README.rst

@@ -56,10 +56,32 @@ included are (listed in order of fun/utility):
   ``_build``/``_display`` directories; with ``--watch`` it starts the HTTP
   server and automatically rebuilds the staged fragments whenever you edit
   a ``.qmd`` file.
-- `pydifft gd [git diff args...]` shows the same Qt review table as the old
+- ``pydifft tree`` (or ``git tree`` with the alias installed) opens the last
+  40 commits across all branches, in Git date order. Use the down arrow
+  below the history to add the next 40 commits. Colors follow
+  first-parent ancestry; merged branches join the receiving branch.
+  Tags and branch tips have vector icon badges; hashes appear on hover.
+  Click any part of a commit row
+  to compare with the working directory, or right-click to copy its hash
+  or set a commit as the comparison endpoint. The right-click menu can restore
+  the working-directory endpoint. Diff window titles show the equivalent
+  arguments, preferring tags, then branch names, then six-character hashes.
+  Run ``pydifft tree --install`` to add the matching ``git tree`` alias.
+- ``pydifft gd`` (or ``git gd`` with the alias installed) reviews unstaged
+  changes, like bare ``git diff``.
+  ``pydifft gd [git diff args...]`` shows the same Qt review table as the old
   ``git_gd_qt.py`` helper before launching ``git difftool`` for a selected
-  file.  Run ``pydifft gd --install`` to add the matching ``git gd`` alias
-  to your global git config.
+  file.
+  Image rows are scored in the background and displayed as normalized
+  ``rgb X.X a X.X`` RMS changes; RGB change orders the image rows as scores
+  arrive.
+  Raster images open in a Qt viewer that aligns the old and new image,
+  displays their RGB difference, and uses up/down controls to switch
+  among the original, difference, and aligned new image. Images with an
+  alpha channel are displayed over a checkerboard; when transparency
+  changes, an additional red/blue alpha-difference view is included.
+  Run ``pydifft gd --install`` to add the matching ``git gd`` alias to
+  your global git config.
 - `pydifft qmdinit [directory]` scaffolds a new Quarto-style project using
   the bundled templates and example ``project1`` hierarchy, then downloads
   MathJax into ``_template/mathjax`` so the builder can run immediately.
@@ -70,12 +92,20 @@ included are (listed in order of fun/utility):
   wrapping, ideal for when you are
   working on manuscripts that you
   are version tracking with git.
+  Headers, fenced code blocks, and Pandoc tables retain their formatting.
+  Display-math delimiters get their own lines while equation contents retain
+  their wrapping; inline-math boundaries are preferred places to wrap prose.
 - `pydifft wmatch` ("whitespace match"): a script that matches whitespace between two text files.
 
     * pandoc can convert between markdown/latex/word, but doing this messes with your whitespace and gvimdiff comparisons.
 
     * this allows you to use an original file with good whitespace formatting as a "template" that you can match other (e.g. pandoc converted file) onto another
 
+    * changed prose lines exceeding 1.5 times the nearby reference width are
+      wrapped using the same sentence and punctuation rules as ``wr``.
+      Existing surrounding line breaks are retained; the fallback width is
+      80 columns when the reference provides too little prose.
+
 - `pydifft wd` ("word diff"): generate "track changes" word files starting from pandoc markdown in a git history.  Assuming that you have copied diff-doc.js (copied + licensed from elsewhere) into your home directory, this will use pandoc to convert the markdown files to MS Word, then use the MS Word comparison tool to generate a document where all relevant changes are shown with "track changes."
 
     * by default, this uses the file `template.docx` in the current directory as a pandoc word template

{pydifftools-0.1.28 → pydifftools-0.1.30/pyDiffTools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyDiffTools
-Version: 0.1.28
+Version: 0.1.30
 Summary: Diff tools
 Author: J M Franck
 License: Copyright (c) 2015, jmfranck
@@ -34,6 +34,8 @@ License: Copyright (c) 2015, jmfranck
         
 Description-Content-Type: text/x-rst
 License-File: LICENSE.md
+Requires-Dist: numpy
+Requires-Dist: Pillow
 Requires-Dist: selenium
 Requires-Dist: fuzzywuzzy[speedup]
 Requires-Dist: PyYAML>=6.0
@@ -41,11 +43,14 @@ Requires-Dist: watchdog
 Requires-Dist: pydot
 Requires-Dist: python-dateutil
 Requires-Dist: jinja2
+Requires-Dist: ipykernel
+Requires-Dist: matplotlib
 Requires-Dist: nbformat
 Requires-Dist: nbconvert
 Requires-Dist: pygments
 Requires-Dist: ansi2html
 Requires-Dist: lxml
+Requires-Dist: PySide6
 Dynamic: license-file
 
 pydifftools
@@ -106,10 +111,32 @@ included are (listed in order of fun/utility):
   ``_build``/``_display`` directories; with ``--watch`` it starts the HTTP
   server and automatically rebuilds the staged fragments whenever you edit
   a ``.qmd`` file.
-- `pydifft gd [git diff args...]` shows the same Qt review table as the old
+- ``pydifft tree`` (or ``git tree`` with the alias installed) opens the last
+  40 commits across all branches, in Git date order. Use the down arrow
+  below the history to add the next 40 commits. Colors follow
+  first-parent ancestry; merged branches join the receiving branch.
+  Tags and branch tips have vector icon badges; hashes appear on hover.
+  Click any part of a commit row
+  to compare with the working directory, or right-click to copy its hash
+  or set a commit as the comparison endpoint. The right-click menu can restore
+  the working-directory endpoint. Diff window titles show the equivalent
+  arguments, preferring tags, then branch names, then six-character hashes.
+  Run ``pydifft tree --install`` to add the matching ``git tree`` alias.
+- ``pydifft gd`` (or ``git gd`` with the alias installed) reviews unstaged
+  changes, like bare ``git diff``.
+  ``pydifft gd [git diff args...]`` shows the same Qt review table as the old
   ``git_gd_qt.py`` helper before launching ``git difftool`` for a selected
-  file.  Run ``pydifft gd --install`` to add the matching ``git gd`` alias
-  to your global git config.
+  file.
+  Image rows are scored in the background and displayed as normalized
+  ``rgb X.X a X.X`` RMS changes; RGB change orders the image rows as scores
+  arrive.
+  Raster images open in a Qt viewer that aligns the old and new image,
+  displays their RGB difference, and uses up/down controls to switch
+  among the original, difference, and aligned new image. Images with an
+  alpha channel are displayed over a checkerboard; when transparency
+  changes, an additional red/blue alpha-difference view is included.
+  Run ``pydifft gd --install`` to add the matching ``git gd`` alias to
+  your global git config.
 - `pydifft qmdinit [directory]` scaffolds a new Quarto-style project using
   the bundled templates and example ``project1`` hierarchy, then downloads
   MathJax into ``_template/mathjax`` so the builder can run immediately.
@@ -120,12 +147,20 @@ included are (listed in order of fun/utility):
   wrapping, ideal for when you are
   working on manuscripts that you
   are version tracking with git.
+  Headers, fenced code blocks, and Pandoc tables retain their formatting.
+  Display-math delimiters get their own lines while equation contents retain
+  their wrapping; inline-math boundaries are preferred places to wrap prose.
 - `pydifft wmatch` ("whitespace match"): a script that matches whitespace between two text files.
 
     * pandoc can convert between markdown/latex/word, but doing this messes with your whitespace and gvimdiff comparisons.
 
     * this allows you to use an original file with good whitespace formatting as a "template" that you can match other (e.g. pandoc converted file) onto another
 
+    * changed prose lines exceeding 1.5 times the nearby reference width are
+      wrapped using the same sentence and punctuation rules as ``wr``.
+      Existing surrounding line breaks are retained; the fallback width is
+      80 columns when the reference provides too little prose.
+
 - `pydifft wd` ("word diff"): generate "track changes" word files starting from pandoc markdown in a git history.  Assuming that you have copied diff-doc.js (copied + licensed from elsewhere) into your home directory, this will use pandoc to convert the markdown files to MS Word, then use the MS Word comparison tool to generate a document where all relevant changes are shown with "track changes."
 
     * by default, this uses the file `template.docx` in the current directory as a pandoc word template

{pydifftools-0.1.28 → pydifftools-0.1.30}/pyDiffTools.egg-info/SOURCES.txt

@@ -59,7 +59,10 @@ pydifftools/continuous.py
 pydifftools/copy_files.py
 pydifftools/diff-doc.js
 pydifftools/doc_contents.py
+pydifftools/forward_search.py
 pydifftools/git_gd.py
+pydifftools/git_gd_history.py
+pydifftools/git_gd_image.py
 pydifftools/git_gd_qt.py
 pydifftools/html_comments.py
 pydifftools/html_uncomments.py
@@ -81,11 +84,19 @@ pydifftools/flowchart/dot_to_yaml.py
 pydifftools/flowchart/graph.py
 pydifftools/flowchart/watch_graph.py
 pydifftools/notebook/__init__.py
+pydifftools/notebook/display.py
 pydifftools/notebook/fast_build.py
 pydifftools/notebook/tex_to_qmd.py
 tests/test_browser_lifecycle.py
+tests/test_check_single_use.py
 tests/test_command_line_help.py
 tests/test_continuous_shutdown.py
+tests/test_forward_search.py
+tests/test_git_gd_history.py
+tests/test_git_gd_image.py
+tests/test_git_gd_qt.py
 tests/test_rrng.py
 tests/test_tex_to_qmd.py
-tests/test_update_check.py
+tests/test_update_check.py
+tests/test_wrap_check.py
+tests/test_wrapping.py

{pydifftools-0.1.28 → pydifftools-0.1.30}/pyDiffTools.egg-info/requires.txt

@@ -1,3 +1,5 @@
+numpy
+Pillow
 selenium
 fuzzywuzzy[speedup]
 PyYAML>=6.0
@@ -5,8 +7,11 @@ watchdog
 pydot
 python-dateutil
 jinja2
+ipykernel
+matplotlib
 nbformat
 nbconvert
 pygments
 ansi2html
 lxml
+PySide6

{pydifftools-0.1.28 → pydifftools-0.1.30}/pydifftools/command_line.py

@@ -10,7 +10,6 @@ import re
 import nbformat
 import difflib
 import shutil
-import socket
 import importlib.util
 from pathlib import Path
 from . import (
@@ -20,7 +19,15 @@ from . import (
     update_check,
 )
 from .continuous import cpb, FORWARD_SEARCH_HOST, FORWARD_SEARCH_PORT
+from .forward_search import (
+    ForwardSearchProtocolError,
+    ForwardSearchUnavailable,
+    send_forward_search,
+)
 from .wrap_sentences import wr as wrap_sentences_wr  # registers wrap command
+from .wrap_sentences import (  # registers wrchk command
+    wrchk as wrap_sentences_wrchk,
+)
 from .separate_comments import tex_sepcomments
 from .unseparate_comments import tex_unsepcomments
 from .comment_functions import matchingbrackets
@@ -356,7 +363,10 @@ def gvr(arguments):
     subprocess.Popen(" ".join(cmd))
 
 
-@register_command("match whitespace")
+@register_command(
+    "match whitespace",
+    filename_extensions={"arguments": [".md", ".tex"]},
+)
 def wmatch(arguments):
     match_spaces.run(arguments)
 
@@ -530,7 +540,21 @@ def mfs(text):
     if marker_match:
         search_text = search_text[: marker_match.start()]
     search_text = re.sub(r"\[@[^\]]+\]", " ", search_text)
-    search_text = search_text.replace("**", " ").replace("*", " ")
+    # Strip paired markup delimiters (bold/italic, strikethrough,
+    # superscript/subscript). These delimiters hug the text they wrap with no
+    # space in the rendered output (e.g. "x^2^" renders as "x2"), so they are
+    # dropped rather than replaced with a space. Plain str.replace is used
+    # (not regex) so this is linear time regardless of how many delimiter
+    # characters appear.
+    search_text = (
+        search_text.replace("**", "")
+        .replace("__", "")
+        .replace("~~", "")
+        .replace("*", "")
+        .replace("_", "")
+        .replace("~", "")
+        .replace("^", "")
+    )
     search_text = re.sub(r"\s+", " ", search_text).strip()
     if not search_text:
         search_text = text.strip()
@@ -540,16 +564,27 @@ def mfs(text):
         (FORWARD_SEARCH_HOST, FORWARD_SEARCH_PORT),
         (QMDB_FORWARD_SEARCH_HOST, QMDB_FORWARD_SEARCH_PORT),
     ]
-    client = None
-    for address in socket_addresses:
-        candidate = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        try:
-            candidate.connect(address)
-            client = candidate
-            break
-        except OSError:
-            candidate.close()
-    if client is None:
+
+    def try_existing_listener():
+        protocol_errors = []
+        for address in socket_addresses:
+            try:
+                send_forward_search(address, search_text)
+            except ForwardSearchUnavailable:
+                continue
+            except ForwardSearchProtocolError as exc:
+                protocol_errors.append(str(exc))
+                continue
+            return True
+        if protocol_errors:
+            raise RuntimeError(
+                "A forward-search port accepted the connection but did not "
+                "acknowledge the pydifft protocol. Refusing to open another "
+                "browser window.\n" + "\n".join(protocol_errors)
+            )
+        return False
+
+    if not try_existing_listener():
         # If no listener is running yet, choose a markdown file in this
         # directory that contains the requested search text and start cpb for
         # it.
@@ -581,24 +616,14 @@ def mfs(text):
         # Wait up to 20 seconds so the child can bring up the listener,
         # then resend the forward-search text.
         for _ in range(80):
-            for address in socket_addresses:
-                candidate = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-                try:
-                    candidate.connect(address)
-                    client = candidate
-                    break
-                except OSError:
-                    candidate.close()
-            if client is not None:
-                break
+            if try_existing_listener():
+                return
             time.sleep(0.25)
         else:
             raise RuntimeError(
-                "Started cpb automatically, but the forward search socket "
-                "did not come up within 20 seconds."
+                "Started cpb automatically, but no acknowledged forward "
+                "search endpoint came up within 20 seconds."
             )
-    client.sendall(search_text.encode("utf-8"))
-    client.close()
 
 
 @register_command("Convert xml to xlsx")
@@ -943,11 +968,82 @@ def main(argv=None):
             "argument --no-comments: not allowed with argument "
             "--comments-to-margin"
         )
+    if (
+        namespace.command == "qmdb"
+        and namespace.always_code
+        and namespace.no_code
+    ):
+        parser._pydifft_subparsers["qmdb"].error(
+            "argument --no-code: not allowed with argument --always-code"
+        )
     handler = namespace._handler
     handler_kwargs = dict(vars(namespace))
     handler_kwargs.pop("_handler", None)
     handler_kwargs.pop("command", None)
-    handler(**handler_kwargs)
+    # {{{ explain Chrome and ChromeDriver version mismatches
+    from selenium.common.exceptions import SessionNotCreatedException
+
+    try:
+        handler(**handler_kwargs)
+    except SessionNotCreatedException as exc:
+        details = str(exc)
+        driver_match = re.search(
+            r"ChromeDriver only supports Chrome version (\d+)",
+            details,
+        )
+        browser_match = re.search(
+            r"Current browser version is (\d+)",
+            details,
+        )
+        if driver_match is None or browser_match is None:
+            raise
+
+        driver_major = int(driver_match.group(1))
+        browser_major = int(browser_match.group(1))
+        print(
+            "pydifft: Chrome could not start because ChromeDriver "
+            f"{driver_major} and Chrome {browser_major} do not match.",
+            file=sys.stderr,
+        )
+        if shutil.which("apt-get") is not None:
+            if browser_major < driver_major:
+                binary_match = re.search(
+                    r"binary path ([^;\n]+)",
+                    details,
+                )
+                browser_binary = (
+                    binary_match.group(1) if binary_match is not None else ""
+                )
+                browser_package = (
+                    "chromium"
+                    if "chromium" in browser_binary
+                    else "google-chrome-stable"
+                )
+                packages = browser_package
+            elif driver_major < browser_major:
+                packages = "chromium-driver"
+            else:
+                packages = "google-chrome-stable chromium-driver"
+            print(
+                "Update the older system package:\n"
+                "  sudo apt update\n"
+                f"  sudo apt install --only-upgrade {packages}",
+                file=sys.stderr,
+            )
+        else:
+            print(
+                "Update the older Chrome or ChromeDriver installation so "
+                "their major versions match.",
+                file=sys.stderr,
+            )
+        print(
+            "Then retry. You can verify the versions with:\n"
+            "  google-chrome --version\n"
+            "  chromedriver --version",
+            file=sys.stderr,
+        )
+        raise SystemExit(1) from None
+    # }}}
 
 
 if __name__ == "__main__":