pyDiffTools 0.1.52__tar.gz → 0.1.53__tar.gz

{pydifftools-0.1.52 → pydifftools-0.1.53}/MANIFEST.in

@@ -1,6 +1,7 @@
 # In addition to the package file, various *.sh files are included -- these will eventually be converted to python
 include README.rst
 include LICENSE.md
+include pydifftools/completions/git-mergein
 include pydifftools/diff-doc.js
 include pydifftools/xml2xlsx.vbs
 include pydifftools/comments.css

{pydifftools-0.1.52/pyDiffTools.egg-info → pydifftools-0.1.53}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyDiffTools
-Version: 0.1.52
+Version: 0.1.53
 Summary: Diff tools
 Author: J M Franck
 License: Copyright (c) 2015, jmfranck
@@ -72,6 +72,30 @@ included are (listed in order of fun/utility):
   `filename.md`, build the result,
   and displays it in your browser. 
 
+  Source diff linting minimizes line-break changes against the Git index
+  (staging area) by default, matching plain ``git diff``. Use
+  ``pydifft cpb filename.md --diff-base @`` to compare against HEAD, or
+  ``--diff-base jf_last`` to compare against a tag, branch, or commit hash.
+  The selected baseline is read again on each build. An unreadable explicit
+  baseline stops the build; an unavailable index baseline, such as for an
+  untracked file, falls back to ordinary source linting.
+  All diff-minimizing line-break fixes are applied automatically before
+  their notice appears. Each page shows as many changed hunks as fit in the
+  window, with a blank line separating hunks; larger changes are applied
+  just like single-break changes.
+  Diff alignment has separate eligibility rules from prose linting.
+  Equations and HTML comment contents participate in alignment, including
+  hunks that begin inside them. Display equations and hidden text remain
+  exempt from prose wrapping and sentence rules. Equation delimiters are
+  matched independently of their contents, and surviving matches on either
+  side of an edit restore whitespace while preserving changed values and
+  TeX commands. Literal delimiters in code are preserved.
+  Leading whitespace at matching line starts is restored in top-level
+  prose when both margins contain at most three spaces, and inside HTML
+  comments and equations. Container indentation (lists, definitions, and
+  quotations), tabs or four-space code indentation outside those spans,
+  and protected blocks retain their current margins.
+
   Continuous pandoc build.
   This works *very well* together
   with the `g/` vim command
@@ -205,6 +229,12 @@ 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.
+  Browser previews in ``qmdb``, ``cpb``, and ``wgrph`` share the same
+  Selenium launcher: Chrome/Chromium is preferred, with Firefox as a
+  fallback. Installed ``chromedriver`` and ``geckodriver`` are used directly
+  without online driver discovery; if only ``geckodriver`` is installed,
+  Firefox opens directly. With neither driver installed, Selenium handles
+  discovery. Chrome startup failures are reported before trying Firefox.
 - ``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
@@ -215,7 +245,7 @@ included are (listed in order of fun/utility):
   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.
+  Run ``pydifft --add_to_git tree`` 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
@@ -229,12 +259,31 @@ included are (listed in order of fun/utility):
   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 gd --add-to-git`` offers the same installation, retaining the
-  exact command of an existing global ``gd`` alias. If none is configured,
-  it installs ``!f() { pydifft gd "$@"; }; f``. Alias installation is shared
-  with ``pd`` and ``tree``.
+  Run ``pydifft --add_to_git gd`` to install the global ``git gd`` alias,
+  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
+  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 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``.
+  ``git mergein incoming/topic`` runs ``git fetch origin
+  incoming/topic:incoming/topic`` followed by ``git merge --no-ff
+  incoming/topic``. Use ``--remote upstream`` to select another remote;
+  ``origin`` is the default. Fetch failures stop the sequence, local
+  branch updates are not forced, and merge conflicts remain available
+  for normal Git resolution.
+
+  Installing ``mergein`` also installs its Bash completion in the user
+  Bash completion directory (honoring ``BASH_COMPLETION_USER_DIR`` and
+  ``XDG_DATA_HOME``). With standard Git Bash completion enabled,
+  ``git mergein`` suggests cached branches of the selected remote, using
+  bare branch names such as ``incoming/topic``. Completion does not
+  contact the remote; fetch to refresh the suggestions. The ``pydifft``
+  form supports the same suggestions when argcomplete is enabled.
 - `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.
@@ -300,7 +349,7 @@ included are (listed in order of fun/utility):
   The former ``git-latexdiffnocompile.sh`` is a compatibility wrapper for
   ``pydifft pd --no-compile``.
 
-  Run ``pydifft pd --add-to-git`` to install the global ``git pd`` alias.
+  Run ``pydifft --add_to_git pd`` to install the global ``git pd`` alias.
   It accepts Git diff arguments: ``git pd 00ffaa -- filename.md`` compares
   that revision with the working file; bare ``git pd`` compares unstaged
   changes; ``git pd --cached`` compares staged changes; and

{pydifftools-0.1.52 → pydifftools-0.1.53}/README.rst

@@ -17,6 +17,30 @@ included are (listed in order of fun/utility):
   `filename.md`, build the result,
   and displays it in your browser. 
 
+  Source diff linting minimizes line-break changes against the Git index
+  (staging area) by default, matching plain ``git diff``. Use
+  ``pydifft cpb filename.md --diff-base @`` to compare against HEAD, or
+  ``--diff-base jf_last`` to compare against a tag, branch, or commit hash.
+  The selected baseline is read again on each build. An unreadable explicit
+  baseline stops the build; an unavailable index baseline, such as for an
+  untracked file, falls back to ordinary source linting.
+  All diff-minimizing line-break fixes are applied automatically before
+  their notice appears. Each page shows as many changed hunks as fit in the
+  window, with a blank line separating hunks; larger changes are applied
+  just like single-break changes.
+  Diff alignment has separate eligibility rules from prose linting.
+  Equations and HTML comment contents participate in alignment, including
+  hunks that begin inside them. Display equations and hidden text remain
+  exempt from prose wrapping and sentence rules. Equation delimiters are
+  matched independently of their contents, and surviving matches on either
+  side of an edit restore whitespace while preserving changed values and
+  TeX commands. Literal delimiters in code are preserved.
+  Leading whitespace at matching line starts is restored in top-level
+  prose when both margins contain at most three spaces, and inside HTML
+  comments and equations. Container indentation (lists, definitions, and
+  quotations), tabs or four-space code indentation outside those spans,
+  and protected blocks retain their current margins.
+
   Continuous pandoc build.
   This works *very well* together
   with the `g/` vim command
@@ -150,6 +174,12 @@ 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.
+  Browser previews in ``qmdb``, ``cpb``, and ``wgrph`` share the same
+  Selenium launcher: Chrome/Chromium is preferred, with Firefox as a
+  fallback. Installed ``chromedriver`` and ``geckodriver`` are used directly
+  without online driver discovery; if only ``geckodriver`` is installed,
+  Firefox opens directly. With neither driver installed, Selenium handles
+  discovery. Chrome startup failures are reported before trying Firefox.
 - ``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
@@ -160,7 +190,7 @@ included are (listed in order of fun/utility):
   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.
+  Run ``pydifft --add_to_git tree`` 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
@@ -174,12 +204,31 @@ included are (listed in order of fun/utility):
   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 gd --add-to-git`` offers the same installation, retaining the
-  exact command of an existing global ``gd`` alias. If none is configured,
-  it installs ``!f() { pydifft gd "$@"; }; f``. Alias installation is shared
-  with ``pd`` and ``tree``.
+  Run ``pydifft --add_to_git gd`` to install the global ``git gd`` alias,
+  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
+  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 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``.
+  ``git mergein incoming/topic`` runs ``git fetch origin
+  incoming/topic:incoming/topic`` followed by ``git merge --no-ff
+  incoming/topic``. Use ``--remote upstream`` to select another remote;
+  ``origin`` is the default. Fetch failures stop the sequence, local
+  branch updates are not forced, and merge conflicts remain available
+  for normal Git resolution.
+
+  Installing ``mergein`` also installs its Bash completion in the user
+  Bash completion directory (honoring ``BASH_COMPLETION_USER_DIR`` and
+  ``XDG_DATA_HOME``). With standard Git Bash completion enabled,
+  ``git mergein`` suggests cached branches of the selected remote, using
+  bare branch names such as ``incoming/topic``. Completion does not
+  contact the remote; fetch to refresh the suggestions. The ``pydifft``
+  form supports the same suggestions when argcomplete is enabled.
 - `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.
@@ -245,7 +294,7 @@ included are (listed in order of fun/utility):
   The former ``git-latexdiffnocompile.sh`` is a compatibility wrapper for
   ``pydifft pd --no-compile``.
 
-  Run ``pydifft pd --add-to-git`` to install the global ``git pd`` alias.
+  Run ``pydifft --add_to_git pd`` to install the global ``git pd`` alias.
   It accepts Git diff arguments: ``git pd 00ffaa -- filename.md`` compares
   that revision with the working file; bare ``git pd`` compares unstaged
   changes; ``git pd --cached`` compares staged changes; and

{pydifftools-0.1.52 → pydifftools-0.1.53/pyDiffTools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyDiffTools
-Version: 0.1.52
+Version: 0.1.53
 Summary: Diff tools
 Author: J M Franck
 License: Copyright (c) 2015, jmfranck
@@ -72,6 +72,30 @@ included are (listed in order of fun/utility):
   `filename.md`, build the result,
   and displays it in your browser. 
 
+  Source diff linting minimizes line-break changes against the Git index
+  (staging area) by default, matching plain ``git diff``. Use
+  ``pydifft cpb filename.md --diff-base @`` to compare against HEAD, or
+  ``--diff-base jf_last`` to compare against a tag, branch, or commit hash.
+  The selected baseline is read again on each build. An unreadable explicit
+  baseline stops the build; an unavailable index baseline, such as for an
+  untracked file, falls back to ordinary source linting.
+  All diff-minimizing line-break fixes are applied automatically before
+  their notice appears. Each page shows as many changed hunks as fit in the
+  window, with a blank line separating hunks; larger changes are applied
+  just like single-break changes.
+  Diff alignment has separate eligibility rules from prose linting.
+  Equations and HTML comment contents participate in alignment, including
+  hunks that begin inside them. Display equations and hidden text remain
+  exempt from prose wrapping and sentence rules. Equation delimiters are
+  matched independently of their contents, and surviving matches on either
+  side of an edit restore whitespace while preserving changed values and
+  TeX commands. Literal delimiters in code are preserved.
+  Leading whitespace at matching line starts is restored in top-level
+  prose when both margins contain at most three spaces, and inside HTML
+  comments and equations. Container indentation (lists, definitions, and
+  quotations), tabs or four-space code indentation outside those spans,
+  and protected blocks retain their current margins.
+
   Continuous pandoc build.
   This works *very well* together
   with the `g/` vim command
@@ -205,6 +229,12 @@ 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.
+  Browser previews in ``qmdb``, ``cpb``, and ``wgrph`` share the same
+  Selenium launcher: Chrome/Chromium is preferred, with Firefox as a
+  fallback. Installed ``chromedriver`` and ``geckodriver`` are used directly
+  without online driver discovery; if only ``geckodriver`` is installed,
+  Firefox opens directly. With neither driver installed, Selenium handles
+  discovery. Chrome startup failures are reported before trying Firefox.
 - ``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
@@ -215,7 +245,7 @@ included are (listed in order of fun/utility):
   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.
+  Run ``pydifft --add_to_git tree`` 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
@@ -229,12 +259,31 @@ included are (listed in order of fun/utility):
   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 gd --add-to-git`` offers the same installation, retaining the
-  exact command of an existing global ``gd`` alias. If none is configured,
-  it installs ``!f() { pydifft gd "$@"; }; f``. Alias installation is shared
-  with ``pd`` and ``tree``.
+  Run ``pydifft --add_to_git gd`` to install the global ``git gd`` alias,
+  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
+  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 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``.
+  ``git mergein incoming/topic`` runs ``git fetch origin
+  incoming/topic:incoming/topic`` followed by ``git merge --no-ff
+  incoming/topic``. Use ``--remote upstream`` to select another remote;
+  ``origin`` is the default. Fetch failures stop the sequence, local
+  branch updates are not forced, and merge conflicts remain available
+  for normal Git resolution.
+
+  Installing ``mergein`` also installs its Bash completion in the user
+  Bash completion directory (honoring ``BASH_COMPLETION_USER_DIR`` and
+  ``XDG_DATA_HOME``). With standard Git Bash completion enabled,
+  ``git mergein`` suggests cached branches of the selected remote, using
+  bare branch names such as ``incoming/topic``. Completion does not
+  contact the remote; fetch to refresh the suggestions. The ``pydifft``
+  form supports the same suggestions when argcomplete is enabled.
 - `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.
@@ -300,7 +349,7 @@ included are (listed in order of fun/utility):
   The former ``git-latexdiffnocompile.sh`` is a compatibility wrapper for
   ``pydifft pd --no-compile``.
 
-  Run ``pydifft pd --add-to-git`` to install the global ``git pd`` alias.
+  Run ``pydifft --add_to_git pd`` to install the global ``git pd`` alias.
   It accepts Git diff arguments: ``git pd 00ffaa -- filename.md`` compares
   that revision with the working file; bare ``git pd`` compares unstaged
   changes; ``git pd --cached`` compares staged changes; and

{pydifftools-0.1.52 → pydifftools-0.1.53}/pyDiffTools.egg-info/SOURCES.txt

@@ -90,6 +90,7 @@ pydifftools/wrap_sentences.py
 pydifftools/wrapping_options.py
 pydifftools/xml2xlsx.vbs
 pydifftools/zotero.py
+pydifftools/completions/git-mergein
 pydifftools/flowchart/__init__.py
 pydifftools/flowchart/comparison.py
 pydifftools/flowchart/dot_to_yaml.py
@@ -113,6 +114,7 @@ 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_mergein.py
 tests/test_git_pdf_diff.py
 tests/test_line_alignment.py
 tests/test_pdf_diff.py

pydifftools-0.1.53/pydifftools/browser_lifecycle.py

@@ -0,0 +1,173 @@
+import os
+import re
+import shutil
+import subprocess
+import sys
+
+# callbacks that run before any dialog needs the user; cpb registers one
+# that closes its live preview, so issues are dealt with before it reopens
+dialog_callbacks = []
+
+
+# also used by: continuous.py, notebook/fast_build.py, flowchart/watch_graph.py
+def start_browser():
+    """Prefer Chrome/Chromium, using installed drivers before discovery.
+
+    If only GeckoDriver is installed, use Firefox directly. Otherwise try
+    Chrome first, including version-mismatch recovery, then Firefox.
+    """
+    from selenium import webdriver
+    from selenium.common.exceptions import (
+        SessionNotCreatedException,
+        WebDriverException,
+    )
+    from selenium.webdriver.chrome.service import Service as ChromeService
+    from selenium.webdriver.firefox.service import Service as FirefoxService
+
+    chrome_driver = shutil.which("chromedriver")
+    firefox_driver = shutil.which("geckodriver")
+    chrome_error = None
+    if chrome_driver or not firefox_driver:
+        # {{{ Use installed ChromeDriver without an online Manager lookup
+        kwargs = {}
+        if chrome_driver:
+            options = webdriver.ChromeOptions()
+            # Debian's driver defaults to Chromium even if Chrome is installed;
+            # retain Selenium Manager's preference for Google Chrome.
+            browser_path = (
+                shutil.which("google-chrome")
+                or shutil.which("google-chrome-stable")
+                or shutil.which("chromium")
+                or shutil.which("chromium-browser")
+            )
+            if browser_path:
+                options.binary_location = browser_path
+            kwargs = {
+                "service": ChromeService(chrome_driver),
+                "options": options,
+            }
+        # }}}
+        try:
+            try:
+                return webdriver.Chrome(**kwargs)
+            except SessionNotCreatedException as exc:
+                # {{{ Retry ChromeDriver's explicit browser-version rejection
+                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
+                print(
+                    "pydifft: warning: ChromeDriver "
+                    f"{driver_match.group(1)} and Chrome "
+                    f"{browser_match.group(1)} do not match; retrying "
+                    "with the driver version check disabled.",
+                    file=sys.stderr,
+                )
+                service = kwargs.get("service")
+                kwargs["service"] = ChromeService(
+                    executable_path=service.path if service else None,
+                    service_args=[
+                        *(service.service_args if service else []),
+                        "--disable-build-check",
+                    ],
+                )
+                return webdriver.Chrome(**kwargs)
+                # }}}
+        except WebDriverException as exc:
+            chrome_error = exc
+            print(
+                f"pydifft: warning: Chrome/Chromium could not start: {exc}\n"
+                "Trying Firefox instead.",
+                file=sys.stderr,
+            )
+
+    try:
+        if firefox_driver:
+            return webdriver.Firefox(service=FirefoxService(firefox_driver))
+        return webdriver.Firefox()
+    except WebDriverException as exc:
+        if chrome_error is not None:
+            raise exc from chrome_error
+        raise
+
+
+def prepare_for_dialog():
+    """Let watch commands close their preview before a dialog appears."""
+    for callback in list(dialog_callbacks):
+        callback()
+
+
+# also used by: continuous.py, notebook/fast_build.py, flowchart/watch_graph.py
+def browser_window_is_alive(browser):
+    # Keep all browser liveness checks in one place so watch commands share
+    # the same shutdown behavior when a user closes the browser window.
+    # Do not probe with execute_script here: page navigations can briefly
+    # interrupt script execution even while the window is still open.
+    if browser is None:
+        return False
+    try:
+        handles = browser.window_handles
+        if not handles:
+            return False
+        return True
+    except Exception:
+        return False
+
+
+def close_browser_window(browser):
+    # Close a Selenium browser session and ignore errors from already-closed
+    # windows so cleanup paths stay simple.
+    if browser is None:
+        return
+    try:
+        browser.quit()
+    except Exception:
+        pass
+
+
+# also used by: notebook/fast_build.py (qmdb's forward search), besides
+# cpb in continuous.py; tests/test_continuous_shutdown.py monkeypatches it
+def forward_search_in_browser(browser, search_text):
+    # Reuse the same browser-side find logic across cpb and qmdb.
+    if browser is None or not search_text:
+        return False
+    found = browser.execute_script(
+        """
+        var searchText = arguments[0];
+        if (!window.find) {
+            return false;
+        }
+        var didFind = window.find(searchText);
+        if (didFind && window.getSelection) {
+            var selection = window.getSelection();
+            if (selection.rangeCount > 0) {
+                var rect = selection.getRangeAt(0).getBoundingClientRect();
+                window.scrollBy(0, rect.top - window.innerHeight / 3);
+            }
+        }
+        return didFind;
+        """,
+        search_text,
+    )
+    if not found:
+        print("forward search did not find text:", search_text)
+    # Bring the browser window to the foreground in Linux window managers,
+    # but only when it found the text, since every qmdb session hears it.
+    if found and os.name == "posix" and shutil.which("wmctrl"):
+        window_title = browser.execute_script("return document.title;")
+        if window_title:
+            # Try common browser title forms used by desktop environments.
+            for title_candidate in [
+                window_title,
+                window_title + " - Google Chrome",
+                window_title + " - Chromium",
+                window_title + " - Chrome",
+                window_title + " - Mozilla Firefox",
+            ]:
+                subprocess.run(["wmctrl", "-a", title_candidate], check=False)
+    return found

{pydifftools-0.1.52 → pydifftools-0.1.53}/pydifftools/command_line.py

@@ -37,6 +37,9 @@ from .searchacro import replace_acros
 from .rearrange_tex import run as rearrange_tex_run
 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 (
+    GIT_ALIASES, install_git_alias, mergein_completer,
+)
 from .flowchart.watch_graph import wgrph
 from .flowchart.graph import load_graph_yaml
 from .notebook.tex_to_qmd import tex2qmd
@@ -45,6 +48,7 @@ from .notebook.fast_build import (
     qmdinit,
     QMDB_FORWARD_SEARCH_HOST,
     QMDB_FORWARD_SEARCH_PORT,
+    QMDB_PORT_ATTEMPTS,
 )
 
 from .command_registry import _COMMAND_SPECS, register_command
@@ -575,13 +579,17 @@ def mfs(text):
         search_text = text.strip()
 
     # Try existing cpb and qmdb listeners before launching a new cpb process.
-    socket_addresses = [
-        (FORWARD_SEARCH_HOST, FORWARD_SEARCH_PORT),
-        (QMDB_FORWARD_SEARCH_HOST, QMDB_FORWARD_SEARCH_PORT),
+    # Several qmdb sessions can run at once on consecutive ports; each one
+    # receives the search and only a browser that finds the text comes
+    # forward.
+    socket_addresses = [(FORWARD_SEARCH_HOST, FORWARD_SEARCH_PORT)] + [
+        (QMDB_FORWARD_SEARCH_HOST, QMDB_FORWARD_SEARCH_PORT + offset)
+        for offset in range(QMDB_PORT_ATTEMPTS)
     ]
 
     def try_existing_listener():
         protocol_errors = []
+        delivered = False
         for address in socket_addresses:
             try:
                 send_forward_search(address, search_text)
@@ -590,6 +598,10 @@ def mfs(text):
             except ForwardSearchProtocolError as exc:
                 protocol_errors.append(str(exc))
                 continue
+            if address == socket_addresses[0]:
+                return True
+            delivered = True
+        if delivered:
             return True
         if protocol_errors:
             raise RuntimeError(
@@ -902,8 +914,14 @@ def build_parser():
     )
     parser.epilog = _subcommand_help_hint(parser.prog)
     parser._pydifft_subparsers = {}
-    subparsers = parser.add_subparsers(dest="command")
-    subparsers.required = True
+    subparsers = parser.add_subparsers(dest="command", title="commands")
+    # Consume installer names exclusively, including during completion.
+    # 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 "
+              "(without a subcommand)."),
+    )
     for name, spec in _COMMAND_SPECS.items():
         subparser = subparsers.add_parser(
             name,
@@ -926,6 +944,8 @@ def build_parser():
             if name == "wgrph" and action.dest == "t":
                 # Offer case-insensitive completions for incomplete task names.
                 action.completer = wgrph_task_completer
+            if name == "mergein" and action.dest in ("branch", "remote"):
+                action.completer = mergein_completer
         subparser.set_defaults(_handler=spec["handler"])
         parser._pydifft_subparsers[name] = subparser
     return parser
@@ -985,6 +1005,25 @@ def main(argv=None):
             parser._pydifft_subparsers[subcommand].print_help()
             return
     namespace = parser.parse_args(argv)
+    if namespace.add_to_git is not None:
+        if not namespace.add_to_git:
+            parser.error("--add_to_git requires at least one command name")
+        unknown_names = [
+            name for name in namespace.add_to_git if name not in GIT_ALIASES
+        ]
+        if unknown_names:
+            parser.error(
+                "unknown Git alias name(s): " + ", ".join(unknown_names)
+            )
+        if namespace.command is not None:
+            parser.error("--add_to_git cannot be combined with a subcommand")
+        for name in dict.fromkeys(namespace.add_to_git):
+            install_git_alias(
+                name, GIT_ALIASES[name], preserve_existing=(name == "gd"),
+            )
+        return
+    if namespace.command is None:
+        parser.error("a subcommand or --add_to_git is required")
     # Shared wrapping arguments are validated identically for each command.
     if hasattr(namespace, "wrapnumber") and namespace.wrapnumber < 1:
         parser._pydifft_subparsers[namespace.command].error(
@@ -1016,6 +1055,7 @@ def main(argv=None):
     handler_kwargs = dict(vars(namespace))
     handler_kwargs.pop("_handler", None)
     handler_kwargs.pop("command", None)
+    handler_kwargs.pop("add_to_git", None)
     # {{{ explain Chrome and ChromeDriver version mismatches
     from selenium.common.exceptions import SessionNotCreatedException
 

pydifftools-0.1.53/pydifftools/completions/git-mergein

@@ -0,0 +1,41 @@
+# Loaded by Git's Bash completion through _completion_loader git-mergein.
+_git_mergein ()
+{
+    local remote=origin branch_seen=0 expect_remote=0 end_options=0
+    local i word ref symref ref_prefix candidate
+    for ((i = __git_cmd_idx + 1; i < cword; i++)); do
+        word=${words[i]}
+        if ((expect_remote)); then
+            remote=$word
+            expect_remote=0
+        elif ((end_options)); then
+            branch_seen=1
+        else
+            case "$word" in
+                --remote) expect_remote=1 ;;
+                --remote=*) remote=${word#--remote=} ;;
+                --) end_options=1 ;;
+                -*) ;;
+                *) branch_seen=1 ;;
+            esac
+        fi
+    done
+    if ((expect_remote)); then
+        __gitcomp_nl "$(__git remote)"
+    elif ((!end_options)) && [[ $cur == --remote=* ]]; then
+        __gitcomp_nl "$(__git remote)" "--remote=" "${cur#--remote=}"
+    elif ((!end_options)) && [[ $cur == -* ]]; then
+        __gitcomp "--remote --help"
+    elif ((!branch_seen)); then
+        ref_prefix="refs/remotes/$remote/"
+        local candidates=
+        while read -r ref symref; do
+            [[ $ref == "$ref_prefix"* && -z $symref ]] || continue
+            candidate=${ref#"$ref_prefix"}
+            [[ $candidate == HEAD ]] && continue
+            candidates+="$candidate"$'\n'
+        done < <(__git for-each-ref --format='%(refname) %(symref)' \
+            -- "$ref_prefix" 2>/dev/null)
+        __gitcomp_nl "$candidates"
+    fi
+}