pyDiffTools 0.1.51__tar.gz → 0.1.53__tar.gz

{pydifftools-0.1.51 → 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.51/pyDiffTools.egg-info → pydifftools-0.1.53}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyDiffTools
-Version: 0.1.51
+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
@@ -185,9 +209,13 @@ included are (listed in order of fun/utility):
   clearing the entire query shows the full plan, including completed and
   undated tasks. Each embedded SVG and live refresh uses the same URL mode.
   The search button beside Home and Zoom finds text in the visible graph,
-  highlights matches, and centers them at a readable font size. Tab or Enter
-  advances to the next match; Shift+Tab or Shift+Enter goes back. Esc closes
-  search. Phrases can span wrapped lines and formatted text.
+  highlights matches, and centers the containing task at your chosen zoom.
+  Tab or Enter advances to the next match; Shift+Tab or Shift+Enter goes
+  back. Esc closes search. Phrases can span wrapped lines and formatted
+  text. Resizing the window scales the current view with the viewport.
+  The ``1:1`` button displays fonts at their declared pixel sizes, including
+  correction for GraphViz's SVG scaling. Right-click a task and select
+  Jump to source to open its YAML definition in gvim.
   Comparison uses the same repository-relative YAML path; a file absent
   from the revision is treated as an empty plan. Historical file renames
   are not followed, and comparison markup is never written to YAML.
@@ -201,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
@@ -211,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
@@ -225,8 +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.
+  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.
@@ -262,6 +319,50 @@ included are (listed in order of fun/utility):
       this rule. The option is shared by ``cpb``, ``wmatch``, ``wr`` and
       ``wrchk``; ``--punctuation-slop`` remains an alias.
 
+- ``pydifft pd OLD NEW [--no-compile]`` ("PDF diff") compares two ``.md``
+  files or two ``.tex`` files. It writes ``NEW_diff.tex`` beside the newer
+  input and, by default, compiles ``NEW_diff.pdf`` there with ``pdflatex``.
+  For example, ``pydifft pd old.md paper.md`` produces ``paper_diff.tex``
+  and ``paper_diff.pdf``. ``--no-compile`` retains the diff TeX without
+  running a compiler and supports TeX fragments as well as full documents.
+
+  Both formats use ``mylatexdiff-preamble.sty`` and the existing custom
+  ``latexdiff`` options and postprocessing. The preamble is searched for
+  in the current directory, beside NEW, then through ``kpsewhich``.
+  Tools must be available on the caller's PATH, including any TeX Live
+  directory configured in your shell. Markdown additionally requires
+  Pandoc and pandoc-crossref; conversion honors declared bibliography and
+  CSL metadata, renders citations and cross-references, and resolves local
+  images beside each source. Converted TeX intermediates are temporary;
+  the Markdown sources are unchanged.
+
+  Markdown code blocks retain Pandoc syntax highlighting. Changed lines
+  get a colored background and a ``+`` or ``-`` marker, with each line
+  processed independently so highlighted code remains valid TeX.
+  Prose keeps the custom preamble styling.
+
+  Python runs ``pdflatex`` beside NEW until references and the table of
+  contents settle (at most six passes), running ``bibtex`` or ``biber``
+  when required. ``latexmk`` and its configuration are not used.
+  Compilation artifacts and the diff TeX remain available if compilation
+  fails. Existing generated outputs can be replaced on a successful rerun.
+  The former ``git-latexdiffnocompile.sh`` is a compatibility wrapper for
+  ``pydifft pd --no-compile``.
+
+  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
+  ``git pd OLD NEW -- filename.md`` compares two revisions. Ranges and
+  Git pathspecs work as usual, including from repository subdirectories.
+  Each changed Markdown or TeX file produces its own ``NAME_diff.tex`` and
+  PDF beside the document's working-tree path. ``git pd --no-compile``
+  generates only TeX. Other file types are skipped, and unchanged files
+  produce no output. Additions, deletions, and renames are supported;
+  unresolved merge conflicts must be resolved first. Historical document
+  snapshots use the current project's bibliography, images, and TeX
+  includes. The shared installer edits only the requested global Git alias.
+
 - `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.51 → 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
@@ -130,9 +154,13 @@ included are (listed in order of fun/utility):
   clearing the entire query shows the full plan, including completed and
   undated tasks. Each embedded SVG and live refresh uses the same URL mode.
   The search button beside Home and Zoom finds text in the visible graph,
-  highlights matches, and centers them at a readable font size. Tab or Enter
-  advances to the next match; Shift+Tab or Shift+Enter goes back. Esc closes
-  search. Phrases can span wrapped lines and formatted text.
+  highlights matches, and centers the containing task at your chosen zoom.
+  Tab or Enter advances to the next match; Shift+Tab or Shift+Enter goes
+  back. Esc closes search. Phrases can span wrapped lines and formatted
+  text. Resizing the window scales the current view with the viewport.
+  The ``1:1`` button displays fonts at their declared pixel sizes, including
+  correction for GraphViz's SVG scaling. Right-click a task and select
+  Jump to source to open its YAML definition in gvim.
   Comparison uses the same repository-relative YAML path; a file absent
   from the revision is treated as an empty plan. Historical file renames
   are not followed, and comparison markup is never written to YAML.
@@ -146,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
@@ -156,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
@@ -170,8 +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.
+  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.
@@ -207,6 +264,50 @@ included are (listed in order of fun/utility):
       this rule. The option is shared by ``cpb``, ``wmatch``, ``wr`` and
       ``wrchk``; ``--punctuation-slop`` remains an alias.
 
+- ``pydifft pd OLD NEW [--no-compile]`` ("PDF diff") compares two ``.md``
+  files or two ``.tex`` files. It writes ``NEW_diff.tex`` beside the newer
+  input and, by default, compiles ``NEW_diff.pdf`` there with ``pdflatex``.
+  For example, ``pydifft pd old.md paper.md`` produces ``paper_diff.tex``
+  and ``paper_diff.pdf``. ``--no-compile`` retains the diff TeX without
+  running a compiler and supports TeX fragments as well as full documents.
+
+  Both formats use ``mylatexdiff-preamble.sty`` and the existing custom
+  ``latexdiff`` options and postprocessing. The preamble is searched for
+  in the current directory, beside NEW, then through ``kpsewhich``.
+  Tools must be available on the caller's PATH, including any TeX Live
+  directory configured in your shell. Markdown additionally requires
+  Pandoc and pandoc-crossref; conversion honors declared bibliography and
+  CSL metadata, renders citations and cross-references, and resolves local
+  images beside each source. Converted TeX intermediates are temporary;
+  the Markdown sources are unchanged.
+
+  Markdown code blocks retain Pandoc syntax highlighting. Changed lines
+  get a colored background and a ``+`` or ``-`` marker, with each line
+  processed independently so highlighted code remains valid TeX.
+  Prose keeps the custom preamble styling.
+
+  Python runs ``pdflatex`` beside NEW until references and the table of
+  contents settle (at most six passes), running ``bibtex`` or ``biber``
+  when required. ``latexmk`` and its configuration are not used.
+  Compilation artifacts and the diff TeX remain available if compilation
+  fails. Existing generated outputs can be replaced on a successful rerun.
+  The former ``git-latexdiffnocompile.sh`` is a compatibility wrapper for
+  ``pydifft pd --no-compile``.
+
+  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
+  ``git pd OLD NEW -- filename.md`` compares two revisions. Ranges and
+  Git pathspecs work as usual, including from repository subdirectories.
+  Each changed Markdown or TeX file produces its own ``NAME_diff.tex`` and
+  PDF beside the document's working-tree path. ``git pd --no-compile``
+  generates only TeX. Other file types are skipped, and unchanged files
+  produce no output. Additions, deletions, and renames are supported;
+  unresolved merge conflicts must be resolved first. Historical document
+  snapshots use the current project's bibliography, images, and TeX
+  includes. The shared installer edits only the requested global Git alias.
+
 - `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.51 → pydifftools-0.1.53/pyDiffTools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyDiffTools
-Version: 0.1.51
+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
@@ -185,9 +209,13 @@ included are (listed in order of fun/utility):
   clearing the entire query shows the full plan, including completed and
   undated tasks. Each embedded SVG and live refresh uses the same URL mode.
   The search button beside Home and Zoom finds text in the visible graph,
-  highlights matches, and centers them at a readable font size. Tab or Enter
-  advances to the next match; Shift+Tab or Shift+Enter goes back. Esc closes
-  search. Phrases can span wrapped lines and formatted text.
+  highlights matches, and centers the containing task at your chosen zoom.
+  Tab or Enter advances to the next match; Shift+Tab or Shift+Enter goes
+  back. Esc closes search. Phrases can span wrapped lines and formatted
+  text. Resizing the window scales the current view with the viewport.
+  The ``1:1`` button displays fonts at their declared pixel sizes, including
+  correction for GraphViz's SVG scaling. Right-click a task and select
+  Jump to source to open its YAML definition in gvim.
   Comparison uses the same repository-relative YAML path; a file absent
   from the revision is treated as an empty plan. Historical file renames
   are not followed, and comparison markup is never written to YAML.
@@ -201,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
@@ -211,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
@@ -225,8 +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.
+  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.
@@ -262,6 +319,50 @@ included are (listed in order of fun/utility):
       this rule. The option is shared by ``cpb``, ``wmatch``, ``wr`` and
       ``wrchk``; ``--punctuation-slop`` remains an alias.
 
+- ``pydifft pd OLD NEW [--no-compile]`` ("PDF diff") compares two ``.md``
+  files or two ``.tex`` files. It writes ``NEW_diff.tex`` beside the newer
+  input and, by default, compiles ``NEW_diff.pdf`` there with ``pdflatex``.
+  For example, ``pydifft pd old.md paper.md`` produces ``paper_diff.tex``
+  and ``paper_diff.pdf``. ``--no-compile`` retains the diff TeX without
+  running a compiler and supports TeX fragments as well as full documents.
+
+  Both formats use ``mylatexdiff-preamble.sty`` and the existing custom
+  ``latexdiff`` options and postprocessing. The preamble is searched for
+  in the current directory, beside NEW, then through ``kpsewhich``.
+  Tools must be available on the caller's PATH, including any TeX Live
+  directory configured in your shell. Markdown additionally requires
+  Pandoc and pandoc-crossref; conversion honors declared bibliography and
+  CSL metadata, renders citations and cross-references, and resolves local
+  images beside each source. Converted TeX intermediates are temporary;
+  the Markdown sources are unchanged.
+
+  Markdown code blocks retain Pandoc syntax highlighting. Changed lines
+  get a colored background and a ``+`` or ``-`` marker, with each line
+  processed independently so highlighted code remains valid TeX.
+  Prose keeps the custom preamble styling.
+
+  Python runs ``pdflatex`` beside NEW until references and the table of
+  contents settle (at most six passes), running ``bibtex`` or ``biber``
+  when required. ``latexmk`` and its configuration are not used.
+  Compilation artifacts and the diff TeX remain available if compilation
+  fails. Existing generated outputs can be replaced on a successful rerun.
+  The former ``git-latexdiffnocompile.sh`` is a compatibility wrapper for
+  ``pydifft pd --no-compile``.
+
+  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
+  ``git pd OLD NEW -- filename.md`` compares two revisions. Ranges and
+  Git pathspecs work as usual, including from repository subdirectories.
+  Each changed Markdown or TeX file produces its own ``NAME_diff.tex`` and
+  PDF beside the document's working-tree path. ``git pd --no-compile``
+  generates only TeX. Other file types are skipped, and unchanged files
+  produce no output. Additions, deletions, and renames are supported;
+  unresolved merge conflicts must be resolved first. Historical document
+  snapshots use the current project's bibliography, images, and TeX
+  includes. The shared installer edits only the requested global Git alias.
+
 - `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.51 → pydifftools-0.1.53}/pyDiffTools.egg-info/SOURCES.txt

@@ -65,6 +65,7 @@ pydifftools/copy_files.py
 pydifftools/diff-doc.js
 pydifftools/doc_contents.py
 pydifftools/forward_search.py
+pydifftools/git_aliases.py
 pydifftools/git_gd.py
 pydifftools/git_gd_history.py
 pydifftools/git_gd_image.py
@@ -77,6 +78,7 @@ pydifftools/match_spaces.py
 pydifftools/onewordify.py
 pydifftools/onewordify_undo.py
 pydifftools/outline.py
+pydifftools/pdf_diff.py
 pydifftools/rearrange_tex.py
 pydifftools/searchacro.py
 pydifftools/separate_comments.py
@@ -88,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
@@ -111,7 +114,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_mergein.py
+tests/test_git_pdf_diff.py
 tests/test_line_alignment.py
+tests/test_pdf_diff.py
 tests/test_rrng.py
 tests/test_source_jump.py
 tests/test_tex_to_qmd.py