cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-05 23:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deployed 3a98c4e to v0.28.0 with MkDocs 1.6.1 and mike 2.1.3

Browse Source
This commit is contained in:
jj-docs[bot] 2025-04-03 02:24:00 +00:00
parent 54bc8cc358
commit 3f387908a4
146 changed files with 99592 additions and 978 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
latest/404.html
View File

@ -293,7 +293,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -315,7 +315,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -409,7 +409,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -508,7 +508,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -574,7 +574,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -858,7 +858,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1098,7 +1098,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1120,7 +1120,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1164,7 +1164,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1317,7 +1317,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1390,7 +1390,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>

67
latest/FAQ/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -665,7 +665,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -764,7 +764,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -830,7 +830,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -1114,7 +1114,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1354,7 +1354,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1376,7 +1376,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1420,7 +1420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1573,7 +1573,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1646,7 +1646,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
@ -1918,9 +1918,12 @@ options:</p>
</ul> </ul>
<h3 id="where-is-my-commit-why-is-it-not-visible-in-jj-log">Where is my commit, why is it not visible in <code>jj log</code>?<a class="headerlink" href="#where-is-my-commit-why-is-it-not-visible-in-jj-log" title="Permanent link">&para;</a></h3> <h3 id="where-is-my-commit-why-is-it-not-visible-in-jj-log">Where is my commit, why is it not visible in <code>jj log</code>?<a class="headerlink" href="#where-is-my-commit-why-is-it-not-visible-in-jj-log" title="Permanent link">&para;</a></h3>
<p>Is your commit visible with <code>jj log -r 'all()'</code>?</p> <p>Is your commit visible with <code>jj log -r 'all()'</code>?</p>
<p>If yes, you should be aware that <code>jj log</code> only shows the revisions matching <p>If yes, you should be aware that <code>jj log</code> only shows a subset of the commits in
<code>revsets.log</code> by default. You can change it as described in <a href="../config/">config</a> to show the repo by default. Most commits that exist on a remote are not shown. Local
more revisions.</p> commits and their immediate parents (for context) are shown. The thinking is
that you are more likely to interact with this set of commits. You can configure
the set of revisions to show by default by overriding <code>revsets.log</code> as described
in <a href="../config/">config</a>.</p>
<p>If not, the revision may have been abandoned (e.g. because you <p>If not, the revision may have been abandoned (e.g. because you
used <code>jj abandon</code>, or because it's an obsolete version that's been rewritten used <code>jj abandon</code>, or because it's an obsolete version that's been rewritten
with <code>jj rebase</code>, <code>jj describe</code>, etc). In that case, <code>jj log -r commit_id</code> with <code>jj rebase</code>, <code>jj describe</code>, etc). In that case, <code>jj log -r commit_id</code>
@ -2046,9 +2049,11 @@ working-copy commit with <code>jj split -i</code> (or the practically identical
<code>jj commit -i</code>).</p> <code>jj commit -i</code>).</p>
<p>For the equivalent of <code>git commit --amend -p</code>/<code>hg amend -i</code>, use <code>jj squash -i</code>.</p> <p>For the equivalent of <code>git commit --amend -p</code>/<code>hg amend -i</code>, use <code>jj squash -i</code>.</p>
<h3 id="is-there-something-like-git-rebase-interactive-or-hg-histedit">Is there something like <code>git rebase --interactive</code> or <code>hg histedit</code>?<a class="headerlink" href="#is-there-something-like-git-rebase-interactive-or-hg-histedit" title="Permanent link">&para;</a></h3> <h3 id="is-there-something-like-git-rebase-interactive-or-hg-histedit">Is there something like <code>git rebase --interactive</code> or <code>hg histedit</code>?<a class="headerlink" href="#is-there-something-like-git-rebase-interactive-or-hg-histedit" title="Permanent link">&para;</a></h3>
<p>Not yet, you can check <a href="https://github.com/jj-vcs/jj/issues/1531">this issue</a> for updates.</p> <p>It is often sufficient to use some form of <code>jj rebase</code> with <code>-A/-B</code>. For
<p>To reorder commits, it is for now recommended to rebase commits individually, example, if you have a linear chain of revisions <code>A</code> through <code>C</code> and want to
which may require multiple invocations of <code>jj rebase -r</code> or <code>jj rebase -s</code>.</p> move <code>C</code> before <code>B</code>, use <code>jj rebase -r C -B B</code>. See <code>jj help rebase</code> for more
examples.</p>
<p>There is a <a href="https://github.com/jj-vcs/jj/issues/1531">tracking issue</a> you can check for updates.</p>
<p>To squash or split commits, use <code>jj squash</code> and <code>jj split</code>.</p> <p>To squash or split commits, use <code>jj squash</code> and <code>jj split</code>.</p>
<h3 id="how-can-i-keep-my-scratch-files-in-the-repository-without-committing-them">How can I keep my scratch files in the repository without committing them?<a class="headerlink" href="#how-can-i-keep-my-scratch-files-in-the-repository-without-committing-them" title="Permanent link">&para;</a></h3> <h3 id="how-can-i-keep-my-scratch-files-in-the-repository-without-committing-them">How can I keep my scratch files in the repository without committing them?<a class="headerlink" href="#how-can-i-keep-my-scratch-files-in-the-repository-without-committing-them" title="Permanent link">&para;</a></h3>
<p>You can set <code>snapshot.auto-track</code> to only start tracking new files matching the <p>You can set <code>snapshot.auto-track</code> to only start tracking new files matching the
@ -2086,8 +2091,8 @@ into your branch.</p>
</code></pre></div> </code></pre></div>
<p>First, create a new commit branched from main and add your private changes:</p> <p>First, create a new commit branched from main and add your private changes:</p>
<div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>main<span class="w"> </span>-m<span class="w"> </span><span class="s2">&quot;private: my credentials&quot;</span> <div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>main<span class="w"> </span>-m<span class="w"> </span><span class="s2">&quot;private: my credentials&quot;</span>
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>wwwwwwww<span class="w"> </span>861de9eb<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>private:<span class="w"> </span>my<span class="w"> </span>credentials Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>wwwwwwww<span class="w"> </span>861de9eb<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>private:<span class="w"> </span>my<span class="w"> </span>credentials
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>yyyyyyyy<span class="w"> </span>b624cf12<span class="w"> </span>main<span class="w"> </span><span class="p">|</span><span class="w"> </span>Existing<span class="w"> </span>work Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>yyyyyyyy<span class="w"> </span>b624cf12<span class="w"> </span>main<span class="w"> </span><span class="p">|</span><span class="w"> </span>Existing<span class="w"> </span>work
Added<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>modified<span class="w"> </span><span class="m">1</span><span class="w"> </span>files,<span class="w"> </span>removed<span class="w"> </span><span class="m">0</span><span class="w"> </span>files Added<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>modified<span class="w"> </span><span class="m">1</span><span class="w"> </span>files,<span class="w"> </span>removed<span class="w"> </span><span class="m">0</span><span class="w"> </span>files
$<span class="w"> </span><span class="nb">echo</span><span class="w"> </span><span class="s1">&#39;{ &quot;password&quot;: &quot;p@ssw0rd1&quot; }&#39;</span><span class="w"> </span>&gt;<span class="w"> </span>secret_config.json $<span class="w"> </span><span class="nb">echo</span><span class="w"> </span><span class="s1">&#39;{ &quot;password&quot;: &quot;p@ssw0rd1&quot; }&#39;</span><span class="w"> </span>&gt;<span class="w"> </span>secret_config.json
@ -2095,9 +2100,9 @@ $<span class="w"> </span><span class="nb">echo</span><span class="w"> </span><sp
<p>Now create a merge commit with the branch you're working on and the private <p>Now create a merge commit with the branch you're working on and the private
commit:</p> commit:</p>
<div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>xxxxxxxx<span class="w"> </span>wwwwwwww <div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>xxxxxxxx<span class="w"> </span>wwwwwwww
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>vvvvvvvv<span class="w"> </span>ac4d9fbe<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span> Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>vvvvvvvv<span class="w"> </span>ac4d9fbe<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span>
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>xxxxxxxx<span class="w"> </span>ef612875<span class="w"> </span>Add<span class="w"> </span>new<span class="w"> </span>feature Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>xxxxxxxx<span class="w"> </span>ef612875<span class="w"> </span>Add<span class="w"> </span>new<span class="w"> </span>feature
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>wwwwwwww<span class="w"> </span>2106921e<span class="w"> </span>private:<span class="w"> </span>my<span class="w"> </span>credentials Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>wwwwwwww<span class="w"> </span>2106921e<span class="w"> </span>private:<span class="w"> </span>my<span class="w"> </span>credentials
Added<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>modified<span class="w"> </span><span class="m">1</span><span class="w"> </span>files,<span class="w"> </span>removed<span class="w"> </span><span class="m">0</span><span class="w"> </span>files Added<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>modified<span class="w"> </span><span class="m">1</span><span class="w"> </span>files,<span class="w"> </span>removed<span class="w"> </span><span class="m">0</span><span class="w"> </span>files
$<span class="w"> </span>jj<span class="w"> </span>log $<span class="w"> </span>jj<span class="w"> </span>log
@ -2122,13 +2127,13 @@ $<span class="w"> </span>jj<span class="w"> </span>log
<code>--insert-after</code> and <code>--insert-before</code> options (<code>-A</code> and <code>-B</code> for short):</p> <code>--insert-after</code> and <code>--insert-before</code> options (<code>-A</code> and <code>-B</code> for short):</p>
<div class="highlight"><pre><span></span><code><span class="c1"># Insert a new commit after xxxxxxxx</span> <div class="highlight"><pre><span></span><code><span class="c1"># Insert a new commit after xxxxxxxx</span>
$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>--no-edit<span class="w"> </span>-A<span class="w"> </span>xxxxxxxx<span class="w"> </span>-m<span class="w"> </span><span class="s2">&quot;Another feature&quot;</span> $<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>--no-edit<span class="w"> </span>-A<span class="w"> </span>xxxxxxxx<span class="w"> </span>-m<span class="w"> </span><span class="s2">&quot;Another feature&quot;</span>
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>uuuuuuuu<span class="w"> </span>1c3cff09<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>Another<span class="w"> </span>feature Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>uuuuuuuu<span class="w"> </span>1c3cff09<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>Another<span class="w"> </span>feature
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>xxxxxxxx<span class="w"> </span>ef612875<span class="w"> </span>Add<span class="w"> </span>new<span class="w"> </span>feature Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>xxxxxxxx<span class="w"> </span>ef612875<span class="w"> </span>Add<span class="w"> </span>new<span class="w"> </span>feature
<span class="c1"># Insert a new commit between yyyyyyyy and vvvvvvvv</span> <span class="c1"># Insert a new commit between yyyyyyyy and vvvvvvvv</span>
$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>--no-edit<span class="w"> </span>-A<span class="w"> </span>yyyyyyyy<span class="w"> </span>-B<span class="w"> </span>vvvvvvvv<span class="w"> </span>-m<span class="w"> </span><span class="s2">&quot;Yet another feature&quot;</span> $<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>--no-edit<span class="w"> </span>-A<span class="w"> </span>yyyyyyyy<span class="w"> </span>-B<span class="w"> </span>vvvvvvvv<span class="w"> </span>-m<span class="w"> </span><span class="s2">&quot;Yet another feature&quot;</span>
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>tttttttt<span class="w"> </span>938ab831<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>Yet<span class="w"> </span>another<span class="w"> </span>feature Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>tttttttt<span class="w"> </span>938ab831<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>Yet<span class="w"> </span>another<span class="w"> </span>feature
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>yyyyyyyy<span class="w"> </span>b624cf12<span class="w"> </span>Existing<span class="w"> </span>work Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>yyyyyyyy<span class="w"> </span>b624cf12<span class="w"> </span>Existing<span class="w"> </span>work
</code></pre></div> </code></pre></div>
<p>To avoid pushing change <em>wwwwwwww</em> by mistake, use the configuration <p>To avoid pushing change <em>wwwwwwww</em> by mistake, use the configuration
<a href="../config/#set-of-private-commits">git.private-commits</a>:</p> <a href="../config/#set-of-private-commits">git.private-commits</a>:</p>
@ -2220,8 +2225,8 @@ state at commit <code>b80</code> (see step 1 above for how we found that commit
<p>First, we create a new empty child commit. Since it is empty, it has the same <p>First, we create a new empty child commit. Since it is empty, it has the same
contents as <code>31a</code>.</p> contents as <code>31a</code>.</p>
<div class="highlight"><pre><span></span><code><span class="gp">$ </span>jj<span class="w"> </span>new<span class="w"> </span>-m<span class="w"> </span><span class="s2">&quot;featureB&quot;</span> <div class="highlight"><pre><span></span><code><span class="gp">$ </span>jj<span class="w"> </span>new<span class="w"> </span>-m<span class="w"> </span><span class="s2">&quot;featureB&quot;</span>
<span class="go">Working copy now at: pvnrkl 47171aa (empty) featureB</span> <span class="go">Working copy (@) now at: pvnrkl 47171aa (empty) featureB</span>
<span class="go">Parent commit : lnvvtr 31a347e featureA</span> <span class="go">Parent commit (@-) : lnvvtr 31a347e featureA</span>
<span class="gp">$ </span>cat<span class="w"> </span>file <span class="gp">$ </span>cat<span class="w"> </span>file
<span class="go">Done with feature A</span> <span class="go">Done with feature A</span>
<span class="go">Working on feature B</span> <span class="go">Working on feature B</span>
@ -2233,8 +2238,8 @@ the "featureB" change is preserved.</p>
<span class="gp">$ </span>jj<span class="w"> </span>restore<span class="w"> </span>--from<span class="w"> </span>b80<span class="w"> </span>--into<span class="w"> </span>@-<span class="w"> </span>--restore-descendants <span class="gp">$ </span>jj<span class="w"> </span>restore<span class="w"> </span>--from<span class="w"> </span>b80<span class="w"> </span>--into<span class="w"> </span>@-<span class="w"> </span>--restore-descendants
<span class="go">Created lnvvtr 599994e featureA</span> <span class="go">Created lnvvtr 599994e featureA</span>
<span class="go">Rebased 1 descendant commits (while preserving their content)</span> <span class="go">Rebased 1 descendant commits (while preserving their content)</span>
<span class="go">Working copy now at: pvnrkl 468104c featureB</span> <span class="go">Working copy (@) now at: pvnrkl 468104c featureB</span>
<span class="go">Parent commit : lnvvtr 599994e featureA</span> <span class="go">Parent commit (@-) : lnvvtr 599994e featureA</span>
</code></pre></div> </code></pre></div>
<p>Even though <code>@-</code> was modified, <code>--restore-descendants</code> preserved the contents of <p>Even though <code>@-</code> was modified, <code>--restore-descendants</code> preserved the contents of
the current change:</p> the current change:</p>
@ -2323,7 +2328,7 @@ commits associated with it.</p>
<h3 id="how-do-i-integrate-jujutsu-with-gerrit">How do I integrate Jujutsu with Gerrit?<a class="headerlink" href="#how-do-i-integrate-jujutsu-with-gerrit" title="Permanent link">&para;</a></h3> <h3 id="how-do-i-integrate-jujutsu-with-gerrit">How do I integrate Jujutsu with Gerrit?<a class="headerlink" href="#how-do-i-integrate-jujutsu-with-gerrit" title="Permanent link">&para;</a></h3>
<p>At the moment you'll need a script, which adds the required fields for Gerrit <p>At the moment you'll need a script, which adds the required fields for Gerrit
like the <code>Change-Id</code> footer. Then <code>jj</code> can invoke it via an <code>$EDITOR</code> override like the <code>Change-Id</code> footer. Then <code>jj</code> can invoke it via an <code>$EDITOR</code> override
in an aliased command. Here's an <a href="https://gist.github.com/thoughtpolice/8f2fd36ae17cd11b8e7bd93a70e31ad6">example</a> from an in an aliased command. Here's an <a href="https://gist.github.com/thoughtpolice/8f2fd36ae17cd11b8e7bd93a70e31ad6">example</a> from a
contributor (look for the <code>jj signoff</code> alias).</p> contributor (look for the <code>jj signoff</code> alias).</p>
<p>After you have attached the <code>Change-Id:</code> footer to the commit series, you'll <p>After you have attached the <code>Change-Id:</code> footer to the commit series, you'll
have to manually invoke <code>git push</code> of <code>HEAD</code> on the underlying git repository have to manually invoke <code>git push</code> of <code>HEAD</code> on the underlying git repository

22
latest/bookmarks/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -521,7 +521,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -742,7 +742,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -1026,7 +1026,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1266,7 +1266,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1288,7 +1288,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1332,7 +1332,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1485,7 +1485,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1558,7 +1558,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>

473
latest/cli-reference/index.html
View File

File diff suppressed because it is too large Load Diff

22
latest/code-of-conduct/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -869,7 +869,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1257,7 +1257,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1279,7 +1279,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1323,7 +1323,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1476,7 +1476,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1549,7 +1549,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>

44
latest/community_tools/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -548,6 +548,15 @@
</span> </span>
</a> </a>
</li>
<li class="md-nav__item">
<a href="#jujutsu-kaizen" class="md-nav__link">
<span class="md-ellipsis">
Jujutsu Kaizen
</span>
</a>
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
@ -641,7 +650,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -707,7 +716,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -991,7 +1000,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1231,7 +1240,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1253,7 +1262,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1297,7 +1306,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1450,7 +1459,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1523,7 +1532,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
@ -1602,6 +1611,15 @@
</span> </span>
</a> </a>
</li>
<li class="md-nav__item">
<a href="#jujutsu-kaizen" class="md-nav__link">
<span class="md-ellipsis">
Jujutsu Kaizen
</span>
</a>
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
@ -1680,6 +1698,10 @@ commonly used <code>jj</code> operations from rebase to undo, and helps with div
<p>This is TUI for Jujutsu built in Ocaml, it is unopiniated and its creator is <p>This is TUI for Jujutsu built in Ocaml, it is unopiniated and its creator is
open to feedback.</p> open to feedback.</p>
<p>Find it <a href="https://github.com/faldor20/jj_tui">here</a>.</p> <p>Find it <a href="https://github.com/faldor20/jj_tui">here</a>.</p>
<h2 id="jujutsu-kaizen">Jujutsu Kaizen<a class="headerlink" href="#jujutsu-kaizen" title="Permanent link">&para;</a></h2>
<p>Jujutsu Kaizen is a plugin for Visual Studio Code. The goal of this extension is to bring the great UX of Jujutsu into the VS Code UI.
Its developers are currently focused on achieving parity for commonly used features of VS Code's built-in Git extension, such as the various operations possible via the Source Control view.</p>
<p>Find it <a href="https://github.com/keanemind/jjk">here</a>.</p>
<h2 id="lazyjj">LazyJJ<a class="headerlink" href="#lazyjj" title="Permanent link">&para;</a></h2> <h2 id="lazyjj">LazyJJ<a class="headerlink" href="#lazyjj" title="Permanent link">&para;</a></h2>
<p>lazyjj is a lazygit inspired TUI for Jujutsu.</p> <p>lazyjj is a lazygit inspired TUI for Jujutsu.</p>
<p>Find it <a href="https://github.com/Cretezy/lazyjj">here</a>.</p> <p>Find it <a href="https://github.com/Cretezy/lazyjj">here</a>.</p>

66
latest/config-schema.json
View File

@ -210,14 +210,34 @@
"description": "Editor to use for commands that involve editing text" "description": "Editor to use for commands that involve editing text"
}, },
"diff-editor": { "diff-editor": {
"type": "string",
"description": "Editor tool to use for editing diffs", "description": "Editor tool to use for editing diffs",
"default": ":builtin" "default": ":builtin",
"oneOf": [
{
"type": "string"
},
{
"type": "array",
"items": {
"type": "string"
}
}
]
}, },
"merge-editor": { "merge-editor": {
"type": "string",
"description": "Tool to use for resolving three-way merges. Behavior for a given tool name can be configured in merge-tools.TOOL tables", "description": "Tool to use for resolving three-way merges. Behavior for a given tool name can be configured in merge-tools.TOOL tables",
"default": ":builtin" "default": ":builtin",
"oneOf": [
{
"type": "string"
},
{
"type": "array",
"items": {
"type": "string"
}
}
]
}, },
"conflict-marker-style": { "conflict-marker-style": {
"$ref": "#/properties/ui/definitions/conflict-marker-style" "$ref": "#/properties/ui/definitions/conflict-marker-style"
@ -250,7 +270,7 @@
"watchman": { "watchman": {
"type": "object", "type": "object",
"properties": { "properties": {
"register_snapshot_trigger": { "register-snapshot-trigger": {
"type": "boolean", "type": "boolean",
"default": false, "default": false,
"description": "Whether to use triggers to monitor for changes in the background." "description": "Whether to use triggers to monitor for changes in the background."
@ -322,6 +342,9 @@
}, },
"underline": { "underline": {
"type": "boolean" "type": "boolean"
},
"reverse": {
"type": "boolean"
} }
} }
} }
@ -512,6 +535,11 @@
"type": "string", "type": "string",
"description": "Default set of revisions to sign when no explicit revset is given for jj sign", "description": "Default set of revisions to sign when no explicit revset is given for jj sign",
"default": "reachable(@, mutable())" "default": "reachable(@, mutable())"
},
"log-graph-prioritize": {
"type": "string",
"description": "Set of revisions to prioritize when rendering the graph for jj log",
"default": "present(@)"
} }
}, },
"additionalProperties": { "additionalProperties": {
@ -599,7 +627,7 @@
"properties": { "properties": {
"backend": { "backend": {
"type": "string", "type": "string",
"enum": ["gpg", "none", "ssh"], "enum": ["gpg", "gpgsm", "none", "ssh"],
"description": "The backend to use for signing commits. The string `none` disables signing.", "description": "The backend to use for signing commits. The string `none` disables signing.",
"default": "none" "default": "none"
}, },
@ -626,8 +654,23 @@
}, },
"allow-expired-keys": { "allow-expired-keys": {
"type": "boolean", "type": "boolean",
"description": "Whether to consider signatures generated with an expired key as invalid", "description": "Whether to consider signatures generated with an expired key as valid",
"default": true "default": false
}
}
},
"gpgsm": {
"type": "object",
"properties": {
"program": {
"type": "string",
"description": "Path to the gpgsm program to be called",
"default": "gpgsm"
},
"allow-expired-keys": {
"type": "boolean",
"description": "Whether to consider signatures generated with an expired key as valid",
"default": false
} }
} }
}, },
@ -695,6 +738,13 @@
"default": false "default": false
} }
} }
},
"hints": {
"type": "object",
"description": "Various hints in jj's UI that can be disabled",
"additionalProperties": {
"type": "boolean"
}
} }
} }
} }

328
latest/config/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -877,6 +877,30 @@
</ul> </ul>
</nav> </nav>
</li>
<li class="md-nav__item">
<a href="#list" class="md-nav__link">
<span class="md-ellipsis">
List
</span>
</a>
<nav class="md-nav" aria-label="List">
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#default-template" class="md-nav__link">
<span class="md-ellipsis">
Default Template
</span>
</a>
</li>
</ul>
</nav>
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
@ -899,7 +923,7 @@
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
<a href="#default-template" class="md-nav__link"> <a href="#default-template_1" class="md-nav__link">
<span class="md-ellipsis"> <span class="md-ellipsis">
Default Template Default Template
</span> </span>
@ -1235,6 +1259,21 @@
</span> </span>
</a> </a>
<nav class="md-nav" aria-label="GnuPG Signing">
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#pkcs12-certificates" class="md-nav__link">
<span class="md-ellipsis">
PKCS#12 Certificates
</span>
</a>
</li>
</ul>
</nav>
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
@ -1415,9 +1454,9 @@
<ul class="md-nav__list"> <ul class="md-nav__list">
<li class="md-nav__item"> <li class="md-nav__item">
<a href="#user-config-file" class="md-nav__link"> <a href="#user-config-files" class="md-nav__link">
<span class="md-ellipsis"> <span class="md-ellipsis">
User config file User config files
</span> </span>
</a> </a>
@ -1448,6 +1487,39 @@
</span> </span>
</a> </a>
<nav class="md-nav" aria-label="Conditional variables">
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#using-scope-tables" class="md-nav__link">
<span class="md-ellipsis">
Using [[--scope]] tables
</span>
</a>
</li>
<li class="md-nav__item">
<a href="#using-multiple-files" class="md-nav__link">
<span class="md-ellipsis">
Using multiple files
</span>
</a>
</li>
<li class="md-nav__item">
<a href="#available-condition-keys" class="md-nav__link">
<span class="md-ellipsis">
Available condition keys
</span>
</a>
</li>
</ul>
</nav>
</li> </li>
</ul> </ul>
@ -1650,7 +1722,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1890,7 +1962,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1912,7 +1984,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1956,7 +2028,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -2109,7 +2181,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -2182,7 +2254,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
@ -2378,6 +2450,30 @@
</ul> </ul>
</nav> </nav>
</li>
<li class="md-nav__item">
<a href="#list" class="md-nav__link">
<span class="md-ellipsis">
List
</span>
</a>
<nav class="md-nav" aria-label="List">
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#default-template" class="md-nav__link">
<span class="md-ellipsis">
Default Template
</span>
</a>
</li>
</ul>
</nav>
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
@ -2400,7 +2496,7 @@
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
<a href="#default-template" class="md-nav__link"> <a href="#default-template_1" class="md-nav__link">
<span class="md-ellipsis"> <span class="md-ellipsis">
Default Template Default Template
</span> </span>
@ -2736,6 +2832,21 @@
</span> </span>
</a> </a>
<nav class="md-nav" aria-label="GnuPG Signing">
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#pkcs12-certificates" class="md-nav__link">
<span class="md-ellipsis">
PKCS#12 Certificates
</span>
</a>
</li>
</ul>
</nav>
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
@ -2916,9 +3027,9 @@
<ul class="md-nav__list"> <ul class="md-nav__list">
<li class="md-nav__item"> <li class="md-nav__item">
<a href="#user-config-file" class="md-nav__link"> <a href="#user-config-files" class="md-nav__link">
<span class="md-ellipsis"> <span class="md-ellipsis">
User config file User config files
</span> </span>
</a> </a>
@ -2949,6 +3060,39 @@
</span> </span>
</a> </a>
<nav class="md-nav" aria-label="Conditional variables">
<ul class="md-nav__list">
<li class="md-nav__item">
<a href="#using-scope-tables" class="md-nav__link">
<span class="md-ellipsis">
Using [[--scope]] tables
</span>
</a>
</li>
<li class="md-nav__item">
<a href="#using-multiple-files" class="md-nav__link">
<span class="md-ellipsis">
Using multiple files
</span>
</a>
</li>
<li class="md-nav__item">
<a href="#available-condition-keys" class="md-nav__link">
<span class="md-ellipsis">
Available condition keys
</span>
</a>
</li>
</ul>
</nav>
</li> </li>
</ul> </ul>
@ -2983,7 +3127,7 @@
</li> </li>
<li> <li>
<p>The user settings. These can be edited with <code>jj config edit --user</code>. User <p>The user settings. These can be edited with <code>jj config edit --user</code>. User
settings are located in <a href="#user-config-file">the user config file</a>, which can be found with <code>jj settings are located in <a href="#user-config-files">the user config files</a>, which can be found with <code>jj
config path --user</code>.</p> config path --user</code>.</p>
</li> </li>
<li> <li>
@ -3068,10 +3212,12 @@ active labels alongside the regular colorized output.</p>
<span class="n">change_id</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;#ff1525&quot;</span> <span class="n">change_id</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;#ff1525&quot;</span>
</code></pre></div> </code></pre></div>
<p>If you use a string value for a color, as in the examples above, it will be used <p>If you use a string value for a color, as in the examples above, it will be used
for the foreground color. You can also set the background color, or make the for the foreground color. You can also set the background color, reverse colors
text bold, italic, or underlined. For that, you need to use a table:</p> (swap foreground and background), or make the text bold, italic, or underlined.
For that, you need to use a table:</p>
<div class="highlight"><pre><span></span><code><span class="k">[colors]</span> <div class="highlight"><pre><span></span><code><span class="k">[colors]</span>
<span class="n">commit_id</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">{</span><span class="w"> </span><span class="n">fg</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="s2">&quot;green&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">bg</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="s2">&quot;#ff1525&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">bold</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w"> </span><span class="n">italic</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w"> </span><span class="n">underline</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="kc">true</span><span class="w"> </span><span class="p">}</span> <span class="n">commit_id</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">{</span><span class="w"> </span><span class="n">fg</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="s2">&quot;green&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">bg</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="s2">&quot;#ff1525&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">bold</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w"> </span><span class="n">underline</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="kc">true</span><span class="w"> </span><span class="p">}</span>
<span class="n">change_id</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">{</span><span class="w"> </span><span class="n">reverse</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w"> </span><span class="n">italic</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="kc">true</span><span class="w"> </span><span class="p">}</span>
</code></pre></div> </code></pre></div>
<p>The key names are called "labels". The above used <code>commit_id</code> as label. You can <p>The key names are called "labels". The above used <code>commit_id</code> as label. You can
also create rules combining multiple labels. The rules work a bit like CSS also create rules combining multiple labels. The rules work a bit like CSS
@ -3100,7 +3246,7 @@ subcommand name, subcommand alias, or user-defined alias (defaults to <code>"log
<div class="highlight"><pre><span></span><code><span class="k">[templates]</span> <div class="highlight"><pre><span></span><code><span class="k">[templates]</span>
<span class="n">draft_commit_description</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s1">&#39;&#39;&#39;</span> <span class="n">draft_commit_description</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s1">&#39;&#39;&#39;</span>
<span class="s1">concat(</span> <span class="s1">concat(</span>
<span class="s1"> description,</span> <span class="s1"> coalesce(description, &quot;\n&quot;),</span>
<span class="s1"> surround(</span> <span class="s1"> surround(</span>
<span class="s1"> &quot;\nJJ: This commit contains the following changes:\n&quot;, &quot;&quot;,</span> <span class="s1"> &quot;\nJJ: This commit contains the following changes:\n&quot;, &quot;&quot;,</span>
<span class="s1"> indent(&quot;JJ: &quot;, diff.stat(72)),</span> <span class="s1"> indent(&quot;JJ: &quot;, diff.stat(72)),</span>
@ -3122,6 +3268,8 @@ can override the default style with the following keys:</p>
<span class="c1"># Highlight hunks with background</span> <span class="c1"># Highlight hunks with background</span>
<span class="s2">&quot;diff removed token&quot;</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">{</span><span class="w"> </span><span class="n">bg</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="s2">&quot;#221111&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">underline</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="kc">false</span><span class="w"> </span><span class="p">}</span> <span class="s2">&quot;diff removed token&quot;</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">{</span><span class="w"> </span><span class="n">bg</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="s2">&quot;#221111&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">underline</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="kc">false</span><span class="w"> </span><span class="p">}</span>
<span class="s2">&quot;diff added token&quot;</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">{</span><span class="w"> </span><span class="n">bg</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="s2">&quot;#002200&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">underline</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="kc">false</span><span class="w"> </span><span class="p">}</span> <span class="s2">&quot;diff added token&quot;</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">{</span><span class="w"> </span><span class="n">bg</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="s2">&quot;#002200&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">underline</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="kc">false</span><span class="w"> </span><span class="p">}</span>
<span class="c1"># Alternatively, swap colors</span>
<span class="s2">&quot;diff token&quot;</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">{</span><span class="w"> </span><span class="n">reverse</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w"> </span><span class="n">underline</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="kc">false</span><span class="w"> </span><span class="p">}</span>
</code></pre></div> </code></pre></div>
<h3 id="diff-format">Diff format<a class="headerlink" href="#diff-format" title="Permanent link">&para;</a></h3> <h3 id="diff-format">Diff format<a class="headerlink" href="#diff-format" title="Permanent link">&para;</a></h3>
<div class="highlight"><pre><span></span><code><span class="k">[ui]</span> <div class="highlight"><pre><span></span><code><span class="k">[ui]</span>
@ -3247,6 +3395,21 @@ making it the default:</p>
</code></pre></div> </code></pre></div>
<p>You can pass the <code>--no-edit</code> flag to <code>prev</code> and <code>next</code> if you find yourself <p>You can pass the <code>--no-edit</code> flag to <code>prev</code> and <code>next</code> if you find yourself
needing the original behavior.</p> needing the original behavior.</p>
<h2 id="list">List<a class="headerlink" href="#list" title="Permanent link">&para;</a></h2>
<h3 id="default-template">Default Template<a class="headerlink" href="#default-template" title="Permanent link">&para;</a></h3>
<p>You can configure the template used when no <code>-T</code> is specified.</p>
<ul>
<li><code>templates.config_list</code> for <code>jj config list</code></li>
</ul>
<div class="highlight"><pre><span></span><code><span class="k">[templates]</span>
<span class="c1"># Use builtin config list template</span>
<span class="n">config_list</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;builtin_config_list&quot;</span>
</code></pre></div>
<p>If you want to see the config variable origin (type and path) when you do <code>jj config list</code>
you can add this to your config:</p>
<div class="highlight"><pre><span></span><code><span class="k">[templates]</span>
<span class="n">config_list</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;builtin_config_list_detailed&quot;</span>
</code></pre></div>
<h2 id="log">Log<a class="headerlink" href="#log" title="Permanent link">&para;</a></h2> <h2 id="log">Log<a class="headerlink" href="#log" title="Permanent link">&para;</a></h2>
<h3 id="default-revisions">Default revisions<a class="headerlink" href="#default-revisions" title="Permanent link">&para;</a></h3> <h3 id="default-revisions">Default revisions<a class="headerlink" href="#default-revisions" title="Permanent link">&para;</a></h3>
<p>You can configure the revisions <code>jj log</code> would show when neither <code>-r</code> nor any paths are specified.</p> <p>You can configure the revisions <code>jj log</code> would show when neither <code>-r</code> nor any paths are specified.</p>
@ -3256,7 +3419,7 @@ needing the original behavior.</p>
</code></pre></div> </code></pre></div>
<p>The default value for <code>revsets.log</code> is <p>The default value for <code>revsets.log</code> is
<code>'present(@) | ancestors(immutable_heads().., 2) | present(trunk())'</code>.</p> <code>'present(@) | ancestors(immutable_heads().., 2) | present(trunk())'</code>.</p>
<h3 id="default-template">Default Template<a class="headerlink" href="#default-template" title="Permanent link">&para;</a></h3> <h3 id="default-template_1">Default Template<a class="headerlink" href="#default-template_1" title="Permanent link">&para;</a></h3>
<p>You can configure the template used when no <code>-T</code> is specified.</p> <p>You can configure the template used when no <code>-T</code> is specified.</p>
<ul> <ul>
<li><code>templates.log</code> for <code>jj log</code></li> <li><code>templates.log</code> for <code>jj log</code></li>
@ -3355,7 +3518,7 @@ will need to modify the <code>format_time_range()</code> template alias.</p>
<span class="c1"># Both name and email address</span> <span class="c1"># Both name and email address</span>
<span class="s1">&#39;format_short_signature(signature)&#39;</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s1">&#39;signature&#39;</span> <span class="s1">&#39;format_short_signature(signature)&#39;</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s1">&#39;signature&#39;</span>
<span class="c1"># Username part of the email address</span> <span class="c1"># Username part of the email address</span>
<span class="s1">&#39;format_short_signature(signature)&#39;</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s1">&#39;signature.username()&#39;</span> <span class="s1">&#39;format_short_signature(signature)&#39;</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s1">&#39;signature.email().local()&#39;</span>
</code></pre></div> </code></pre></div>
<h3 id="commit-timestamp">Commit timestamp<a class="headerlink" href="#commit-timestamp" title="Permanent link">&para;</a></h3> <h3 id="commit-timestamp">Commit timestamp<a class="headerlink" href="#commit-timestamp" title="Permanent link">&para;</a></h3>
<p>Commits have both an "author timestamp" and "committer timestamp". By default, <p>Commits have both an "author timestamp" and "committer timestamp". By default,
@ -3858,8 +4021,9 @@ GnuPG or SSH signing keys.</p>
<div class="highlight"><pre><span></span><code><span class="k">[signing]</span> <div class="highlight"><pre><span></span><code><span class="k">[signing]</span>
<span class="n">behavior</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;own&quot;</span> <span class="n">behavior</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;own&quot;</span>
<span class="n">backend</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;gpg&quot;</span> <span class="n">backend</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;gpg&quot;</span>
<span class="n">key</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;4ED556E9729E000F&quot;</span>
<span class="c1">## You can set `key` to anything accepted by `gpg -u`</span> <span class="c1">## You can set `key` to anything accepted by `gpg -u`</span>
<span class="c1">## If not set then defaults to the key associated with `user.email`</span>
<span class="c1"># key = &quot;4ED556E9729E000F&quot;</span>
<span class="c1"># key = &quot;signing@example.com&quot;</span> <span class="c1"># key = &quot;signing@example.com&quot;</span>
</code></pre></div> </code></pre></div>
<p>By default the gpg backend will look for a <code>gpg</code> binary on your path. If you want <p>By default the gpg backend will look for a <code>gpg</code> binary on your path. If you want
@ -3867,10 +4031,30 @@ to change the program used or specify a path to <code>gpg</code> explicitly you
<div class="highlight"><pre><span></span><code><span class="k">[signing]</span> <div class="highlight"><pre><span></span><code><span class="k">[signing]</span>
<span class="n">backends</span><span class="p">.</span><span class="n">gpg</span><span class="p">.</span><span class="n">program</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;gpg2&quot;</span> <span class="n">backends</span><span class="p">.</span><span class="n">gpg</span><span class="p">.</span><span class="n">program</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;gpg2&quot;</span>
</code></pre></div> </code></pre></div>
<p>Also by default the gpg backend will ignore key expiry when verifying commit signatures. <p>Also by default the gpg backend will consider key expiry when verifying commit signatures.
To consider expired keys as invalid you can set:</p> To consider expired keys as valid you can set:</p>
<div class="highlight"><pre><span></span><code><span class="k">[signing]</span> <div class="highlight"><pre><span></span><code><span class="k">[signing]</span>
<span class="n">backends</span><span class="p">.</span><span class="n">gpg</span><span class="p">.</span><span class="n">allow-expired-keys</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="kc">false</span> <span class="n">backends</span><span class="p">.</span><span class="n">gpg</span><span class="p">.</span><span class="n">allow-expired-keys</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="kc">true</span>
</code></pre></div>
<h4 id="pkcs12-certificates">PKCS#12 Certificates<a class="headerlink" href="#pkcs12-certificates" title="Permanent link">&para;</a></h4>
<p>PKCS#12 certificates can be used to sign commits using the <code>gpgsm</code> backend.</p>
<div class="highlight"><pre><span></span><code><span class="k">[signing]</span>
<span class="n">behavior</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;own&quot;</span>
<span class="n">backend</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;gpgsm&quot;</span>
<span class="c1">## You can set `key` to anything accepted by `gpgsm -u`</span>
<span class="c1">## If not set then defaults to the key associated with `user.email`</span>
<span class="c1"># key = &quot;4ED556E9729E000F&quot;</span>
<span class="c1"># key = &quot;signing@example.com&quot;</span>
</code></pre></div>
<p>By default the gpgsm backend will look for a <code>gpgsm</code> binary on your path. If you want
to change the program used or specify a path to <code>gpgsm</code> explicitly you can set:</p>
<div class="highlight"><pre><span></span><code><span class="k">[signing]</span>
<span class="n">backends</span><span class="p">.</span><span class="n">gpgsm</span><span class="p">.</span><span class="n">program</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;gpgsm&quot;</span>
</code></pre></div>
<p>Also by default the gpgsm backend will consider key expiry when verifying commit signatures.
To consider expired keys as valid you can set:</p>
<div class="highlight"><pre><span></span><code><span class="k">[signing]</span>
<span class="n">backends</span><span class="p">.</span><span class="n">gpgsm</span><span class="p">.</span><span class="n">allow-expired-keys</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="kc">true</span>
</code></pre></div> </code></pre></div>
<h3 id="ssh-signing">SSH Signing<a class="headerlink" href="#ssh-signing" title="Permanent link">&para;</a></h3> <h3 id="ssh-signing">SSH Signing<a class="headerlink" href="#ssh-signing" title="Permanent link">&para;</a></h3>
<div class="highlight"><pre><span></span><code><span class="k">[signing]</span> <div class="highlight"><pre><span></span><code><span class="k">[signing]</span>
@ -4031,7 +4215,7 @@ snapshots without having to rescan the entire working copy.</p>
executable on your system</a>.</p> executable on your system</a>.</p>
<p>You can configure <code>jj</code> to use watchman triggers to automatically create <p>You can configure <code>jj</code> to use watchman triggers to automatically create
snapshots on filesystem changes by setting snapshots on filesystem changes by setting
<code>core.watchman.register_snapshot_trigger = true</code>.</p> <code>core.watchman.register-snapshot-trigger = true</code>.</p>
<p>You can check whether Watchman is enabled and whether it is installed correctly <p>You can check whether Watchman is enabled and whether it is installed correctly
using <code>jj debug watchman status</code>.</p> using <code>jj debug watchman status</code>.</p>
<h2 id="snapshot-settings">Snapshot settings<a class="headerlink" href="#snapshot-settings" title="Permanent link">&para;</a></h2> <h2 id="snapshot-settings">Snapshot settings<a class="headerlink" href="#snapshot-settings" title="Permanent link">&para;</a></h2>
@ -4061,47 +4245,59 @@ raw integer literal, the value is interpreted as if it were specified in bytes.<
<p>Files that already exist in the working copy are not subject to this limit.</p> <p>Files that already exist in the working copy are not subject to this limit.</p>
<p>Setting this value to zero will disable the limit entirely.</p> <p>Setting this value to zero will disable the limit entirely.</p>
<h2 id="ways-to-specify-jj-config-details">Ways to specify <code>jj</code> config: details<a class="headerlink" href="#ways-to-specify-jj-config-details" title="Permanent link">&para;</a></h2> <h2 id="ways-to-specify-jj-config-details">Ways to specify <code>jj</code> config: details<a class="headerlink" href="#ways-to-specify-jj-config-details" title="Permanent link">&para;</a></h2>
<h3 id="user-config-file">User config file<a class="headerlink" href="#user-config-file" title="Permanent link">&para;</a></h3> <h3 id="user-config-files">User config files<a class="headerlink" href="#user-config-files" title="Permanent link">&para;</a></h3>
<p>An easy way to find the user config file is:</p> <p>An easy way to find the user config file/directory is:</p>
<div class="highlight"><pre><span></span><code>jj<span class="w"> </span>config<span class="w"> </span>path<span class="w"> </span>--user <div class="highlight"><pre><span></span><code>jj<span class="w"> </span>config<span class="w"> </span>path<span class="w"> </span>--user
</code></pre></div> </code></pre></div>
<p>The rest of this section covers the details of where this file can be located.</p> <p>On all platforms, the user's global <code>jj</code> configurations are by default loaded in
<p>On all platforms, the user's global <code>jj</code> configuration file is located at either the following precedence order (with later configs overriding earlier ones):</p>
<code>~/.jjconfig.toml</code> (where <code>~</code> represents <code>$HOME</code> on Unix-likes, or <ul>
<code>%USERPROFILE%</code> on Windows) or in a platform-specific directory. The <li><code>$HOME/.jjconfig.toml</code></li>
platform-specific location is recommended for better integration with platform <li><code>&lt;PLATFORM_SPECIFIC&gt;/jj/config.toml</code> (preferred)</li>
services. It is an error for both of these files to exist.</p> <li><code>&lt;PLATFORM_SPECIFIC&gt;/jj/conf.d/*.toml</code></li>
</ul>
<p>where <code>$HOME</code> represents the user's home directory (<code>%USERPROFILE%</code> on Windows),
and <code>&lt;PLATFORM_SPECIFIC&gt;</code> represents the platform-specific configuration
directory shown in the table below. The platform-specific location is
recommended for better integration with platform services.</p>
<p>The files in the <code>conf.d</code> directory are loaded in lexicographic order. This allows
configs to be split across multiple files and combines well
with <a href="#conditional-variables">Conditional Variables</a>.</p>
<table> <table>
<thead> <thead>
<tr> <tr>
<th style="text-align: left;">Platform</th> <th style="text-align: left;">Platform</th>
<th style="text-align: left;">Value</th> <th style="text-align: left;">Location of <code>&lt;PLATFORM_SPECIFIC&gt;</code> dir</th>
<th style="text-align: left;">Example</th> <th style="text-align: left;">Example config file location</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td style="text-align: left;">Linux</td> <td style="text-align: left;">Linux</td>
<td style="text-align: left;"><code>$XDG_CONFIG_HOME/jj/config.toml</code></td> <td style="text-align: left;"><code>$XDG_CONFIG_HOME</code> or <code>$HOME/.config</code></td>
<td style="text-align: left;"><code>/home/alice/.config/jj/config.toml</code></td> <td style="text-align: left;"><code>/home/alice/.config/jj/config.toml</code></td>
</tr> </tr>
<tr> <tr>
<td style="text-align: left;">macOS</td> <td style="text-align: left;">macOS</td>
<td style="text-align: left;"><code>$HOME/Library/Application Support/jj/config.toml</code></td> <td style="text-align: left;"><code>$HOME/Library/Application Support</code></td>
<td style="text-align: left;"><code>/Users/Alice/Library/Application Support/jj/config.toml</code></td> <td style="text-align: left;"><code>/Users/Alice/Library/Application Support/jj/config.toml</code></td>
</tr> </tr>
<tr> <tr>
<td style="text-align: left;">Windows</td> <td style="text-align: left;">Windows</td>
<td style="text-align: left;"><code>{FOLDERID_RoamingAppData}\jj\config.toml</code></td> <td style="text-align: left;"><code>{FOLDERID_RoamingAppData}</code></td>
<td style="text-align: left;"><code>C:\Users\Alice\AppData\Roaming\jj\config.toml</code></td> <td style="text-align: left;"><code>C:\Users\Alice\AppData\Roaming\jj\config.toml</code></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<p>The location of the <code>jj</code> config file can also be overridden with the <p>The location of the <code>jj</code> user config files/directories can also be overridden with the
<code>JJ_CONFIG</code> environment variable. If it is not empty, it should contain the path <code>JJ_CONFIG</code> environment variable. If it is not empty, it will be used instead
to a TOML file that will be used instead of any configuration file in the of any configuration files in the default locations. If it is a path to a TOML
default locations. For example,</p> file, then that file will be loaded instead. If it is a path to a directory,
<div class="highlight"><pre><span></span><code>env<span class="w"> </span><span class="nv">JJ_CONFIG</span><span class="o">=</span>/dev/null<span class="w"> </span>jj<span class="w"> </span>log<span class="w"> </span><span class="c1"># Ignores any settings specified in the config file.</span> then all the TOML files in that directory will be loaded in lexicographic order
and merged. Multiple paths can be specified by separating them with a
platform-specific path separator (<code>:</code> on Unix-like systems, <code>;</code> on Windows).</p>
<p>For example, the following could be used to run <code>jj</code> without loading any user configs:</p>
<div class="highlight"><pre><span></span><code><span class="nv">JJ_CONFIG</span><span class="o">=</span><span class="w"> </span>jj<span class="w"> </span>log<span class="w"> </span><span class="c1"># Ignores any settings specified in the config file.</span>
</code></pre></div> </code></pre></div>
<h3 id="json-schema-support">JSON Schema Support<a class="headerlink" href="#json-schema-support" title="Permanent link">&para;</a></h3> <h3 id="json-schema-support">JSON Schema Support<a class="headerlink" href="#json-schema-support" title="Permanent link">&para;</a></h3>
<p>Many popular editors support TOML file syntax highlighting and validation. To <p>Many popular editors support TOML file syntax highlighting and validation. To
@ -4151,8 +4347,8 @@ config files or environment variables. For example,</p>
<div class="highlight"><pre><span></span><code><span class="c1"># Must not have spaces around the `=`</span> <div class="highlight"><pre><span></span><code><span class="c1"># Must not have spaces around the `=`</span>
jj<span class="w"> </span>--config<span class="w"> </span>ui.color<span class="o">=</span>always<span class="w"> </span>--config<span class="w"> </span>ui.diff-editor<span class="o">=</span>meld<span class="w"> </span>split jj<span class="w"> </span>--config<span class="w"> </span>ui.color<span class="o">=</span>always<span class="w"> </span>--config<span class="w"> </span>ui.diff-editor<span class="o">=</span>meld<span class="w"> </span>split
</code></pre></div> </code></pre></div>
<p>Config value should be specified as a TOML expression. If string value doesn't <p>Config value should be specified as a TOML expression. If string value isn't
contain any TOML constructs (such as array notation), quotes can be omitted. enclosed by any TOML constructs (such as array notation), quotes can be omitted.
Here is an example with more advanced TOML constructs:</p> Here is an example with more advanced TOML constructs:</p>
<div class="highlight"><pre><span></span><code><span class="c1"># Single quotes and the &#39;\&#39; are interpreted by the shell and assume a Unix shell</span> <div class="highlight"><pre><span></span><code><span class="c1"># Single quotes and the &#39;\&#39; are interpreted by the shell and assume a Unix shell</span>
<span class="c1"># Double quotes are passed to jj and are parsed as TOML syntax</span> <span class="c1"># Double quotes are passed to jj and are parsed as TOML syntax</span>
@ -4163,11 +4359,12 @@ jj<span class="w"> </span>log<span class="w"> </span>--config<span class="w"> </
<div class="highlight"><pre><span></span><code>jj<span class="w"> </span>--config-file<span class="o">=</span>extra-config.toml<span class="w"> </span>log <div class="highlight"><pre><span></span><code>jj<span class="w"> </span>--config-file<span class="o">=</span>extra-config.toml<span class="w"> </span>log
</code></pre></div> </code></pre></div>
<h3 id="conditional-variables">Conditional variables<a class="headerlink" href="#conditional-variables" title="Permanent link">&para;</a></h3> <h3 id="conditional-variables">Conditional variables<a class="headerlink" href="#conditional-variables" title="Permanent link">&para;</a></h3>
<p>You can conditionally enable config variables by using <code>--when</code> and <p>You can conditionally enable config variables by using <code>--when</code>.</p>
<code>[[--scope]]</code> tables. Variables defined in <code>[[--scope]]</code> tables are expanded to <h4 id="using-scope-tables">Using <code>[[--scope]]</code> tables<a class="headerlink" href="#using-scope-tables" title="Permanent link">&para;</a></h4>
the root table. <code>--when</code> specifies the condition to enable the scope table.</p> <p>Variables defined in <code>[[--scope]]</code> tables are expanded to the root table.
<p>If no conditions are specified, table is always enabled. If multiple conditions <code>--when</code> specifies the condition to enable the scope table.</p>
are specified, the intersection is used.</p> <p>If no conditions are specified, the table is always enabled. If multiple
conditions are specified, their intersection is used.</p>
<div class="highlight"><pre><span></span><code><span class="k">[user]</span> <div class="highlight"><pre><span></span><code><span class="k">[user]</span>
<span class="n">name</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;YOUR NAME&quot;</span> <span class="n">name</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;YOUR NAME&quot;</span>
<span class="n">email</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;YOUR_DEFAULT_EMAIL@example.com&quot;</span> <span class="n">email</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;YOUR_DEFAULT_EMAIL@example.com&quot;</span>
@ -4188,7 +4385,28 @@ are specified, the intersection is used.</p>
<span class="k">[--scope.ui]</span> <span class="k">[--scope.ui]</span>
<span class="n">pager</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;delta&quot;</span> <span class="n">pager</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;delta&quot;</span>
</code></pre></div> </code></pre></div>
<p>Condition keys:</p> <h4 id="using-multiple-files">Using multiple files<a class="headerlink" href="#using-multiple-files" title="Permanent link">&para;</a></h4>
<p><code>--when</code> can also be used on the top level of a TOML file, which is convenient
when splitting your config across multiple files.
The behavior of conditions are the same as when using <code>[[--scope]]</code> tables.</p>
<div class="highlight"><pre><span></span><code><span class="c1"># In $XDG_CONFIG_HOME/jj/config.toml</span>
<span class="k">[user]</span>
<span class="n">name</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;YOUR NAME&quot;</span>
<span class="n">email</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;YOUR_DEFAULT_EMAIL@example.com&quot;</span>
</code></pre></div>
<div class="highlight"><pre><span></span><code><span class="c1"># In $XDG_CONFIG_HOME/jj/conf.d/work.toml</span>
<span class="n">--when</span><span class="p">.</span><span class="n">repositories</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">[</span><span class="s2">&quot;~/the/work/repo&quot;</span><span class="p">]</span>
<span class="k">[user]</span>
<span class="n">email</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;YOUR_WORK_EMAIL@workplace.com&quot;</span>
<span class="k">[revset-aliases]</span>
<span class="n">work</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">&quot;heads(::@ ~ description(exact:&#39;&#39;))::&quot;</span>
<span class="k">[aliases]</span>
<span class="n">wip</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">[</span><span class="s2">&quot;log&quot;</span><span class="p">,</span><span class="w"> </span><span class="s2">&quot;-r&quot;</span><span class="p">,</span><span class="w"> </span><span class="s2">&quot;work&quot;</span><span class="p">]</span>
</code></pre></div>
<h4 id="available-condition-keys">Available condition keys<a class="headerlink" href="#available-condition-keys" title="Permanent link">&para;</a></h4>
<ul> <ul>
<li> <li>
<p><code>--when.repositories</code>: List of paths to match the repository path prefix.</p> <p><code>--when.repositories</code>: List of paths to match the repository path prefix.</p>

22
latest/conflicts/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -521,7 +521,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -682,7 +682,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -966,7 +966,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1206,7 +1206,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1228,7 +1228,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1272,7 +1272,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1425,7 +1425,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1498,7 +1498,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>

32
latest/contributing/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -869,7 +869,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1398,7 +1398,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1420,7 +1420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1464,7 +1464,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1617,7 +1617,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1690,7 +1690,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
@ -2095,7 +2095,7 @@ recommended steps.</p>
<h3 id="summary">Summary<a class="headerlink" href="#summary" title="Permanent link">&para;</a></h3> <h3 id="summary">Summary<a class="headerlink" href="#summary" title="Permanent link">&para;</a></h3>
<p>One-time setup:</p> <p>One-time setup:</p>
<div class="codehilite"><pre><span></span><code>rustup toolchain add nightly # wanted for &#39;rustfmt&#39; <div class="codehilite"><pre><span></span><code>rustup toolchain add nightly # wanted for &#39;rustfmt&#39;
rustup toolchain add 1.76 # also specified in Cargo.toml rustup toolchain add 1.84 # also specified in Cargo.toml
cargo install --locked bacon cargo install --locked bacon
cargo install --locked cargo-insta cargo install --locked cargo-insta
cargo install --locked cargo-nextest cargo install --locked cargo-nextest
@ -2136,7 +2136,7 @@ Cargo will happily use up your entire hard drive. If this happens, run
<p>Your code will be rejected if it cannot be compiled with the minimal <p>Your code will be rejected if it cannot be compiled with the minimal
supported version of Rust ("MSRV"). Currently, <code>jj</code> follows a rather supported version of Rust ("MSRV"). Currently, <code>jj</code> follows a rather
casual MSRV policy: "The current <code>rustc</code> stable version, minus one." casual MSRV policy: "The current <code>rustc</code> stable version, minus one."
As of this writing, that version is <strong>1.76.0</strong>.</p> As of this writing, that version is <strong>1.84.0</strong>.</p>
</li> </li>
<li> <li>
<p>Your code needs to pass <code>cargo clippy</code>. You can also <p>Your code needs to pass <code>cargo clippy</code>. You can also
@ -2380,9 +2380,9 @@ want to adjust the <code>site_url</code> to something like <code>https://jjfan.g
<h2 id="logging">Logging<a class="headerlink" href="#logging" title="Permanent link">&para;</a></h2> <h2 id="logging">Logging<a class="headerlink" href="#logging" title="Permanent link">&para;</a></h2>
<p>You can print internal jj logs using <code>JJ_LOG</code>. It acts like the <code>RUST_LOG</code> <p>You can print internal jj logs using <code>JJ_LOG</code>. It acts like the <code>RUST_LOG</code>
environment variable, frequent in Rust codebases, and accepts one or more environment variable, frequent in Rust codebases, and accepts one or more
<a href="https://docs.rs/tracing-subscriber/latest/tracing_subscriber/filter/struct.EnvFilter.html#directives">directives</a>. You can also use the <code>--debug</code> global option that sets <a href="https://docs.rs/tracing-subscriber/latest/tracing_subscriber/filter/struct.EnvFilter.html#directives">directives</a>. You can also run <code>JJ_LOG=debug jj</code> to get <code>debug</code> level logs
<code>debug</code> log level for all targets by default. <code>JJ_LOG</code> is still respected when enabled for all targets. You can also use the <code>--debug</code> global option, which
using <code>--debug</code>.</p> turns on <code>debug</code> log level for <code>jj-lib</code> and <code>jj-cli</code> only.</p>
<h2 id="profiling">Profiling<a class="headerlink" href="#profiling" title="Permanent link">&para;</a></h2> <h2 id="profiling">Profiling<a class="headerlink" href="#profiling" title="Permanent link">&para;</a></h2>
<p>One easy-to-use sampling profiler <p>One easy-to-use sampling profiler
is <a href="https://github.com/mstange/samply">samply</a>. For example: is <a href="https://github.com/mstange/samply">samply</a>. For example:

22
latest/design/copy-tracking/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -869,7 +869,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1109,7 +1109,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1131,7 +1131,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1175,7 +1175,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1330,7 +1330,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1633,7 +1633,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>

22
latest/design/git-submodule-storage/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -869,7 +869,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1109,7 +1109,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1131,7 +1131,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1175,7 +1175,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1515,7 +1515,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1588,7 +1588,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>

22
latest/design/git-submodules/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -869,7 +869,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1109,7 +1109,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1131,7 +1131,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1175,7 +1175,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1566,7 +1566,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1639,7 +1639,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>

36
latest/design/run/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -869,7 +869,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1109,7 +1109,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1131,7 +1131,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1175,7 +1175,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1551,7 +1551,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1624,7 +1624,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
@ -1885,13 +1885,13 @@ in a <a href="https://github.com/jj-vcs/jj/issues/405">github discussion</a>. In
the git-hook model, there was consensus about not repeating their mistakes.</p> the git-hook model, there was consensus about not repeating their mistakes.</p>
<p>For <code>jj run</code> there is prior art in Mercurial, git branchless and Google's <p>For <code>jj run</code> there is prior art in Mercurial, git branchless and Google's
internal Mercurial. Currently git-branchless <code>git test</code> and <code>hg fix</code> implement internal Mercurial. Currently git-branchless <code>git test</code> and <code>hg fix</code> implement
some kind of command runner. The Google internal <code>hg run</code> works in some kind of command runner. The Google internal <code>hg run</code> works in conjunction
conjunction with CitC (Clients in the Cloud) which allows it to lazily apply with CitC (Clients in the Cloud) which allows it to lazily apply the current
the current command to any affected file. Currently no Jujutsu backend command to any affected file. Currently no open-source Jujutsu backend (Git,
(Git, Native) has a fancy virtual filesystem supporting it, so we Simple) has a fancy virtual filesystem supporting it, so we can't apply this
can't apply this optimization. We could do the same once we have an optimization. We could do the same once we have an implementation of the working
implementation of the working copy based on a virtual file system. Until then, copy based on a virtual file system. Until then, we have to run the commands in
we have to run the commands in regular local-disk working copies.</p> regular local-disk working copies.</p>
<h2 id="goals-and-non-goals">Goals and Non-Goals<a class="headerlink" href="#goals-and-non-goals" title="Permanent link">&para;</a></h2> <h2 id="goals-and-non-goals">Goals and Non-Goals<a class="headerlink" href="#goals-and-non-goals" title="Permanent link">&para;</a></h2>
<h3 id="goals">Goals<a class="headerlink" href="#goals" title="Permanent link">&para;</a></h3> <h3 id="goals">Goals<a class="headerlink" href="#goals" title="Permanent link">&para;</a></h3>
<ul> <ul>

32
latest/design/sparse-v2/index.html
View File

@ -22,7 +22,7 @@
<title>Sparse Patterns v2 - Jujutsu docs</title> <title>Sparse patterns v2 - Jujutsu docs</title>
@ -114,7 +114,7 @@
<div class="md-header__topic" data-md-component="header-topic"> <div class="md-header__topic" data-md-component="header-topic">
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
</div> </div>
@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -869,7 +869,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1109,7 +1109,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1131,7 +1131,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1175,7 +1175,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1339,7 +1339,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1351,7 +1351,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1582,7 +1582,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
@ -1992,7 +1992,7 @@ if desired.</p>
indirection will save on storage since working copy patterns are not expected to indirection will save on storage since working copy patterns are not expected to
change very frequently.</p> change very frequently.</p>
<div class="highlight"><pre><span></span><code><span class="c1">// Before:</span> <div class="highlight"><pre><span></span><code><span class="c1">// Before:</span>
<span class="k">pub</span><span class="w"> </span><span class="n">wc_commit_ids</span><span class="p">:</span><span class="w"> </span><span class="nc">HashMap</span><span class="o">&lt;</span><span class="n">WorkspaceId</span><span class="p">,</span><span class="w"> </span><span class="n">CommitId</span><span class="o">&gt;</span><span class="p">,</span> <span class="k">pub</span><span class="w"> </span><span class="n">wc_commit_ids</span><span class="p">:</span><span class="w"> </span><span class="nc">HashMap</span><span class="o">&lt;</span><span class="n">WorkspaceNameBuf</span><span class="p">,</span><span class="w"> </span><span class="n">CommitId</span><span class="o">&gt;</span><span class="p">,</span>
<span class="c1">// After:</span> <span class="c1">// After:</span>
<span class="k">pub</span><span class="w"> </span><span class="k">struct</span><span class="w"> </span><span class="nc">WorkingCopyInfo</span><span class="w"> </span><span class="p">{</span> <span class="k">pub</span><span class="w"> </span><span class="k">struct</span><span class="w"> </span><span class="nc">WorkingCopyInfo</span><span class="w"> </span><span class="p">{</span>
@ -2000,7 +2000,7 @@ change very frequently.</p>
<span class="w"> </span><span class="k">pub</span><span class="w"> </span><span class="n">wc_patterns_id</span><span class="p">:</span><span class="w"> </span><span class="nc">WorkingCopyPatternsId</span><span class="p">,</span> <span class="w"> </span><span class="k">pub</span><span class="w"> </span><span class="n">wc_patterns_id</span><span class="p">:</span><span class="w"> </span><span class="nc">WorkingCopyPatternsId</span><span class="p">,</span>
<span class="p">}</span> <span class="p">}</span>
<span class="o">..</span><span class="p">.</span> <span class="o">..</span><span class="p">.</span>
<span class="k">pub</span><span class="w"> </span><span class="n">wc_info</span><span class="p">:</span><span class="w"> </span><span class="nc">HashMap</span><span class="o">&lt;</span><span class="n">WorkspaceId</span><span class="p">,</span><span class="w"> </span><span class="n">WorkingCopyInfo</span><span class="o">&gt;</span><span class="p">,</span> <span class="k">pub</span><span class="w"> </span><span class="n">wc_info</span><span class="p">:</span><span class="w"> </span><span class="nc">HashMap</span><span class="o">&lt;</span><span class="n">WorkspaceNameBuf</span><span class="p">,</span><span class="w"> </span><span class="n">WorkingCopyInfo</span><span class="o">&gt;</span><span class="p">,</span>
</code></pre></div> </code></pre></div>
<p>A View object with no stored working copy patterns will be modified at read <p>A View object with no stored working copy patterns will be modified at read
time to include the current working copy patterns, thus all <code>read_view</code> time to include the current working copy patterns, thus all <code>read_view</code>

28
latest/design/tracking-branches/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -869,7 +869,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1109,7 +1109,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1131,7 +1131,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1175,7 +1175,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1330,7 +1330,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1633,7 +1633,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
@ -1985,9 +1985,9 @@ git_refs # last imported/exported refs
branch. <code>jj branch</code> sub commands will be added to change the tracking state.</p> branch. <code>jj branch</code> sub commands will be added to change the tracking state.</p>
<div class="highlight"><pre><span></span><code><span class="k">fn</span><span class="w"> </span><span class="nf">default_state_for_newly_imported_branch</span><span class="p">(</span><span class="n">config</span><span class="p">,</span><span class="w"> </span><span class="n">remote</span><span class="p">)</span><span class="w"> </span><span class="p">{</span> <div class="highlight"><pre><span></span><code><span class="k">fn</span><span class="w"> </span><span class="nf">default_state_for_newly_imported_branch</span><span class="p">(</span><span class="n">config</span><span class="p">,</span><span class="w"> </span><span class="n">remote</span><span class="p">)</span><span class="w"> </span><span class="p">{</span>
<span class="w"> </span><span class="k">if</span><span class="w"> </span><span class="n">remote</span><span class="w"> </span><span class="o">==</span><span class="w"> </span><span class="s">&quot;git&quot;</span><span class="w"> </span><span class="p">{</span> <span class="w"> </span><span class="k">if</span><span class="w"> </span><span class="n">remote</span><span class="w"> </span><span class="o">==</span><span class="w"> </span><span class="s">&quot;git&quot;</span><span class="w"> </span><span class="p">{</span>
<span class="w"> </span><span class="n">State</span><span class="p">::</span><span class="n">Tracking</span> <span class="w"> </span><span class="n">State</span><span class="p">::</span><span class="n">Tracked</span>
<span class="w"> </span><span class="p">}</span><span class="w"> </span><span class="k">else</span><span class="w"> </span><span class="k">if</span><span class="w"> </span><span class="n">config</span><span class="p">[</span><span class="s">&quot;git.auto-local-bookmark&quot;</span><span class="p">]</span><span class="w"> </span><span class="p">{</span> <span class="w"> </span><span class="p">}</span><span class="w"> </span><span class="k">else</span><span class="w"> </span><span class="k">if</span><span class="w"> </span><span class="n">config</span><span class="p">[</span><span class="s">&quot;git.auto-local-bookmark&quot;</span><span class="p">]</span><span class="w"> </span><span class="p">{</span>
<span class="w"> </span><span class="n">State</span><span class="p">::</span><span class="n">Tracking</span> <span class="w"> </span><span class="n">State</span><span class="p">::</span><span class="n">Tracked</span>
<span class="w"> </span><span class="p">}</span><span class="w"> </span><span class="k">else</span><span class="w"> </span><span class="p">{</span> <span class="w"> </span><span class="p">}</span><span class="w"> </span><span class="k">else</span><span class="w"> </span><span class="p">{</span>
<span class="w"> </span><span class="n">State</span><span class="p">::</span><span class="n">New</span> <span class="w"> </span><span class="n">State</span><span class="p">::</span><span class="n">New</span>
<span class="w"> </span><span class="p">}</span> <span class="w"> </span><span class="p">}</span>
@ -1997,7 +1997,7 @@ branch. <code>jj branch</code> sub commands will be added to change the tracking
<div class="highlight"><pre><span></span><code><span class="k">fn</span><span class="w"> </span><span class="nf">target_in_merge_context</span><span class="p">(</span><span class="n">known_target</span><span class="p">,</span><span class="w"> </span><span class="n">state</span><span class="p">)</span><span class="w"> </span><span class="p">{</span> <div class="highlight"><pre><span></span><code><span class="k">fn</span><span class="w"> </span><span class="nf">target_in_merge_context</span><span class="p">(</span><span class="n">known_target</span><span class="p">,</span><span class="w"> </span><span class="n">state</span><span class="p">)</span><span class="w"> </span><span class="p">{</span>
<span class="w"> </span><span class="k">match</span><span class="w"> </span><span class="n">state</span><span class="w"> </span><span class="p">{</span> <span class="w"> </span><span class="k">match</span><span class="w"> </span><span class="n">state</span><span class="w"> </span><span class="p">{</span>
<span class="w"> </span><span class="n">State</span><span class="p">::</span><span class="n">New</span><span class="w"> </span><span class="o">=&gt;</span><span class="w"> </span><span class="n">RefTarget</span><span class="p">::</span><span class="n">absent</span><span class="p">(),</span> <span class="w"> </span><span class="n">State</span><span class="p">::</span><span class="n">New</span><span class="w"> </span><span class="o">=&gt;</span><span class="w"> </span><span class="n">RefTarget</span><span class="p">::</span><span class="n">absent</span><span class="p">(),</span>
<span class="w"> </span><span class="n">State</span><span class="p">::</span><span class="n">Tracking</span><span class="w"> </span><span class="o">=&gt;</span><span class="w"> </span><span class="n">known_target</span><span class="p">,</span> <span class="w"> </span><span class="n">State</span><span class="p">::</span><span class="n">Tracked</span><span class="w"> </span><span class="o">=&gt;</span><span class="w"> </span><span class="n">known_target</span><span class="p">,</span>
<span class="w"> </span><span class="p">}</span> <span class="w"> </span><span class="p">}</span>
<span class="p">}</span> <span class="p">}</span>
</code></pre></div> </code></pre></div>

28
latest/design_doc_blueprint/index.html
View File

@ -22,7 +22,7 @@
<title>Design Doc Blueprint - Jujutsu docs</title> <title>Design doc blueprint - Jujutsu docs</title>
@ -114,7 +114,7 @@
<div class="md-header__topic" data-md-component="header-topic"> <div class="md-header__topic" data-md-component="header-topic">
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
</div> </div>
@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -869,7 +869,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1111,7 +1111,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1142,7 +1142,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1154,7 +1154,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1314,7 +1314,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1467,7 +1467,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1540,7 +1540,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>

30
latest/design_docs/index.html
View File

@ -22,7 +22,7 @@
<title>Design Docs - Jujutsu docs</title> <title>Design docs - Jujutsu docs</title>
@ -114,7 +114,7 @@
<div class="md-header__topic" data-md-component="header-topic"> <div class="md-header__topic" data-md-component="header-topic">
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
</div> </div>
@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -869,7 +869,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1120,7 +1120,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1132,7 +1132,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1192,7 +1192,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1236,7 +1236,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1389,7 +1389,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1462,7 +1462,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
@ -1539,7 +1539,7 @@ thorough process, in which the design doc must be approved before PRs for the
feature will be accepted. It shares some similarities with <a href="https://github.com/rust-lang/rfcs">Rust RFCs</a> but feature will be accepted. It shares some similarities with <a href="https://github.com/rust-lang/rfcs">Rust RFCs</a> but
mostly addresses <em>technical</em> problems and gauges the technical and social mostly addresses <em>technical</em> problems and gauges the technical and social
concerns of all stakeholders.</p> concerns of all stakeholders.</p>
<p>So if you want to start building the native backend or the server component for <p>So if you want to start building a native backend or the server component for
Jujutsu, you'll need to go through this process.</p> Jujutsu, you'll need to go through this process.</p>
<h2 id="process">Process<a class="headerlink" href="#process" title="Permanent link">&para;</a></h2> <h2 id="process">Process<a class="headerlink" href="#process" title="Permanent link">&para;</a></h2>
<ol> <ol>

53
latest/filesets/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -739,6 +739,15 @@
</label> </label>
<ul class="md-nav__list" data-md-component="toc" data-md-scrollfix> <ul class="md-nav__list" data-md-component="toc" data-md-scrollfix>
<li class="md-nav__item">
<a href="#quoting-file-names" class="md-nav__link">
<span class="md-ellipsis">
Quoting file names
</span>
</a>
</li>
<li class="md-nav__item"> <li class="md-nav__item">
<a href="#file-patterns" class="md-nav__link"> <a href="#file-patterns" class="md-nav__link">
<span class="md-ellipsis"> <span class="md-ellipsis">
@ -948,7 +957,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1188,7 +1197,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1210,7 +1219,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1254,7 +1263,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1407,7 +1416,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1480,7 +1489,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
@ -1516,6 +1525,15 @@
</label> </label>
<ul class="md-nav__list" data-md-component="toc" data-md-scrollfix> <ul class="md-nav__list" data-md-component="toc" data-md-scrollfix>
<li class="md-nav__item">
<a href="#quoting-file-names" class="md-nav__link">
<span class="md-ellipsis">
Quoting file names
</span>
</a>
</li>
<li class="md-nav__item"> <li class="md-nav__item">
<a href="#file-patterns" class="md-nav__link"> <a href="#file-patterns" class="md-nav__link">
<span class="md-ellipsis"> <span class="md-ellipsis">
@ -1573,6 +1591,7 @@
Expressions in this language are called "filesets" (the idea comes from Expressions in this language are called "filesets" (the idea comes from
<a href="https://repo.mercurial-scm.org/hg/help/filesets">Mercurial</a>). The language <a href="https://repo.mercurial-scm.org/hg/help/filesets">Mercurial</a>). The language
consists of file patterns, operators, and functions.</p> consists of file patterns, operators, and functions.</p>
<h2 id="quoting-file-names">Quoting file names<a class="headerlink" href="#quoting-file-names" title="Permanent link">&para;</a></h2>
<p>Many <code>jj</code> commands accept fileset expressions as positional arguments. File <p>Many <code>jj</code> commands accept fileset expressions as positional arguments. File
names passed to these commands <a href="../templates/#string-literals">must be quoted</a> if they contain names passed to these commands <a href="../templates/#string-literals">must be quoted</a> if they contain
whitespace or meta characters. However, as a special case, quotes can be omitted whitespace or meta characters. However, as a special case, quotes can be omitted
@ -1588,12 +1607,14 @@ required:</p>
<li><code>jj diff '~glob:**/*.rs'</code></li> <li><code>jj diff '~glob:**/*.rs'</code></li>
</ul> </ul>
<h2 id="file-patterns">File patterns<a class="headerlink" href="#file-patterns" title="Permanent link">&para;</a></h2> <h2 id="file-patterns">File patterns<a class="headerlink" href="#file-patterns" title="Permanent link">&para;</a></h2>
<p>The following patterns are supported:</p> <p>The following patterns are supported. In all cases, we do not mention any shell
quoting that might be necessary, and the quotes around <code>"path"</code> are optional if
the path <a href="#quoting-file-names">has no special characters</a>.</p>
<ul> <ul>
<li><code>"path"</code>, <code>path</code> (the quotes are optional), or <code>cwd:"path"</code>: Matches <li><code>"path"</code> or <code>cwd:"path"</code>: Matches cwd-relative path prefix (file or files
cwd-relative path prefix (file or files under directory recursively.)</li> under directory recursively.)</li>
<li><code>cwd-file:"path"</code> or <code>file:"path"</code>: Matches cwd-relative file (or exact) path.</li> <li><code>file:"path"</code> or <code>cwd-file:"path"</code>: Matches cwd-relative file (or exact) path.</li>
<li><code>cwd-glob:"pattern"</code> or <code>glob:"pattern"</code>: Matches file paths with cwd-relative <li><code>glob:"pattern"</code> or <code>cwd-glob:"pattern"</code>: Matches file paths with cwd-relative
Unix-style shell <a href="https://docs.rs/glob/latest/glob/struct.Pattern.html">wildcard <code>pattern</code></a>. For example, <code>glob:"*.c"</code> will Unix-style shell <a href="https://docs.rs/glob/latest/glob/struct.Pattern.html">wildcard <code>pattern</code></a>. For example, <code>glob:"*.c"</code> will
match all <code>.c</code> files in the current working directory non-recursively.</li> match all <code>.c</code> files in the current working directory non-recursively.</li>
<li><code>root:"path"</code>: Matches workspace-relative path prefix (file or files under <li><code>root:"path"</code>: Matches workspace-relative path prefix (file or files under

26
latest/git-command-table/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -881,7 +881,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1121,7 +1121,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1143,7 +1143,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1187,7 +1187,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1340,7 +1340,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1413,7 +1413,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
@ -1536,6 +1536,10 @@ parent.</p>
<td><code>jj diff --from A --to B</code></td> <td><code>jj diff --from A --to B</code></td>
</tr> </tr>
<tr> <tr>
<td>Show all the changes in A..B</td>
<td><code>git diff A...B</code></td>
<td><code>jj diff -r A..B</code></td>
</tr>
<tr> <tr>
<td>Show description and diff of a change</td> <td>Show description and diff of a change</td>
<td><code>git show &lt;revision&gt;</code></td> <td><code>git show &lt;revision&gt;</code></td>

22
latest/git-comparison/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -939,7 +939,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1179,7 +1179,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1201,7 +1201,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1245,7 +1245,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1398,7 +1398,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1471,7 +1471,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>

22
latest/git-compatibility/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -990,7 +990,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1230,7 +1230,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1252,7 +1252,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1296,7 +1296,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1449,7 +1449,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1522,7 +1522,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>

22
latest/github/index.html
View File

@ -306,7 +306,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -328,7 +328,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -610,7 +610,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -709,7 +709,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -775,7 +775,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -1059,7 +1059,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1299,7 +1299,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1321,7 +1321,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1365,7 +1365,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1518,7 +1518,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1591,7 +1591,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>

31
latest/glossary/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -521,7 +521,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -587,7 +587,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -1164,7 +1164,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1404,7 +1404,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1426,7 +1426,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1470,7 +1470,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1623,7 +1623,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1696,7 +1696,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
@ -2008,11 +2008,10 @@ Jujutsu keeps commits on anonymous branches around until they are explicitly
abandoned. Visible anonymous branches are tracked by the <a href="#view">view</a>, which abandoned. Visible anonymous branches are tracked by the <a href="#view">view</a>, which
stores a list of <a href="#head">heads</a> of such branches.</p> stores a list of <a href="#head">heads</a> of such branches.</p>
<h2 id="backend">Backend<a class="headerlink" href="#backend" title="Permanent link">&para;</a></h2> <h2 id="backend">Backend<a class="headerlink" href="#backend" title="Permanent link">&para;</a></h2>
<p>A backend is an implementation of the storage layer. There are currently two <p>A backend is an implementation of the storage layer. There is currently only one
builtin commit backends: the Git backend and the native backend. The Git backend production-ready builtin commit backend: the Git backend. The Git backend stores
stores commits in a Git repository. The native backend is used for testing commits in a Git repository. There are several backends used for testing. Google
purposes only. Alternative backends could be used, for example, if somebody also has its own cloud-based backend.</p>
wanted to use jj with a humongous monorepo (as Google does).</p>
<p>There are also pluggable backends for storing other information than commits, <p>There are also pluggable backends for storing other information than commits,
such as the "operation store backend" for storing such as the "operation store backend" for storing
<a href="#operation-log">the operation log</a>.</p> <a href="#operation-log">the operation log</a>.</p>

22
latest/governance/GOVERNANCE/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -869,7 +869,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1111,7 +1111,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1133,7 +1133,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1177,7 +1177,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1461,7 +1461,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1534,7 +1534,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>

28
latest/governance/temporary-voting/index.html
View File

@ -22,7 +22,7 @@
<title>Temporary Voting for Governance - Jujutsu docs</title> <title>Temporary voting for governance - Jujutsu docs</title>
@ -114,7 +114,7 @@
<div class="md-header__topic" data-md-component="header-topic"> <div class="md-header__topic" data-md-component="header-topic">
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
</div> </div>
@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -869,7 +869,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1111,7 +1111,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1133,7 +1133,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1186,7 +1186,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1198,7 +1198,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1449,7 +1449,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1522,7 +1522,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>

6
latest/images/LICENSE
View File

@ -1,3 +1,7 @@
This license applies to favicon-96x96.png and jj-logo.png: This license applies to favicon-96x96.png:
This work © 2025 by J. Jennings is licensed under Creative Commons Attribution 4.0 International This work © 2025 by J. Jennings is licensed under Creative Commons Attribution 4.0 International
This license applies to jj-logo.svg:
This work © 2025 by J. Jennings and adapted to SVG by Lucas Garron is licensed under Creative Commons Attribution 4.0 International

BIN
latest/images/jj-logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

1
latest/images/jj-logo.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

24
latest/index.html
View File

@ -361,7 +361,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -383,7 +383,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -477,7 +477,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -576,7 +576,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -642,7 +642,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -926,7 +926,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1166,7 +1166,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1188,7 +1188,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1232,7 +1232,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1385,7 +1385,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1458,7 +1458,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
@ -1530,7 +1530,7 @@
<h1 id="jujutsua-version-control-system">Jujutsu—a version control system<a class="headerlink" href="#jujutsua-version-control-system" title="Permanent link">&para;</a></h1> <h1 id="jujutsua-version-control-system">Jujutsu—a version control system<a class="headerlink" href="#jujutsua-version-control-system" title="Permanent link">&para;</a></h1>
<figure> <figure>
<img title="jj logo" src="images/jj-logo.png" width=40%> <img title="jj logo" src="images/jj-logo.svg" width="320" height="320">
</figure> </figure>
<h2 id="welcome-to-jjs-documentation-website">Welcome to <code>jj</code>'s documentation website!<a class="headerlink" href="#welcome-to-jjs-documentation-website" title="Permanent link">&para;</a></h2> <h2 id="welcome-to-jjs-documentation-website">Welcome to <code>jj</code>'s documentation website!<a class="headerlink" href="#welcome-to-jjs-documentation-website" title="Permanent link">&para;</a></h2>

52
latest/install-and-setup/index.html
View File

@ -22,7 +22,7 @@
<title>Installation and Setup - Jujutsu docs</title> <title>Installation and setup - Jujutsu docs</title>
@ -114,7 +114,7 @@
<div class="md-header__topic" data-md-component="header-topic"> <div class="md-header__topic" data-md-component="header-topic">
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
</div> </div>
@ -315,7 +315,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -327,7 +327,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -412,9 +412,9 @@
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
<a href="#nix-os" class="md-nav__link"> <a href="#nixos" class="md-nav__link">
<span class="md-ellipsis"> <span class="md-ellipsis">
Nix OS NixOS
</span> </span>
</a> </a>
@ -678,7 +678,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -772,7 +772,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -871,7 +871,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -937,7 +937,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -1221,7 +1221,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1461,7 +1461,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1483,7 +1483,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1527,7 +1527,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1680,7 +1680,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1753,7 +1753,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
@ -1852,9 +1852,9 @@
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
<a href="#nix-os" class="md-nav__link"> <a href="#nixos" class="md-nav__link">
<span class="md-ellipsis"> <span class="md-ellipsis">
Nix OS NixOS
</span> </span>
</a> </a>
@ -2134,7 +2134,7 @@ options below.</p>
</div> </div>
<h3 id="linux">Linux<a class="headerlink" href="#linux" title="Permanent link">&para;</a></h3> <h3 id="linux">Linux<a class="headerlink" href="#linux" title="Permanent link">&para;</a></h3>
<h4 id="from-source">From Source<a class="headerlink" href="#from-source" title="Permanent link">&para;</a></h4> <h4 id="from-source">From Source<a class="headerlink" href="#from-source" title="Permanent link">&para;</a></h4>
<p>First make sure that you have a Rust version &gt;= 1.76 and that the <code>libssl-dev</code>, <p>First make sure that you have a Rust version &gt;= 1.84 and that the <code>libssl-dev</code>,
<code>openssl</code>, <code>pkg-config</code>, and <code>build-essential</code> packages are installed by running <code>openssl</code>, <code>pkg-config</code>, and <code>build-essential</code> packages are installed by running
something like this:</p> something like this:</p>
<div class="highlight"><pre><span></span><code>sudo<span class="w"> </span>apt-get<span class="w"> </span>install<span class="w"> </span>libssl-dev<span class="w"> </span>openssl<span class="w"> </span>pkg-config<span class="w"> </span>build-essential <div class="highlight"><pre><span></span><code>sudo<span class="w"> </span>apt-get<span class="w"> </span>install<span class="w"> </span>libssl-dev<span class="w"> </span>openssl<span class="w"> </span>pkg-config<span class="w"> </span>build-essential
@ -2154,8 +2154,8 @@ cargo<span class="w"> </span>install<span class="w"> </span>--locked<span class=
<p>Or install from the <a href="https://aur.archlinux.org/packages/jujutsu-git">AUR repository</a> with an <a href="https://wiki.archlinux.org/title/AUR_helpers">AUR Helper</a>:</p> <p>Or install from the <a href="https://aur.archlinux.org/packages/jujutsu-git">AUR repository</a> with an <a href="https://wiki.archlinux.org/title/AUR_helpers">AUR Helper</a>:</p>
<div class="highlight"><pre><span></span><code>yay<span class="w"> </span>-S<span class="w"> </span>jujutsu-git <div class="highlight"><pre><span></span><code>yay<span class="w"> </span>-S<span class="w"> </span>jujutsu-git
</code></pre></div> </code></pre></div>
<h4 id="nix-os">Nix OS<a class="headerlink" href="#nix-os" title="Permanent link">&para;</a></h4> <h4 id="nixos">NixOS<a class="headerlink" href="#nixos" title="Permanent link">&para;</a></h4>
<p>If you're on Nix OS you can install a <strong>released</strong> version of <code>jj</code> using the <p>If you're on NixOS you can install a <strong>released</strong> version of <code>jj</code> using the
<a href="https://search.nixos.org/packages?channel=unstable&amp;show=jujutsu">nixpkgs <code>jujutsu</code> package</a>.</p> <a href="https://search.nixos.org/packages?channel=unstable&amp;show=jujutsu">nixpkgs <code>jujutsu</code> package</a>.</p>
<p>To install a <strong>prerelease</strong> version, you can use the flake for this repository. <p>To install a <strong>prerelease</strong> version, you can use the flake for this repository.
For example, if you want to run <code>jj</code> loaded from the flake, use:</p> For example, if you want to run <code>jj</code> loaded from the flake, use:</p>
@ -2179,7 +2179,7 @@ Details on how to enable the GURU repository can be found <a href="https://wiki.
</code></pre></div> </code></pre></div>
<h3 id="mac">Mac<a class="headerlink" href="#mac" title="Permanent link">&para;</a></h3> <h3 id="mac">Mac<a class="headerlink" href="#mac" title="Permanent link">&para;</a></h3>
<h4 id="from-source-vendored-openssl">From Source, Vendored OpenSSL<a class="headerlink" href="#from-source-vendored-openssl" title="Permanent link">&para;</a></h4> <h4 id="from-source-vendored-openssl">From Source, Vendored OpenSSL<a class="headerlink" href="#from-source-vendored-openssl" title="Permanent link">&para;</a></h4>
<p>First make sure that you have a Rust version &gt;= 1.76. You may also need to run:</p> <p>First make sure that you have a Rust version &gt;= 1.84. You may also need to run:</p>
<div class="highlight"><pre><span></span><code>xcode-select<span class="w"> </span>--install <div class="highlight"><pre><span></span><code>xcode-select<span class="w"> </span>--install
</code></pre></div> </code></pre></div>
<p>Now run either:</p> <p>Now run either:</p>
@ -2192,7 +2192,7 @@ cargo<span class="w"> </span>install<span class="w"> </span>--git<span class="w"
cargo<span class="w"> </span>install<span class="w"> </span>--features<span class="w"> </span>vendored-openssl<span class="w"> </span>--locked<span class="w"> </span>--bin<span class="w"> </span>jj<span class="w"> </span>jj-cli cargo<span class="w"> </span>install<span class="w"> </span>--features<span class="w"> </span>vendored-openssl<span class="w"> </span>--locked<span class="w"> </span>--bin<span class="w"> </span>jj<span class="w"> </span>jj-cli
</code></pre></div> </code></pre></div>
<h4 id="from-source-homebrew-openssl">From Source, Homebrew OpenSSL<a class="headerlink" href="#from-source-homebrew-openssl" title="Permanent link">&para;</a></h4> <h4 id="from-source-homebrew-openssl">From Source, Homebrew OpenSSL<a class="headerlink" href="#from-source-homebrew-openssl" title="Permanent link">&para;</a></h4>
<p>First make sure that you have a Rust version &gt;= 1.76. You will also need <p>First make sure that you have a Rust version &gt;= 1.84. You will also need
<a href="https://brew.sh/">Homebrew</a> installed. You may then need to run some or all of <a href="https://brew.sh/">Homebrew</a> installed. You may then need to run some or all of
these:</p> these:</p>
<div class="highlight"><pre><span></span><code>xcode-select<span class="w"> </span>--install <div class="highlight"><pre><span></span><code>xcode-select<span class="w"> </span>--install
@ -2220,7 +2220,7 @@ port</a>:</p>
sudo<span class="w"> </span>port<span class="w"> </span>install<span class="w"> </span>jujutsu sudo<span class="w"> </span>port<span class="w"> </span>install<span class="w"> </span>jujutsu
</code></pre></div> </code></pre></div>
<h3 id="windows">Windows<a class="headerlink" href="#windows" title="Permanent link">&para;</a></h3> <h3 id="windows">Windows<a class="headerlink" href="#windows" title="Permanent link">&para;</a></h3>
<p>First make sure that you have a Rust version &gt;= 1.76. Now run either:</p> <p>First make sure that you have a Rust version &gt;= 1.84. Now run either:</p>
<div class="highlight"><pre><span></span><code><span class="c1"># To install the *prerelease* version from the main branch</span> <div class="highlight"><pre><span></span><code><span class="c1"># To install the *prerelease* version from the main branch</span>
cargo<span class="w"> </span>install<span class="w"> </span>--git<span class="w"> </span>https://github.com/jj-vcs/jj.git<span class="w"> </span>--locked<span class="w"> </span>--bin<span class="w"> </span>jj<span class="w"> </span>jj-cli<span class="w"> </span>--features<span class="w"> </span>vendored-openssl cargo<span class="w"> </span>install<span class="w"> </span>--git<span class="w"> </span>https://github.com/jj-vcs/jj.git<span class="w"> </span>--locked<span class="w"> </span>--bin<span class="w"> </span>jj<span class="w"> </span>jj-cli<span class="w"> </span>--features<span class="w"> </span>vendored-openssl
</code></pre></div> </code></pre></div>
@ -2268,6 +2268,10 @@ compinit
<div class="highlight"><pre><span></span><code><span class="nb">source</span><span class="w"> </span>&lt;<span class="o">(</span><span class="nv">COMPLETE</span><span class="o">=</span>zsh<span class="w"> </span>jj<span class="o">)</span> <div class="highlight"><pre><span></span><code><span class="nb">source</span><span class="w"> </span>&lt;<span class="o">(</span><span class="nv">COMPLETE</span><span class="o">=</span>zsh<span class="w"> </span>jj<span class="o">)</span>
</code></pre></div> </code></pre></div>
<h3 id="fish">Fish<a class="headerlink" href="#fish" title="Permanent link">&para;</a></h3> <h3 id="fish">Fish<a class="headerlink" href="#fish" title="Permanent link">&para;</a></h3>
<div class="admonition note">
<p class="admonition-title">Note</p>
<p>No configuration is required with fish &gt;= 4.1 which loads dynamic completions by default.</p>
</div>
<h4 id="standard_2">Standard<a class="headerlink" href="#standard_2" title="Permanent link">&para;</a></h4> <h4 id="standard_2">Standard<a class="headerlink" href="#standard_2" title="Permanent link">&para;</a></h4>
<div class="highlight"><pre><span></span><code>jj<span class="w"> </span>util<span class="w"> </span>completion<span class="w"> </span>fish<span class="w"> </span><span class="p">|</span><span class="w"> </span><span class="nb">source</span> <div class="highlight"><pre><span></span><code>jj<span class="w"> </span>util<span class="w"> </span>completion<span class="w"> </span>fish<span class="w"> </span><span class="p">|</span><span class="w"> </span><span class="nb">source</span>
</code></pre></div> </code></pre></div>

28
latest/operation-log/index.html
View File

@ -22,7 +22,7 @@
<title>Operation Log - Jujutsu docs</title> <title>Operation log - Jujutsu docs</title>
@ -114,7 +114,7 @@
<div class="md-header__topic" data-md-component="header-topic"> <div class="md-header__topic" data-md-component="header-topic">
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
</div> </div>
@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -521,7 +521,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -596,7 +596,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -608,7 +608,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -939,7 +939,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1179,7 +1179,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1201,7 +1201,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1245,7 +1245,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1398,7 +1398,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1471,7 +1471,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>

23
latest/paid_contributors/index.html
View File

@ -300,7 +300,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -322,7 +322,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -416,7 +416,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -515,7 +515,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -581,7 +581,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -865,7 +865,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1105,7 +1105,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1127,7 +1127,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1171,7 +1171,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1324,7 +1324,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1397,7 +1397,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
@ -1488,7 +1488,6 @@ contribute or not.</p>
<li>solson</li> <li>solson</li>
<li>spectral54</li> <li>spectral54</li>
<li>steadmon</li> <li>steadmon</li>
<li>torquestomp</li>
<li>zygoloid</li> <li>zygoloid</li>
</ul> </ul>

22
latest/related-work/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -871,7 +871,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1121,7 +1121,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1143,7 +1143,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1187,7 +1187,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1340,7 +1340,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1413,7 +1413,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>

26
latest/releasing/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -869,7 +869,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1111,7 +1111,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1133,7 +1133,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1245,7 +1245,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1398,7 +1398,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1471,7 +1471,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
@ -1561,10 +1561,10 @@ copy-edit the changelog in order to:</p>
</ul> </ul>
<p>Producing the list of contributors is a bit annoying. The current suggestion is <p>Producing the list of contributors is a bit annoying. The current suggestion is
to run something like this:</p> to run something like this:</p>
<div class="highlight"><pre><span></span><code><span class="nv">root</span><span class="o">=</span>v0.25.0 <div class="highlight"><pre><span></span><code><span class="nv">root</span><span class="o">=</span><span class="k">$(</span>jj<span class="w"> </span>log<span class="w"> </span>--no-graph<span class="w"> </span>-r<span class="w"> </span><span class="s1">&#39;heads(tags())&#39;</span><span class="w"> </span>-T<span class="w"> </span><span class="s1">&#39;commit_id&#39;</span><span class="k">)</span>
<span class="k">for</span><span class="w"> </span>i<span class="w"> </span><span class="k">in</span><span class="w"> </span><span class="k">$(</span>seq<span class="w"> </span><span class="m">5</span><span class="k">)</span><span class="p">;</span><span class="w"> </span><span class="k">do</span> <span class="k">for</span><span class="w"> </span>i<span class="w"> </span><span class="k">in</span><span class="w"> </span><span class="k">$(</span>seq<span class="w"> </span><span class="m">5</span><span class="k">)</span><span class="p">;</span><span class="w"> </span><span class="k">do</span>
<span class="w"> </span>gh<span class="w"> </span>api<span class="w"> </span><span class="s2">&quot;/repos/jj-vcs/jj/compare/</span><span class="nv">$root</span><span class="s2">...main?per_page=100;page=</span><span class="nv">$i</span><span class="s2">&quot;</span> <span class="w"> </span>gh<span class="w"> </span>api<span class="w"> </span><span class="s2">&quot;/repos/jj-vcs/jj/compare/</span><span class="nv">$root</span><span class="s2">...main?per_page=100;page=</span><span class="nv">$i</span><span class="s2">&quot;</span>
<span class="k">done</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>jq<span class="w"> </span>-r<span class="w"> </span><span class="s1">&#39;.commits[] | &quot;* &quot; + .commit.author.name + &quot; (@&quot; + .author.login + &quot;)&quot;&#39;</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>sort<span class="w"> </span>-fu <span class="k">done</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>jq<span class="w"> </span>-r<span class="w"> </span><span class="s1">&#39;.commits[] | select(.author.login | endswith(&quot;[bot]&quot;) | not) | &quot;* &quot; + .commit.author.name + &quot; (@&quot; + .author.login + &quot;)&quot;&#39;</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>sort<span class="w"> </span>-fu
</code></pre></div> </code></pre></div>
<p>https://docs.github.com/en/rest/commits/commits?apiVersion=2022-11-28#compare-two-commits</p> <p>https://docs.github.com/en/rest/commits/commits?apiVersion=2022-11-28#compare-two-commits</p>
<p>Alternatively, the list can be produced locally:</p> <p>Alternatively, the list can be produced locally:</p>

36
latest/revsets/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -1014,7 +1014,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1254,7 +1254,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1276,7 +1276,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1320,7 +1320,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1473,7 +1473,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1546,7 +1546,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
@ -1770,7 +1770,7 @@ only symbols.</p>
<details class="examples"> <details class="examples">
<summary>Examples</summary> <summary>Examples</summary>
<p>Given this history: <p>Given this history:
<div class="highlight"><pre><span></span><code>D <div class="highlight"><pre><span></span><code>o D
|\ |\
| o C | o C
| | | |
@ -2065,9 +2065,9 @@ is added to or removed from files under "src".</p>
<details class="examples"> <details class="examples">
<summary>Examples</summary> <summary>Examples</summary>
<p>Given this history: <p>Given this history:
<div class="highlight"><pre><span></span><code>E <div class="highlight"><pre><span></span><code>o E
| |
| D | o D
|/| |/|
| o C | o C
| | | |
@ -2109,7 +2109,7 @@ o root()
</ul> </ul>
<p><strong>function</strong> <code>fork_point()</code></p> <p><strong>function</strong> <code>fork_point()</code></p>
<ul> <ul>
<li><code>fork_point(E|D)</code> ⇒ <code>{A}</code></li> <li><code>fork_point(E|D)</code> ⇒ <code>{B}</code></li>
<li><code>fork_point(E|C)</code> ⇒ <code>{A}</code></li> <li><code>fork_point(E|C)</code> ⇒ <code>{A}</code></li>
<li><code>fork_point(E|B)</code> ⇒ <code>{B}</code></li> <li><code>fork_point(E|B)</code> ⇒ <code>{B}</code></li>
<li><code>fork_point(E|A)</code> ⇒ <code>{A}</code></li> <li><code>fork_point(E|A)</code> ⇒ <code>{A}</code></li>
@ -2121,10 +2121,10 @@ o root()
</ul> </ul>
</details> </details>
<h2 id="string-patterns">String patterns<a class="headerlink" href="#string-patterns" title="Permanent link">&para;</a></h2> <h2 id="string-patterns">String patterns<a class="headerlink" href="#string-patterns" title="Permanent link">&para;</a></h2>
<p>Functions that perform string matching support the following pattern syntax:</p> <p>Functions that perform string matching support the following pattern syntax (the
quotes are optional):</p>
<ul> <ul>
<li><code>"string"</code>, or <code>string</code> (the quotes are optional), or <code>substring:"string"</code>: <li><code>"string"</code> or <code>substring:"string"</code>: Matches strings that contain <code>string</code>.</li>
Matches strings that contain <code>string</code>.</li>
<li><code>exact:"string"</code>: Matches strings exactly equal to <code>string</code>.</li> <li><code>exact:"string"</code>: Matches strings exactly equal to <code>string</code>.</li>
<li><code>glob:"pattern"</code>: Matches strings with Unix-style shell <a href="https://docs.rs/glob/latest/glob/struct.Pattern.html">wildcard <li><code>glob:"pattern"</code>: Matches strings with Unix-style shell <a href="https://docs.rs/glob/latest/glob/struct.Pattern.html">wildcard
<code>pattern</code></a>.</li> <code>pattern</code></a>.</li>

28
latest/roadmap/index.html
View File

@ -20,7 +20,7 @@
<title>Development Roadmap - Jujutsu docs</title> <title>Development roadmap - Jujutsu docs</title>
@ -112,7 +112,7 @@
<div class="md-header__topic" data-md-component="header-topic"> <div class="md-header__topic" data-md-component="header-topic">
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
</div> </div>
@ -302,7 +302,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -324,7 +324,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -418,7 +418,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -517,7 +517,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -583,7 +583,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -867,7 +867,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1107,7 +1107,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1129,7 +1129,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1173,7 +1173,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1326,7 +1326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1408,7 +1408,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
@ -1420,7 +1420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>

28
latest/sapling-comparison/index.html
View File

@ -22,7 +22,7 @@
<title>Sapling - Jujutsu docs</title> <title>Sapling comparison - Jujutsu docs</title>
@ -114,7 +114,7 @@
<div class="md-header__topic" data-md-component="header-topic"> <div class="md-header__topic" data-md-component="header-topic">
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
</div> </div>
@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -880,7 +880,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -892,7 +892,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1170,7 +1170,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1192,7 +1192,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1236,7 +1236,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1389,7 +1389,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1462,7 +1462,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>

2
latest/search/search_index.json
View File

File diff suppressed because one or more lines are too long

82
latest/sitemap.xml
View File

@ -2,166 +2,166 @@
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"> <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/</loc> <loc>https://jj-vcs.github.io/jj/latest/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/FAQ/</loc> <loc>https://jj-vcs.github.io/jj/latest/FAQ/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/bookmarks/</loc> <loc>https://jj-vcs.github.io/jj/latest/bookmarks/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/cli-reference/</loc> <loc>https://jj-vcs.github.io/jj/latest/cli-reference/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/code-of-conduct/</loc> <loc>https://jj-vcs.github.io/jj/latest/code-of-conduct/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/community_tools/</loc> <loc>https://jj-vcs.github.io/jj/latest/community_tools/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/config/</loc> <loc>https://jj-vcs.github.io/jj/latest/config/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/conflicts/</loc> <loc>https://jj-vcs.github.io/jj/latest/conflicts/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/contributing/</loc> <loc>https://jj-vcs.github.io/jj/latest/contributing/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/design_doc_blueprint/</loc> <loc>https://jj-vcs.github.io/jj/latest/design_doc_blueprint/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/design_docs/</loc> <loc>https://jj-vcs.github.io/jj/latest/design_docs/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/filesets/</loc> <loc>https://jj-vcs.github.io/jj/latest/filesets/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/git-command-table/</loc> <loc>https://jj-vcs.github.io/jj/latest/git-command-table/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/git-comparison/</loc> <loc>https://jj-vcs.github.io/jj/latest/git-comparison/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/git-compatibility/</loc> <loc>https://jj-vcs.github.io/jj/latest/git-compatibility/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/github/</loc> <loc>https://jj-vcs.github.io/jj/latest/github/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/glossary/</loc> <loc>https://jj-vcs.github.io/jj/latest/glossary/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/install-and-setup/</loc> <loc>https://jj-vcs.github.io/jj/latest/install-and-setup/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/operation-log/</loc> <loc>https://jj-vcs.github.io/jj/latest/operation-log/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/paid_contributors/</loc> <loc>https://jj-vcs.github.io/jj/latest/paid_contributors/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/related-work/</loc> <loc>https://jj-vcs.github.io/jj/latest/related-work/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/releasing/</loc> <loc>https://jj-vcs.github.io/jj/latest/releasing/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/revsets/</loc> <loc>https://jj-vcs.github.io/jj/latest/revsets/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/roadmap/</loc> <loc>https://jj-vcs.github.io/jj/latest/roadmap/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/sapling-comparison/</loc> <loc>https://jj-vcs.github.io/jj/latest/sapling-comparison/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/templates/</loc> <loc>https://jj-vcs.github.io/jj/latest/templates/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/testimonials/</loc> <loc>https://jj-vcs.github.io/jj/latest/testimonials/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/tutorial/</loc> <loc>https://jj-vcs.github.io/jj/latest/tutorial/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/windows/</loc> <loc>https://jj-vcs.github.io/jj/latest/windows/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/working-copy/</loc> <loc>https://jj-vcs.github.io/jj/latest/working-copy/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/design/copy-tracking/</loc> <loc>https://jj-vcs.github.io/jj/latest/design/copy-tracking/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/design/git-submodule-storage/</loc> <loc>https://jj-vcs.github.io/jj/latest/design/git-submodule-storage/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/design/git-submodules/</loc> <loc>https://jj-vcs.github.io/jj/latest/design/git-submodules/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/design/run/</loc> <loc>https://jj-vcs.github.io/jj/latest/design/run/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/design/sparse-v2/</loc> <loc>https://jj-vcs.github.io/jj/latest/design/sparse-v2/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/design/tracking-branches/</loc> <loc>https://jj-vcs.github.io/jj/latest/design/tracking-branches/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/governance/GOVERNANCE/</loc> <loc>https://jj-vcs.github.io/jj/latest/governance/GOVERNANCE/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/governance/temporary-voting/</loc> <loc>https://jj-vcs.github.io/jj/latest/governance/temporary-voting/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/technical/architecture/</loc> <loc>https://jj-vcs.github.io/jj/latest/technical/architecture/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/technical/concurrency/</loc> <loc>https://jj-vcs.github.io/jj/latest/technical/concurrency/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
<url> <url>
<loc>https://jj-vcs.github.io/jj/latest/technical/conflicts/</loc> <loc>https://jj-vcs.github.io/jj/latest/technical/conflicts/</loc>
<lastmod>2025-03-05</lastmod> <lastmod>2025-04-02</lastmod>
</url> </url>
</urlset> </urlset>

BIN
latest/sitemap.xml.gz
View File

Binary file not shown.

40
latest/technical/architecture/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -869,7 +869,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1066,9 +1066,9 @@
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
<a href="#localbackend" class="md-nav__link"> <a href="#simplebackend" class="md-nav__link">
<span class="md-ellipsis"> <span class="md-ellipsis">
LocalBackend SimpleBackend
</span> </span>
</a> </a>
@ -1362,7 +1362,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1384,7 +1384,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1428,7 +1428,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1581,7 +1581,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1654,7 +1654,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
@ -1755,9 +1755,9 @@
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
<a href="#localbackend" class="md-nav__link"> <a href="#simplebackend" class="md-nav__link">
<span class="md-ellipsis"> <span class="md-ellipsis">
LocalBackend SimpleBackend
</span> </span>
</a> </a>
@ -1955,13 +1955,13 @@ relate. For example, given a <code>Workspace</code>, you can use it to get a <co
or a <code>RepoLoader</code>. A <code>Transaction</code> is required to acquire a <code>MutableRepo</code>, etc. or a <code>RepoLoader</code>. A <code>Transaction</code> is required to acquire a <code>MutableRepo</code>, etc.
The following sections describe each component.</p> The following sections describe each component.</p>
<p><img alt="Type diagram" src="../types.svg" /></p> <p><img alt="Type diagram" src="../types.svg" /></p>
<p><em>This diagram was created with <a href="https://excalidraw.com/">Excalidraw</a>. You can get a copy of it <a href="https://excalidraw.com/#json=wuOSusqzm6MjoXatFk1kn,aCySj27AVmQMf7aJdMzMCw">at this <p><em>This diagram was created with <a href="https://excalidraw.com/">Excalidraw</a>. You can get a copy of it <a href="https://excalidraw.com/#json=X081PJVRW2h4iW12qZxc1,H2Yg3qnycVG0Vpq5Z90Miw">at this
location</a>, and Right Click &gt; "Copy to Clipboard as SVG".</em></p> location</a>, and Right Click &gt; "Copy to Clipboard as SVG".</em></p>
<h3 id="backend">Backend<a class="headerlink" href="#backend" title="Permanent link">&para;</a></h3> <h3 id="backend">Backend<a class="headerlink" href="#backend" title="Permanent link">&para;</a></h3>
<p>The <code>Backend</code> trait defines the interface each <p>The <code>Backend</code> trait defines the interface each
commit backend needs to implement. The current in-tree commit backends commit backend needs to implement. The current in-tree commit backends
are <code>GitBackend</code> are <code>GitBackend</code>
and <code>LocalBackend</code>.</p> and <code>SimpleBackend</code>.</p>
<p>Since there are non-commit backends, the <code>Backend</code> trait should probably be <p>Since there are non-commit backends, the <code>Backend</code> trait should probably be
renamed to <code>CommitBackend</code>.</p> renamed to <code>CommitBackend</code>.</p>
<h3 id="gitbackend">GitBackend<a class="headerlink" href="#gitbackend" title="Permanent link">&para;</a></h3> <h3 id="gitbackend">GitBackend<a class="headerlink" href="#gitbackend" title="Permanent link">&para;</a></h3>
@ -1978,8 +1978,8 @@ predecessors, and the bit-reversed commit ID as change ID.</p>
<p>Because we use the Git Object ID as commit ID, two commits that differ only in <p>Because we use the Git Object ID as commit ID, two commits that differ only in
their change ID, for example, will get the same commit ID, so we error out when their change ID, for example, will get the same commit ID, so we error out when
trying to write the second one of them.</p> trying to write the second one of them.</p>
<h3 id="localbackend">LocalBackend<a class="headerlink" href="#localbackend" title="Permanent link">&para;</a></h3> <h3 id="simplebackend">SimpleBackend<a class="headerlink" href="#simplebackend" title="Permanent link">&para;</a></h3>
<p>The <code>LocalBackend</code> is just a proof of concept. It stores objects addressed by <p>The <code>SimpleBackend</code> is just a proof of concept. It stores objects addressed by
their hash, with one file per object.</p> their hash, with one file per object.</p>
<h3 id="store">Store<a class="headerlink" href="#store" title="Permanent link">&para;</a></h3> <h3 id="store">Store<a class="headerlink" href="#store" title="Permanent link">&para;</a></h3>
<p>The <code>Store</code> type wraps the <code>Backend</code> and returns wrapped types for commits and <p>The <code>Store</code> type wraps the <code>Backend</code> and returns wrapped types for commits and
@ -2017,7 +2017,7 @@ the files on disk to match a requested <code>TreeId</code>.</p>
<p>The <code>TreeState</code> type supports sparse checkouts. In fact, all working copies are <p>The <code>TreeState</code> type supports sparse checkouts. In fact, all working copies are
sparse; they simply track the full repo in most cases.</p> sparse; they simply track the full repo in most cases.</p>
<h3 id="workingcopy">WorkingCopy<a class="headerlink" href="#workingcopy" title="Permanent link">&para;</a></h3> <h3 id="workingcopy">WorkingCopy<a class="headerlink" href="#workingcopy" title="Permanent link">&para;</a></h3>
<p>The <code>WorkingCopy</code> type has a <code>TreeState</code> but also knows which <code>WorkspaceId</code> it <p>The <code>WorkingCopy</code> type has a <code>TreeState</code> but also knows which <code>WorkspaceName</code> it
has and at which operation it was most recently updated.</p> has and at which operation it was most recently updated.</p>
<h3 id="workspace">Workspace<a class="headerlink" href="#workspace" title="Permanent link">&para;</a></h3> <h3 id="workspace">Workspace<a class="headerlink" href="#workspace" title="Permanent link">&para;</a></h3>
<p>The <code>Workspace</code> type represents the combination of a repo and a working copy ( <p>The <code>Workspace</code> type represents the combination of a repo and a working copy (

22
latest/technical/concurrency/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -869,7 +869,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1209,7 +1209,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1231,7 +1231,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1275,7 +1275,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1428,7 +1428,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1501,7 +1501,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>

22
latest/technical/conflicts/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -869,7 +869,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1179,7 +1179,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1201,7 +1201,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1245,7 +1245,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1398,7 +1398,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1471,7 +1471,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>

12
latest/technical/types.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 120 KiB

After

Width:  |  Height:  |  Size: 120 KiB

114
latest/templates/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -519,7 +519,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -585,7 +585,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -878,6 +878,15 @@
</span> </span>
</a> </a>
</li>
<li class="md-nav__item">
<a href="#commitref-type" class="md-nav__link">
<span class="md-ellipsis">
CommitRef type
</span>
</a>
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
@ -968,15 +977,6 @@
</span> </span>
</a> </a>
</li>
<li class="md-nav__item">
<a href="#refname-type" class="md-nav__link">
<span class="md-ellipsis">
RefName type
</span>
</a>
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
@ -1245,7 +1245,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1485,7 +1485,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1507,7 +1507,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1551,7 +1551,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1704,7 +1704,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1777,7 +1777,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
@ -1908,6 +1908,15 @@
</span> </span>
</a> </a>
</li>
<li class="md-nav__item">
<a href="#commitref-type" class="md-nav__link">
<span class="md-ellipsis">
CommitRef type
</span>
</a>
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
@ -1998,15 +2007,6 @@
</span> </span>
</a> </a>
</li>
<li class="md-nav__item">
<a href="#refname-type" class="md-nav__link">
<span class="md-ellipsis">
RefName type
</span>
</a>
</li> </li>
<li class="md-nav__item"> <li class="md-nav__item">
@ -2268,13 +2268,15 @@ type</a> are available as keywords. For example,
working-copy commit as <code>&lt;workspace name&gt;@</code>.</li> working-copy commit as <code>&lt;workspace name&gt;@</code>.</li>
<li><code>current_working_copy() -&gt; Boolean</code>: True for the working-copy commit of the <li><code>current_working_copy() -&gt; Boolean</code>: True for the working-copy commit of the
current workspace.</li> current workspace.</li>
<li><code>bookmarks() -&gt; List&lt;RefName&gt;</code>: Local and remote bookmarks pointing to the <li><code>bookmarks() -&gt; List&lt;CommitRef&gt;</code>: Local and remote bookmarks pointing to the
commit. A tracking remote bookmark will be included only if its target is commit. A tracking remote bookmark will be included only if its target is
different from the local one.</li> different from the local one.</li>
<li><code>local_bookmarks() -&gt; List&lt;RefName&gt;</code>: All local bookmarks pointing to the commit.</li> <li><code>local_bookmarks() -&gt; List&lt;CommitRef&gt;</code>: All local bookmarks pointing to the
<li><code>remote_bookmarks() -&gt; List&lt;RefName&gt;</code>: All remote bookmarks pointing to the commit.</li> commit.</li>
<li><code>tags() -&gt; List&lt;RefName&gt;</code></li> <li><code>remote_bookmarks() -&gt; List&lt;CommitRef&gt;</code>: All remote bookmarks pointing to the
<li><code>git_refs() -&gt; List&lt;RefName&gt;</code></li> commit.</li>
<li><code>tags() -&gt; List&lt;CommitRef&gt;</code></li>
<li><code>git_refs() -&gt; List&lt;CommitRef&gt;</code></li>
<li><code>git_head() -&gt; Boolean</code>: True for the Git <code>HEAD</code> commit.</li> <li><code>git_head() -&gt; Boolean</code>: True for the Git <code>HEAD</code> commit.</li>
<li><code>divergent() -&gt; Boolean</code>: True if the commit's change id corresponds to multiple <li><code>divergent() -&gt; Boolean</code>: True if the commit's change id corresponds to multiple
visible commits.</li> visible commits.</li>
@ -2297,6 +2299,28 @@ type</a> are available as keywords. For example,
<li><code>.short([len: Integer]) -&gt; String</code></li> <li><code>.short([len: Integer]) -&gt; String</code></li>
<li><code>.shortest([min_len: Integer]) -&gt; ShortestIdPrefix</code>: Shortest unique prefix.</li> <li><code>.shortest([min_len: Integer]) -&gt; ShortestIdPrefix</code>: Shortest unique prefix.</li>
</ul> </ul>
<h3 id="commitref-type">CommitRef type<a class="headerlink" href="#commitref-type" title="Permanent link">&para;</a></h3>
<p>The following methods are defined.</p>
<ul>
<li><code>.name() -&gt; String</code>: Local bookmark or tag name.</li>
<li><code>.remote() -&gt; String</code>: Remote name or empty if this is a local ref.</li>
<li><code>.present() -&gt; Boolean</code>: True if the ref points to any commit.</li>
<li><code>.conflict() -&gt; Boolean</code>: True if <a href="../bookmarks/#conflicts">the bookmark or tag is
conflicted</a>.</li>
<li><code>.normal_target() -&gt; Option&lt;Commit&gt;</code>: Target commit if the ref is not
conflicted and points to a commit.</li>
<li><code>.removed_targets() -&gt; List&lt;Commit&gt;</code>: Old target commits if conflicted.</li>
<li><code>.added_targets() -&gt; List&lt;Commit&gt;</code>: New target commits. The list usually
contains one "normal" target.</li>
<li><code>.tracked() -&gt; Boolean</code>: True if the ref is tracked by a local ref. The local
ref might have been deleted (but not pushed yet.)</li>
<li><code>.tracking_present() -&gt; Boolean</code>: True if the ref is tracked by a local ref,
and if the local ref points to any commit.</li>
<li><code>.tracking_ahead_count() -&gt; SizeHint</code>: Number of commits ahead of the tracking
local ref.</li>
<li><code>.tracking_behind_count() -&gt; SizeHint</code>: Number of commits behind of the
tracking local ref.</li>
</ul>
<h3 id="configvalue-type">ConfigValue type<a class="headerlink" href="#configvalue-type" title="Permanent link">&para;</a></h3> <h3 id="configvalue-type">ConfigValue type<a class="headerlink" href="#configvalue-type" title="Permanent link">&para;</a></h3>
<p>This type can be printed in TOML syntax. The following methods are defined.</p> <p>This type can be printed in TOML syntax. The following methods are defined.</p>
<ul> <ul>
@ -2385,28 +2409,6 @@ defined.</p>
<p>An option can be implicitly converted to <code>Boolean</code> denoting whether the <p>An option can be implicitly converted to <code>Boolean</code> denoting whether the
contained value is set. If set, all methods of the contained value can be contained value is set. If set, all methods of the contained value can be
invoked. If not set, an error will be reported inline on method call.</p> invoked. If not set, an error will be reported inline on method call.</p>
<h3 id="refname-type">RefName type<a class="headerlink" href="#refname-type" title="Permanent link">&para;</a></h3>
<p>The following methods are defined.</p>
<ul>
<li><code>.name() -&gt; String</code>: Local bookmark or tag name.</li>
<li><code>.remote() -&gt; String</code>: Remote name or empty if this is a local ref.</li>
<li><code>.present() -&gt; Boolean</code>: True if the ref points to any commit.</li>
<li><code>.conflict() -&gt; Boolean</code>: True if <a href="../bookmarks/#conflicts">the bookmark or tag is
conflicted</a>.</li>
<li><code>.normal_target() -&gt; Option&lt;Commit&gt;</code>: Target commit if the ref is not
conflicted and points to a commit.</li>
<li><code>.removed_targets() -&gt; List&lt;Commit&gt;</code>: Old target commits if conflicted.</li>
<li><code>.added_targets() -&gt; List&lt;Commit&gt;</code>: New target commits. The list usually
contains one "normal" target.</li>
<li><code>.tracked() -&gt; Boolean</code>: True if the ref is tracked by a local ref. The local
ref might have been deleted (but not pushed yet.)</li>
<li><code>.tracking_present() -&gt; Boolean</code>: True if the ref is tracked by a local ref,
and if the local ref points to any commit.</li>
<li><code>.tracking_ahead_count() -&gt; SizeHint</code>: Number of commits ahead of the tracking
local ref.</li>
<li><code>.tracking_behind_count() -&gt; SizeHint</code>: Number of commits behind of the
tracking local ref.</li>
</ul>
<h3 id="repopath-type">RepoPath type<a class="headerlink" href="#repopath-type" title="Permanent link">&para;</a></h3> <h3 id="repopath-type">RepoPath type<a class="headerlink" href="#repopath-type" title="Permanent link">&para;</a></h3>
<p>A slash-separated path relative to the repository root. The following methods <p>A slash-separated path relative to the repository root. The following methods
are defined.</p> are defined.</p>

22
latest/testimonials/index.html
View File

@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -587,7 +587,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -653,7 +653,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -937,7 +937,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1177,7 +1177,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1199,7 +1199,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1243,7 +1243,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1396,7 +1396,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1469,7 +1469,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>

112
latest/tutorial/index.html
View File

@ -22,7 +22,7 @@
<title>Tutorial and Birds-Eye View - Jujutsu docs</title> <title>Tutorial and bird's eye view - Jujutsu docs</title>
@ -114,7 +114,7 @@
<div class="md-header__topic" data-md-component="header-topic"> <div class="md-header__topic" data-md-component="header-topic">
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
</div> </div>
@ -306,7 +306,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -337,7 +337,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -349,7 +349,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -535,7 +535,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -634,7 +634,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -700,7 +700,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -984,7 +984,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1224,7 +1224,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1246,7 +1246,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1290,7 +1290,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1443,7 +1443,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1516,7 +1516,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
@ -1664,16 +1664,16 @@ bookmark:<span class="w"> </span>master@origin<span class="w"> </span><
bookmark:<span class="w"> </span>octocat-patch-1@origin<span class="w"> </span><span class="o">[</span>new<span class="o">]</span><span class="w"> </span>untracked bookmark:<span class="w"> </span>octocat-patch-1@origin<span class="w"> </span><span class="o">[</span>new<span class="o">]</span><span class="w"> </span>untracked
bookmark:<span class="w"> </span>test@origin<span class="w"> </span><span class="o">[</span>new<span class="o">]</span><span class="w"> </span>untracked bookmark:<span class="w"> </span>test@origin<span class="w"> </span><span class="o">[</span>new<span class="o">]</span><span class="w"> </span>untracked
Setting<span class="w"> </span>the<span class="w"> </span>revset<span class="w"> </span><span class="nb">alias</span><span class="w"> </span><span class="s2">&quot;trunk()&quot;</span><span class="w"> </span>to<span class="w"> </span><span class="s2">&quot;master@origin&quot;</span> Setting<span class="w"> </span>the<span class="w"> </span>revset<span class="w"> </span><span class="nb">alias</span><span class="w"> </span><span class="s2">&quot;trunk()&quot;</span><span class="w"> </span>to<span class="w"> </span><span class="s2">&quot;master@origin&quot;</span>
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>kntqzsqt<span class="w"> </span>d7439b06<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span> Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>kntqzsqt<span class="w"> </span>d7439b06<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span>
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>orrkosyo<span class="w"> </span>7fd1a60b<span class="w"> </span>master<span class="w"> </span><span class="p">|</span><span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>Merge<span class="w"> </span>pull<span class="w"> </span>request<span class="w"> </span><span class="c1">#6 from Spaceghost/patch-1</span> Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>orrkosyo<span class="w"> </span>7fd1a60b<span class="w"> </span>master<span class="w"> </span><span class="p">|</span><span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>Merge<span class="w"> </span>pull<span class="w"> </span>request<span class="w"> </span><span class="c1">#6 from Spaceghost/patch-1</span>
Added<span class="w"> </span><span class="m">1</span><span class="w"> </span>files,<span class="w"> </span>modified<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>removed<span class="w"> </span><span class="m">0</span><span class="w"> </span>files Added<span class="w"> </span><span class="m">1</span><span class="w"> </span>files,<span class="w"> </span>modified<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>removed<span class="w"> </span><span class="m">0</span><span class="w"> </span>files
$<span class="w"> </span><span class="nb">cd</span><span class="w"> </span>Hello-World $<span class="w"> </span><span class="nb">cd</span><span class="w"> </span>Hello-World
</code></pre></div> </code></pre></div>
<p>Running <code>jj st</code> (short for <code>jj status</code>) now yields something like this:</p> <p>Running <code>jj st</code> (short for <code>jj status</code>) now yields something like this:</p>
<div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>st <div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>st
The<span class="w"> </span>working<span class="w"> </span>copy<span class="w"> </span>has<span class="w"> </span>no<span class="w"> </span>changes. The<span class="w"> </span>working<span class="w"> </span>copy<span class="w"> </span>has<span class="w"> </span>no<span class="w"> </span>changes.
Working<span class="w"> </span>copy<span class="w"> </span>:<span class="w"> </span>kntqzsqt<span class="w"> </span>d7439b06<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span> Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>kntqzsqt<span class="w"> </span>d7439b06<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span>
Parent<span class="w"> </span>commit:<span class="w"> </span>orrkosyo<span class="w"> </span>7fd1a60b<span class="w"> </span>master<span class="w"> </span><span class="p">|</span><span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>Merge<span class="w"> </span>pull<span class="w"> </span>request<span class="w"> </span><span class="c1">#6 from Spaceghost/patch-1</span> Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span>:<span class="w"> </span>orrkosyo<span class="w"> </span>7fd1a60b<span class="w"> </span>master<span class="w"> </span><span class="p">|</span><span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>Merge<span class="w"> </span>pull<span class="w"> </span>request<span class="w"> </span><span class="c1">#6 from Spaceghost/patch-1</span>
</code></pre></div> </code></pre></div>
<p>Let's look at that output as it introduces new concepts. You can see two <p>Let's look at that output as it introduces new concepts. You can see two
commits: Parent and working copy. Both are identified using two separate commits: Parent and working copy. Both are identified using two separate
@ -1711,8 +1711,8 @@ we don't forget what we're working on:</p>
<span class="c1"># Enter something like &quot;Say goodbye&quot; in the editor and then save the file and close</span> <span class="c1"># Enter something like &quot;Say goodbye&quot; in the editor and then save the file and close</span>
<span class="c1"># the editor.</span> <span class="c1"># the editor.</span>
$<span class="w"> </span>jj<span class="w"> </span>describe $<span class="w"> </span>jj<span class="w"> </span>describe
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>kntqzsqt<span class="w"> </span>e427edcf<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>Say<span class="w"> </span>goodbye Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>kntqzsqt<span class="w"> </span>e427edcf<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>Say<span class="w"> </span>goodbye
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>orrkosyo<span class="w"> </span>7fd1a60b<span class="w"> </span>master<span class="w"> </span><span class="p">|</span><span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>Merge<span class="w"> </span>pull<span class="w"> </span>request<span class="w"> </span><span class="c1">#6 from Spaceghost/patch-1</span> Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>orrkosyo<span class="w"> </span>7fd1a60b<span class="w"> </span>master<span class="w"> </span><span class="p">|</span><span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>Merge<span class="w"> </span>pull<span class="w"> </span>request<span class="w"> </span><span class="c1">#6 from Spaceghost/patch-1</span>
</code></pre></div> </code></pre></div>
<p>Now make the change in the README:</p> <p>Now make the change in the README:</p>
<div class="highlight"><pre><span></span><code><span class="c1"># Adjust as necessary for compatibility with your flavor of `sed`</span> <div class="highlight"><pre><span></span><code><span class="c1"># Adjust as necessary for compatibility with your flavor of `sed`</span>
@ -1720,8 +1720,8 @@ $<span class="w"> </span>sed<span class="w"> </span>-i<span class="w"> </span><s
$<span class="w"> </span>jj<span class="w"> </span>st $<span class="w"> </span>jj<span class="w"> </span>st
Working<span class="w"> </span>copy<span class="w"> </span>changes: Working<span class="w"> </span>copy<span class="w"> </span>changes:
M<span class="w"> </span>README M<span class="w"> </span>README
Working<span class="w"> </span>copy<span class="w"> </span>:<span class="w"> </span>kntqzsqt<span class="w"> </span>5d39e19d<span class="w"> </span>Say<span class="w"> </span>goodbye Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>kntqzsqt<span class="w"> </span>5d39e19d<span class="w"> </span>Say<span class="w"> </span>goodbye
Parent<span class="w"> </span>commit:<span class="w"> </span>orrkosyo<span class="w"> </span>7fd1a60b<span class="w"> </span>master<span class="w"> </span><span class="p">|</span><span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>Merge<span class="w"> </span>pull<span class="w"> </span>request<span class="w"> </span><span class="c1">#6 from Spaceghost/patch-1</span> Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span>:<span class="w"> </span>orrkosyo<span class="w"> </span>7fd1a60b<span class="w"> </span>master<span class="w"> </span><span class="p">|</span><span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>Merge<span class="w"> </span>pull<span class="w"> </span>request<span class="w"> </span><span class="c1">#6 from Spaceghost/patch-1</span>
</code></pre></div> </code></pre></div>
<p>Note that you didn't have to tell Jujutsu to add the change like you would with <p>Note that you didn't have to tell Jujutsu to add the change like you would with
<code>git add</code>. You actually don't even need to tell it when you add new files or <code>git add</code>. You actually don't even need to tell it when you add new files or
@ -1751,12 +1751,12 @@ create a new commit on top of your current working-copy commit. The new commit
is for the working-copy changes.</p> is for the working-copy changes.</p>
<p>So, let's say we're now done with this change, so we create a new change:</p> <p>So, let's say we're now done with this change, so we create a new change:</p>
<div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>new <div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>new
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>mpqrykyp<span class="w"> </span>aef4df99<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span> Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>mpqrykyp<span class="w"> </span>aef4df99<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span>
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>kntqzsqt<span class="w"> </span>5d39e19d<span class="w"> </span>Say<span class="w"> </span>goodbye Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>kntqzsqt<span class="w"> </span>5d39e19d<span class="w"> </span>Say<span class="w"> </span>goodbye
$<span class="w"> </span>jj<span class="w"> </span>st $<span class="w"> </span>jj<span class="w"> </span>st
The<span class="w"> </span>working<span class="w"> </span>copy<span class="w"> </span>has<span class="w"> </span>no<span class="w"> </span>changes. The<span class="w"> </span>working<span class="w"> </span>copy<span class="w"> </span>has<span class="w"> </span>no<span class="w"> </span>changes.
Working<span class="w"> </span>copy<span class="w"> </span>:<span class="w"> </span>mpqrykyp<span class="w"> </span>aef4df99<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span> Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>mpqrykyp<span class="w"> </span>aef4df99<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span>
Parent<span class="w"> </span>commit:<span class="w"> </span>kntqzsqt<span class="w"> </span>5d39e19d<span class="w"> </span>Say<span class="w"> </span>goodbye Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span>:<span class="w"> </span>kntqzsqt<span class="w"> </span>5d39e19d<span class="w"> </span>Say<span class="w"> </span>goodbye
</code></pre></div> </code></pre></div>
<p>If we later realize that we want to make further changes, we can make them in <p>If we later realize that we want to make further changes, we can make them in
the working copy and then run <code>jj squash</code>. That command squashes (moves) the the working copy and then run <code>jj squash</code>. That command squashes (moves) the
@ -1827,18 +1827,18 @@ commits. We use <code>jj new</code> with the <code>--message</code>/<code>-m</co
descriptions (commit messages) right away.</p> descriptions (commit messages) right away.</p>
<div class="highlight"><pre><span></span><code><span class="c1"># Start creating a chain of commits off of the `master` bookmark</span> <div class="highlight"><pre><span></span><code><span class="c1"># Start creating a chain of commits off of the `master` bookmark</span>
$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>master<span class="w"> </span>-m<span class="w"> </span>A<span class="p">;</span><span class="w"> </span><span class="nb">echo</span><span class="w"> </span>a<span class="w"> </span>&gt;<span class="w"> </span>file1 $<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>master<span class="w"> </span>-m<span class="w"> </span>A<span class="p">;</span><span class="w"> </span><span class="nb">echo</span><span class="w"> </span>a<span class="w"> </span>&gt;<span class="w"> </span>file1
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>nuvyytnq<span class="w"> </span>00a2aeed<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>A Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>nuvyytnq<span class="w"> </span>00a2aeed<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>A
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>orrkosyo<span class="w"> </span>7fd1a60b<span class="w"> </span>master<span class="w"> </span><span class="p">|</span><span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>Merge<span class="w"> </span>pull<span class="w"> </span>request<span class="w"> </span><span class="c1">#6 from Spaceghost/patch-1</span> Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>orrkosyo<span class="w"> </span>7fd1a60b<span class="w"> </span>master<span class="w"> </span><span class="p">|</span><span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>Merge<span class="w"> </span>pull<span class="w"> </span>request<span class="w"> </span><span class="c1">#6 from Spaceghost/patch-1</span>
Added<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>modified<span class="w"> </span><span class="m">1</span><span class="w"> </span>files,<span class="w"> </span>removed<span class="w"> </span><span class="m">0</span><span class="w"> </span>files Added<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>modified<span class="w"> </span><span class="m">1</span><span class="w"> </span>files,<span class="w"> </span>removed<span class="w"> </span><span class="m">0</span><span class="w"> </span>files
$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>-m<span class="w"> </span>B1<span class="p">;</span><span class="w"> </span><span class="nb">echo</span><span class="w"> </span>b1<span class="w"> </span>&gt;<span class="w"> </span>file1 $<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>-m<span class="w"> </span>B1<span class="p">;</span><span class="w"> </span><span class="nb">echo</span><span class="w"> </span>b1<span class="w"> </span>&gt;<span class="w"> </span>file1
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>ovknlmro<span class="w"> </span>967d9f9f<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>B1 Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>ovknlmro<span class="w"> </span>967d9f9f<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>B1
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>nuvyytnq<span class="w"> </span>5dda2f09<span class="w"> </span>A Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>nuvyytnq<span class="w"> </span>5dda2f09<span class="w"> </span>A
$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>-m<span class="w"> </span>B2<span class="p">;</span><span class="w"> </span><span class="nb">echo</span><span class="w"> </span>b2<span class="w"> </span>&gt;<span class="w"> </span>file1 $<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>-m<span class="w"> </span>B2<span class="p">;</span><span class="w"> </span><span class="nb">echo</span><span class="w"> </span>b2<span class="w"> </span>&gt;<span class="w"> </span>file1
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>puqltutt<span class="w"> </span>8ebeaffa<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>B2 Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>puqltutt<span class="w"> </span>8ebeaffa<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>B2
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>ovknlmro<span class="w"> </span>7d7c6e6b<span class="w"> </span>B1 Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>ovknlmro<span class="w"> </span>7d7c6e6b<span class="w"> </span>B1
$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>-m<span class="w"> </span>C<span class="p">;</span><span class="w"> </span><span class="nb">echo</span><span class="w"> </span>c<span class="w"> </span>&gt;<span class="w"> </span>file2 $<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>-m<span class="w"> </span>C<span class="p">;</span><span class="w"> </span><span class="nb">echo</span><span class="w"> </span>c<span class="w"> </span>&gt;<span class="w"> </span>file2
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>qzvqqupx<span class="w"> </span>62a3c6d3<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>C Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>qzvqqupx<span class="w"> </span>62a3c6d3<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>C
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>puqltutt<span class="w"> </span>daa6ffd5<span class="w"> </span>B2 Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>puqltutt<span class="w"> </span>daa6ffd5<span class="w"> </span>B2
$<span class="w"> </span>jj<span class="w"> </span>log $<span class="w"> </span>jj<span class="w"> </span>log
@<span class="w"> </span>qzvqqupx<span class="w"> </span>martinvonz@google.com<span class="w"> </span><span class="m">2023</span>-02-12<span class="w"> </span><span class="m">15</span>:07:41.946<span class="w"> </span>-08:00<span class="w"> </span>2370ddf3 @<span class="w"> </span>qzvqqupx<span class="w"> </span>martinvonz@google.com<span class="w"> </span><span class="m">2023</span>-02-12<span class="w"> </span><span class="m">15</span>:07:41.946<span class="w"> </span>-08:00<span class="w"> </span>2370ddf3
│<span class="w"> </span>C │<span class="w"> </span>C
@ -1864,8 +1864,8 @@ modifies a different file. Let's now rebase B2 directly onto A. We use the
on A.</p> on A.</p>
<div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>rebase<span class="w"> </span>-s<span class="w"> </span>puqltutt<span class="w"> </span>-d<span class="w"> </span>nuvyytnq<span class="w"> </span><span class="c1"># Replace the IDs by what you have for B2 and A</span> <div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>rebase<span class="w"> </span>-s<span class="w"> </span>puqltutt<span class="w"> </span>-d<span class="w"> </span>nuvyytnq<span class="w"> </span><span class="c1"># Replace the IDs by what you have for B2 and A</span>
Rebased<span class="w"> </span><span class="m">2</span><span class="w"> </span>commits Rebased<span class="w"> </span><span class="m">2</span><span class="w"> </span>commits
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>qzvqqupx<span class="w"> </span>1978b534<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>C Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>qzvqqupx<span class="w"> </span>1978b534<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>C
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>puqltutt<span class="w"> </span>f7fb5943<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>B2 Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>puqltutt<span class="w"> </span>f7fb5943<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>B2
Added<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>modified<span class="w"> </span><span class="m">1</span><span class="w"> </span>files,<span class="w"> </span>removed<span class="w"> </span><span class="m">0</span><span class="w"> </span>files Added<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>modified<span class="w"> </span><span class="m">1</span><span class="w"> </span>files,<span class="w"> </span>removed<span class="w"> </span><span class="m">0</span><span class="w"> </span>files
There<span class="w"> </span>are<span class="w"> </span>unresolved<span class="w"> </span>conflicts<span class="w"> </span>at<span class="w"> </span>these<span class="w"> </span>paths: There<span class="w"> </span>are<span class="w"> </span>unresolved<span class="w"> </span>conflicts<span class="w"> </span>at<span class="w"> </span>these<span class="w"> </span>paths:
file1<span class="w"> </span><span class="m">2</span>-sided<span class="w"> </span>conflict file1<span class="w"> </span><span class="m">2</span>-sided<span class="w"> </span>conflict
@ -1908,8 +1908,8 @@ on top.</p>
top of B2. Once we've resolved the conflict, we'll squash the conflict top of B2. Once we've resolved the conflict, we'll squash the conflict
resolution into the conflicted B2. That might look like this:</p> resolution into the conflicted B2. That might look like this:</p>
<div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>puqltutt<span class="w"> </span><span class="c1"># Replace the ID by what you have for B2</span> <div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>puqltutt<span class="w"> </span><span class="c1"># Replace the ID by what you have for B2</span>
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>zxoosnnp<span class="w"> </span>c7068d1c<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span> Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>zxoosnnp<span class="w"> </span>c7068d1c<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span>
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>puqltutt<span class="w"> </span>f7fb5943<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>B2 Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>puqltutt<span class="w"> </span>f7fb5943<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>B2
Added<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>modified<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>removed<span class="w"> </span><span class="m">1</span><span class="w"> </span>files Added<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>modified<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>removed<span class="w"> </span><span class="m">1</span><span class="w"> </span>files
There<span class="w"> </span>are<span class="w"> </span>unresolved<span class="w"> </span>conflicts<span class="w"> </span>at<span class="w"> </span>these<span class="w"> </span>paths: There<span class="w"> </span>are<span class="w"> </span>unresolved<span class="w"> </span>conflicts<span class="w"> </span>at<span class="w"> </span>these<span class="w"> </span>paths:
file1<span class="w"> </span><span class="m">2</span>-sided<span class="w"> </span>conflict file1<span class="w"> </span><span class="m">2</span>-sided<span class="w"> </span>conflict
@ -1918,8 +1918,8 @@ $<span class="w"> </span>jj<span class="w"> </span>st
The<span class="w"> </span>working<span class="w"> </span>copy<span class="w"> </span>has<span class="w"> </span>no<span class="w"> </span>changes. The<span class="w"> </span>working<span class="w"> </span>copy<span class="w"> </span>has<span class="w"> </span>no<span class="w"> </span>changes.
There<span class="w"> </span>are<span class="w"> </span>unresolved<span class="w"> </span>conflicts<span class="w"> </span>at<span class="w"> </span>these<span class="w"> </span>paths: There<span class="w"> </span>are<span class="w"> </span>unresolved<span class="w"> </span>conflicts<span class="w"> </span>at<span class="w"> </span>these<span class="w"> </span>paths:
file1<span class="w"> </span><span class="m">2</span>-sided<span class="w"> </span>conflict file1<span class="w"> </span><span class="m">2</span>-sided<span class="w"> </span>conflict
Working<span class="w"> </span>copy<span class="w"> </span>:<span class="w"> </span>zxoosnnp<span class="w"> </span>c7068d1c<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span> Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>zxoosnnp<span class="w"> </span>c7068d1c<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span>
Parent<span class="w"> </span>commit:<span class="w"> </span>puqltutt<span class="w"> </span>f7fb5943<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>B2 Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span>:<span class="w"> </span>puqltutt<span class="w"> </span>f7fb5943<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>B2
To<span class="w"> </span>resolve<span class="w"> </span>the<span class="w"> </span>conflicts,<span class="w"> </span>start<span class="w"> </span>by<span class="w"> </span>updating<span class="w"> </span>to<span class="w"> </span>it: To<span class="w"> </span>resolve<span class="w"> </span>the<span class="w"> </span>conflicts,<span class="w"> </span>start<span class="w"> </span>by<span class="w"> </span>updating<span class="w"> </span>to<span class="w"> </span>it:
<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>puqltutt <span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>puqltutt
Then<span class="w"> </span>use<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>resolve<span class="sb">`</span>,<span class="w"> </span>or<span class="w"> </span>edit<span class="w"> </span>the<span class="w"> </span>conflict<span class="w"> </span>markers<span class="w"> </span><span class="k">in</span><span class="w"> </span>the<span class="w"> </span>file<span class="w"> </span>directly. Then<span class="w"> </span>use<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>resolve<span class="sb">`</span>,<span class="w"> </span>or<span class="w"> </span>edit<span class="w"> </span>the<span class="w"> </span>conflict<span class="w"> </span>markers<span class="w"> </span><span class="k">in</span><span class="w"> </span>the<span class="w"> </span>file<span class="w"> </span>directly.
@ -1940,14 +1940,14 @@ $<span class="w"> </span><span class="nb">echo</span><span class="w"> </span>res
$<span class="w"> </span>jj<span class="w"> </span>st $<span class="w"> </span>jj<span class="w"> </span>st
Working<span class="w"> </span>copy<span class="w"> </span>changes: Working<span class="w"> </span>copy<span class="w"> </span>changes:
M<span class="w"> </span>file1 M<span class="w"> </span>file1
Working<span class="w"> </span>copy<span class="w"> </span>:<span class="w"> </span>zxoosnnp<span class="w"> </span>c2a31a06<span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span> Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>zxoosnnp<span class="w"> </span>c2a31a06<span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span>
Parent<span class="w"> </span>commit:<span class="w"> </span>puqltutt<span class="w"> </span>f7fb5943<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>B2 Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span>:<span class="w"> </span>puqltutt<span class="w"> </span>f7fb5943<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>B2
Conflict<span class="w"> </span><span class="k">in</span><span class="w"> </span>parent<span class="w"> </span>commit<span class="w"> </span>has<span class="w"> </span>been<span class="w"> </span>resolved<span class="w"> </span><span class="k">in</span><span class="w"> </span>working<span class="w"> </span>copy Conflict<span class="w"> </span><span class="k">in</span><span class="w"> </span>parent<span class="w"> </span>commit<span class="w"> </span>has<span class="w"> </span>been<span class="w"> </span>resolved<span class="w"> </span><span class="k">in</span><span class="w"> </span>working<span class="w"> </span>copy
$<span class="w"> </span>jj<span class="w"> </span>squash $<span class="w"> </span>jj<span class="w"> </span>squash
Rebased<span class="w"> </span><span class="m">1</span><span class="w"> </span>descendant<span class="w"> </span>commits Rebased<span class="w"> </span><span class="m">1</span><span class="w"> </span>descendant<span class="w"> </span>commits
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>ntxxqymr<span class="w"> </span>e3c279cc<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span> Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>ntxxqymr<span class="w"> </span>e3c279cc<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span>
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>puqltutt<span class="w"> </span>2c7a658e<span class="w"> </span>B2 Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>puqltutt<span class="w"> </span>2c7a658e<span class="w"> </span>B2
Existing<span class="w"> </span>conflicts<span class="w"> </span>were<span class="w"> </span>resolved<span class="w"> </span>or<span class="w"> </span>abandoned<span class="w"> </span>from<span class="w"> </span>these<span class="w"> </span>commits: Existing<span class="w"> </span>conflicts<span class="w"> </span>were<span class="w"> </span>resolved<span class="w"> </span>or<span class="w"> </span>abandoned<span class="w"> </span>from<span class="w"> </span>these<span class="w"> </span>commits:
<span class="w"> </span>qzvqqupx<span class="w"> </span>hidden<span class="w"> </span>1978b534<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>C <span class="w"> </span>qzvqqupx<span class="w"> </span>hidden<span class="w"> </span>1978b534<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>C
<span class="w"> </span>puqltutt<span class="w"> </span>hidden<span class="w"> </span>f7fb5943<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>B2 <span class="w"> </span>puqltutt<span class="w"> </span>hidden<span class="w"> </span>f7fb5943<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>B2
@ -2008,8 +2008,8 @@ To<span class="w"> </span>resolve<span class="w"> </span>the<span class="w"> </s
Then<span class="w"> </span>use<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>resolve<span class="sb">`</span>,<span class="w"> </span>or<span class="w"> </span>edit<span class="w"> </span>the<span class="w"> </span>conflict<span class="w"> </span>markers<span class="w"> </span><span class="k">in</span><span class="w"> </span>the<span class="w"> </span>file<span class="w"> </span>directly. Then<span class="w"> </span>use<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>resolve<span class="sb">`</span>,<span class="w"> </span>or<span class="w"> </span>edit<span class="w"> </span>the<span class="w"> </span>conflict<span class="w"> </span>markers<span class="w"> </span><span class="k">in</span><span class="w"> </span>the<span class="w"> </span>file<span class="w"> </span>directly.
Once<span class="w"> </span>the<span class="w"> </span>conflicts<span class="w"> </span>are<span class="w"> </span>resolved,<span class="w"> </span>you<span class="w"> </span>may<span class="w"> </span>want<span class="w"> </span>to<span class="w"> </span>inspect<span class="w"> </span>the<span class="w"> </span>result<span class="w"> </span>with<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>diff<span class="sb">`</span>. Once<span class="w"> </span>the<span class="w"> </span>conflicts<span class="w"> </span>are<span class="w"> </span>resolved,<span class="w"> </span>you<span class="w"> </span>may<span class="w"> </span>want<span class="w"> </span>to<span class="w"> </span>inspect<span class="w"> </span>the<span class="w"> </span>result<span class="w"> </span>with<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>diff<span class="sb">`</span>.
Then<span class="w"> </span>run<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>squash<span class="sb">`</span><span class="w"> </span>to<span class="w"> </span>move<span class="w"> </span>the<span class="w"> </span>resolution<span class="w"> </span>into<span class="w"> </span>the<span class="w"> </span>conflicted<span class="w"> </span>commit. Then<span class="w"> </span>run<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>squash<span class="sb">`</span><span class="w"> </span>to<span class="w"> </span>move<span class="w"> </span>the<span class="w"> </span>resolution<span class="w"> </span>into<span class="w"> </span>the<span class="w"> </span>conflicted<span class="w"> </span>commit.
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>zxoosnnp<span class="w"> </span>63874fe6<span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span> Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>zxoosnnp<span class="w"> </span>63874fe6<span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span>
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>puqltutt<span class="w"> </span>f7fb5943<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>B2 Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>puqltutt<span class="w"> </span>f7fb5943<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>B2
$<span class="w"> </span>jj<span class="w"> </span>log $<span class="w"> </span>jj<span class="w"> </span>log
@<span class="w"> </span>zxoosnnp<span class="w"> </span>martinvonz@google.com<span class="w"> </span><span class="m">2023</span>-02-12<span class="w"> </span><span class="m">19</span>:34:09.000<span class="w"> </span>-08:00<span class="w"> </span>63874fe6 @<span class="w"> </span>zxoosnnp<span class="w"> </span>martinvonz@google.com<span class="w"> </span><span class="m">2023</span>-02-12<span class="w"> </span><span class="m">19</span>:34:09.000<span class="w"> </span>-08:00<span class="w"> </span>63874fe6
@ -2046,17 +2046,17 @@ commits.</p>
<p>We'll need some more complex content to test these commands, so let's create a <p>We'll need some more complex content to test these commands, so let's create a
few more commits:</p> few more commits:</p>
<div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>master<span class="w"> </span>-m<span class="w"> </span>abc<span class="p">;</span><span class="w"> </span><span class="nb">printf</span><span class="w"> </span><span class="s1">&#39;a\nb\nc\n&#39;</span><span class="w"> </span>&gt;<span class="w"> </span>file <div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>master<span class="w"> </span>-m<span class="w"> </span>abc<span class="p">;</span><span class="w"> </span><span class="nb">printf</span><span class="w"> </span><span class="s1">&#39;a\nb\nc\n&#39;</span><span class="w"> </span>&gt;<span class="w"> </span>file
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>ztqrpvnw<span class="w"> </span>f94e49cf<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>abc Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>ztqrpvnw<span class="w"> </span>f94e49cf<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>abc
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>orrkosyo<span class="w"> </span>7fd1a60b<span class="w"> </span>master<span class="w"> </span><span class="p">|</span><span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>Merge<span class="w"> </span>pull<span class="w"> </span>request<span class="w"> </span><span class="c1">#6 from Spaceghost/patch-1</span> Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>orrkosyo<span class="w"> </span>7fd1a60b<span class="w"> </span>master<span class="w"> </span><span class="p">|</span><span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>Merge<span class="w"> </span>pull<span class="w"> </span>request<span class="w"> </span><span class="c1">#6 from Spaceghost/patch-1</span>
Added<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>modified<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>removed<span class="w"> </span><span class="m">1</span><span class="w"> </span>files Added<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>modified<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>removed<span class="w"> </span><span class="m">1</span><span class="w"> </span>files
$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>-m<span class="w"> </span>ABC<span class="p">;</span><span class="w"> </span><span class="nb">printf</span><span class="w"> </span><span class="s1">&#39;A\nB\nc\n&#39;</span><span class="w"> </span>&gt;<span class="w"> </span>file $<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>-m<span class="w"> </span>ABC<span class="p">;</span><span class="w"> </span><span class="nb">printf</span><span class="w"> </span><span class="s1">&#39;A\nB\nc\n&#39;</span><span class="w"> </span>&gt;<span class="w"> </span>file
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>kwtuwqnm<span class="w"> </span>6f30cd1f<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>ABC Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>kwtuwqnm<span class="w"> </span>6f30cd1f<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>ABC
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>ztqrpvnw<span class="w"> </span><span class="m">51002261</span><span class="w"> </span>ab Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>ztqrpvnw<span class="w"> </span><span class="m">51002261</span><span class="w"> </span>ab
$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>-m<span class="w"> </span>ABCD<span class="p">;</span><span class="w"> </span><span class="nb">printf</span><span class="w"> </span><span class="s1">&#39;A\nB\nC\nD\n&#39;</span><span class="w"> </span>&gt;<span class="w"> </span>file $<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>-m<span class="w"> </span>ABCD<span class="p">;</span><span class="w"> </span><span class="nb">printf</span><span class="w"> </span><span class="s1">&#39;A\nB\nC\nD\n&#39;</span><span class="w"> </span>&gt;<span class="w"> </span>file
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>mrxqplyk<span class="w"> </span>a6749154<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>ABCD Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>mrxqplyk<span class="w"> </span>a6749154<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>ABCD
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>kwtuwqnm<span class="w"> </span>30aecc08<span class="w"> </span>ABC Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>kwtuwqnm<span class="w"> </span>30aecc08<span class="w"> </span>ABC
$<span class="w"> </span>jj<span class="w"> </span>log<span class="w"> </span>-r<span class="w"> </span>master::@ $<span class="w"> </span>jj<span class="w"> </span>log<span class="w"> </span>-r<span class="w"> </span>master::@
@<span class="w"> </span>mrxqplyk<span class="w"> </span>martinvonz@google.com<span class="w"> </span><span class="m">2023</span>-02-12<span class="w"> </span><span class="m">19</span>:38:21.000<span class="w"> </span>-08:00<span class="w"> </span>b98c607b @<span class="w"> </span>mrxqplyk<span class="w"> </span>martinvonz@google.com<span class="w"> </span><span class="m">2023</span>-02-12<span class="w"> </span><span class="m">19</span>:38:21.000<span class="w"> </span>-08:00<span class="w"> </span>b98c607b
@ -2079,8 +2079,8 @@ that:</p>
<div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>squash<span class="w"> </span>-i <div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>squash<span class="w"> </span>-i
Hint:<span class="w"> </span>Using<span class="w"> </span>default<span class="w"> </span>editor<span class="w"> </span><span class="s1">&#39;:builtin&#39;</span><span class="p">;</span><span class="w"> </span>run<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>config<span class="w"> </span><span class="nb">set</span><span class="w"> </span>--user<span class="w"> </span>ui.diff-editor<span class="w"> </span>:builtin<span class="sb">`</span><span class="w"> </span>to<span class="w"> </span>disable<span class="w"> </span>this<span class="w"> </span>message. Hint:<span class="w"> </span>Using<span class="w"> </span>default<span class="w"> </span>editor<span class="w"> </span><span class="s1">&#39;:builtin&#39;</span><span class="p">;</span><span class="w"> </span>run<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>config<span class="w"> </span><span class="nb">set</span><span class="w"> </span>--user<span class="w"> </span>ui.diff-editor<span class="w"> </span>:builtin<span class="sb">`</span><span class="w"> </span>to<span class="w"> </span>disable<span class="w"> </span>this<span class="w"> </span>message.
Rebased<span class="w"> </span><span class="m">1</span><span class="w"> </span>descendant<span class="w"> </span>commits Rebased<span class="w"> </span><span class="m">1</span><span class="w"> </span>descendant<span class="w"> </span>commits
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>mrxqplyk<span class="w"> </span>52a6c7fd<span class="w"> </span>ABCD Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>mrxqplyk<span class="w"> </span>52a6c7fd<span class="w"> </span>ABCD
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>kwtuwqnm<span class="w"> </span>643061ac<span class="w"> </span>ABC Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>kwtuwqnm<span class="w"> </span>643061ac<span class="w"> </span>ABC
</code></pre></div> </code></pre></div>
<p>That will bring up the built-in diff editor<sup id="fnref:alternative_diff_editors"><a class="footnote-ref" href="#fn:alternative_diff_editors">1</a></sup> with a <p>That will bring up the built-in diff editor<sup id="fnref:alternative_diff_editors"><a class="footnote-ref" href="#fn:alternative_diff_editors">1</a></sup> with a
diff of the changes in the "ABCD" commit. Expand the file by clicking on <code>(+)</code> diff of the changes in the "ABCD" commit. Expand the file by clicking on <code>(+)</code>
@ -2114,8 +2114,8 @@ checking it out.</p>
Hint:<span class="w"> </span>Using<span class="w"> </span>default<span class="w"> </span>editor<span class="w"> </span><span class="s1">&#39;:builtin&#39;</span><span class="p">;</span><span class="w"> </span>run<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>config<span class="w"> </span><span class="nb">set</span><span class="w"> </span>--user<span class="w"> </span>ui.diff-editor<span class="w"> </span>:builtin<span class="sb">`</span><span class="w"> </span>to<span class="w"> </span>disable<span class="w"> </span>this<span class="w"> </span>message. Hint:<span class="w"> </span>Using<span class="w"> </span>default<span class="w"> </span>editor<span class="w"> </span><span class="s1">&#39;:builtin&#39;</span><span class="p">;</span><span class="w"> </span>run<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>config<span class="w"> </span><span class="nb">set</span><span class="w"> </span>--user<span class="w"> </span>ui.diff-editor<span class="w"> </span>:builtin<span class="sb">`</span><span class="w"> </span>to<span class="w"> </span>disable<span class="w"> </span>this<span class="w"> </span>message.
Created<span class="w"> </span>kwtuwqnm<span class="w"> </span>70985eaa<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>ABC Created<span class="w"> </span>kwtuwqnm<span class="w"> </span>70985eaa<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>ABC
Rebased<span class="w"> </span><span class="m">1</span><span class="w"> </span>descendant<span class="w"> </span>commits Rebased<span class="w"> </span><span class="m">1</span><span class="w"> </span>descendant<span class="w"> </span>commits
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>mrxqplyk<span class="w"> </span>1c72cd50<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>ABCD Working<span class="w"> </span>copy<span class="w"> </span><span class="o">(</span>@<span class="o">)</span><span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>mrxqplyk<span class="w"> </span>1c72cd50<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>ABCD
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>kwtuwqnm<span class="w"> </span>70985eaa<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>ABC Parent<span class="w"> </span>commit<span class="w"> </span><span class="o">(</span>@-<span class="o">)</span><span class="w"> </span>:<span class="w"> </span>kwtuwqnm<span class="w"> </span>70985eaa<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>ABC
Added<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>modified<span class="w"> </span><span class="m">1</span><span class="w"> </span>files,<span class="w"> </span>removed<span class="w"> </span><span class="m">0</span><span class="w"> </span>files Added<span class="w"> </span><span class="m">0</span><span class="w"> </span>files,<span class="w"> </span>modified<span class="w"> </span><span class="m">1</span><span class="w"> </span>files,<span class="w"> </span>removed<span class="w"> </span><span class="m">0</span><span class="w"> </span>files
There<span class="w"> </span>are<span class="w"> </span>unresolved<span class="w"> </span>conflicts<span class="w"> </span>at<span class="w"> </span>these<span class="w"> </span>paths: There<span class="w"> </span>are<span class="w"> </span>unresolved<span class="w"> </span>conflicts<span class="w"> </span>at<span class="w"> </span>these<span class="w"> </span>paths:
file<span class="w"> </span><span class="m">2</span>-sided<span class="w"> </span>conflict file<span class="w"> </span><span class="m">2</span>-sided<span class="w"> </span>conflict

22
latest/windows/index.html
View File

@ -306,7 +306,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -328,7 +328,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -508,7 +508,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -607,7 +607,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -673,7 +673,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -957,7 +957,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1197,7 +1197,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1219,7 +1219,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1263,7 +1263,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1416,7 +1416,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1489,7 +1489,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>

37
latest/working-copy/index.html
View File

@ -22,7 +22,7 @@
<title>Working Copy - Jujutsu docs</title> <title>Working copy - Jujutsu docs</title>
@ -114,7 +114,7 @@
<div class="md-header__topic" data-md-component="header-topic"> <div class="md-header__topic" data-md-component="header-topic">
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
</div> </div>
@ -304,7 +304,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Installation and Setup Installation and setup
</span> </span>
@ -326,7 +326,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Tutorial and Birds-Eye View Tutorial and bird's eye view
</span> </span>
@ -420,7 +420,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
CLI Reference CLI reference
</span> </span>
@ -530,7 +530,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -542,7 +542,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Working Copy Working copy
</span> </span>
@ -673,7 +673,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Operation Log Operation log
</span> </span>
@ -957,7 +957,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sapling Sapling comparison
</span> </span>
@ -1197,7 +1197,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Docs Design docs
</span> </span>
@ -1219,7 +1219,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Design Doc Blueprint Design doc blueprint
</span> </span>
@ -1263,7 +1263,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Temporary Voting for Governance Temporary voting for governance
</span> </span>
@ -1416,7 +1416,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Sparse Patterns v2 Sparse patterns v2
</span> </span>
@ -1489,7 +1489,7 @@
<span class="md-ellipsis"> <span class="md-ellipsis">
Development Roadmap Development roadmap
</span> </span>
@ -1639,12 +1639,9 @@ See https://git-scm.com/docs/gitignore for details about the format.
<code>.gitignore</code> files are supported in any directory in the working copy, as well <code>.gitignore</code> files are supported in any directory in the working copy, as well
as in <code>$XDG_CONFIG_HOME/git/ignore</code> and <code>$GIT_DIR/info/exclude</code>.</p> as in <code>$XDG_CONFIG_HOME/git/ignore</code> and <code>$GIT_DIR/info/exclude</code>.</p>
<p>Ignored files are never tracked automatically (regardless of the value of <p>Ignored files are never tracked automatically (regardless of the value of
<code>snapshot.auto-track</code>), but they can still end up being tracked for a few reasons:</p> <code>snapshot.auto-track</code>), but files that were already tracked will remain tracked
<ul> even if they match ignore patterns. You can untrack such files with the
<li>if they were tracked in the parent commit</li> <code>jj file untrack</code> command.</p>
<li>because of an explicit <code>jj file track</code> command</li>
</ul>
<p>You can untrack such files with the <code>jj file untrack</code> command.</p>
<h2 id="workspaces">Workspaces<a class="headerlink" href="#workspaces" title="Permanent link">&para;</a></h2> <h2 id="workspaces">Workspaces<a class="headerlink" href="#workspaces" title="Permanent link">&para;</a></h2>
<p>You can have multiple working copies backed by a single repo. Use <p>You can have multiple working copies backed by a single repo. Use
<code>jj workspace add</code> to create a new working copy. The working copy will have a <code>jj workspace add</code> to create a new working copy. The working copy will have a

1473
v0.28.0/404.html Normal file
View File

File diff suppressed because it is too large Load Diff

2406
v0.28.0/FAQ/index.html Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
v0.28.0/assets/images/favicon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

16
v0.28.0/assets/javascripts/bundle.f1b6f286.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

7
v0.28.0/assets/javascripts/bundle.f1b6f286.min.js.map Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.28.0/assets/javascripts/lunr/min/lunr.ar.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

18
v0.28.0/assets/javascripts/lunr/min/lunr.da.min.js vendored Normal file
View File

@ -0,0 +1,18 @@
/*!
* Lunr languages, `Danish` language
* https://github.com/MihaiValentin/lunr-languages
*
* Copyright 2014, Mihai Valentin
* http://www.mozilla.org/MPL/
*/
/*!
* based on
* Snowball JavaScript Library v0.3
* http://code.google.com/p/urim/
* http://snowball.tartarus.org/
*
* Copyright 2010, Oleg Mazko
* http://www.mozilla.org/MPL/
*/
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.da=function(){this.pipeline.reset(),this.pipeline.add(e.da.trimmer,e.da.stopWordFilter,e.da.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.da.stemmer))},e.da.wordCharacters="A-Za-zªºÀ-ÖØ-öø-ʸˠ-ˤᴀ-ᴥᴬ-ᵜᵢ-ᵥᵫ-ᵷᵹ-ᶾḀ-ỿⁱⁿₐ-ₜKÅℲⅎⅠ-ↈⱠ-ⱿꜢ-ꞇꞋ-ꞭꞰ-ꞷꟷ-ꟿꬰ-ꭚꭜ-ꭤff-stＡ-Ｚａ-ｚ",e.da.trimmer=e.trimmerSupport.generateTrimmer(e.da.wordCharacters),e.Pipeline.registerFunction(e.da.trimmer,"trimmer-da"),e.da.stemmer=function(){var r=e.stemmerSupport.Among,i=e.stemmerSupport.SnowballProgram,n=new function(){function e(){var e,r=f.cursor+3;if(d=f.limit,0<=r&&r<=f.limit){for(a=r;;){if(e=f.cursor,f.in_grouping(w,97,248)){f.cursor=e;break}if(f.cursor=e,e>=f.limit)return;f.cursor++}for(;!f.out_grouping(w,97,248);){if(f.cursor>=f.limit)return;f.cursor++}d=f.cursor,d<a&&(d=a)}}function n(){var e,r;if(f.cursor>=d&&(r=f.limit_backward,f.limit_backward=d,f.ket=f.cursor,e=f.find_among_b(c,32),f.limit_backward=r,e))switch(f.bra=f.cursor,e){case 1:f.slice_del();break;case 2:f.in_grouping_b(p,97,229)&&f.slice_del()}}function t(){var e,r=f.limit-f.cursor;f.cursor>=d&&(e=f.limit_backward,f.limit_backward=d,f.ket=f.cursor,f.find_among_b(l,4)?(f.bra=f.cursor,f.limit_backward=e,f.cursor=f.limit-r,f.cursor>f.limit_backward&&(f.cursor--,f.bra=f.cursor,f.slice_del())):f.limit_backward=e)}function s(){var e,r,i,n=f.limit-f.cursor;if(f.ket=f.cursor,f.eq_s_b(2,"st")&&(f.bra=f.cursor,f.eq_s_b(2,"ig")&&f.slice_del()),f.cursor=f.limit-n,f.cursor>=d&&(r=f.limit_backward,f.limit_backward=d,f.ket=f.cursor,e=f.find_among_b(m,5),f.limit_backward=r,e))switch(f.bra=f.cursor,e){case 1:f.slice_del(),i=f.limit-f.cursor,t(),f.cursor=f.limit-i;break;case 2:f.slice_from("løs")}}function o(){var e;f.cursor>=d&&(e=f.limit_backward,f.limit_backward=d,f.ket=f.cursor,f.out_grouping_b(w,97,248)?(f.bra=f.cursor,u=f.slice_to(u),f.limit_backward=e,f.eq_v_b(u)&&f.slice_del()):f.limit_backward=e)}var a,d,u,c=[new r("hed",-1,1),new r("ethed",0,1),new r("ered",-1,1),new r("e",-1,1),new r("erede",3,1),new r("ende",3,1),new r("erende",5,1),new r("ene",3,1),new r("erne",3,1),new r("ere",3,1),new r("en",-1,1),new r("heden",10,1),new r("eren",10,1),new r("er",-1,1),new r("heder",13,1),new r("erer",13,1),new r("s",-1,2),new r("heds",16,1),new r("es",16,1),new r("endes",18,1),new r("erendes",19,1),new r("enes",18,1),new r("ernes",18,1),new r("eres",18,1),new r("ens",16,1),new r("hedens",24,1),new r("erens",24,1),new r("ers",16,1),new r("ets",16,1),new r("erets",28,1),new r("et",-1,1),new r("eret",30,1)],l=[new r("gd",-1,-1),new r("dt",-1,-1),new r("gt",-1,-1),new r("kt",-1,-1)],m=[new r("ig",-1,1),new r("lig",0,1),new r("elig",1,1),new r("els",-1,1),new r("løst",-1,2)],w=[17,65,16,1,0,0,0,0,0,0,0,0,0,0,0,0,48,0,128],p=[239,254,42,3,0,0,0,0,0,0,0,0,0,0,0,0,16],f=new i;this.setCurrent=function(e){f.setCurrent(e)},this.getCurrent=function(){return f.getCurrent()},this.stem=function(){var r=f.cursor;return e(),f.limit_backward=r,f.cursor=f.limit,n(),f.cursor=f.limit,t(),f.cursor=f.limit,s(),f.cursor=f.limit,o(),!0}};return function(e){return"function"==typeof e.update?e.update(function(e){return n.setCurrent(e),n.stem(),n.getCurrent()}):(n.setCurrent(e),n.stem(),n.getCurrent())}}(),e.Pipeline.registerFunction(e.da.stemmer,"stemmer-da"),e.da.stopWordFilter=e.generateStopWordFilter("ad af alle alt anden at blev blive bliver da de dem den denne der deres det dette dig din disse dog du efter eller en end er et for fra ham han hans har havde have hende hendes her hos hun hvad hvis hvor i ikke ind jeg jer jo kunne man mange med meget men mig min mine mit mod ned noget nogle nu når og også om op os over på selv sig sin sine sit skal skulle som sådan thi til ud under var vi vil ville vor være været".split(" ")),e.Pipeline.registerFunction(e.da.stopWordFilter,"stopWordFilter-da")}});

18
v0.28.0/assets/javascripts/lunr/min/lunr.de.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

18
v0.28.0/assets/javascripts/lunr/min/lunr.du.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.28.0/assets/javascripts/lunr/min/lunr.el.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

18
v0.28.0/assets/javascripts/lunr/min/lunr.es.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

18
v0.28.0/assets/javascripts/lunr/min/lunr.fi.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

18
v0.28.0/assets/javascripts/lunr/min/lunr.fr.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.28.0/assets/javascripts/lunr/min/lunr.he.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.28.0/assets/javascripts/lunr/min/lunr.hi.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.hi=function(){this.pipeline.reset(),this.pipeline.add(e.hi.trimmer,e.hi.stopWordFilter,e.hi.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.hi.stemmer))},e.hi.wordCharacters="ऀ-ःऄ-एऐ-टठ-यर-िी-ॏॐ-य़ॠ-९॰-ॿa-zA-Zａ-ｚＡ-Ｚ0-9０-９",e.hi.trimmer=e.trimmerSupport.generateTrimmer(e.hi.wordCharacters),e.Pipeline.registerFunction(e.hi.trimmer,"trimmer-hi"),e.hi.stopWordFilter=e.generateStopWordFilter("अत अपना अपनी अपने अभी अंदर आदि आप इत्यादि इन इनका इन्हीं इन्हें इन्हों इस इसका इसकी इसके इसमें इसी इसे उन उनका उनकी उनके उनको उन्हीं उन्हें उन्हों उस उसके उसी उसे एक एवं एस ऐसे और कई कर करता करते करना करने करें कहते कहा का काफ़ी कि कितना किन्हें किन्हों किया किर किस किसी किसे की कुछ कुल के को कोई कौन कौनसा गया घर जब जहाँ जा जितना जिन जिन्हें जिन्हों जिस जिसे जीधर जैसा जैसे जो तक तब तरह तिन तिन्हें तिन्हों तिस तिसे तो था थी थे दबारा दिया दुसरा दूसरे दो द्वारा न नके नहीं ना निहायत नीचे ने पर पहले पूरा पे फिर बनी बही बहुत बाद बाला बिलकुल भी भीतर मगर मानो मे में यदि यह यहाँ यही या यिह ये रखें रहा रहे ऱ्वासा लिए लिये लेकिन व वग़ैरह वर्ग वह वहाँ वहीं वाले वुह वे वो सकता सकते सबसे सभी साथ साबुत साभ सारा से सो संग ही हुआ हुई हुए है हैं हो होता होती होते होना होने".split(" ")),e.hi.stemmer=function(){return function(e){return"function"==typeof e.update?e.update(function(e){return e}):e}}();var r=e.wordcut;r.init(),e.hi.tokenizer=function(i){if(!arguments.length||null==i||void 0==i)return[];if(Array.isArray(i))return i.map(function(r){return isLunr2?new e.Token(r.toLowerCase()):r.toLowerCase()});var t=i.toString().toLowerCase().replace(/^\s+/,"");return r.cut(t).split("|")},e.Pipeline.registerFunction(e.hi.stemmer,"stemmer-hi"),e.Pipeline.registerFunction(e.hi.stopWordFilter,"stopWordFilter-hi")}});

18
v0.28.0/assets/javascripts/lunr/min/lunr.hu.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.28.0/assets/javascripts/lunr/min/lunr.hy.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.hy=function(){this.pipeline.reset(),this.pipeline.add(e.hy.trimmer,e.hy.stopWordFilter)},e.hy.wordCharacters="[A-Za-z԰-֏ff-ﭏ]",e.hy.trimmer=e.trimmerSupport.generateTrimmer(e.hy.wordCharacters),e.Pipeline.registerFunction(e.hy.trimmer,"trimmer-hy"),e.hy.stopWordFilter=e.generateStopWordFilter("դու և եք էիր էիք հետո նաև նրանք որը վրա է որ պիտի են այս մեջ ն իր ու ի այդ որոնք այն կամ էր մի ես համար այլ իսկ էին ենք հետ ին թ էինք մենք նրա նա դուք եմ էի ըստ որպես ում".split(" ")),e.Pipeline.registerFunction(e.hy.stopWordFilter,"stopWordFilter-hy"),e.hy.stemmer=function(){return function(e){return"function"==typeof e.update?e.update(function(e){return e}):e}}(),e.Pipeline.registerFunction(e.hy.stemmer,"stemmer-hy")}});

18
v0.28.0/assets/javascripts/lunr/min/lunr.it.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.28.0/assets/javascripts/lunr/min/lunr.ja.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");var r="2"==e.version[0];e.ja=function(){this.pipeline.reset(),this.pipeline.add(e.ja.trimmer,e.ja.stopWordFilter,e.ja.stemmer),r?this.tokenizer=e.ja.tokenizer:(e.tokenizer&&(e.tokenizer=e.ja.tokenizer),this.tokenizerFn&&(this.tokenizerFn=e.ja.tokenizer))};var t=new e.TinySegmenter;e.ja.tokenizer=function(i){var n,o,s,p,a,u,m,l,c,f;if(!arguments.length||null==i||void 0==i)return[];if(Array.isArray(i))return i.map(function(t){return r?new e.Token(t.toLowerCase()):t.toLowerCase()});for(o=i.toString().toLowerCase().replace(/^\s+/,""),n=o.length-1;n>=0;n--)if(/\S/.test(o.charAt(n))){o=o.substring(0,n+1);break}for(a=[],s=o.length,c=0,l=0;c<=s;c++)if(u=o.charAt(c),m=c-l,u.match(/\s/)||c==s){if(m>0)for(p=t.segment(o.slice(l,c)).filter(function(e){return!!e}),f=l,n=0;n<p.length;n++)r?a.push(new e.Token(p[n],{position:[f,p[n].length],index:a.length})):a.push(p[n]),f+=p[n].length;l=c+1}return a},e.ja.stemmer=function(){return function(e){return e}}(),e.Pipeline.registerFunction(e.ja.stemmer,"stemmer-ja"),e.ja.wordCharacters="一二三四五六七八九十百千万億兆一-龠々〆ヵヶぁ-んァ-ヴーｱ-ﾝﾞa-zA-Zａ-ｚＡ-Ｚ0-9０-９",e.ja.trimmer=e.trimmerSupport.generateTrimmer(e.ja.wordCharacters),e.Pipeline.registerFunction(e.ja.trimmer,"trimmer-ja"),e.ja.stopWordFilter=e.generateStopWordFilter("これ それ あれ この その あの ここ そこ あそこ こちら どこ だれ なに なん 何 私 貴方 貴方方 我々 私達 あの人 あのかた 彼女 彼 です あります おります います は が の に を で え から まで より も どの と し それで しかし".split(" ")),e.Pipeline.registerFunction(e.ja.stopWordFilter,"stopWordFilter-ja"),e.jp=e.ja,e.Pipeline.registerFunction(e.jp.stemmer,"stemmer-jp"),e.Pipeline.registerFunction(e.jp.trimmer,"trimmer-jp"),e.Pipeline.registerFunction(e.jp.stopWordFilter,"stopWordFilter-jp")}});

1
v0.28.0/assets/javascripts/lunr/min/lunr.jp.min.js vendored Normal file
View File

@ -0,0 +1 @@
module.exports=require("./lunr.ja");

1
v0.28.0/assets/javascripts/lunr/min/lunr.kn.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.kn=function(){this.pipeline.reset(),this.pipeline.add(e.kn.trimmer,e.kn.stopWordFilter,e.kn.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.kn.stemmer))},e.kn.wordCharacters="ಀ-಄ಅ-ಔಕ-ಹಾ-ೌ಼-ಽೕ-ೖೝ-ೞೠ-ೡೢ-ೣ೤೥೦-೯ೱ-ೳ",e.kn.trimmer=e.trimmerSupport.generateTrimmer(e.kn.wordCharacters),e.Pipeline.registerFunction(e.kn.trimmer,"trimmer-kn"),e.kn.stopWordFilter=e.generateStopWordFilter("ಮತ್ತು ಈ ಒಂದು ರಲ್ಲಿ ಹಾಗೂ ಎಂದು ಅಥವಾ ಇದು ರ ಅವರು ಎಂಬ ಮೇಲೆ ಅವರ ತನ್ನ ಆದರೆ ತಮ್ಮ ನಂತರ ಮೂಲಕ ಹೆಚ್ಚು ನ ಆ ಕೆಲವು ಅನೇಕ ಎರಡು ಹಾಗು ಪ್ರಮುಖ ಇದನ್ನು ಇದರ ಸುಮಾರು ಅದರ ಅದು ಮೊದಲ ಬಗ್ಗೆ ನಲ್ಲಿ ರಂದು ಇತರ ಅತ್ಯಂತ ಹೆಚ್ಚಿನ ಸಹ ಸಾಮಾನ್ಯವಾಗಿ ನೇ ಹಲವಾರು ಹೊಸ ದಿ ಕಡಿಮೆ ಯಾವುದೇ ಹೊಂದಿದೆ ದೊಡ್ಡ ಅನ್ನು ಇವರು ಪ್ರಕಾರ ಇದೆ ಮಾತ್ರ ಕೂಡ ಇಲ್ಲಿ ಎಲ್ಲಾ ವಿವಿಧ ಅದನ್ನು ಹಲವು ರಿಂದ ಕೇವಲ ದ ದಕ್ಷಿಣ ಗೆ ಅವನ ಅತಿ ನೆಯ ಬಹಳ ಕೆಲಸ ಎಲ್ಲ ಪ್ರತಿ ಇತ್ಯಾದಿ ಇವು ಬೇರೆ ಹೀಗೆ ನಡುವೆ ಇದಕ್ಕೆ ಎಸ್ ಇವರ ಮೊದಲು ಶ್ರೀ ಮಾಡುವ ಇದರಲ್ಲಿ ರೀತಿಯ ಮಾಡಿದ ಕಾಲ ಅಲ್ಲಿ ಮಾಡಲು ಅದೇ ಈಗ ಅವು ಗಳು ಎ ಎಂಬುದು ಅವನು ಅಂದರೆ ಅವರಿಗೆ ಇರುವ ವಿಶೇಷ ಮುಂದೆ ಅವುಗಳ ಮುಂತಾದ ಮೂಲ ಬಿ ಮೀ ಒಂದೇ ಇನ್ನೂ ಹೆಚ್ಚಾಗಿ ಮಾಡಿ ಅವರನ್ನು ಇದೇ ಯ ರೀತಿಯಲ್ಲಿ ಜೊತೆ ಅದರಲ್ಲಿ ಮಾಡಿದರು ನಡೆದ ಆಗ ಮತ್ತೆ ಪೂರ್ವ ಆತ ಬಂದ ಯಾವ ಒಟ್ಟು ಇತರೆ ಹಿಂದೆ ಪ್ರಮಾಣದ ಗಳನ್ನು ಕುರಿತು ಯು ಆದ್ದರಿಂದ ಅಲ್ಲದೆ ನಗರದ ಮೇಲಿನ ಏಕೆಂದರೆ ರಷ್ಟು ಎಂಬುದನ್ನು ಬಾರಿ ಎಂದರೆ ಹಿಂದಿನ ಆದರೂ ಆದ ಸಂಬಂಧಿಸಿದ ಮತ್ತೊಂದು ಸಿ ಆತನ ".split(" ")),e.kn.stemmer=function(){return function(e){return"function"==typeof e.update?e.update(function(e){return e}):e}}();var r=e.wordcut;r.init(),e.kn.tokenizer=function(t){if(!arguments.length||null==t||void 0==t)return[];if(Array.isArray(t))return t.map(function(r){return isLunr2?new e.Token(r.toLowerCase()):r.toLowerCase()});var n=t.toString().toLowerCase().replace(/^\s+/,"");return r.cut(n).split("|")},e.Pipeline.registerFunction(e.kn.stemmer,"stemmer-kn"),e.Pipeline.registerFunction(e.kn.stopWordFilter,"stopWordFilter-kn")}});

1
v0.28.0/assets/javascripts/lunr/min/lunr.ko.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.28.0/assets/javascripts/lunr/min/lunr.multi.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,t){"function"==typeof define&&define.amd?define(t):"object"==typeof exports?module.exports=t():t()(e.lunr)}(this,function(){return function(e){e.multiLanguage=function(){for(var t=Array.prototype.slice.call(arguments),i=t.join("-"),r="",n=[],s=[],p=0;p<t.length;++p)"en"==t[p]?(r+="\\w",n.unshift(e.stopWordFilter),n.push(e.stemmer),s.push(e.stemmer)):(r+=e[t[p]].wordCharacters,e[t[p]].stopWordFilter&&n.unshift(e[t[p]].stopWordFilter),e[t[p]].stemmer&&(n.push(e[t[p]].stemmer),s.push(e[t[p]].stemmer)));var o=e.trimmerSupport.generateTrimmer(r);return e.Pipeline.registerFunction(o,"lunr-multi-trimmer-"+i),n.unshift(o),function(){this.pipeline.reset(),this.pipeline.add.apply(this.pipeline,n),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add.apply(this.searchPipeline,s))}}}});

18
v0.28.0/assets/javascripts/lunr/min/lunr.nl.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

18
v0.28.0/assets/javascripts/lunr/min/lunr.no.min.js vendored Normal file
View File

@ -0,0 +1,18 @@
/*!
* Lunr languages, `Norwegian` language
* https://github.com/MihaiValentin/lunr-languages
*
* Copyright 2014, Mihai Valentin
* http://www.mozilla.org/MPL/
*/
/*!
* based on
* Snowball JavaScript Library v0.3
* http://code.google.com/p/urim/
* http://snowball.tartarus.org/
*
* Copyright 2010, Oleg Mazko
* http://www.mozilla.org/MPL/
*/
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.no=function(){this.pipeline.reset(),this.pipeline.add(e.no.trimmer,e.no.stopWordFilter,e.no.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.no.stemmer))},e.no.wordCharacters="A-Za-zªºÀ-ÖØ-öø-ʸˠ-ˤᴀ-ᴥᴬ-ᵜᵢ-ᵥᵫ-ᵷᵹ-ᶾḀ-ỿⁱⁿₐ-ₜKÅℲⅎⅠ-ↈⱠ-ⱿꜢ-ꞇꞋ-ꞭꞰ-ꞷꟷ-ꟿꬰ-ꭚꭜ-ꭤff-stＡ-Ｚａ-ｚ",e.no.trimmer=e.trimmerSupport.generateTrimmer(e.no.wordCharacters),e.Pipeline.registerFunction(e.no.trimmer,"trimmer-no"),e.no.stemmer=function(){var r=e.stemmerSupport.Among,n=e.stemmerSupport.SnowballProgram,i=new function(){function e(){var e,r=w.cursor+3;if(a=w.limit,0<=r||r<=w.limit){for(s=r;;){if(e=w.cursor,w.in_grouping(d,97,248)){w.cursor=e;break}if(e>=w.limit)return;w.cursor=e+1}for(;!w.out_grouping(d,97,248);){if(w.cursor>=w.limit)return;w.cursor++}a=w.cursor,a<s&&(a=s)}}function i(){var e,r,n;if(w.cursor>=a&&(r=w.limit_backward,w.limit_backward=a,w.ket=w.cursor,e=w.find_among_b(m,29),w.limit_backward=r,e))switch(w.bra=w.cursor,e){case 1:w.slice_del();break;case 2:n=w.limit-w.cursor,w.in_grouping_b(c,98,122)?w.slice_del():(w.cursor=w.limit-n,w.eq_s_b(1,"k")&&w.out_grouping_b(d,97,248)&&w.slice_del());break;case 3:w.slice_from("er")}}function t(){var e,r=w.limit-w.cursor;w.cursor>=a&&(e=w.limit_backward,w.limit_backward=a,w.ket=w.cursor,w.find_among_b(u,2)?(w.bra=w.cursor,w.limit_backward=e,w.cursor=w.limit-r,w.cursor>w.limit_backward&&(w.cursor--,w.bra=w.cursor,w.slice_del())):w.limit_backward=e)}function o(){var e,r;w.cursor>=a&&(r=w.limit_backward,w.limit_backward=a,w.ket=w.cursor,e=w.find_among_b(l,11),e?(w.bra=w.cursor,w.limit_backward=r,1==e&&w.slice_del()):w.limit_backward=r)}var s,a,m=[new r("a",-1,1),new r("e",-1,1),new r("ede",1,1),new r("ande",1,1),new r("ende",1,1),new r("ane",1,1),new r("ene",1,1),new r("hetene",6,1),new r("erte",1,3),new r("en",-1,1),new r("heten",9,1),new r("ar",-1,1),new r("er",-1,1),new r("heter",12,1),new r("s",-1,2),new r("as",14,1),new r("es",14,1),new r("edes",16,1),new r("endes",16,1),new r("enes",16,1),new r("hetenes",19,1),new r("ens",14,1),new r("hetens",21,1),new r("ers",14,1),new r("ets",14,1),new r("et",-1,1),new r("het",25,1),new r("ert",-1,3),new r("ast",-1,1)],u=[new r("dt",-1,-1),new r("vt",-1,-1)],l=[new r("leg",-1,1),new r("eleg",0,1),new r("ig",-1,1),new r("eig",2,1),new r("lig",2,1),new r("elig",4,1),new r("els",-1,1),new r("lov",-1,1),new r("elov",7,1),new r("slov",7,1),new r("hetslov",9,1)],d=[17,65,16,1,0,0,0,0,0,0,0,0,0,0,0,0,48,0,128],c=[119,125,149,1],w=new n;this.setCurrent=function(e){w.setCurrent(e)},this.getCurrent=function(){return w.getCurrent()},this.stem=function(){var r=w.cursor;return e(),w.limit_backward=r,w.cursor=w.limit,i(),w.cursor=w.limit,t(),w.cursor=w.limit,o(),!0}};return function(e){return"function"==typeof e.update?e.update(function(e){return i.setCurrent(e),i.stem(),i.getCurrent()}):(i.setCurrent(e),i.stem(),i.getCurrent())}}(),e.Pipeline.registerFunction(e.no.stemmer,"stemmer-no"),e.no.stopWordFilter=e.generateStopWordFilter("alle at av bare begge ble blei bli blir blitt både båe da de deg dei deim deira deires dem den denne der dere deres det dette di din disse ditt du dykk dykkar då eg ein eit eitt eller elles en enn er et ett etter for fordi fra før ha hadde han hans har hennar henne hennes her hjå ho hoe honom hoss hossen hun hva hvem hver hvilke hvilken hvis hvor hvordan hvorfor i ikke ikkje ikkje ingen ingi inkje inn inni ja jeg kan kom korleis korso kun kunne kva kvar kvarhelst kven kvi kvifor man mange me med medan meg meget mellom men mi min mine mitt mot mykje ned no noe noen noka noko nokon nokor nokre nå når og også om opp oss over på samme seg selv si si sia sidan siden sin sine sitt sjøl skal skulle slik so som som somme somt så sånn til um upp ut uten var vart varte ved vere verte vi vil ville vore vors vort vår være være vært å".split(" ")),e.Pipeline.registerFunction(e.no.stopWordFilter,"stopWordFilter-no")}});

18
v0.28.0/assets/javascripts/lunr/min/lunr.pt.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

18
v0.28.0/assets/javascripts/lunr/min/lunr.ro.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

18
v0.28.0/assets/javascripts/lunr/min/lunr.ru.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.28.0/assets/javascripts/lunr/min/lunr.sa.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.sa=function(){this.pipeline.reset(),this.pipeline.add(e.sa.trimmer,e.sa.stopWordFilter,e.sa.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.sa.stemmer))},e.sa.wordCharacters="ऀ-ःऄ-एऐ-टठ-यर-िी-ॏॐ-य़ॠ-९॰-ॿ꣠-꣱ꣲ-ꣷ꣸-ꣻ꣼-ꣽꣾ-ꣿᆰ0-ᆰ9",e.sa.trimmer=e.trimmerSupport.generateTrimmer(e.sa.wordCharacters),e.Pipeline.registerFunction(e.sa.trimmer,"trimmer-sa"),e.sa.stopWordFilter=e.generateStopWordFilter('तथा अयम्‌ एकम्‌ इत्यस्मिन्‌ तथा तत्‌ वा अयम्‌ इत्यस्य ते आहूत उपरि तेषाम्‌ किन्तु तेषाम्‌ तदा इत्यनेन अधिकः इत्यस्य तत्‌ केचन बहवः द्वि तथा महत्वपूर्णः अयम्‌ अस्य विषये अयं अस्ति तत्‌ प्रथमः विषये इत्युपरि इत्युपरि इतर अधिकतमः अधिकः अपि सामान्यतया ठ इतरेतर नूतनम्‌ द न्यूनम्‌ कश्चित्‌ वा विशालः द सः अस्ति तदनुसारम् तत्र अस्ति केवलम्‌ अपि अत्र सर्वे विविधाः तत्‌ बहवः यतः इदानीम्‌ द दक्षिण इत्यस्मै तस्य उपरि नथ अतीव कार्यम्‌ सर्वे एकैकम्‌ इत्यादि। एते सन्ति उत इत्थम्‌ मध्ये एतदर्थं . स कस्य प्रथमः श्री. करोति अस्मिन् प्रकारः निर्मिता कालः तत्र कर्तुं समान अधुना ते सन्ति स एकः अस्ति सः अर्थात् तेषां कृते . स्थितम् विशेषः अग्रिम तेषाम्‌ समान स्रोतः ख म समान इदानीमपि अधिकतया करोतु ते समान इत्यस्य वीथी सह यस्मिन् कृतवान्‌ धृतः तदा पुनः पूर्वं सः आगतः किम्‌ कुल इतर पुरा मात्रा स विषये उ अतएव अपि नगरस्य उपरि यतः प्रतिशतं कतरः कालः साधनानि भूत तथापि जात सम्बन्धि अन्यत्‌ ग अतः अस्माकं स्वकीयाः अस्माकं इदानीं अन्तः इत्यादयः भवन्तः इत्यादयः एते एताः तस्य अस्य इदम् एते तेषां तेषां तेषां तान् तेषां तेषां तेषां समानः सः एकः च तादृशाः बहवः अन्ये च वदन्ति यत् कियत् कस्मै कस्मै यस्मै यस्मै यस्मै यस्मै न अतिनीचः किन्तु प्रथमं सम्पूर्णतया ततः चिरकालानन्तरं पुस्तकं सम्पूर्णतया अन्तः किन्तु अत्र वा इह इव श्रद्धाय अवशिष्यते परन्तु अन्ये वर्गाः सन्ति ते सन्ति शक्नुवन्ति सर्वे मिलित्वा सर्वे एकत्र"'.split(" ")),e.sa.stemmer=function(){return function(e){return"function"==typeof e.update?e.update(function(e){return e}):e}}();var r=e.wordcut;r.init(),e.sa.tokenizer=function(t){if(!arguments.length||null==t||void 0==t)return[];if(Array.isArray(t))return t.map(function(r){return isLunr2?new e.Token(r.toLowerCase()):r.toLowerCase()});var i=t.toString().toLowerCase().replace(/^\s+/,"");return r.cut(i).split("|")},e.Pipeline.registerFunction(e.sa.stemmer,"stemmer-sa"),e.Pipeline.registerFunction(e.sa.stopWordFilter,"stopWordFilter-sa")}});

1
v0.28.0/assets/javascripts/lunr/min/lunr.stemmer.support.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(r,t){"function"==typeof define&&define.amd?define(t):"object"==typeof exports?module.exports=t():t()(r.lunr)}(this,function(){return function(r){r.stemmerSupport={Among:function(r,t,i,s){if(this.toCharArray=function(r){for(var t=r.length,i=new Array(t),s=0;s<t;s++)i[s]=r.charCodeAt(s);return i},!r&&""!=r||!t&&0!=t||!i)throw"Bad Among initialisation: s:"+r+", substring_i: "+t+", result: "+i;this.s_size=r.length,this.s=this.toCharArray(r),this.substring_i=t,this.result=i,this.method=s},SnowballProgram:function(){var r;return{bra:0,ket:0,limit:0,cursor:0,limit_backward:0,setCurrent:function(t){r=t,this.cursor=0,this.limit=t.length,this.limit_backward=0,this.bra=this.cursor,this.ket=this.limit},getCurrent:function(){var t=r;return r=null,t},in_grouping:function(t,i,s){if(this.cursor<this.limit){var e=r.charCodeAt(this.cursor);if(e<=s&&e>=i&&(e-=i,t[e>>3]&1<<(7&e)))return this.cursor++,!0}return!1},in_grouping_b:function(t,i,s){if(this.cursor>this.limit_backward){var e=r.charCodeAt(this.cursor-1);if(e<=s&&e>=i&&(e-=i,t[e>>3]&1<<(7&e)))return this.cursor--,!0}return!1},out_grouping:function(t,i,s){if(this.cursor<this.limit){var e=r.charCodeAt(this.cursor);if(e>s||e<i)return this.cursor++,!0;if(e-=i,!(t[e>>3]&1<<(7&e)))return this.cursor++,!0}return!1},out_grouping_b:function(t,i,s){if(this.cursor>this.limit_backward){var e=r.charCodeAt(this.cursor-1);if(e>s||e<i)return this.cursor--,!0;if(e-=i,!(t[e>>3]&1<<(7&e)))return this.cursor--,!0}return!1},eq_s:function(t,i){if(this.limit-this.cursor<t)return!1;for(var s=0;s<t;s++)if(r.charCodeAt(this.cursor+s)!=i.charCodeAt(s))return!1;return this.cursor+=t,!0},eq_s_b:function(t,i){if(this.cursor-this.limit_backward<t)return!1;for(var s=0;s<t;s++)if(r.charCodeAt(this.cursor-t+s)!=i.charCodeAt(s))return!1;return this.cursor-=t,!0},find_among:function(t,i){for(var s=0,e=i,n=this.cursor,u=this.limit,o=0,h=0,c=!1;;){for(var a=s+(e-s>>1),f=0,l=o<h?o:h,_=t[a],m=l;m<_.s_size;m++){if(n+l==u){f=-1;break}if(f=r.charCodeAt(n+l)-_.s[m])break;l++}if(f<0?(e=a,h=l):(s=a,o=l),e-s<=1){if(s>0||e==s||c)break;c=!0}}for(;;){var _=t[s];if(o>=_.s_size){if(this.cursor=n+_.s_size,!_.method)return _.result;var b=_.method();if(this.cursor=n+_.s_size,b)return _.result}if((s=_.substring_i)<0)return 0}},find_among_b:function(t,i){for(var s=0,e=i,n=this.cursor,u=this.limit_backward,o=0,h=0,c=!1;;){for(var a=s+(e-s>>1),f=0,l=o<h?o:h,_=t[a],m=_.s_size-1-l;m>=0;m--){if(n-l==u){f=-1;break}if(f=r.charCodeAt(n-1-l)-_.s[m])break;l++}if(f<0?(e=a,h=l):(s=a,o=l),e-s<=1){if(s>0||e==s||c)break;c=!0}}for(;;){var _=t[s];if(o>=_.s_size){if(this.cursor=n-_.s_size,!_.method)return _.result;var b=_.method();if(this.cursor=n-_.s_size,b)return _.result}if((s=_.substring_i)<0)return 0}},replace_s:function(t,i,s){var e=s.length-(i-t),n=r.substring(0,t),u=r.substring(i);return r=n+s+u,this.limit+=e,this.cursor>=i?this.cursor+=e:this.cursor>t&&(this.cursor=t),e},slice_check:function(){if(this.bra<0||this.bra>this.ket||this.ket>this.limit||this.limit>r.length)throw"faulty slice operation"},slice_from:function(r){this.slice_check(),this.replace_s(this.bra,this.ket,r)},slice_del:function(){this.slice_from("")},insert:function(r,t,i){var s=this.replace_s(r,t,i);r<=this.bra&&(this.bra+=s),r<=this.ket&&(this.ket+=s)},slice_to:function(){return this.slice_check(),r.substring(this.bra,this.ket)},eq_v_b:function(r){return this.eq_s_b(r.length,r)}}}},r.trimmerSupport={generateTrimmer:function(r){var t=new RegExp("^[^"+r+"]+"),i=new RegExp("[^"+r+"]+$");return function(r){return"function"==typeof r.update?r.update(function(r){return r.replace(t,"").replace(i,"")}):r.replace(t,"").replace(i,"")}}}}});

18
v0.28.0/assets/javascripts/lunr/min/lunr.sv.min.js vendored Normal file
View File

@ -0,0 +1,18 @@
/*!
* Lunr languages, `Swedish` language
* https://github.com/MihaiValentin/lunr-languages
*
* Copyright 2014, Mihai Valentin
* http://www.mozilla.org/MPL/
*/
/*!
* based on
* Snowball JavaScript Library v0.3
* http://code.google.com/p/urim/
* http://snowball.tartarus.org/
*
* Copyright 2010, Oleg Mazko
* http://www.mozilla.org/MPL/
*/
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.sv=function(){this.pipeline.reset(),this.pipeline.add(e.sv.trimmer,e.sv.stopWordFilter,e.sv.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.sv.stemmer))},e.sv.wordCharacters="A-Za-zªºÀ-ÖØ-öø-ʸˠ-ˤᴀ-ᴥᴬ-ᵜᵢ-ᵥᵫ-ᵷᵹ-ᶾḀ-ỿⁱⁿₐ-ₜKÅℲⅎⅠ-ↈⱠ-ⱿꜢ-ꞇꞋ-ꞭꞰ-ꞷꟷ-ꟿꬰ-ꭚꭜ-ꭤff-stＡ-Ｚａ-ｚ",e.sv.trimmer=e.trimmerSupport.generateTrimmer(e.sv.wordCharacters),e.Pipeline.registerFunction(e.sv.trimmer,"trimmer-sv"),e.sv.stemmer=function(){var r=e.stemmerSupport.Among,n=e.stemmerSupport.SnowballProgram,t=new function(){function e(){var e,r=w.cursor+3;if(o=w.limit,0<=r||r<=w.limit){for(a=r;;){if(e=w.cursor,w.in_grouping(l,97,246)){w.cursor=e;break}if(w.cursor=e,w.cursor>=w.limit)return;w.cursor++}for(;!w.out_grouping(l,97,246);){if(w.cursor>=w.limit)return;w.cursor++}o=w.cursor,o<a&&(o=a)}}function t(){var e,r=w.limit_backward;if(w.cursor>=o&&(w.limit_backward=o,w.cursor=w.limit,w.ket=w.cursor,e=w.find_among_b(u,37),w.limit_backward=r,e))switch(w.bra=w.cursor,e){case 1:w.slice_del();break;case 2:w.in_grouping_b(d,98,121)&&w.slice_del()}}function i(){var e=w.limit_backward;w.cursor>=o&&(w.limit_backward=o,w.cursor=w.limit,w.find_among_b(c,7)&&(w.cursor=w.limit,w.ket=w.cursor,w.cursor>w.limit_backward&&(w.bra=--w.cursor,w.slice_del())),w.limit_backward=e)}function s(){var e,r;if(w.cursor>=o){if(r=w.limit_backward,w.limit_backward=o,w.cursor=w.limit,w.ket=w.cursor,e=w.find_among_b(m,5))switch(w.bra=w.cursor,e){case 1:w.slice_del();break;case 2:w.slice_from("lös");break;case 3:w.slice_from("full")}w.limit_backward=r}}var a,o,u=[new r("a",-1,1),new r("arna",0,1),new r("erna",0,1),new r("heterna",2,1),new r("orna",0,1),new r("ad",-1,1),new r("e",-1,1),new r("ade",6,1),new r("ande",6,1),new r("arne",6,1),new r("are",6,1),new r("aste",6,1),new r("en",-1,1),new r("anden",12,1),new r("aren",12,1),new r("heten",12,1),new r("ern",-1,1),new r("ar",-1,1),new r("er",-1,1),new r("heter",18,1),new r("or",-1,1),new r("s",-1,2),new r("as",21,1),new r("arnas",22,1),new r("ernas",22,1),new r("ornas",22,1),new r("es",21,1),new r("ades",26,1),new r("andes",26,1),new r("ens",21,1),new r("arens",29,1),new r("hetens",29,1),new r("erns",21,1),new r("at",-1,1),new r("andet",-1,1),new r("het",-1,1),new r("ast",-1,1)],c=[new r("dd",-1,-1),new r("gd",-1,-1),new r("nn",-1,-1),new r("dt",-1,-1),new r("gt",-1,-1),new r("kt",-1,-1),new r("tt",-1,-1)],m=[new r("ig",-1,1),new r("lig",0,1),new r("els",-1,1),new r("fullt",-1,3),new r("löst",-1,2)],l=[17,65,16,1,0,0,0,0,0,0,0,0,0,0,0,0,24,0,32],d=[119,127,149],w=new n;this.setCurrent=function(e){w.setCurrent(e)},this.getCurrent=function(){return w.getCurrent()},this.stem=function(){var r=w.cursor;return e(),w.limit_backward=r,w.cursor=w.limit,t(),w.cursor=w.limit,i(),w.cursor=w.limit,s(),!0}};return function(e){return"function"==typeof e.update?e.update(function(e){return t.setCurrent(e),t.stem(),t.getCurrent()}):(t.setCurrent(e),t.stem(),t.getCurrent())}}(),e.Pipeline.registerFunction(e.sv.stemmer,"stemmer-sv"),e.sv.stopWordFilter=e.generateStopWordFilter("alla allt att av blev bli blir blivit de dem den denna deras dess dessa det detta dig din dina ditt du där då efter ej eller en er era ert ett från för ha hade han hans har henne hennes hon honom hur här i icke ingen inom inte jag ju kan kunde man med mellan men mig min mina mitt mot mycket ni nu när någon något några och om oss på samma sedan sig sin sina sitta själv skulle som så sådan sådana sådant till under upp ut utan vad var vara varför varit varje vars vart vem vi vid vilka vilkas vilken vilket vår våra vårt än är åt över".split(" ")),e.Pipeline.registerFunction(e.sv.stopWordFilter,"stopWordFilter-sv")}});

1
v0.28.0/assets/javascripts/lunr/min/lunr.ta.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,t){"function"==typeof define&&define.amd?define(t):"object"==typeof exports?module.exports=t():t()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.ta=function(){this.pipeline.reset(),this.pipeline.add(e.ta.trimmer,e.ta.stopWordFilter,e.ta.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.ta.stemmer))},e.ta.wordCharacters="஀-உஊ-ஏஐ-ஙச-ட஠-னப-யர-ஹ஺-ிீ-௉ொ-௏ௐ-௙௚-௟௠-௩௪-௯௰-௹௺-௿a-zA-Zａ-ｚＡ-Ｚ0-9０-９",e.ta.trimmer=e.trimmerSupport.generateTrimmer(e.ta.wordCharacters),e.Pipeline.registerFunction(e.ta.trimmer,"trimmer-ta"),e.ta.stopWordFilter=e.generateStopWordFilter("அங்கு அங்கே அது அதை அந்த அவர் அவர்கள் அவள் அவன் அவை ஆக ஆகவே ஆகையால் ஆதலால் ஆதலினால் ஆனாலும் ஆனால் இங்கு இங்கே இது இதை இந்த இப்படி இவர் இவர்கள் இவள் இவன் இவை இவ்வளவு உனக்கு உனது உன் உன்னால் எங்கு எங்கே எது எதை எந்த எப்படி எவர் எவர்கள் எவள் எவன் எவை எவ்வளவு எனக்கு எனது எனவே என் என்ன என்னால் ஏது ஏன் தனது தன்னால் தானே தான் நாங்கள் நாம் நான் நீ நீங்கள்".split(" ")),e.ta.stemmer=function(){return function(e){return"function"==typeof e.update?e.update(function(e){return e}):e}}();var t=e.wordcut;t.init(),e.ta.tokenizer=function(r){if(!arguments.length||null==r||void 0==r)return[];if(Array.isArray(r))return r.map(function(t){return isLunr2?new e.Token(t.toLowerCase()):t.toLowerCase()});var i=r.toString().toLowerCase().replace(/^\s+/,"");return t.cut(i).split("|")},e.Pipeline.registerFunction(e.ta.stemmer,"stemmer-ta"),e.Pipeline.registerFunction(e.ta.stopWordFilter,"stopWordFilter-ta")}});

1
v0.28.0/assets/javascripts/lunr/min/lunr.te.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,t){"function"==typeof define&&define.amd?define(t):"object"==typeof exports?module.exports=t():t()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.te=function(){this.pipeline.reset(),this.pipeline.add(e.te.trimmer,e.te.stopWordFilter,e.te.stemmer),this.searchPipeline&&(this.searchPipeline.reset(),this.searchPipeline.add(e.te.stemmer))},e.te.wordCharacters="ఀ-ఄఅ-ఔక-హా-ౌౕ-ౖౘ-ౚౠ-ౡౢ-ౣ౦-౯౸-౿఼ఽ్ౝ౷౤౥",e.te.trimmer=e.trimmerSupport.generateTrimmer(e.te.wordCharacters),e.Pipeline.registerFunction(e.te.trimmer,"trimmer-te"),e.te.stopWordFilter=e.generateStopWordFilter("అందరూ అందుబాటులో అడగండి అడగడం అడ్డంగా అనుగుణంగా అనుమతించు అనుమతిస్తుంది అయితే ఇప్పటికే ఉన్నారు ఎక్కడైనా ఎప్పుడు ఎవరైనా ఎవరో ఏ ఏదైనా ఏమైనప్పటికి ఒక ఒకరు కనిపిస్తాయి కాదు కూడా గా గురించి చుట్టూ చేయగలిగింది తగిన తర్వాత దాదాపు దూరంగా నిజంగా పై ప్రకారం ప్రక్కన మధ్య మరియు మరొక మళ్ళీ మాత్రమే మెచ్చుకో వద్ద వెంట వేరుగా వ్యతిరేకంగా సంబంధం".split(" ")),e.te.stemmer=function(){return function(e){return"function"==typeof e.update?e.update(function(e){return e}):e}}();var t=e.wordcut;t.init(),e.te.tokenizer=function(r){if(!arguments.length||null==r||void 0==r)return[];if(Array.isArray(r))return r.map(function(t){return isLunr2?new e.Token(t.toLowerCase()):t.toLowerCase()});var i=r.toString().toLowerCase().replace(/^\s+/,"");return t.cut(i).split("|")},e.Pipeline.registerFunction(e.te.stemmer,"stemmer-te"),e.Pipeline.registerFunction(e.te.stopWordFilter,"stopWordFilter-te")}});

1
v0.28.0/assets/javascripts/lunr/min/lunr.th.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");var r="2"==e.version[0];e.th=function(){this.pipeline.reset(),this.pipeline.add(e.th.trimmer),r?this.tokenizer=e.th.tokenizer:(e.tokenizer&&(e.tokenizer=e.th.tokenizer),this.tokenizerFn&&(this.tokenizerFn=e.th.tokenizer))},e.th.wordCharacters="[฀-๿]",e.th.trimmer=e.trimmerSupport.generateTrimmer(e.th.wordCharacters),e.Pipeline.registerFunction(e.th.trimmer,"trimmer-th");var t=e.wordcut;t.init(),e.th.tokenizer=function(i){if(!arguments.length||null==i||void 0==i)return[];if(Array.isArray(i))return i.map(function(t){return r?new e.Token(t):t});var n=i.toString().replace(/^\s+/,"");return t.cut(n).split("|")}}});

18
v0.28.0/assets/javascripts/lunr/min/lunr.tr.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.28.0/assets/javascripts/lunr/min/lunr.vi.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r():r()(e.lunr)}(this,function(){return function(e){if(void 0===e)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===e.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");e.vi=function(){this.pipeline.reset(),this.pipeline.add(e.vi.stopWordFilter,e.vi.trimmer)},e.vi.wordCharacters="[A-Za-ẓ̀͐́͑̉̃̓ÂâÊêÔôĂ-ăĐ-đƠ-ơƯ-ư]",e.vi.trimmer=e.trimmerSupport.generateTrimmer(e.vi.wordCharacters),e.Pipeline.registerFunction(e.vi.trimmer,"trimmer-vi"),e.vi.stopWordFilter=e.generateStopWordFilter("là cái nhưng mà".split(" "))}});

1
v0.28.0/assets/javascripts/lunr/min/lunr.zh.min.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e,r){"function"==typeof define&&define.amd?define(r):"object"==typeof exports?module.exports=r(require("@node-rs/jieba")):r()(e.lunr)}(this,function(e){return function(r,t){if(void 0===r)throw new Error("Lunr is not present. Please include / require Lunr before this script.");if(void 0===r.stemmerSupport)throw new Error("Lunr stemmer support is not present. Please include / require Lunr stemmer support before this script.");var i="2"==r.version[0];r.zh=function(){this.pipeline.reset(),this.pipeline.add(r.zh.trimmer,r.zh.stopWordFilter,r.zh.stemmer),i?this.tokenizer=r.zh.tokenizer:(r.tokenizer&&(r.tokenizer=r.zh.tokenizer),this.tokenizerFn&&(this.tokenizerFn=r.zh.tokenizer))},r.zh.tokenizer=function(n){if(!arguments.length||null==n||void 0==n)return[];if(Array.isArray(n))return n.map(function(e){return i?new r.Token(e.toLowerCase()):e.toLowerCase()});t&&e.load(t);var o=n.toString().trim().toLowerCase(),s=[];e.cut(o,!0).forEach(function(e){s=s.concat(e.split(" "))}),s=s.filter(function(e){return!!e});var u=0;return s.map(function(e,t){if(i){var n=o.indexOf(e,u),s={};return s.position=[n,e.length],s.index=t,u=n,new r.Token(e,s)}return e})},r.zh.wordCharacters="\\w一-龥",r.zh.trimmer=r.trimmerSupport.generateTrimmer(r.zh.wordCharacters),r.Pipeline.registerFunction(r.zh.trimmer,"trimmer-zh"),r.zh.stemmer=function(){return function(e){return e}}(),r.Pipeline.registerFunction(r.zh.stemmer,"stemmer-zh"),r.zh.stopWordFilter=r.generateStopWordFilter("的 一 不 在 人 有 是 为 為 以 于 於 上 他 而 后 後 之 来 來 及 了 因 下 可 到 由 这 這 与 與 也 此 但 并 並 个 個 其 已 无 無 小 我 们 們 起 最 再 今 去 好 只 又 或 很 亦 某 把 那 你 乃 它 吧 被 比 别 趁 当 當 从 從 得 打 凡 儿 兒 尔 爾 该 該 各 给 給 跟 和 何 还 還 即 几 幾 既 看 据 據 距 靠 啦 另 么 麽 每 嘛 拿 哪 您 凭 憑 且 却 卻 让 讓 仍 啥 如 若 使 谁 誰 虽 雖 随 隨 同 所 她 哇 嗡 往 些 向 沿 哟 喲 用 咱 则 則 怎 曾 至 致 着 著 诸 諸 自".split(" ")),r.Pipeline.registerFunction(r.zh.stopWordFilter,"stopWordFilter-zh")}});

206
v0.28.0/assets/javascripts/lunr/tinyseg.js Normal file
View File

@ -0,0 +1,206 @@
/**
* export the module via AMD, CommonJS or as a browser global
* Export code from https://github.com/umdjs/umd/blob/master/returnExports.js
*/
;(function (root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(factory)
} else if (typeof exports === 'object') {
/**
* Node. Does not work with strict CommonJS, but
* only CommonJS-like environments that support module.exports,
* like Node.
*/
module.exports = factory()
} else {
// Browser globals (root is window)
factory()(root.lunr);
}
}(this, function () {
/**
* Just return a value to define the module export.
* This example returns an object, but the module
* can return a function as the exported value.
*/
return function(lunr) {
// TinySegmenter 0.1 -- Super compact Japanese tokenizer in Javascript
// (c) 2008 Taku Kudo <taku@chasen.org>
// TinySegmenter is freely distributable under the terms of a new BSD licence.
// For details, see http://chasen.org/~taku/software/TinySegmenter/LICENCE.txt
function TinySegmenter() {
var patterns = {
"[一二三四五六七八九十百千万億兆]":"M",
"[一-龠々〆ヵヶ]":"H",
"[ぁ-ん]":"I",
"[ァ-ヴーｱ-ﾝﾞｰ]":"K",
"[a-zA-Zａ-ｚＡ-Ｚ]":"A",
"[0-9０-９]":"N"
}
this.chartype_ = [];
for (var i in patterns) {
var regexp = new RegExp(i);
this.chartype_.push([regexp, patterns[i]]);
}
this.BIAS__ = -332
this.BC1__ = {"HH":6,"II":2461,"KH":406,"OH":-1378};
this.BC2__ = {"AA":-3267,"AI":2744,"AN":-878,"HH":-4070,"HM":-1711,"HN":4012,"HO":3761,"IA":1327,"IH":-1184,"II":-1332,"IK":1721,"IO":5492,"KI":3831,"KK":-8741,"MH":-3132,"MK":3334,"OO":-2920};
this.BC3__ = {"HH":996,"HI":626,"HK":-721,"HN":-1307,"HO":-836,"IH":-301,"KK":2762,"MK":1079,"MM":4034,"OA":-1652,"OH":266};
this.BP1__ = {"BB":295,"OB":304,"OO":-125,"UB":352};
this.BP2__ = {"BO":60,"OO":-1762};
this.BQ1__ = {"BHH":1150,"BHM":1521,"BII":-1158,"BIM":886,"BMH":1208,"BNH":449,"BOH":-91,"BOO":-2597,"OHI":451,"OIH":-296,"OKA":1851,"OKH":-1020,"OKK":904,"OOO":2965};
this.BQ2__ = {"BHH":118,"BHI":-1159,"BHM":466,"BIH":-919,"BKK":-1720,"BKO":864,"OHH":-1139,"OHM":-181,"OIH":153,"UHI":-1146};
this.BQ3__ = {"BHH":-792,"BHI":2664,"BII":-299,"BKI":419,"BMH":937,"BMM":8335,"BNN":998,"BOH":775,"OHH":2174,"OHM":439,"OII":280,"OKH":1798,"OKI":-793,"OKO":-2242,"OMH":-2402,"OOO":11699};
this.BQ4__ = {"BHH":-3895,"BIH":3761,"BII":-4654,"BIK":1348,"BKK":-1806,"BMI":-3385,"BOO":-12396,"OAH":926,"OHH":266,"OHK":-2036,"ONN":-973};
this.BW1__ = {",と":660,",同":727,"B1あ":1404,"B1同":542,"、と":660,"、同":727,"」と":1682,"あっ":1505,"いう":1743,"いっ":-2055,"いる":672,"うし":-4817,"うん":665,"から":3472,"がら":600,"こう":-790,"こと":2083,"こん":-1262,"さら":-4143,"さん":4573,"した":2641,"して":1104,"すで":-3399,"そこ":1977,"それ":-871,"たち":1122,"ため":601,"った":3463,"つい":-802,"てい":805,"てき":1249,"でき":1127,"です":3445,"では":844,"とい":-4915,"とみ":1922,"どこ":3887,"ない":5713,"なっ":3015,"など":7379,"なん":-1113,"にし":2468,"には":1498,"にも":1671,"に対":-912,"の一":-501,"の中":741,"ませ":2448,"まで":1711,"まま":2600,"まる":-2155,"やむ":-1947,"よっ":-2565,"れた":2369,"れで":-913,"をし":1860,"を見":731,"亡く":-1886,"京都":2558,"取り":-2784,"大き":-2604,"大阪":1497,"平方":-2314,"引き":-1336,"日本":-195,"本当":-2423,"毎日":-2113,"目指":-724,"Ｂ１あ":1404,"Ｂ１同":542,"｣と":1682};
this.BW2__ = {"..":-11822,"11":-669,"――":-5730,"−−":-13175,"いう":-1609,"うか":2490,"かし":-1350,"かも":-602,"から":-7194,"かれ":4612,"がい":853,"がら":-3198,"きた":1941,"くな":-1597,"こと":-8392,"この":-4193,"させ":4533,"され":13168,"さん":-3977,"しい":-1819,"しか":-545,"した":5078,"して":972,"しな":939,"その":-3744,"たい":-1253,"たた":-662,"ただ":-3857,"たち":-786,"たと":1224,"たは":-939,"った":4589,"って":1647,"っと":-2094,"てい":6144,"てき":3640,"てく":2551,"ては":-3110,"ても":-3065,"でい":2666,"でき":-1528,"でし":-3828,"です":-4761,"でも":-4203,"とい":1890,"とこ":-1746,"とと":-2279,"との":720,"とみ":5168,"とも":-3941,"ない":-2488,"なが":-1313,"など":-6509,"なの":2614,"なん":3099,"にお":-1615,"にし":2748,"にな":2454,"によ":-7236,"に対":-14943,"に従":-4688,"に関":-11388,"のか":2093,"ので":-7059,"のに":-6041,"のの":-6125,"はい":1073,"はが":-1033,"はず":-2532,"ばれ":1813,"まし":-1316,"まで":-6621,"まれ":5409,"めて":-3153,"もい":2230,"もの":-10713,"らか":-944,"らし":-1611,"らに":-1897,"りし":651,"りま":1620,"れた":4270,"れて":849,"れば":4114,"ろう":6067,"われ":7901,"を通":-11877,"んだ":728,"んな":-4115,"一人":602,"一方":-1375,"一日":970,"一部":-1051,"上が":-4479,"会社":-1116,"出て":2163,"分の":-7758,"同党":970,"同日":-913,"大阪":-2471,"委員":-1250,"少な":-1050,"年度":-8669,"年間":-1626,"府県":-2363,"手権":-1982,"新聞":-4066,"日新":-722,"日本":-7068,"日米":3372,"曜日":-601,"朝鮮":-2355,"本人":-2697,"東京":-1543,"然と":-1384,"社会":-1276,"立て":-990,"第に":-1612,"米国":-4268,"１１":-669};
this.BW3__ = {"あた":-2194,"あり":719,"ある":3846,"い.":-1185,"い。":-1185,"いい":5308,"いえ":2079,"いく":3029,"いた":2056,"いっ":1883,"いる":5600,"いわ":1527,"うち":1117,"うと":4798,"えと":1454,"か.":2857,"か。":2857,"かけ":-743,"かっ":-4098,"かに":-669,"から":6520,"かり":-2670,"が,":1816,"が、":1816,"がき":-4855,"がけ":-1127,"がっ":-913,"がら":-4977,"がり":-2064,"きた":1645,"けど":1374,"こと":7397,"この":1542,"ころ":-2757,"さい":-714,"さを":976,"し,":1557,"し、":1557,"しい":-3714,"した":3562,"して":1449,"しな":2608,"しま":1200,"す.":-1310,"す。":-1310,"する":6521,"ず,":3426,"ず、":3426,"ずに":841,"そう":428,"た.":8875,"た。":8875,"たい":-594,"たの":812,"たり":-1183,"たる":-853,"だ.":4098,"だ。":4098,"だっ":1004,"った":-4748,"って":300,"てい":6240,"てお":855,"ても":302,"です":1437,"でに":-1482,"では":2295,"とう":-1387,"とし":2266,"との":541,"とも":-3543,"どう":4664,"ない":1796,"なく":-903,"など":2135,"に,":-1021,"に、":-1021,"にし":1771,"にな":1906,"には":2644,"の,":-724,"の、":-724,"の子":-1000,"は,":1337,"は、":1337,"べき":2181,"まし":1113,"ます":6943,"まっ":-1549,"まで":6154,"まれ":-793,"らし":1479,"られ":6820,"るる":3818,"れ,":854,"れ、":854,"れた":1850,"れて":1375,"れば":-3246,"れる":1091,"われ":-605,"んだ":606,"んで":798,"カ月":990,"会議":860,"入り":1232,"大会":2217,"始め":1681,"市":965,"新聞":-5055,"日,":974,"日、":974,"社会":2024,"ｶ月":990};
this.TC1__ = {"AAA":1093,"HHH":1029,"HHM":580,"HII":998,"HOH":-390,"HOM":-331,"IHI":1169,"IOH":-142,"IOI":-1015,"IOM":467,"MMH":187,"OOI":-1832};
this.TC2__ = {"HHO":2088,"HII":-1023,"HMM":-1154,"IHI":-1965,"KKH":703,"OII":-2649};
this.TC3__ = {"AAA":-294,"HHH":346,"HHI":-341,"HII":-1088,"HIK":731,"HOH":-1486,"IHH":128,"IHI":-3041,"IHO":-1935,"IIH":-825,"IIM":-1035,"IOI":-542,"KHH":-1216,"KKA":491,"KKH":-1217,"KOK":-1009,"MHH":-2694,"MHM":-457,"MHO":123,"MMH":-471,"NNH":-1689,"NNO":662,"OHO":-3393};
this.TC4__ = {"HHH":-203,"HHI":1344,"HHK":365,"HHM":-122,"HHN":182,"HHO":669,"HIH":804,"HII":679,"HOH":446,"IHH":695,"IHO":-2324,"IIH":321,"III":1497,"IIO":656,"IOO":54,"KAK":4845,"KKA":3386,"KKK":3065,"MHH":-405,"MHI":201,"MMH":-241,"MMM":661,"MOM":841};
this.TQ1__ = {"BHHH":-227,"BHHI":316,"BHIH":-132,"BIHH":60,"BIII":1595,"BNHH":-744,"BOHH":225,"BOOO":-908,"OAKK":482,"OHHH":281,"OHIH":249,"OIHI":200,"OIIH":-68};
this.TQ2__ = {"BIHH":-1401,"BIII":-1033,"BKAK":-543,"BOOO":-5591};
this.TQ3__ = {"BHHH":478,"BHHM":-1073,"BHIH":222,"BHII":-504,"BIIH":-116,"BIII":-105,"BMHI":-863,"BMHM":-464,"BOMH":620,"OHHH":346,"OHHI":1729,"OHII":997,"OHMH":481,"OIHH":623,"OIIH":1344,"OKAK":2792,"OKHH":587,"OKKA":679,"OOHH":110,"OOII":-685};
this.TQ4__ = {"BHHH":-721,"BHHM":-3604,"BHII":-966,"BIIH":-607,"BIII":-2181,"OAAA":-2763,"OAKK":180,"OHHH":-294,"OHHI":2446,"OHHO":480,"OHIH":-1573,"OIHH":1935,"OIHI":-493,"OIIH":626,"OIII":-4007,"OKAK":-8156};
this.TW1__ = {"につい":-4681,"東京都":2026};
this.TW2__ = {"ある程":-2049,"いった":-1256,"ころが":-2434,"しょう":3873,"その後":-4430,"だって":-1049,"ていた":1833,"として":-4657,"ともに":-4517,"もので":1882,"一気に":-792,"初めて":-1512,"同時に":-8097,"大きな":-1255,"対して":-2721,"社会党":-3216};
this.TW3__ = {"いただ":-1734,"してい":1314,"として":-4314,"につい":-5483,"にとっ":-5989,"に当た":-6247,"ので,":-727,"ので、":-727,"のもの":-600,"れから":-3752,"十二月":-2287};
this.TW4__ = {"いう.":8576,"いう。":8576,"からな":-2348,"してい":2958,"たが,":1516,"たが、":1516,"ている":1538,"という":1349,"ました":5543,"ません":1097,"ようと":-4258,"よると":5865};
this.UC1__ = {"A":484,"K":93,"M":645,"O":-505};
this.UC2__ = {"A":819,"H":1059,"I":409,"M":3987,"N":5775,"O":646};
this.UC3__ = {"A":-1370,"I":2311};
this.UC4__ = {"A":-2643,"H":1809,"I":-1032,"K":-3450,"M":3565,"N":3876,"O":6646};
this.UC5__ = {"H":313,"I":-1238,"K":-799,"M":539,"O":-831};
this.UC6__ = {"H":-506,"I":-253,"K":87,"M":247,"O":-387};
this.UP1__ = {"O":-214};
this.UP2__ = {"B":69,"O":935};
this.UP3__ = {"B":189};
this.UQ1__ = {"BH":21,"BI":-12,"BK":-99,"BN":142,"BO":-56,"OH":-95,"OI":477,"OK":410,"OO":-2422};
this.UQ2__ = {"BH":216,"BI":113,"OK":1759};
this.UQ3__ = {"BA":-479,"BH":42,"BI":1913,"BK":-7198,"BM":3160,"BN":6427,"BO":14761,"OI":-827,"ON":-3212};
this.UW1__ = {",":156,"、":156,"「":-463,"あ":-941,"う":-127,"が":-553,"き":121,"こ":505,"で":-201,"と":-547,"ど":-123,"に":-789,"の":-185,"は":-847,"も":-466,"や":-470,"よ":182,"ら":-292,"り":208,"れ":169,"を":-446,"ん":-137,"・":-135,"主":-402,"京":-268,"区":-912,"午":871,"国":-460,"大":561,"委":729,"市":-411,"日":-141,"理":361,"生":-408,"県":-386,"都":-718,"｢":-463,"･":-135};
this.UW2__ = {",":-829,"、":-829,"〇":892,"「":-645,"」":3145,"あ":-538,"い":505,"う":134,"お":-502,"か":1454,"が":-856,"く":-412,"こ":1141,"さ":878,"ざ":540,"し":1529,"す":-675,"せ":300,"そ":-1011,"た":188,"だ":1837,"つ":-949,"て":-291,"で":-268,"と":-981,"ど":1273,"な":1063,"に":-1764,"の":130,"は":-409,"ひ":-1273,"べ":1261,"ま":600,"も":-1263,"や":-402,"よ":1639,"り":-579,"る":-694,"れ":571,"を":-2516,"ん":2095,"ア":-587,"カ":306,"キ":568,"ッ":831,"三":-758,"不":-2150,"世":-302,"中":-968,"主":-861,"事":492,"人":-123,"会":978,"保":362,"入":548,"初":-3025,"副":-1566,"北":-3414,"区":-422,"大":-1769,"天":-865,"太":-483,"子":-1519,"学":760,"実":1023,"小":-2009,"市":-813,"年":-1060,"強":1067,"手":-1519,"揺":-1033,"政":1522,"文":-1355,"新":-1682,"日":-1815,"明":-1462,"最":-630,"朝":-1843,"本":-1650,"東":-931,"果":-665,"次":-2378,"民":-180,"気":-1740,"理":752,"発":529,"目":-1584,"相":-242,"県":-1165,"立":-763,"第":810,"米":509,"自":-1353,"行":838,"西":-744,"見":-3874,"調":1010,"議":1198,"込":3041,"開":1758,"間":-1257,"｢":-645,"｣":3145,"ｯ":831,"ｱ":-587,"ｶ":306,"ｷ":568};
this.UW3__ = {",":4889,"1":-800,"−":-1723,"、":4889,"々":-2311,"〇":5827,"」":2670,"〓":-3573,"あ":-2696,"い":1006,"う":2342,"え":1983,"お":-4864,"か":-1163,"が":3271,"く":1004,"け":388,"げ":401,"こ":-3552,"ご":-3116,"さ":-1058,"し":-395,"す":584,"せ":3685,"そ":-5228,"た":842,"ち":-521,"っ":-1444,"つ":-1081,"て":6167,"で":2318,"と":1691,"ど":-899,"な":-2788,"に":2745,"の":4056,"は":4555,"ひ":-2171,"ふ":-1798,"へ":1199,"ほ":-5516,"ま":-4384,"み":-120,"め":1205,"も":2323,"や":-788,"よ":-202,"ら":727,"り":649,"る":5905,"れ":2773,"わ":-1207,"を":6620,"ん":-518,"ア":551,"グ":1319,"ス":874,"ッ":-1350,"ト":521,"ム":1109,"ル":1591,"ロ":2201,"ン":278,"・":-3794,"一":-1619,"下":-1759,"世":-2087,"両":3815,"中":653,"主":-758,"予":-1193,"二":974,"人":2742,"今":792,"他":1889,"以":-1368,"低":811,"何":4265,"作":-361,"保":-2439,"元":4858,"党":3593,"全":1574,"公":-3030,"六":755,"共":-1880,"円":5807,"再":3095,"分":457,"初":2475,"別":1129,"前":2286,"副":4437,"力":365,"動":-949,"務":-1872,"化":1327,"北":-1038,"区":4646,"千":-2309,"午":-783,"協":-1006,"口":483,"右":1233,"各":3588,"合":-241,"同":3906,"和":-837,"員":4513,"国":642,"型":1389,"場":1219,"外":-241,"妻":2016,"学":-1356,"安":-423,"実":-1008,"家":1078,"小":-513,"少":-3102,"州":1155,"市":3197,"平":-1804,"年":2416,"広":-1030,"府":1605,"度":1452,"建":-2352,"当":-3885,"得":1905,"思":-1291,"性":1822,"戸":-488,"指":-3973,"政":-2013,"教":-1479,"数":3222,"文":-1489,"新":1764,"日":2099,"旧":5792,"昨":-661,"時":-1248,"曜":-951,"最":-937,"月":4125,"期":360,"李":3094,"村":364,"東":-805,"核":5156,"森":2438,"業":484,"氏":2613,"民":-1694,"決":-1073,"法":1868,"海":-495,"無":979,"物":461,"特":-3850,"生":-273,"用":914,"町":1215,"的":7313,"直":-1835,"省":792,"県":6293,"知":-1528,"私":4231,"税":401,"立":-960,"第":1201,"米":7767,"系":3066,"約":3663,"級":1384,"統":-4229,"総":1163,"線":1255,"者":6457,"能":725,"自":-2869,"英":785,"見":1044,"調":-562,"財":-733,"費":1777,"車":1835,"軍":1375,"込":-1504,"通":-1136,"選":-681,"郎":1026,"郡":4404,"部":1200,"金":2163,"長":421,"開":-1432,"間":1302,"関":-1282,"雨":2009,"電":-1045,"非":2066,"駅":1620,"１":-800,"｣":2670,"･":-3794,"ｯ":-1350,"ｱ":551,"ｸﾞ":1319,"ｽ":874,"ﾄ":521,"ﾑ":1109,"ﾙ":1591,"ﾛ":2201,"ﾝ":278};
this.UW4__ = {",":3930,".":3508,"―":-4841,"、":3930,"。":3508,"〇":4999,"「":1895,"」":3798,"〓":-5156,"あ":4752,"い":-3435,"う":-640,"え":-2514,"お":2405,"か":530,"が":6006,"き":-4482,"ぎ":-3821,"く":-3788,"け":-4376,"げ":-4734,"こ":2255,"ご":1979,"さ":2864,"し":-843,"じ":-2506,"す":-731,"ず":1251,"せ":181,"そ":4091,"た":5034,"だ":5408,"ち":-3654,"っ":-5882,"つ":-1659,"て":3994,"で":7410,"と":4547,"な":5433,"に":6499,"ぬ":1853,"ね":1413,"の":7396,"は":8578,"ば":1940,"ひ":4249,"び":-4134,"ふ":1345,"へ":6665,"べ":-744,"ほ":1464,"ま":1051,"み":-2082,"む":-882,"め":-5046,"も":4169,"ゃ":-2666,"や":2795,"ょ":-1544,"よ":3351,"ら":-2922,"り":-9726,"る":-14896,"れ":-2613,"ろ":-4570,"わ":-1783,"を":13150,"ん":-2352,"カ":2145,"コ":1789,"セ":1287,"ッ":-724,"ト":-403,"メ":-1635,"ラ":-881,"リ":-541,"ル":-856,"ン":-3637,"・":-4371,"ー":-11870,"一":-2069,"中":2210,"予":782,"事":-190,"井":-1768,"人":1036,"以":544,"会":950,"体":-1286,"作":530,"側":4292,"先":601,"党":-2006,"共":-1212,"内":584,"円":788,"初":1347,"前":1623,"副":3879,"力":-302,"動":-740,"務":-2715,"化":776,"区":4517,"協":1013,"参":1555,"合":-1834,"和":-681,"員":-910,"器":-851,"回":1500,"国":-619,"園":-1200,"地":866,"場":-1410,"塁":-2094,"士":-1413,"多":1067,"大":571,"子":-4802,"学":-1397,"定":-1057,"寺":-809,"小":1910,"屋":-1328,"山":-1500,"島":-2056,"川":-2667,"市":2771,"年":374,"庁":-4556,"後":456,"性":553,"感":916,"所":-1566,"支":856,"改":787,"政":2182,"教":704,"文":522,"方":-856,"日":1798,"時":1829,"最":845,"月":-9066,"木":-485,"来":-442,"校":-360,"業":-1043,"氏":5388,"民":-2716,"気":-910,"沢":-939,"済":-543,"物":-735,"率":672,"球":-1267,"生":-1286,"産":-1101,"田":-2900,"町":1826,"的":2586,"目":922,"省":-3485,"県":2997,"空":-867,"立":-2112,"第":788,"米":2937,"系":786,"約":2171,"経":1146,"統":-1169,"総":940,"線":-994,"署":749,"者":2145,"能":-730,"般":-852,"行":-792,"規":792,"警":-1184,"議":-244,"谷":-1000,"賞":730,"車":-1481,"軍":1158,"輪":-1433,"込":-3370,"近":929,"道":-1291,"選":2596,"郎":-4866,"都":1192,"野":-1100,"銀":-2213,"長":357,"間":-2344,"院":-2297,"際":-2604,"電":-878,"領":-1659,"題":-792,"館":-1984,"首":1749,"高":2120,"｢":1895,"｣":3798,"･":-4371,"ｯ":-724,"ｰ":-11870,"ｶ":2145,"ｺ":1789,"ｾ":1287,"ﾄ":-403,"ﾒ":-1635,"ﾗ":-881,"ﾘ":-541,"ﾙ":-856,"ﾝ":-3637};
this.UW5__ = {",":465,".":-299,"1":-514,"E2":-32768,"]":-2762,"、":465,"。":-299,"「":363,"あ":1655,"い":331,"う":-503,"え":1199,"お":527,"か":647,"が":-421,"き":1624,"ぎ":1971,"く":312,"げ":-983,"さ":-1537,"し":-1371,"す":-852,"だ":-1186,"ち":1093,"っ":52,"つ":921,"て":-18,"で":-850,"と":-127,"ど":1682,"な":-787,"に":-1224,"の":-635,"は":-578,"べ":1001,"み":502,"め":865,"ゃ":3350,"ょ":854,"り":-208,"る":429,"れ":504,"わ":419,"を":-1264,"ん":327,"イ":241,"ル":451,"ン":-343,"中":-871,"京":722,"会":-1153,"党":-654,"務":3519,"区":-901,"告":848,"員":2104,"大":-1296,"学":-548,"定":1785,"嵐":-1304,"市":-2991,"席":921,"年":1763,"思":872,"所":-814,"挙":1618,"新":-1682,"日":218,"月":-4353,"査":932,"格":1356,"機":-1508,"氏":-1347,"田":240,"町":-3912,"的":-3149,"相":1319,"省":-1052,"県":-4003,"研":-997,"社":-278,"空":-813,"統":1955,"者":-2233,"表":663,"語":-1073,"議":1219,"選":-1018,"郎":-368,"長":786,"間":1191,"題":2368,"館":-689,"１":-514,"Ｅ２":-32768,"｢":363,"ｲ":241,"ﾙ":451,"ﾝ":-343};
this.UW6__ = {",":227,".":808,"1":-270,"E1":306,"、":227,"。":808,"あ":-307,"う":189,"か":241,"が":-73,"く":-121,"こ":-200,"じ":1782,"す":383,"た":-428,"っ":573,"て":-1014,"で":101,"と":-105,"な":-253,"に":-149,"の":-417,"は":-236,"も":-206,"り":187,"る":-135,"を":195,"ル":-673,"ン":-496,"一":-277,"中":201,"件":-800,"会":624,"前":302,"区":1792,"員":-1212,"委":798,"学":-960,"市":887,"広":-695,"後":535,"業":-697,"相":753,"社":-507,"福":974,"空":-822,"者":1811,"連":463,"郎":1082,"１":-270,"Ｅ１":306,"ﾙ":-673,"ﾝ":-496};
return this;
}
TinySegmenter.prototype.ctype_ = function(str) {
for (var i in this.chartype_) {
if (str.match(this.chartype_[i][0])) {
return this.chartype_[i][1];
}
}
return "O";
}
TinySegmenter.prototype.ts_ = function(v) {
if (v) { return v; }
return 0;
}
TinySegmenter.prototype.segment = function(input) {
if (input == null || input == undefined || input == "") {
return [];
}
var result = [];
var seg = ["B3","B2","B1"];
var ctype = ["O","O","O"];
var o = input.split("");
for (i = 0; i < o.length; ++i) {
seg.push(o[i]);
ctype.push(this.ctype_(o[i]))
}
seg.push("E1");
seg.push("E2");
seg.push("E3");
ctype.push("O");
ctype.push("O");
ctype.push("O");
var word = seg[3];
var p1 = "U";
var p2 = "U";
var p3 = "U";
for (var i = 4; i < seg.length - 3; ++i) {
var score = this.BIAS__;
var w1 = seg[i-3];
var w2 = seg[i-2];
var w3 = seg[i-1];
var w4 = seg[i];
var w5 = seg[i+1];
var w6 = seg[i+2];
var c1 = ctype[i-3];
var c2 = ctype[i-2];
var c3 = ctype[i-1];
var c4 = ctype[i];
var c5 = ctype[i+1];
var c6 = ctype[i+2];
score += this.ts_(this.UP1__[p1]);
score += this.ts_(this.UP2__[p2]);
score += this.ts_(this.UP3__[p3]);
score += this.ts_(this.BP1__[p1 + p2]);
score += this.ts_(this.BP2__[p2 + p3]);
score += this.ts_(this.UW1__[w1]);
score += this.ts_(this.UW2__[w2]);
score += this.ts_(this.UW3__[w3]);
score += this.ts_(this.UW4__[w4]);
score += this.ts_(this.UW5__[w5]);
score += this.ts_(this.UW6__[w6]);
score += this.ts_(this.BW1__[w2 + w3]);
score += this.ts_(this.BW2__[w3 + w4]);
score += this.ts_(this.BW3__[w4 + w5]);
score += this.ts_(this.TW1__[w1 + w2 + w3]);
score += this.ts_(this.TW2__[w2 + w3 + w4]);
score += this.ts_(this.TW3__[w3 + w4 + w5]);
score += this.ts_(this.TW4__[w4 + w5 + w6]);
score += this.ts_(this.UC1__[c1]);
score += this.ts_(this.UC2__[c2]);
score += this.ts_(this.UC3__[c3]);
score += this.ts_(this.UC4__[c4]);
score += this.ts_(this.UC5__[c5]);
score += this.ts_(this.UC6__[c6]);
score += this.ts_(this.BC1__[c2 + c3]);
score += this.ts_(this.BC2__[c3 + c4]);
score += this.ts_(this.BC3__[c4 + c5]);
score += this.ts_(this.TC1__[c1 + c2 + c3]);
score += this.ts_(this.TC2__[c2 + c3 + c4]);
score += this.ts_(this.TC3__[c3 + c4 + c5]);
score += this.ts_(this.TC4__[c4 + c5 + c6]);
// score += this.ts_(this.TC5__[c4 + c5 + c6]);
score += this.ts_(this.UQ1__[p1 + c1]);
score += this.ts_(this.UQ2__[p2 + c2]);
score += this.ts_(this.UQ3__[p3 + c3]);
score += this.ts_(this.BQ1__[p2 + c2 + c3]);
score += this.ts_(this.BQ2__[p2 + c3 + c4]);
score += this.ts_(this.BQ3__[p3 + c2 + c3]);
score += this.ts_(this.BQ4__[p3 + c3 + c4]);
score += this.ts_(this.TQ1__[p2 + c1 + c2 + c3]);
score += this.ts_(this.TQ2__[p2 + c2 + c3 + c4]);
score += this.ts_(this.TQ3__[p3 + c1 + c2 + c3]);
score += this.ts_(this.TQ4__[p3 + c2 + c3 + c4]);
var p = "O";
if (score > 0) {
result.push(word);
word = "";
p = "B";
}
p1 = p2;
p2 = p3;
p3 = p;
word += seg[i];
}
result.push(word);
return result;
}
lunr.TinySegmenter = TinySegmenter;
};
}));

6708
v0.28.0/assets/javascripts/lunr/wordcut.js Normal file
View File

File diff suppressed because one or more lines are too long

42
v0.28.0/assets/javascripts/workers/search.f8cc74c7.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

7
v0.28.0/assets/javascripts/workers/search.f8cc74c7.min.js.map Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.28.0/assets/stylesheets/main.8608ea7d.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.28.0/assets/stylesheets/main.8608ea7d.min.css.map Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.28.0/assets/stylesheets/palette.06af60db.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
v0.28.0/assets/stylesheets/palette.06af60db.min.css.map Normal file
View File

@ -0,0 +1 @@
{"version":3,"sources":["src/templates/assets/stylesheets/palette/_scheme.scss","../../../../src/templates/assets/stylesheets/palette.scss","src/templates/assets/stylesheets/palette/_accent.scss","src/templates/assets/stylesheets/palette/_primary.scss","src/templates/assets/stylesheets/utilities/_break.scss"],"names":[],"mappings":"AA2BA,cAGE,6BAME,sDAAA,CACA,6DAAA,CACA,+DAAA,CACA,gEAAA,CACA,mDAAA,CACA,6DAAA,CACA,+DAAA,CACA,gEAAA,CAGA,mDAAA,CACA,gDAAA,CAGA,0BAAA,CACA,mCAAA,CAGA,iCAAA,CACA,kCAAA,CACA,mCAAA,CACA,mCAAA,CACA,kCAAA,CACA,iCAAA,CACA,+CAAA,CACA,6DAAA,CACA,gEAAA,CACA,4DAAA,CACA,4DAAA,CACA,6DAAA,CAGA,6CAAA,CAGA,+CAAA,CAGA,uDAAA,CACA,6DAAA,CACA,2DAAA,CAGA,iCAAA,CAGA,yDAAA,CACA,iEAAA,CAGA,mDAAA,CACA,mDAAA,CAGA,qDAAA,CACA,uDAAA,CAGA,8DAAA,CAKA,8DAAA,CAKA,0DAAA,CAvEA,iBCeF,CD6DE,kHAEE,YC3DJ,CDkFE,yDACE,4BChFJ,CD+EE,2DACE,4BC7EJ,CD4EE,gEACE,4BC1EJ,CDyEE,2DACE,4BCvEJ,CDsEE,yDACE,4BCpEJ,CDmEE,0DACE,4BCjEJ,CDgEE,gEACE,4BC9DJ,CD6DE,0DACE,4BC3DJ,CD0DE,2OACE,4BC/CJ,CDsDA,+FAGE,iCCpDF,CACF,CC/CE,2BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCD2CN,CCrDE,4BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDkDN,CC5DE,8BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDyDN,CCnEE,mCACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDgEN,CC1EE,8BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDuEN,CCjFE,4BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCD8EN,CCxFE,kCACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDqFN,CC/FE,4BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCD4FN,CCtGE,4BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDmGN,CC7GE,6BACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCD0GN,CCpHE,mCACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDiHN,CC3HE,4BACE,4BAAA,CACA,2CAAA,CAIE,8BAAA,CACA,qCD2HN,CClIE,8BACE,4BAAA,CACA,2CAAA,CAIE,8BAAA,CACA,qCDkIN,CCzIE,6BACE,yBAAA,CACA,2CAAA,CAIE,8BAAA,CACA,qCDyIN,CChJE,8BACE,4BAAA,CACA,2CAAA,CAIE,8BAAA,CACA,qCDgJN,CCvJE,mCACE,4BAAA,CACA,2CAAA,CAOE,yBAAA,CACA,qCDoJN,CEzJE,4BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCFsJN,CEjKE,6BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCF8JN,CEzKE,+BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCFsKN,CEjLE,oCACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCF8KN,CEzLE,+BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCFsLN,CEjME,6BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCF8LN,CEzME,mCACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCFsMN,CEjNE,6BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCF8MN,CEzNE,6BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCFsNN,CEjOE,8BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCF8NN,CEzOE,oCACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCFsON,CEjPE,6BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAIE,+BAAA,CACA,sCFiPN,CEzPE,+BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAIE,+BAAA,CACA,sCFyPN,CEjQE,8BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAIE,+BAAA,CACA,sCFiQN,CEzQE,+BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAIE,+BAAA,CACA,sCFyQN,CEjRE,oCACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCF8QN,CEzRE,8BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCFsRN,CEjSE,6BACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCAAA,CAKA,4BF0RN,CE1SE,kCACE,6BAAA,CACA,oCAAA,CACA,mCAAA,CAOE,0BAAA,CACA,sCAAA,CAKA,4BFmSN,CEpRE,sEACE,4BFuRJ,CExRE,+DACE,4BF2RJ,CE5RE,iEACE,4BF+RJ,CEhSE,gEACE,4BFmSJ,CEpSE,iEACE,4BFuSJ,CE9RA,8BACE,mDAAA,CACA,4DAAA,CACA,0DAAA,CACA,oDAAA,CACA,2DAAA,CAGA,4BF+RF,CE5RE,yCACE,+BF8RJ,CE3RI,kDAEE,0CAAA,CACA,sCAAA,CAFA,mCF+RN,CG3MI,mCD1EA,+CACE,8CFwRJ,CErRI,qDACE,8CFuRN,CElRE,iEACE,mCFoRJ,CACF,CGtNI,sCDvDA,uCACE,oCFgRJ,CACF,CEvQA,8BACE,kDAAA,CACA,4DAAA,CACA,wDAAA,CACA,oDAAA,CACA,6DAAA,CAGA,4BFwQF,CErQE,yCACE,+BFuQJ,CEpQI,kDAEE,0CAAA,CACA,sCAAA,CAFA,mCFwQN,CEjQE,yCACE,6CFmQJ,CG5NI,0CDhCA,8CACE,gDF+PJ,CACF,CGjOI,0CDvBA,iFACE,6CF2PJ,CACF,CGzPI,sCDKA,uCACE,6CFuPJ,CACF","file":"palette.css"}

1981
v0.28.0/bookmarks/index.html Normal file
View File

File diff suppressed because it is too large Load Diff

14
v0.28.0/branches/index.html Normal file
View File

@ -0,0 +1,14 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Redirecting...</title>
<link rel="canonical" href="../bookmarks/">
<script>var anchor=window.location.hash.substr(1);location.href="../bookmarks/"+(anchor?"#"+anchor:"")</script>
<meta http-equiv="refresh" content="0; url=../bookmarks/">
</head>
<body>
You're being redirected to a <a href="../bookmarks/">new destination</a>.
</body>
</html>

8779
v0.28.0/cli-reference/index.html Normal file
View File

File diff suppressed because it is too large Load Diff

1858
v0.28.0/code-of-conduct/index.html Normal file
View File

File diff suppressed because it is too large Load Diff

1774
v0.28.0/community_tools/index.html Normal file
View File

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More