pyDiffTools 0.1.58__tar.gz → 0.1.60__tar.gz

{pydifftools-0.1.58/pyDiffTools.egg-info → pydifftools-0.1.60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyDiffTools
-Version: 0.1.58
+Version: 0.1.60
 Summary: Diff tools
 Author: J M Franck
 License: Copyright (c) 2015, jmfranck
@@ -274,10 +274,26 @@ included are (listed in order of fun/utility):
   retaining the exact command of an existing global ``gd`` alias. If none
   is configured, it installs ``!f() { pydifft gd "$@"; }; f``.
   Configure ``difftool.mygvim.cmd`` for the GUI diff tool.
-- ``pydifft --add_to_git gd pd tree mergein`` installs any selected subset
+  Use ``pydifft gd --terminal [git diff args...]`` for a colored terminal
+  picker that opens diffs in foreground Vim without GUI configuration.
+  Navigate with arrows or ``j``/``k``, press Enter to open a diff, Space to
+  toggle its reviewed marker, and ``q`` to quit. Closing Vim returns to the
+  picker. Images and other binary files are skipped. Set ``NO_COLOR`` to
+  disable colors.
+- ``pydifft --add_to_git gd pd tree mergein reattach`` installs any selected subset
   of these global Git aliases in one invocation. Installation appears
   alongside the subcommands in root help; the former per-command
   ``--install`` and ``--add-to-git`` flags have been removed.
+- ``pydifft reattach [--path DIRECTORY]`` attaches detached checkouts to
+  branches pointing at exactly their current commits, including initialized
+  submodules recursively. Remote-only matches create local tracking branches.
+  It never resets existing branches or pulls newer commits. With several
+  matches it prefers the origin default branch when possible, otherwise it
+  reports ambiguity and leaves the checkout detached. A local branch with
+  the required name pointing elsewhere is preserved. ``--dry-run`` previews
+  changes, ``--no-recursive`` limits the operation to one repository, and
+  ``--fetch`` refreshes remote refs before matching. Install the global
+  ``git reattach`` alias with ``pydifft --add_to_git reattach``.
 - ``pydifft mergein BRANCH [--remote REMOTE]`` updates an incoming local
   branch without switching branches, then merges it into the current
   branch. Install ``git mergein`` with ``pydifft --add_to_git mergein``.
@@ -318,10 +334,14 @@ included are (listed in order of fun/utility):
       their words using Git's minimal diff, and restores reference whitespace.
       It then considers extra breaks that preserve an unchanged reference line
       without stranding an edited fragment of three words or fewer, and checks
-      wrapping rules. When matching a baseline, edited lines may exceed the
-      character width by at most four words before wrapping is required.
-
-    * ``--wrapnumber`` sets the maximum width (79 for ``cpb`` and ``wmatch``).
+      wrapping rules. ``--desired-width`` (default 45) limits the width of
+      lines created by removing existing breaks to match Git. Breaks are
+      retained when joining would exceed that desired width.
+
+    * ``--wrapnumber`` independently sets the maximum width (79 for ``cpb``
+      and ``wmatch``), including for stable prose from the Git baseline.
+      For example, ``cpb --desired-width 50 --wrapnumber 85 manuscript.md``
+      changes both limits.
       Wmatch also uses nearby reference widths for large edits, retaining
       unchanged reference lines and protected Markdown blocks.
 
@@ -398,3 +418,14 @@ Future versions will include:
 - Scripts for converting word html comments to latex commands.
 
 - converting to/form one word per line files (for doing things like wdiff, but with more control)
+
+Concurrent cpb previews
+-----------------------
+
+``cpb`` starts at loopback port 51235 and reports occupied ports to stdout
+before trying the next port. The first process keeps a directory-to-port
+registry; subsequent previews register their source file's directory there.
+Run ``pydifft mfs`` from that directory to search the matching preview.
+Directory paths are resolved so symlink aliases identify the same project.
+Keep the first process open while using the other previews: its registry
+lives in memory and ends when that process exits.

{pydifftools-0.1.58 → pydifftools-0.1.60}/README.rst

@@ -219,10 +219,26 @@ included are (listed in order of fun/utility):
   retaining the exact command of an existing global ``gd`` alias. If none
   is configured, it installs ``!f() { pydifft gd "$@"; }; f``.
   Configure ``difftool.mygvim.cmd`` for the GUI diff tool.
-- ``pydifft --add_to_git gd pd tree mergein`` installs any selected subset
+  Use ``pydifft gd --terminal [git diff args...]`` for a colored terminal
+  picker that opens diffs in foreground Vim without GUI configuration.
+  Navigate with arrows or ``j``/``k``, press Enter to open a diff, Space to
+  toggle its reviewed marker, and ``q`` to quit. Closing Vim returns to the
+  picker. Images and other binary files are skipped. Set ``NO_COLOR`` to
+  disable colors.
+- ``pydifft --add_to_git gd pd tree mergein reattach`` installs any selected subset
   of these global Git aliases in one invocation. Installation appears
   alongside the subcommands in root help; the former per-command
   ``--install`` and ``--add-to-git`` flags have been removed.
+- ``pydifft reattach [--path DIRECTORY]`` attaches detached checkouts to
+  branches pointing at exactly their current commits, including initialized
+  submodules recursively. Remote-only matches create local tracking branches.
+  It never resets existing branches or pulls newer commits. With several
+  matches it prefers the origin default branch when possible, otherwise it
+  reports ambiguity and leaves the checkout detached. A local branch with
+  the required name pointing elsewhere is preserved. ``--dry-run`` previews
+  changes, ``--no-recursive`` limits the operation to one repository, and
+  ``--fetch`` refreshes remote refs before matching. Install the global
+  ``git reattach`` alias with ``pydifft --add_to_git reattach``.
 - ``pydifft mergein BRANCH [--remote REMOTE]`` updates an incoming local
   branch without switching branches, then merges it into the current
   branch. Install ``git mergein`` with ``pydifft --add_to_git mergein``.
@@ -263,10 +279,14 @@ included are (listed in order of fun/utility):
       their words using Git's minimal diff, and restores reference whitespace.
       It then considers extra breaks that preserve an unchanged reference line
       without stranding an edited fragment of three words or fewer, and checks
-      wrapping rules. When matching a baseline, edited lines may exceed the
-      character width by at most four words before wrapping is required.
-
-    * ``--wrapnumber`` sets the maximum width (79 for ``cpb`` and ``wmatch``).
+      wrapping rules. ``--desired-width`` (default 45) limits the width of
+      lines created by removing existing breaks to match Git. Breaks are
+      retained when joining would exceed that desired width.
+
+    * ``--wrapnumber`` independently sets the maximum width (79 for ``cpb``
+      and ``wmatch``), including for stable prose from the Git baseline.
+      For example, ``cpb --desired-width 50 --wrapnumber 85 manuscript.md``
+      changes both limits.
       Wmatch also uses nearby reference widths for large edits, retaining
       unchanged reference lines and protected Markdown blocks.
 
@@ -343,3 +363,14 @@ Future versions will include:
 - Scripts for converting word html comments to latex commands.
 
 - converting to/form one word per line files (for doing things like wdiff, but with more control)
+
+Concurrent cpb previews
+-----------------------
+
+``cpb`` starts at loopback port 51235 and reports occupied ports to stdout
+before trying the next port. The first process keeps a directory-to-port
+registry; subsequent previews register their source file's directory there.
+Run ``pydifft mfs`` from that directory to search the matching preview.
+Directory paths are resolved so symlink aliases identify the same project.
+Keep the first process open while using the other previews: its registry
+lives in memory and ends when that process exits.

{pydifftools-0.1.58 → pydifftools-0.1.60/pyDiffTools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyDiffTools
-Version: 0.1.58
+Version: 0.1.60
 Summary: Diff tools
 Author: J M Franck
 License: Copyright (c) 2015, jmfranck
@@ -274,10 +274,26 @@ included are (listed in order of fun/utility):
   retaining the exact command of an existing global ``gd`` alias. If none
   is configured, it installs ``!f() { pydifft gd "$@"; }; f``.
   Configure ``difftool.mygvim.cmd`` for the GUI diff tool.
-- ``pydifft --add_to_git gd pd tree mergein`` installs any selected subset
+  Use ``pydifft gd --terminal [git diff args...]`` for a colored terminal
+  picker that opens diffs in foreground Vim without GUI configuration.
+  Navigate with arrows or ``j``/``k``, press Enter to open a diff, Space to
+  toggle its reviewed marker, and ``q`` to quit. Closing Vim returns to the
+  picker. Images and other binary files are skipped. Set ``NO_COLOR`` to
+  disable colors.
+- ``pydifft --add_to_git gd pd tree mergein reattach`` installs any selected subset
   of these global Git aliases in one invocation. Installation appears
   alongside the subcommands in root help; the former per-command
   ``--install`` and ``--add-to-git`` flags have been removed.
+- ``pydifft reattach [--path DIRECTORY]`` attaches detached checkouts to
+  branches pointing at exactly their current commits, including initialized
+  submodules recursively. Remote-only matches create local tracking branches.
+  It never resets existing branches or pulls newer commits. With several
+  matches it prefers the origin default branch when possible, otherwise it
+  reports ambiguity and leaves the checkout detached. A local branch with
+  the required name pointing elsewhere is preserved. ``--dry-run`` previews
+  changes, ``--no-recursive`` limits the operation to one repository, and
+  ``--fetch`` refreshes remote refs before matching. Install the global
+  ``git reattach`` alias with ``pydifft --add_to_git reattach``.
 - ``pydifft mergein BRANCH [--remote REMOTE]`` updates an incoming local
   branch without switching branches, then merges it into the current
   branch. Install ``git mergein`` with ``pydifft --add_to_git mergein``.
@@ -318,10 +334,14 @@ included are (listed in order of fun/utility):
       their words using Git's minimal diff, and restores reference whitespace.
       It then considers extra breaks that preserve an unchanged reference line
       without stranding an edited fragment of three words or fewer, and checks
-      wrapping rules. When matching a baseline, edited lines may exceed the
-      character width by at most four words before wrapping is required.
-
-    * ``--wrapnumber`` sets the maximum width (79 for ``cpb`` and ``wmatch``).
+      wrapping rules. ``--desired-width`` (default 45) limits the width of
+      lines created by removing existing breaks to match Git. Breaks are
+      retained when joining would exceed that desired width.
+
+    * ``--wrapnumber`` independently sets the maximum width (79 for ``cpb``
+      and ``wmatch``), including for stable prose from the Git baseline.
+      For example, ``cpb --desired-width 50 --wrapnumber 85 manuscript.md``
+      changes both limits.
       Wmatch also uses nearby reference widths for large edits, retaining
       unchanged reference lines and protected Markdown blocks.
 
@@ -398,3 +418,14 @@ Future versions will include:
 - Scripts for converting word html comments to latex commands.
 
 - converting to/form one word per line files (for doing things like wdiff, but with more control)
+
+Concurrent cpb previews
+-----------------------
+
+``cpb`` starts at loopback port 51235 and reports occupied ports to stdout
+before trying the next port. The first process keeps a directory-to-port
+registry; subsequent previews register their source file's directory there.
+Run ``pydifft mfs`` from that directory to search the matching preview.
+Directory paths are resolved so symlink aliases identify the same project.
+Keep the first process open while using the other previews: its registry
+lives in memory and ends when that process exits.

{pydifftools-0.1.58 → pydifftools-0.1.60}/pyDiffTools.egg-info/SOURCES.txt

@@ -70,6 +70,8 @@ pydifftools/git_gd.py
 pydifftools/git_gd_history.py
 pydifftools/git_gd_image.py
 pydifftools/git_gd_qt.py
+pydifftools/git_gd_terminal.py
+pydifftools/git_reattach.py
 pydifftools/html_comments.py
 pydifftools/html_uncomments.py
 pydifftools/line_alignment.py
@@ -114,8 +116,10 @@ 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_git_gd_terminal.py
 tests/test_git_mergein.py
 tests/test_git_pdf_diff.py
+tests/test_git_reattach.py
 tests/test_line_alignment.py
 tests/test_pdf_diff.py
 tests/test_qt_lifecycle.py
@@ -125,4 +129,5 @@ tests/test_tex_to_qmd.py
 tests/test_update_check.py
 tests/test_wrap_check.py
 tests/test_wrapping.py
+tests/test_wrapping_width_limits.py
 tests/test_zotero.py

{pydifftools-0.1.58 → pydifftools-0.1.60}/pydifftools/command_line.py

@@ -25,6 +25,7 @@ from .forward_search import (
     ForwardSearchProtocolError,
     ForwardSearchUnavailable,
     send_forward_search,
+    directory_port,
 )
 from .wrap_sentences import wr as wrap_sentences_wr  # registers wrap command
 from .wrap_sentences import (  # registers wrchk command
@@ -36,6 +37,7 @@ from .comment_functions import matchingbrackets
 from .copy_files import copy_image_files
 from .searchacro import replace_acros
 from .rearrange_tex import run as rearrange_tex_run
+from .git_reattach import reattach  # registers branch reattachment
 from .git_gd import gd  # registers git difftool review command
 from .pdf_diff import pd, git_pd  # registers PDF diff command
 from .git_aliases import (
@@ -54,7 +56,8 @@ from .notebook.fast_build import (
 
 from .command_registry import _COMMAND_SPECS, register_command
 from .wrapping_options import (
-    DEFAULT_WIDTH, DEFAULT_TRAILING_DEPENDENT_PHRASE, WRAPPING_ARGUMENTS,
+    DEFAULT_WIDTH, DEFAULT_DESIRED_WIDTH,
+    DEFAULT_TRAILING_DEPENDENT_PHRASE, WRAPPING_ARGUMENTS,
 )
 
 _ARGCOMPLETE_SPEC = importlib.util.find_spec("argcomplete")
@@ -387,8 +390,11 @@ def gvr(arguments):
 def wmatch(
     arguments, wrapnumber=DEFAULT_WIDTH,
     trailing_dependent_phrase=DEFAULT_TRAILING_DEPENDENT_PHRASE,
+    desired_width=DEFAULT_DESIRED_WIDTH,
 ):
-    match_spaces.run(arguments, wrapnumber, trailing_dependent_phrase)
+    match_spaces.run(
+        arguments, wrapnumber, trailing_dependent_phrase, desired_width,
+    )
 
 
 @register_command("split conflict")
@@ -579,7 +585,38 @@ def mfs(text):
     def try_existing_listener():
         protocol_errors = []
         delivered = False
-        for address in socket_addresses:
+        addresses = socket_addresses
+        try:
+            route = directory_port(socket_addresses[0], os.getcwd())
+        except ForwardSearchUnavailable:
+            route = None
+        except ForwardSearchProtocolError as exc:
+            raise RuntimeError(
+                "Refusing to open another browser window: " + str(exc)
+            ) from exc
+        if route and route["registry"]:
+            if route["port"] is not None:
+                try:
+                    send_forward_search(
+                        (FORWARD_SEARCH_HOST, route["port"]), search_text
+                    )
+                    return True
+                except ForwardSearchUnavailable:
+                    directory_port(socket_addresses[0], os.getcwd(), port=None)
+            addresses = socket_addresses[1:]
+        for address in addresses:
+            if route and route["registry"] and address != socket_addresses[0]:
+                try:
+                    candidate = directory_port(address, os.getcwd())
+                except ForwardSearchUnavailable:
+                    continue
+                except ForwardSearchProtocolError as exc:
+                    protocol_errors.append(str(exc))
+                    continue
+                if candidate["registry"]:
+                    if candidate["port"] is None:
+                        continue
+                    address = (FORWARD_SEARCH_HOST, candidate["port"])
             try:
                 send_forward_search(address, search_text)
             except ForwardSearchUnavailable:
@@ -909,7 +946,7 @@ def build_parser():
     # argparse does not validate REMAINDER choices; main checks them first.
     subparsers.container.add_argument(
         "--add_to_git", nargs=argparse.REMAINDER, choices=list(GIT_ALIASES),
-        help=("Install one or more global Git aliases: gd, pd, tree, mergein "
+        help=("Install one or more global Git aliases: gd, pd, tree, mergein, reattach "
               "(without a subcommand)."),
     )
     for name, spec in _COMMAND_SPECS.items():
@@ -994,6 +1031,14 @@ def main(argv=None):
         if subcommand in parser._pydifft_subparsers:
             parser._pydifft_subparsers[subcommand].print_help()
             return
+    # gd forwards Git's options verbatim, including leading --cached/-M.
+    # argparse's REMAINDER only accepts those after a positional argument.
+    if argv[0] == "gd":
+        option_end = argv.index("--") if "--" in argv else len(argv)
+        if any(arg in ("-h", "--help") for arg in argv[1:option_end]):
+            parser._pydifft_subparsers["gd"].print_help()
+            return
+        return gd(argv[1:])
     namespace = parser.parse_args(argv)
     if namespace.add_to_git is not None:
         if not namespace.add_to_git:
@@ -1019,6 +1064,8 @@ def main(argv=None):
         parser._pydifft_subparsers[namespace.command].error(
             "--wrapnumber must be at least 1"
         )
+    if getattr(namespace, "desired_width", 45) < 1:
+        parser.error("--desired-width must be at least 1")
     if getattr(namespace, "trailing_dependent_phrase",
                getattr(namespace, "punctuation_slop", 0)) < 0:
         parser._pydifft_subparsers[namespace.command].error(

{pydifftools-0.1.58 → pydifftools-0.1.60}/pydifftools/continuous.py

@@ -21,7 +21,8 @@ from watchdog.observers import Observer
 from watchdog.observers.polling import PollingObserver
 from .command_registry import register_command
 from .wrapping_options import (
-    DEFAULT_WIDTH, DEFAULT_TRAILING_DEPENDENT_PHRASE, WRAPPING_ARGUMENTS,
+    DEFAULT_WIDTH, DEFAULT_DESIRED_WIDTH,
+    DEFAULT_TRAILING_DEPENDENT_PHRASE, WRAPPING_ARGUMENTS,
 )
 from .zotero import recover_bibliography, zotero_notice
 from .comment_migration import prepare_comment_source
@@ -35,7 +36,10 @@ from .browser_lifecycle import (
 from .forward_search import (
     CPB_FORWARD_SEARCH_PORT,
     FORWARD_SEARCH_HOST,
-    bind_forward_search_server,
+    bind_cpb_server,
+    directory_port,
+    ForwardSearchUnavailable,
+    ForwardSearchProtocolError,
     drain_forward_search_queue,
     serve_forward_search,
 )
@@ -513,6 +517,7 @@ def run_pandoc(
     wrapnumber=DEFAULT_WIDTH,
     trailing_dependent_phrase=DEFAULT_TRAILING_DEPENDENT_PHRASE,
     diff=None,
+    desired_width=DEFAULT_DESIRED_WIDTH,
 ):
     # {{{ automatically fix Markdown source and request edits for
     # unfinished spans
@@ -523,6 +528,7 @@ def run_pandoc(
         report = autofix_markdown_file(
             filename, wrapnumber=wrapnumber, git_index=True, git_ref=diff,
             punctuation_slop=trailing_dependent_phrase,
+            desired_width=desired_width,
         )
         automatic_fixes_were_made |= bool(report["fixes"])
         if report["fixes"] or report["warnings"]:
@@ -1215,6 +1221,7 @@ def cpb(
     wrapnumber=DEFAULT_WIDTH,
     trailing_dependent_phrase=DEFAULT_TRAILING_DEPENDENT_PHRASE,
     diff=None,
+    desired_width=DEFAULT_DESIRED_WIDTH,
 ):
     source_path = os.path.normpath(os.path.abspath(filename))
     source_dir = os.path.dirname(source_path)
@@ -1222,12 +1229,12 @@ def cpb(
     comment_filter_session = {}
     search_queue = queue.Queue()
     stop_event = threading.Event()
-    forward_search_server = bind_forward_search_server(
-        (FORWARD_SEARCH_HOST, FORWARD_SEARCH_PORT), "cpb"
+    forward_search_server = bind_cpb_server(
+        (FORWARD_SEARCH_HOST, FORWARD_SEARCH_PORT)
     )
     socket_thread = threading.Thread(
         target=serve_forward_search,
-        args=(forward_search_server, stop_event, search_queue),
+        args=(forward_search_server, stop_event, search_queue, source_dir),
         daemon=True,
     )
     chrome = None
@@ -1247,6 +1254,14 @@ def cpb(
         # port authoritative even while a slow initial build is in progress.
         socket_thread.start()
         socket_thread_started = True
+        registry_address = (FORWARD_SEARCH_HOST, FORWARD_SEARCH_PORT)
+        session_port = forward_search_server.getsockname()[1]
+        if session_port != FORWARD_SEARCH_PORT:
+            try:
+                directory_port(registry_address, source_dir, port=session_port)
+            except (ForwardSearchUnavailable, ForwardSearchProtocolError):
+                print("cpb: standard port has no directory registry; "
+                      "mfs discovery is unavailable.")
 
         # Build before opening the browser so a failed build cannot leave an
         # orphaned browser session. Remember the source version from before
@@ -1271,6 +1286,7 @@ def cpb(
             wrapnumber=wrapnumber,
             trailing_dependent_phrase=trailing_dependent_phrase,
             diff=diff,
+            desired_width=desired_width,
         )
         source_jump_server = SourceJumpServer(source_path)
         source_jump_server.start()
@@ -1418,6 +1434,7 @@ def cpb(
                                     trailing_dependent_phrase
                                 ),
                                 diff=diff,
+                                desired_width=desired_width,
                             )
                             append_autorefresh(
                                 html_file, source_jump_server.url
@@ -1463,6 +1480,11 @@ def cpb(
     except KeyboardInterrupt:
         pass
     finally:
+        if socket_thread_started and session_port != FORWARD_SEARCH_PORT:
+            try:
+                directory_port(registry_address, source_dir, port=None)
+            except (ForwardSearchUnavailable, ForwardSearchProtocolError):
+                pass
         stop_event.set()
         forward_search_server.close()
         if source_jump_server is not None:

{pydifftools-0.1.58 → pydifftools-0.1.60}/pydifftools/forward_search.py

@@ -1,5 +1,8 @@
 """Acknowledged loopback transport for browser forward-search requests."""
 
+import errno
+import json
+import os
 import queue
 import socket
 
@@ -41,9 +44,13 @@ def bind_forward_search_server(address, service_name):
     return server
 
 
-def serve_forward_search(server, stop_event, search_queue):
+def serve_forward_search(server, stop_event, search_queue, directory=None):
     """Accept clients, queue valid UTF-8 payloads, and acknowledge receipt."""
 
+    registrations = {}
+    if directory is not None:
+        registrations[os.path.realpath(directory)] = server.getsockname()[1]
+
     while not stop_event.is_set():
         try:
             connection, _ = server.accept()
@@ -71,6 +78,24 @@ def serve_forward_search(server, stop_event, search_queue):
                 search_text = payload.decode("utf-8")
             except UnicodeDecodeError:
                 continue
+            if search_text.startswith("pydifft-directory\n"):
+                try:
+                    request = json.loads(search_text.split("\n", 1)[1])
+                    directory_key = os.path.realpath(request["directory"])
+                    if "port" in request:
+                        port = request["port"]
+                        if port is None:
+                            registrations.pop(directory_key, None)
+                        elif isinstance(port, int) and 0 < port < 65536:
+                            registrations[directory_key] = port
+                    response = json.dumps({
+                        "port": registrations.get(directory_key),
+                        "registry": directory is not None,
+                    }).encode()
+                    connection.sendall(response)
+                except (ValueError, KeyError, TypeError, OSError):
+                    pass
+                continue
             search_queue.put(search_text)
             try:
                 connection.sendall(FORWARD_SEARCH_ACK)
@@ -127,3 +152,53 @@ def drain_forward_search_queue(search_queue):
             searches.append(search_queue.get_nowait())
         except queue.Empty:
             return searches
+
+
+# also used by: continuous.py and command_line.py
+def directory_port(address, directory, **registration):
+    """Query or update the first cpb process's directory registry."""
+    request = {"directory": os.path.realpath(directory), **registration}
+    try:
+        with socket.create_connection(address, timeout=1) as client:
+            client.settimeout(1)
+            client.sendall(("pydifft-directory\n" + json.dumps(request)).encode())
+            client.shutdown(socket.SHUT_WR)
+            response = bytearray()
+            while True:
+                chunk = client.recv(4096)
+                if not chunk:
+                    break
+                response.extend(chunk)
+                if len(response) > 4096:
+                    raise ValueError("oversized registry response")
+    except OSError as exc:
+        raise ForwardSearchUnavailable(address) from exc
+    try:
+        result = json.loads(response)
+        if not isinstance(result, dict) or not isinstance(
+            result.get("registry"), bool
+        ):
+            raise ValueError("invalid registry response")
+        port = result.get("port")
+        if port is not None and (type(port) is not int or not 0 < port < 65536):
+            raise ValueError("invalid port")
+        return result
+    except (ValueError, TypeError) as exc:
+        raise ForwardSearchProtocolError(
+            f"Invalid directory registry response from {address}"
+        ) from exc
+
+
+# also used by: continuous.py and tests/test_forward_search.py
+def bind_cpb_server(address):
+    """Take the first available port, reporting every occupied port."""
+    for port in range(address[1], 65536):
+        try:
+            return bind_forward_search_server((address[0], port), "cpb")
+        except RuntimeError as exc:
+            if not isinstance(exc.__cause__, OSError) or (
+                exc.__cause__.errno != errno.EADDRINUSE
+            ):
+                raise
+            print(f"cpb: port {port} is taken; trying port {port + 1}.")
+    raise RuntimeError("No free cpb forward-search port remains")

{pydifftools-0.1.58 → pydifftools-0.1.60}/pydifftools/git_aliases.py

@@ -11,10 +11,12 @@ GIT_ALIASES = {
     "gd": '!f() { pydifft gd "$@"; }; f',
     "pd": '!f() { pydifft pd --git "$@"; }; f',
     "tree": '!f() { pydifft tree "$@"; }; f',
+    "reattach": '!f() { pydifft reattach "$@"; }; f',
     "mergein": '!f() { pydifft mergein "$@"; }; f',
 }
 
 
+# also used by: pydifftools/command_line.py for global CLI alias installation.
 def install_git_alias(name, command, preserve_existing=False):
     """Install an alias and its completion, optionally retaining its value."""
     if preserve_existing:

{pydifftools-0.1.58 → pydifftools-0.1.60}/pydifftools/git_gd.py

@@ -273,6 +273,7 @@ def build_image_difftool_command(
     )
 
 
+# also used by: tests/cli/test_commands.py.
 def build_image_score_command(
     diff_args: Sequence[str], entry: DiffEntry
 ) -> list[str]:
@@ -363,6 +364,7 @@ def repo_name() -> str:
     return Path(top).name
 
 
+# also used by: git_gd_history.py and tests/cli/test_commands.py.
 def build_entries(argv: Sequence[str]):
     # {{{ separate Git options/revisions from file filters
     if "--" in argv:
@@ -407,9 +409,18 @@ def diff_entry_sort_key(entry: DiffEntry):
     return (group, 2, entry.path)
 
 
+# also used by: tests/test_git_gd_terminal.py.
 def main(argv: Sequence[str]) -> int:
+    # Only consume our flag before Git's pathspec separator.
+    args = list(argv)
+    option_end = args.index("--") if "--" in args else len(args)
+    terminal = "--terminal" in args[:option_end]
+    if terminal:
+        args = [arg for arg in args[:option_end] if arg != "--terminal"] + (
+            args[option_end:]
+        )
     try:
-        diff_args, entries = build_entries(argv)
+        diff_args, entries = build_entries(args)
         name = repo_name()
     except subprocess.CalledProcessError as exc:
         if isinstance(exc.stderr, bytes):
@@ -417,6 +428,10 @@ def main(argv: Sequence[str]) -> int:
         elif exc.stderr:
             sys.stderr.write(exc.stderr)
         return exc.returncode
+    if terminal:
+        from .git_gd_terminal import launch_review
+
+        return launch_review(name, diff_args, entries)
     try:
         from .git_gd_qt import launch_review
     except ModuleNotFoundError as exc:
@@ -429,10 +444,13 @@ def main(argv: Sequence[str]) -> int:
     return launch_review(name, diff_args, entries, command_args=argv)
 
 
+# also used by: command_line.py's registered command dispatcher.
 @register_command(
     "review changed files in a Qt table before launching git difftool",
     "review changed files in a Qt table before launching git difftool\n\n"
     "With no arguments, review unstaged changes, like git diff.\n"
+    "Add --terminal for a colored terminal picker and Vim diffs;\n"
+    "images and binary files are skipped in terminal mode.\n"
     "Use pydifft tree to browse Git history.\n\n"
     "Install the matching git alias automatically with:\n"
     "  pydifft --add_to_git gd\n\n"
@@ -440,11 +458,12 @@ def main(argv: Sequence[str]) -> int:
     "  git config --global alias.gd '!f() { pydifft gd \"$@\"; }; f'\n\n"
     "This command shells out to git difftool --tool=mygvim, so keep\n"
     "difftool.mygvim.cmd configured in your git config.",
+    help={"terminal": "Use a terminal picker and Vim; skip images/binaries."},
 )
-def gd(arguments):
+def gd(arguments, terminal=False):
     """Mirror ``git_gd_qt.py``."""
 
-    return_code = main(arguments)
+    return_code = main(["--terminal", *arguments] if terminal else arguments)
     if return_code != 0:
         raise SystemExit(return_code)