git-cola v4.13.0-85-g57a24b9b663e

Author: davvid

share/doc/git-cola/git-cola.rst

@@ -122,6 +122,11 @@ merge
 Merge branches. ``git cola merge`` is an entry point for the ``Actions > Merge...``
 main menu action.
 
+open
+----
+
+Launch the "Quick Open" dialog to open bookmarked and recently-opened repositories.
+
 pull
 ----
 
@@ -921,6 +926,12 @@ cola.fontdiff
 
 Specifies the font to use for `git cola`'s diff display.
 
+cola.fontsize
+-------------
+
+Specifies the font size that is used for the Status, Submodules, Branches, Recent, and
+Favorites widgets.
+
 cola.hidpi
 ----------
 
@@ -1606,6 +1617,31 @@ The completion scripts and instructions are included in Git Cola's
 * `Setup instructions <https://gitlab.com/git-cola/git-cola/-/blob/main/contrib/README.md>`_
 
 
+MACOS NOTES
+===========
+
+A ``git-cola.app`` bundle can be built using ``garden macos/app``.
+See the ``garden.yaml`` file for more details.
+
+Older versions of the ``git-cola.app`` may have caused macOS to launch Git Cola using
+Rosetta even though Python is arm64 native. This is a macOS / Apple bug.
+
+A stub ``git-cola-macos`` binary is now provided in ``git-cola.app/Contents/MacOS``
+as a workaround to prevent this behavior.
+
+If you launched an older version of the ``git-cola.app`` bundle you may have encountered
+this macOS bug:
+
+https://apple.stackexchange.com/questions/457171/shell-script-application-bundle-prompts-for-rosetta-installation
+
+Per the discussion above, you can clear the buggy cache using this command::
+
+    /usr/libexec/PlistBuddy -c 'Delete :"Architectures for arm64":com.justroots.git-cola' \
+    ~/Library/Preferences/com.apple.LaunchServices/com.apple.LaunchServices.plist
+
+Reboot after running this command and Git Cola should launch natively without Rosetta.
+
+
 WINDOWS NOTES
 =============
 

share/doc/git-cola/html/genindex.html

@@ -4,7 +4,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1"/>
     <meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="#" /><link rel="search" title="Search" href="search.html" />
 
-    <!-- Generated with Sphinx 8.1.3 and Furo 2024.08.06 --><title>Index - Git Cola 4.13.0 documentation</title>
+    <!-- Generated with Sphinx 8.2.1 and Furo 2024.08.06 --><title>Index - Git Cola 4.13.0 documentation</title>
 <link rel="stylesheet" type="text/css" href="static/pygments.css?v=a746c00c" />
     <link rel="stylesheet" type="text/css" href="static/styles/furo.css?v=354aac6f" />
     <link rel="stylesheet" type="text/css" href="static/styles/furo-extensions.css?v=302659d7" />

share/doc/git-cola/html/git-cola.html

@@ -5,7 +5,7 @@
     <meta name="color-scheme" content="light dark"><meta name="viewport" content="width=device-width, initial-scale=1" />
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="git-dag" href="git-dag.html" /><link rel="prev" title="Git Cola Documentation" href="index.html" />
 
-    <!-- Generated with Sphinx 8.1.3 and Furo 2024.08.06 -->
+    <!-- Generated with Sphinx 8.2.1 and Furo 2024.08.06 -->
         <title>git-cola - Git Cola 4.13.0 documentation</title>
       <link rel="stylesheet" type="text/css" href="static/pygments.css?v=a746c00c" />
     <link rel="stylesheet" type="text/css" href="static/styles/furo.css?v=354aac6f" />
@@ -342,6 +342,10 @@ <h3>merge<a class="headerlink" href="#merge" title="Link to this heading">¶</a>
 <p>Merge branches. <code class="docutils literal notranslate"><span class="pre">git</span> <span class="pre">cola</span> <span class="pre">merge</span></code> is an entry point for the <code class="docutils literal notranslate"><span class="pre">Actions</span> <span class="pre">&gt;</span> <span class="pre">Merge...</span></code>
 main menu action.</p>
 </section>
+<section id="open">
+<h3>open<a class="headerlink" href="#open" title="Link to this heading">¶</a></h3>
+<p>Launch the “Quick Open” dialog to open bookmarked and recently-opened repositories.</p>
+</section>
 <section id="pull">
 <h3>pull<a class="headerlink" href="#pull" title="Link to this heading">¶</a></h3>
 <p>Fetch and merge remote branches. <code class="docutils literal notranslate"><span class="pre">git</span> <span class="pre">cola</span> <span class="pre">pull</span></code> is an entry point for the
@@ -983,6 +987,11 @@ <h3>cola.fileattributes<a class="headerlink" href="#cola-fileattributes" title="
 <h3>cola.fontdiff<a class="headerlink" href="#cola-fontdiff" title="Link to this heading">¶</a></h3>
 <p>Specifies the font to use for <cite>git cola</cite>’s diff display.</p>
 </section>
+<section id="cola-fontsize">
+<h3>cola.fontsize<a class="headerlink" href="#cola-fontsize" title="Link to this heading">¶</a></h3>
+<p>Specifies the font size that is used for the Status, Submodules, Branches, Recent, and
+Favorites widgets.</p>
+</section>
 <section id="cola-hidpi">
 <h3>cola.hidpi<a class="headerlink" href="#cola-hidpi" title="Link to this heading">¶</a></h3>
 <p>Specifies the High DPI displays scale factor. Set <cite>0</cite> to automatically scaled.
@@ -1563,6 +1572,24 @@ <h2>SHELL COMPLETIONS<a class="headerlink" href="#shell-completions" title="Link
 <li><p><a class="reference external" href="https://gitlab.com/git-cola/git-cola/-/blob/main/contrib/README.md">Setup instructions</a></p></li>
 </ul>
 </section>
+<section id="macos-notes">
+<h2>MACOS NOTES<a class="headerlink" href="#macos-notes" title="Link to this heading">¶</a></h2>
+<p>A <code class="docutils literal notranslate"><span class="pre">git-cola.app</span></code> bundle can be built using <code class="docutils literal notranslate"><span class="pre">garden</span> <span class="pre">macos/app</span></code>.
+See the <code class="docutils literal notranslate"><span class="pre">garden.yaml</span></code> file for more details.</p>
+<p>Older versions of the <code class="docutils literal notranslate"><span class="pre">git-cola.app</span></code> may have caused macOS to launch Git Cola using
+Rosetta even though Python is arm64 native. This is a macOS / Apple bug.</p>
+<p>A stub <code class="docutils literal notranslate"><span class="pre">git-cola-macos</span></code> binary is now provided in <code class="docutils literal notranslate"><span class="pre">git-cola.app/Contents/MacOS</span></code>
+as a workaround to prevent this behavior.</p>
+<p>If you launched an older version of the <code class="docutils literal notranslate"><span class="pre">git-cola.app</span></code> bundle you may have encountered
+this macOS bug:</p>
+<p><a class="reference external" href="https://apple.stackexchange.com/questions/457171/shell-script-application-bundle-prompts-for-rosetta-installation">https://apple.stackexchange.com/questions/457171/shell-script-application-bundle-prompts-for-rosetta-installation</a></p>
+<p>Per the discussion above, you can clear the buggy cache using this command:</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="o">/</span><span class="n">usr</span><span class="o">/</span><span class="n">libexec</span><span class="o">/</span><span class="n">PlistBuddy</span> <span class="o">-</span><span class="n">c</span> <span class="s1">&#39;Delete :&quot;Architectures for arm64&quot;:com.justroots.git-cola&#39;</span> \
+<span class="o">~/</span><span class="n">Library</span><span class="o">/</span><span class="n">Preferences</span><span class="o">/</span><span class="n">com</span><span class="o">.</span><span class="n">apple</span><span class="o">.</span><span class="n">LaunchServices</span><span class="o">/</span><span class="n">com</span><span class="o">.</span><span class="n">apple</span><span class="o">.</span><span class="n">LaunchServices</span><span class="o">.</span><span class="n">plist</span>
+</pre></div>
+</div>
+<p>Reboot after running this command and Git Cola should launch natively without Rosetta.</p>
+</section>
 <section id="windows-notes">
 <h2>WINDOWS NOTES<a class="headerlink" href="#windows-notes" title="Link to this heading">¶</a></h2>
 <section id="git-installation">
@@ -1697,6 +1724,7 @@ <h3>Git Cola Homepage<a class="headerlink" href="#git-cola-homepage" title="Link
 <li><a class="reference internal" href="#fetch">fetch</a></li>
 <li><a class="reference internal" href="#grep">grep</a></li>
 <li><a class="reference internal" href="#merge">merge</a></li>
+<li><a class="reference internal" href="#open">open</a></li>
 <li><a class="reference internal" href="#pull">pull</a></li>
 <li><a class="reference internal" href="#push">push</a></li>
 <li><a class="reference internal" href="#rebase">rebase</a></li>
@@ -1780,6 +1808,7 @@ <h3>Git Cola Homepage<a class="headerlink" href="#git-cola-homepage" title="Link
 <li><a class="reference internal" href="#cola-gravatar">cola.gravatar</a></li>
 <li><a class="reference internal" href="#cola-fileattributes">cola.fileattributes</a></li>
 <li><a class="reference internal" href="#cola-fontdiff">cola.fontdiff</a></li>
+<li><a class="reference internal" href="#cola-fontsize">cola.fontsize</a></li>
 <li><a class="reference internal" href="#cola-hidpi">cola.hidpi</a></li>
 <li><a class="reference internal" href="#cola-icontheme">cola.icontheme</a></li>
 <li><a class="reference internal" href="#cola-imagediff-extension">cola.imagediff.[extension]</a></li>
@@ -1856,6 +1885,7 @@ <h3>Git Cola Homepage<a class="headerlink" href="#git-cola-homepage" title="Link
 </ul>
 </li>
 <li><a class="reference internal" href="#shell-completions">SHELL COMPLETIONS</a></li>
+<li><a class="reference internal" href="#macos-notes">MACOS NOTES</a></li>
 <li><a class="reference internal" href="#windows-notes">WINDOWS NOTES</a><ul>
 <li><a class="reference internal" href="#git-installation">Git Installation</a></li>
 <li><a class="reference internal" href="#ssh-agents-for-key-based-authentication">SSH Agents for Key-based Authentication</a></li>

share/doc/git-cola/html/git-dag.html

@@ -5,7 +5,7 @@
     <meta name="color-scheme" content="light dark"><meta name="viewport" content="width=device-width, initial-scale=1" />
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="Thanks" href="thanks.html" /><link rel="prev" title="git-cola" href="git-cola.html" />
 
-    <!-- Generated with Sphinx 8.1.3 and Furo 2024.08.06 -->
+    <!-- Generated with Sphinx 8.2.1 and Furo 2024.08.06 -->
         <title>git-dag - Git Cola 4.13.0 documentation</title>
       <link rel="stylesheet" type="text/css" href="static/pygments.css?v=a746c00c" />
     <link rel="stylesheet" type="text/css" href="static/styles/furo.css?v=354aac6f" />

share/doc/git-cola/html/index.html

@@ -5,7 +5,7 @@
     <meta name="color-scheme" content="light dark"><meta name="viewport" content="width=device-width, initial-scale=1" />
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="git-cola" href="git-cola.html" />
 
-    <!-- Generated with Sphinx 8.1.3 and Furo 2024.08.06 -->
+    <!-- Generated with Sphinx 8.2.1 and Furo 2024.08.06 -->
         <title>Git Cola 4.13.0 documentation</title>
       <link rel="stylesheet" type="text/css" href="static/pygments.css?v=a746c00c" />
     <link rel="stylesheet" type="text/css" href="static/styles/furo.css?v=354aac6f" />
@@ -273,6 +273,7 @@ <h1>Git Cola Documentation<a class="headerlink" href="#git-cola-documentation" t
 <li class="toctree-l3"><a class="reference internal" href="git-cola.html#fetch">fetch</a></li>
 <li class="toctree-l3"><a class="reference internal" href="git-cola.html#grep">grep</a></li>
 <li class="toctree-l3"><a class="reference internal" href="git-cola.html#merge">merge</a></li>
+<li class="toctree-l3"><a class="reference internal" href="git-cola.html#open">open</a></li>
 <li class="toctree-l3"><a class="reference internal" href="git-cola.html#pull">pull</a></li>
 <li class="toctree-l3"><a class="reference internal" href="git-cola.html#push">push</a></li>
 <li class="toctree-l3"><a class="reference internal" href="git-cola.html#rebase">rebase</a></li>
@@ -336,6 +337,7 @@ <h1>Git Cola Documentation<a class="headerlink" href="#git-cola-documentation" t
 <li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-gravatar">cola.gravatar</a></li>
 <li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-fileattributes">cola.fileattributes</a></li>
 <li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-fontdiff">cola.fontdiff</a></li>
+<li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-fontsize">cola.fontsize</a></li>
 <li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-hidpi">cola.hidpi</a></li>
 <li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-icontheme">cola.icontheme</a></li>
 <li class="toctree-l3"><a class="reference internal" href="git-cola.html#cola-imagediff-extension">cola.imagediff.[extension]</a></li>
@@ -412,6 +414,7 @@ <h1>Git Cola Documentation<a class="headerlink" href="#git-cola-documentation" t
 </ul>
 </li>
 <li class="toctree-l2"><a class="reference internal" href="git-cola.html#shell-completions">SHELL COMPLETIONS</a></li>
+<li class="toctree-l2"><a class="reference internal" href="git-cola.html#macos-notes">MACOS NOTES</a></li>
 <li class="toctree-l2"><a class="reference internal" href="git-cola.html#windows-notes">WINDOWS NOTES</a><ul>
 <li class="toctree-l3"><a class="reference internal" href="git-cola.html#git-installation">Git Installation</a></li>
 <li class="toctree-l3"><a class="reference internal" href="git-cola.html#ssh-agents-for-key-based-authentication">SSH Agents for Key-based Authentication</a></li>
@@ -457,6 +460,7 @@ <h2>Release Notes<a class="headerlink" href="#release-notes" title="Link to this
 <li class="toctree-l1"><a class="reference internal" href="relnotes.html">Releases</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="relnotes.html#latest-release">Latest Release</a></li>
 <li class="toctree-l2"><a class="reference internal" href="relnotes.html#development-version">Development version</a></li>
+<li class="toctree-l2"><a class="reference internal" href="relnotes.html#upcoming">Upcoming</a></li>
 <li class="toctree-l2"><a class="reference internal" href="relnotes.html#v4-13-0">v4.13.0</a></li>
 <li class="toctree-l2"><a class="reference internal" href="relnotes.html#v4-12-0">v4.12.0</a></li>
 <li class="toctree-l2"><a class="reference internal" href="relnotes.html#v4-11-0">v4.11.0</a></li>