mirror of
https://github.com/martinvonz/jj.git
synced 2025-05-05 15:32:49 +00:00
Deployed 5de285f to v0.23.0 with MkDocs 1.6.1 and mike 2.1.3
This commit is contained in:
parent
0f1829b58d
commit
c38fcf41ad
@ -576,6 +576,15 @@
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#i-want-to-write-a-tool-which-integrates-with-jujutsu-should-i-use-the-library-or-parse-the-cli" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
I want to write a tool which integrates with Jujutsu. Should I use the library or parse the CLI?
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
@ -1654,6 +1663,15 @@
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#i-want-to-write-a-tool-which-integrates-with-jujutsu-should-i-use-the-library-or-parse-the-cli" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
I want to write a tool which integrates with Jujutsu. Should I use the library or parse the CLI?
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
@ -1849,13 +1867,18 @@ $<span class="w"> </span>jj<span class="w"> </span>log
|
||||
<li>The private commit <em>wwwwwwww</em> is the second parent of the merge commit.</li>
|
||||
<li>The working copy (<em>vvvvvvvv</em>) contains changes from both.</li>
|
||||
</ul>
|
||||
<p>As you work, squash your changes using <code>jj squash --into xxxxxxxx</code>. Or, you can
|
||||
keep your changes in a separate commit and remove <em>ttsqqnrx</em> as a parent:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="c1"># Remove the private commit as a parent</span>
|
||||
$<span class="w"> </span>jj<span class="w"> </span>rebase<span class="w"> </span>-r<span class="w"> </span>vvvvvvvv<span class="w"> </span>-d<span class="w"> </span>xxxxxxxx
|
||||
<p>As you work, squash your changes using <code>jj squash --into xxxxxxxx</code>.</p>
|
||||
<p>If you need a new empty commit on top of <code>xxxxxxxx</code> you can use the
|
||||
<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>
|
||||
$<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">"Another feature"</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
|
||||
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
|
||||
|
||||
<span class="c1"># Create a new merge commit to work in</span>
|
||||
$<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>vvvvvvvv<span class="w"> </span>wwwwwwww
|
||||
<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">"Yet another feature"</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
|
||||
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
|
||||
</code></pre></div>
|
||||
<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>
|
||||
@ -1909,6 +1932,18 @@ HEAD:refs/for/main</code>). Using a <a href="../glossary/#co-located-repos">co-l
|
||||
will make the underlying git repo directly accessible from the working
|
||||
directory.</p>
|
||||
<p>We hope to integrate with Gerrit natively in the future.</p>
|
||||
<h3 id="i-want-to-write-a-tool-which-integrates-with-jujutsu-should-i-use-the-library-or-parse-the-cli">I want to write a tool which integrates with Jujutsu. Should I use the library or parse the CLI?<a class="headerlink" href="#i-want-to-write-a-tool-which-integrates-with-jujutsu-should-i-use-the-library-or-parse-the-cli" title="Permanent link">¶</a></h3>
|
||||
<p>There are some trade-offs and there is no definitive answer yet.</p>
|
||||
<ul>
|
||||
<li>Using <code>jj-lib</code> avoids parsing command output and makes error handling easier.</li>
|
||||
<li><code>jj-lib</code> is not a stable API, so you may have to make changes to your tool
|
||||
when the API changes.</li>
|
||||
<li>The CLI is not stable either, so you may need to make your tool detect the
|
||||
different versions and call the right command.</li>
|
||||
<li>Using the CLI means that your tool will work with custom-built <code>jj</code> binaries,
|
||||
like the one at Google (if you're using the library, you will not be able to
|
||||
detect custom backends and more).</li>
|
||||
</ul>
|
||||
|
||||
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -546,6 +546,15 @@
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#visualjj" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
VisualJJ
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
@ -1483,6 +1492,15 @@
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#visualjj" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
VisualJJ
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
@ -1535,6 +1553,11 @@ open to feedback.</p>
|
||||
<p>VJJ is a fzf (fuzzy finder) wrapper for Jujutsu, which is meant to be used
|
||||
interactively in the terminal.</p>
|
||||
<p>Find it <a href="https://github.com/noahmayr/vjj">here</a>.</p>
|
||||
<h2 id="visualjj">VisualJJ<a class="headerlink" href="#visualjj" title="Permanent link">¶</a></h2>
|
||||
<p>VisualJJ is a plugin for Visual Studio Code which provides native integration
|
||||
for Jujutsu, not relying on Git colocation. Unlike other tools on this page,
|
||||
VisualJJ is not open-source.</p>
|
||||
<p>Find it <a href="https://www.visualjj.com">here</a>.</p>
|
||||
<!-- TODO: Add benbrittains/cultivate when its ready -->
|
||||
<h2 id="finding-other-integrations">Finding other integrations<a class="headerlink" href="#finding-other-integrations" title="Permanent link">¶</a></h2>
|
||||
<p>You can find other community contributed tools and integrations in our
|
||||
|
@ -803,6 +803,15 @@
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#git-diff-options" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
Git diff options
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
@ -850,6 +859,15 @@
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#default-template" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
Default Template
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
@ -1212,6 +1230,15 @@
|
||||
<nav class="md-nav" aria-label="Snapshot settings">
|
||||
<ul class="md-nav__list">
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#paths-to-automatically-track" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
Paths to automatically track
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#maximum-size-for-new-files" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
@ -2036,6 +2063,15 @@
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#git-diff-options" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
Git diff options
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
@ -2083,6 +2119,15 @@
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#default-template" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
Default Template
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
@ -2445,6 +2490,15 @@
|
||||
<nav class="md-nav" aria-label="Snapshot settings">
|
||||
<ul class="md-nav__list">
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#paths-to-automatically-track" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
Paths to automatically track
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#maximum-size-for-new-files" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
@ -2653,7 +2707,8 @@ can override the default style with the following keys:</p>
|
||||
<h4 id="color-words-diff-options">Color-words diff options<a class="headerlink" href="#color-words-diff-options" title="Permanent link">¶</a></h4>
|
||||
<p>In color-words diffs, changed words are displayed inline by default. Because
|
||||
it's difficult to read a diff line with many removed/added words, there's a
|
||||
threshold to switch to traditional separate-line format.</p>
|
||||
threshold to switch to traditional separate-line format. You can also change
|
||||
the default number of lines of context shown.</p>
|
||||
<ul>
|
||||
<li>
|
||||
<p><code>max-inline-alternation</code>: Maximum number of removed/added word alternation to
|
||||
@ -2669,9 +2724,21 @@ threshold to switch to traditional separate-line format.</p>
|
||||
<p>The default is <code>3</code>.</p>
|
||||
<p><strong>This parameter is experimental.</strong> The definition is subject to change.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p><code>context</code>: Number of lines of context to show in the diff. The default is <code>3</code>.</p>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="highlight"><pre><span></span><code><span class="k">[diff.color-words]</span>
|
||||
<span class="n">max-inline-alternation</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="mi">3</span>
|
||||
<span class="n">context</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="mi">3</span>
|
||||
</code></pre></div>
|
||||
<h4 id="git-diff-options">Git diff options<a class="headerlink" href="#git-diff-options" title="Permanent link">¶</a></h4>
|
||||
<p>In git diffs you can change the default number of lines of context shown.</p>
|
||||
<ul>
|
||||
<li><code>context</code>: Number of lines of context to show in the diff. The default is <code>3</code>.</li>
|
||||
</ul>
|
||||
<div class="highlight"><pre><span></span><code><span class="k">[diff.git]</span>
|
||||
<span class="n">context</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="mi">3</span>
|
||||
</code></pre></div>
|
||||
<h3 id="generating-diffs-by-external-command">Generating diffs by external command<a class="headerlink" href="#generating-diffs-by-external-command" title="Permanent link">¶</a></h3>
|
||||
<p>If <code>ui.diff.tool</code> is set, the specified diff command will be called instead of
|
||||
@ -2704,11 +2771,15 @@ invocations as follows:</p>
|
||||
<h3 id="set-of-immutable-commits">Set of immutable commits<a class="headerlink" href="#set-of-immutable-commits" title="Permanent link">¶</a></h3>
|
||||
<p>You can configure the set of immutable commits via
|
||||
<code>revset-aliases."immutable_heads()"</code>. The default set of immutable heads is
|
||||
<code>trunk() | tags() | untracked_remote_bookmarks()</code>. For example, to prevent
|
||||
rewriting commits on <code>main@origin</code> and commits authored by other users:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="c1"># The `main.. &` bit is an optimization to scan for non-`mine()` commits only</span>
|
||||
<span class="c1"># among commits that are not in `main`.</span>
|
||||
<span class="n">revset-aliases</span><span class="p">.</span><span class="s2">"immutable_heads()"</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"main@origin | (main@origin.. & ~mine())"</span>
|
||||
<code>builtin_immutable_heads()</code>, which in turn is defined as
|
||||
<code>present(trunk()) | tags() | untracked_remote_bookmarks()</code>. For example, to
|
||||
also consider the <code>release@origin</code> bookmark immutable:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="n">revset-aliases</span><span class="p">.</span><span class="s2">"immutable_heads()"</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"builtin_immutable_heads() | release@origin"</span>
|
||||
</code></pre></div>
|
||||
<p>To prevent rewriting commits authored by other users:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="c1"># The `trunk().. &` bit is an optimization to scan for non-`mine()` commits</span>
|
||||
<span class="c1"># only among commits that are not in `trunk()`.</span>
|
||||
<span class="n">revset-aliases</span><span class="p">.</span><span class="s2">"immutable_heads()"</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"builtin_immutable_heads() | (trunk().. & ~mine())"</span>
|
||||
</code></pre></div>
|
||||
<p>Ancestors of the configured set are also immutable. The root commit is always
|
||||
immutable even if the set is empty.</p>
|
||||
@ -2719,7 +2790,27 @@ immutable even if the set is empty.</p>
|
||||
<span class="n">revsets</span><span class="p">.</span><span class="n">log</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"main@origin.."</span>
|
||||
</code></pre></div>
|
||||
<p>The default value for <code>revsets.log</code> is
|
||||
<code>'present(@) | ancestors(immutable_heads().., 2) | 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">¶</a></h3>
|
||||
<p>You can configure the template used when no <code>-T</code> is specified.</p>
|
||||
<ul>
|
||||
<li><code>templates.log</code> for <code>jj log</code></li>
|
||||
<li><code>templates.op_log</code> for <code>jj op log</code></li>
|
||||
<li><code>templates.show</code> for <code>jj show</code></li>
|
||||
</ul>
|
||||
<div class="highlight"><pre><span></span><code><span class="k">[templates]</span>
|
||||
<span class="c1"># Use builtin log template</span>
|
||||
<span class="n">log</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"builtin_log_compact"</span>
|
||||
<span class="c1"># Use builtin op log template</span>
|
||||
<span class="n">op_log</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"builtin_log_compact"</span>
|
||||
<span class="c1"># Use builtin show template</span>
|
||||
<span class="n">show</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"builtin_log_detailed"</span>
|
||||
</code></pre></div>
|
||||
<p>If you want to see the full description when you do <code>jj log</code> you can add this to
|
||||
your config:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="k">[templates]</span>
|
||||
<span class="n">log</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"builtin_log_compact_full_description"</span>
|
||||
</code></pre></div>
|
||||
<h3 id="graph-style">Graph style<a class="headerlink" href="#graph-style" title="Permanent link">¶</a></h3>
|
||||
<div class="highlight"><pre><span></span><code><span class="c1"># Possible values: "curved" (default), "square", "ascii", "ascii-large"</span>
|
||||
<span class="n">ui</span><span class="p">.</span><span class="n">graph</span><span class="p">.</span><span class="n">style</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"square"</span>
|
||||
@ -2874,27 +2965,46 @@ setting, but you could set it explicitly too.</p>
|
||||
</code></pre></div>
|
||||
<p>Obviously, you would only set one line, don't copy them all in!</p>
|
||||
<h2 id="editing-diffs">Editing diffs<a class="headerlink" href="#editing-diffs" title="Permanent link">¶</a></h2>
|
||||
<p>The <code>ui.diff-editor</code> setting affects the tool used for editing diffs (e.g. <code>jj
|
||||
split</code>, <code>jj squash -i</code>). The default is the special value <code>:builtin</code>, which
|
||||
launches a built-in TUI tool (known as <a href="https://github.com/arxanas/scm-record?tab=readme-ov-file#scm-diff-editor">scm-diff-editor</a>) to edit the diff in
|
||||
your terminal.</p>
|
||||
<p>The <code>ui.diff-editor</code> setting affects the default tool used for editing diffs
|
||||
(e.g. <code>jj split</code>, <code>jj squash -i</code>). If it is not set, the special value
|
||||
<code>:builtin</code> is used. It launches a built-in TUI tool (known as <a href="https://github.com/arxanas/scm-record?tab=readme-ov-file#scm-diff-editor">scm-diff-editor</a>)
|
||||
to edit the diff in your terminal.</p>
|
||||
<p>You can try a different tool temporarily by doing e.g. <code>jj split --tool meld</code> or
|
||||
you can set the option to change the default. This requires that you have an
|
||||
appropriate tool installed, e.g. <a href="https://meldmerge.org/">Meld</a> to use the
|
||||
<code>meld</code> diff editor.</p>
|
||||
<p><strong>Suggestion:</strong> If possible, it is recommended to try an external diff tool like
|
||||
<code>meld</code> (see below for some other possibilities) for splitting commits and other
|
||||
diff editing, in addition to the built-in diff editor. It is good to know the
|
||||
capabilities of both. The built-in diff editor does not require external tools
|
||||
to be available, is faster for tasks like picking hunks, and does not require
|
||||
leaving the terminal. External tools give you the flexibility of picking out
|
||||
portions of lines from the diff or even arbitrarily editing the text of the
|
||||
files.</p>
|
||||
<p>If <code>ui.diff-editor</code> is a string, e.g. <code>"meld"</code>, the arguments will be read from
|
||||
the following config keys.</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="c1"># merge-tools.meld.program = "meld" # Defaults to the name of the tool if not specified</span>
|
||||
<span class="n">merge-tools</span><span class="p">.</span><span class="n">meld</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">"/path/to/meld"</span><span class="w"> </span><span class="c1"># May be necessary if `meld` is not in the PATH</span>
|
||||
<span class="n">merge-tools</span><span class="p">.</span><span class="n">meld</span><span class="p">.</span><span class="n">edit-args</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">[</span><span class="s2">"--newtab"</span><span class="p">,</span><span class="w"> </span><span class="s2">"$left"</span><span class="p">,</span><span class="w"> </span><span class="s2">"$right"</span><span class="p">]</span>
|
||||
</code></pre></div>
|
||||
<p><code>jj</code> makes the following substitutions:</p>
|
||||
<ul>
|
||||
<li><code>$left</code> and <code>$right</code> are replaced with the paths to the left and right
|
||||
directories to diff respectively.</li>
|
||||
<li>
|
||||
<p><code>$left</code> and <code>$right</code> are replaced with the paths to the left and right
|
||||
directories to diff respectively.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p>If no <code>edit-args</code> are specified, <code>["$left", "$right"]</code> are set by default.</p>
|
||||
</li>
|
||||
</ul>
|
||||
<p>If no arguments are specified, <code>["$left", "$right"]</code> are set by default.</p>
|
||||
<p>For example:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="c1"># Use merge-tools.kdiff3.edit-args</span>
|
||||
<span class="n">ui</span><span class="p">.</span><span class="n">diff-editor</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"kdiff3"</span>
|
||||
<p>Finally, <code>ui.diff-editor</code> can be a list that specifies a command and its arguments.</p>
|
||||
<p>Some examples:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="c1"># Use merge-tools.meld.edit-args</span>
|
||||
<span class="n">ui</span><span class="p">.</span><span class="n">diff-editor</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"meld"</span><span class="w"> </span><span class="c1"># Or `kdiff3`, or `diffedit3`, ...</span>
|
||||
<span class="c1"># Specify edit-args inline</span>
|
||||
<span class="n">ui</span><span class="p">.</span><span class="n">diff-editor</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">[</span><span class="s2">"kdiff3"</span><span class="p">,</span><span class="w"> </span><span class="s2">"--merge"</span><span class="p">,</span><span class="w"> </span><span class="s2">"$left"</span><span class="p">,</span><span class="w"> </span><span class="s2">"$right"</span><span class="p">]</span>
|
||||
</code></pre></div>
|
||||
<p>If <code>ui.diff-editor</code> consists of a single word, e.g. <code>"kdiff3"</code>, the arguments
|
||||
will be read from the following config keys.</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="c1"># merge-tools.kdiff3.program = "kdiff3" # Defaults to the name of the tool if not specified</span>
|
||||
<span class="n">merge-tools</span><span class="p">.</span><span class="n">kdiff3</span><span class="p">.</span><span class="n">edit-args</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">[</span>
|
||||
<span class="w"> </span><span class="s2">"--merge"</span><span class="p">,</span><span class="w"> </span><span class="s2">"--cs"</span><span class="p">,</span><span class="w"> </span><span class="s2">"CreateBakFiles=0"</span><span class="p">,</span><span class="w"> </span><span class="s2">"$left"</span><span class="p">,</span><span class="w"> </span><span class="s2">"$right"</span><span class="p">]</span>
|
||||
<span class="n">ui</span><span class="p">.</span><span class="n">diff-editor</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">[</span><span class="s2">"/path/to/binary"</span><span class="p">,</span><span class="w"> </span><span class="s2">"--be-helpful"</span><span class="p">,</span><span class="w"> </span><span class="s2">"$left"</span><span class="p">,</span><span class="w"> </span><span class="s2">"$right"</span><span class="p">]</span>
|
||||
<span class="c1"># Equivalent to ["binary", "$left", "$right"] arguments by default</span>
|
||||
<span class="n">ui</span><span class="p">.</span><span class="n">diff-editor</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"binary"</span>
|
||||
</code></pre></div>
|
||||
<h3 id="experimental-3-pane-diff-editing">Experimental 3-pane diff editing<a class="headerlink" href="#experimental-3-pane-diff-editing" title="Permanent link">¶</a></h3>
|
||||
<p>We offer two special "3-pane" diff editor configs:</p>
|
||||
@ -3188,11 +3298,21 @@ snapshots without having to rescan the entire working copy.</p>
|
||||
<code>core.fsmonitor = "watchman"</code>. Ensure that you have <a href="https://facebook.github.io/watchman/docs/install">installed the Watchman
|
||||
executable on your system</a>.</p>
|
||||
<p>You can configure <code>jj</code> to use watchman triggers to automatically create
|
||||
snapshots on filestem changes by setting
|
||||
snapshots on filesystem changes by setting
|
||||
<code>core.watchman.register_snapshot_trigger = true</code>.</p>
|
||||
<p>You can check whether Watchman is enabled and whether it is installed correctly
|
||||
using <code>jj debug watchman status</code>.</p>
|
||||
<h2 id="snapshot-settings">Snapshot settings<a class="headerlink" href="#snapshot-settings" title="Permanent link">¶</a></h2>
|
||||
<h3 id="paths-to-automatically-track">Paths to automatically track<a class="headerlink" href="#paths-to-automatically-track" title="Permanent link">¶</a></h3>
|
||||
<p>All new files in the working copy that don't match the ignore patterns are
|
||||
tracked by default. You can set the <code>snapshot.auto-track</code> to set which paths
|
||||
get automatically tracked when they're added to the working copy. See the
|
||||
<a href="../filesets/">fileset documentation</a> for the syntax. Files with paths matching
|
||||
<a href="../working-copy/#ignored-files">ignore files</a> are never tracked automatically.</p>
|
||||
<p>You can use <code>jj file untrack</code> to untrack a file while keeping it in the working
|
||||
copy. However, first <a href="../working-copy/#ignored-files">ignore</a> them or remove them
|
||||
from the <code>snapshot.auto-track</code> patterns; otherwise they will be immediately
|
||||
tracked again.</p>
|
||||
<h3 id="maximum-size-for-new-files">Maximum size for new files<a class="headerlink" href="#maximum-size-for-new-files" title="Permanent link">¶</a></h3>
|
||||
<p>By default, as an anti-footgun measure, <code>jj</code> will refuse to add new files to the
|
||||
snapshot that are larger than a certain size; the default is 1MiB. This can be
|
||||
|
@ -1788,13 +1788,16 @@ split up. Include tests and documentation in the same commit as the code they
|
||||
test and document.</p>
|
||||
<p>The commit message should describe the changes in the commit;
|
||||
the PR description can even be empty, but feel free to include a personal
|
||||
message. We write commit messages in an affected component style and don't use
|
||||
message. We start the commit message with <code><topic>:</code> and don't use
|
||||
<a href="https://www.conventionalcommits.org/en/v1.0.0/">conventional commits</a>. This means if
|
||||
you modified a command in the CLI, use its name as the topic, e.g
|
||||
<code>next/prev: <your-modification></code> or <code>conflicts: <your-modification></code>. We don't
|
||||
currently have a specific guidelines on what to write in the topic field, but
|
||||
the reviewers will help you provide a topic if you have difficulties choosing
|
||||
it.</p>
|
||||
it. <a href="https://cbea.ms/git-commit/">How to Write a Git Commit Message</a> is a good
|
||||
guide if you're new to writing good commit messages. We are not particularly
|
||||
strict about the style, but please do explain the reason for the change unless
|
||||
it's obvious.</p>
|
||||
<p>When you address comments on a PR, don't make the changes in a commit on top (as
|
||||
is typical on GitHub). Instead, please make the changes in the appropriate
|
||||
commit. You can do that by creating a new commit on top of the initial commit
|
||||
|
@ -1768,7 +1768,7 @@
|
||||
<h2 id="objective">Objective<a class="headerlink" href="#objective" title="Permanent link">¶</a></h2>
|
||||
<p><code>jj</code> imports all remote branches to local branches by default. As described in
|
||||
<a href="https://github.com/martinvonz/jj/issues/1136">#1136</a>, this doesn't interact nicely with Git if we have multiple Git remotes
|
||||
with a number of branches. The <code>git.auto-local-branch</code> config can mitigate this
|
||||
with a number of branches. The <code>git.auto-local-bookmark</code> config can mitigate this
|
||||
problem, but we'll get locally-deleted branches instead.</p>
|
||||
<p>The goal of this plan is to implement</p>
|
||||
<ul>
|
||||
@ -1870,12 +1870,12 @@ git_refs # last imported/exported refs
|
||||
<li><code>jj op restore</code> never rolls back <code>git_refs</code>.</li>
|
||||
</ul>
|
||||
<h3 id="tracking-state">Tracking state<a class="headerlink" href="#tracking-state" title="Permanent link">¶</a></h3>
|
||||
<p>The <code>git.auto-local-branch</code> config knob is applied when importing new remote
|
||||
<p>The <code>git.auto-local-bookmark</code> config knob is applied when importing new remote
|
||||
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>
|
||||
<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">"git"</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="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">"git.auto-local-branch"</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">"git.auto-local-bookmark"</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="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>
|
||||
@ -1899,7 +1899,7 @@ branch. <code>jj branch</code> sub commands will be added to change the tracking
|
||||
<li>New <code>remotes[remote].branches</code> corresponds to
|
||||
<code>branches[].remote_targets[remote]</code>.</li>
|
||||
<li><code>state = new|tracking</code> doesn't exist in the current model. It's determined
|
||||
by <code>git.auto-local-branch</code> config.</li>
|
||||
by <code>git.auto-local-bookmark</code> config.</li>
|
||||
</ul>
|
||||
<h2 id="common-command-behaviors">Common command behaviors<a class="headerlink" href="#common-command-behaviors" title="Permanent link">¶</a></h2>
|
||||
<p>In the following sections, a merge is expressed as <code>adds - removes</code>.
|
||||
|
@ -1476,32 +1476,37 @@ various use cases.</p>
|
||||
to an intermediate commit between <code>HEAD</code> and the working copy, so workflows
|
||||
that depend on it can be modeled using proper commits instead. Jujutsu has
|
||||
excellent support for moving changes between commits. <a href="#the-index">Details</a>.</li>
|
||||
<li><strong>No need for bookmark names (but they are supported).</strong> Git lets you check out
|
||||
a commit without attaching a bookmark. It calls this state "detached HEAD". This
|
||||
is the normal state in Jujutsu (there's actually no way -- yet, at least -- to
|
||||
have an active bookmark). However, Jujutsu keeps track of all visible heads
|
||||
<li><strong>No need for branch names (but they are supported as
|
||||
<a href="../glossary/#bookmark">bookmarks</a>).</strong> Git lets you check out a commit without
|
||||
attaching a branch to it. It calls this state "detached HEAD". This is the
|
||||
normal state in Jujutsu (there's actually no way -- yet, at least -- to have
|
||||
an active branch/bookmark). However, Jujutsu keeps track of all visible heads
|
||||
(leaves) of the commit graph, so the commits won't get lost or
|
||||
garbage-collected.</li>
|
||||
<li><strong>No current bookmark.</strong> Git lets you check out a bookmark, making it the 'current
|
||||
bookmark', and new commits will automatically update the bookmark. This is
|
||||
necessary in Git because Git might otherwise lose track of the new commits.
|
||||
Jujutsu does not have a 'current bookmark'; instead, you update bookmarks
|
||||
manually. For example, if you start work on top of a commit with a bookmark,
|
||||
new commits are created on top of the bookmark, then you issue a later command
|
||||
to update the bookmark.</li>
|
||||
<li><strong>Conflicts can be committed.</strong> No commands fail because of merge conflicts.
|
||||
<li>
|
||||
<p><strong>No current branch.</strong> Git lets you check out a branch, making it the 'current
|
||||
branch', and new commits will automatically update the branch. This is
|
||||
necessary in Git because Git might otherwise lose track of the new commits.</p>
|
||||
<p>Jujutsu does not have a corresponding concept of a 'current bookmark';
|
||||
instead, you update bookmarks manually. For example, if you start work on top
|
||||
of a commit with a bookmark, new commits are created on top of the bookmark,
|
||||
then you issue a later command to update the bookmark.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p><strong>Conflicts can be committed.</strong> No commands fail because of merge conflicts.
|
||||
The conflicts are instead recorded in commits and you can resolve them later.
|
||||
<a href="../conflicts/">Details</a>.</li>
|
||||
<a href="../conflicts/">Details</a>.</p>
|
||||
</li>
|
||||
<li><strong>Descendant commits are automatically rebased.</strong> Whenever you rewrite a
|
||||
commit (e.g. by running <code>jj rebase</code>), all its descendants commits will
|
||||
automatically be rebased on top. Branches pointing to it will also get
|
||||
updated, and so will the working copy if it points to any of the rebased
|
||||
commits.</li>
|
||||
<li><strong>Branches are identified by their names (across remotes).</strong> For example, if
|
||||
you pull from a remote that has a <code>main</code> bookmark, you'll get a bookmark by that
|
||||
name in your local repo as well. If you then move it and push back to the
|
||||
remote, the <code>main</code> bookmark on the remote will be updated.
|
||||
<a href="../bookmarks/">Details</a>.</li>
|
||||
<li><strong>Bookmarks/branches are identified by their names (across remotes).</strong> For
|
||||
example, if you pull from a remote that has a <code>main</code> branch, you'll get a
|
||||
bookmark by that name in your local repo. If you then move it and push back to
|
||||
the remote, the <code>main</code> branch on the remote will be updated.
|
||||
<a href="../bookmarks/">Details</a>.</li>
|
||||
<li><strong>The operation log replaces reflogs.</strong> The operation log is similar to
|
||||
reflogs, but is much more powerful. It keeps track of atomic updates to all
|
||||
refs at once (Jujutsu thus improves on Git's per-ref history much in the same
|
||||
@ -1510,7 +1515,7 @@ various use cases.</p>
|
||||
<li><strong>There's a single, virtual root commit.</strong> Like Mercurial, Jujutsu has a
|
||||
virtual commit (with a hash consisting of only zeros) called the "root commit"
|
||||
(called the "null revision" in Mercurial). This commit is a common ancestor of
|
||||
all commits. That removes the awkward state Git calls the "unborn bookmark"
|
||||
all commits. That removes the awkward state Git calls the "unborn branch"
|
||||
state (which is the state a newly initialized Git repo is in), and related
|
||||
command-line flags (e.g. <code>git rebase --root</code>, <code>git checkout --orphan</code>).</li>
|
||||
</ul>
|
||||
@ -1557,13 +1562,17 @@ parent.</p>
|
||||
<td><code>git clone <source> <destination> [--origin <remote name>]</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Update the local repo with all bookmarks from a remote</td>
|
||||
<!-- TODO: Mention that you might need to do a `jj bookmark track branch@remote`
|
||||
-- to see the bookmark in `jj log`
|
||||
-->
|
||||
<td>Update the local repo with all bookmarks/branches from a remote</td>
|
||||
<td><code>jj git fetch [--remote <remote>]</code> (there is no
|
||||
support for fetching into non-Git repos yet)</td>
|
||||
<td><code>git fetch [<remote>]</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Update a remote repo with all bookmarks from the local repo</td>
|
||||
<!-- TODO: This only affects tracked branches now -->
|
||||
<td>Update a remote repo with all bookmarks/branches from the local repo</td>
|
||||
<td><code>jj git push --all [--remote <remote>]</code> (there is no
|
||||
support for pushing from non-Git repos yet)</td>
|
||||
<td><code>git push --all [<remote>]</code></td>
|
||||
@ -1575,6 +1584,11 @@ parent.</p>
|
||||
pushing from non-Git repos yet)</td>
|
||||
<td><code>git push <remote> <bookmark name></code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Add a remote target to the repo</td>
|
||||
<td><code>jj git remote add <remote> <url></code></td>
|
||||
<td><code>git remote add <remote> <url></code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Show summary of current work and repo status</td>
|
||||
<td><code>jj st</code></td>
|
||||
@ -1634,7 +1648,7 @@ parent.</p>
|
||||
<tr>
|
||||
<td>See log of all reachable commits</td>
|
||||
<td><code>jj log -r 'all()'</code> or <code>jj log -r ::</code></td>
|
||||
<td><code>git log --oneline --graph --decorate --bookmarks</code></td>
|
||||
<td><code>git log --oneline --graph --decorate --branches</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Show log of commits not on the main bookmark</td>
|
||||
@ -1680,8 +1694,7 @@ parent.</p>
|
||||
<tr>
|
||||
<td>Edit description (commit message) of the previous change</td>
|
||||
<td><code>jj describe @-</code></td>
|
||||
<td><code>git commit --amend</code> (first make sure that nothing is
|
||||
staged)</td>
|
||||
<td><code>git commit --amend --only</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Temporarily put away the current change</td>
|
||||
@ -1690,17 +1703,17 @@ parent.</p>
|
||||
<td><code>git stash</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Start working on a new change based on the <main> bookmark</td>
|
||||
<td>Start working on a new change based on the <main> bookmark/branch</td>
|
||||
<td><code>jj new main</code></td>
|
||||
<td><code>git switch -c topic main</code> or
|
||||
<code>git checkout -b topic main</code> (may need to stash or commit
|
||||
first)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move bookmark A onto bookmark B</td>
|
||||
<td>Move bookmark/branch A onto bookmark/branch B</td>
|
||||
<td><code>jj rebase -b A -d B</code></td>
|
||||
<td><code>git rebase B A</code>
|
||||
(may need to rebase other descendant bookmarks separately)</td>
|
||||
(may need to rebase other descendant branches separately)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move change A and its descendants onto change B</td>
|
||||
@ -1771,29 +1784,30 @@ parent.</p>
|
||||
<td><code>git rev-parse --show-toplevel</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>List bookmarks</td>
|
||||
<td><code>jj bookmark list</code></td>
|
||||
<td><code>git bookmark</code></td>
|
||||
<td>List bookmarks/branches</td>
|
||||
<td><code>jj bookmark list</code> or <code>jj b l</code> for short</td>
|
||||
<td><code>git branch</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Create a bookmark</td>
|
||||
<td>Create a bookmark/branch</td>
|
||||
<td><code>jj bookmark create <name> -r <revision></code></td>
|
||||
<td><code>git bookmark <name> <revision></code></td>
|
||||
<td><code>git branch <name> <revision></code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move a bookmark forward</td>
|
||||
<td><code>jj bookmark set <name> -r <revision></code></td>
|
||||
<td><code>git bookmark -f <name> <revision></code></td>
|
||||
<td>Move a bookmark/branch forward</td>
|
||||
<td><code>jj bookmark move <name> --to <revision></code>
|
||||
or <code>jj b m <name> --to <revision></code> for short</td>
|
||||
<td><code>git branch -f <name> <revision></code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Move a bookmark backward or sideways</td>
|
||||
<td><code>jj bookmark set <name> -r <revision> --allow-backwards</code></td>
|
||||
<td><code>git bookmark -f <name> <revision></code></td>
|
||||
<td>Move a bookmark/branch backward or sideways</td>
|
||||
<td><code>jj bookmark move <name> --to <revision> --allow-backwards</code></td>
|
||||
<td><code>git branch -f <name> <revision></code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Delete a bookmark</td>
|
||||
<td>Delete a bookmark/branch</td>
|
||||
<td><code>jj bookmark delete <name> </code></td>
|
||||
<td><code>git bookmark --delete <name></code></td>
|
||||
<td><code>git branch --delete <name></code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>See log of operations performed on the repo</td>
|
||||
|
@ -1597,8 +1597,9 @@ a comparison with Git, including how workflows are different, see the
|
||||
not be lost either.</li>
|
||||
<li><strong>Partial clones: No.</strong> We use the <a href="https://libgit2.org/">libgit2</a> library,
|
||||
which <a href="https://github.com/libgit2/libgit2/issues/5564">doesn't have support for partial clones</a>.</li>
|
||||
<li><strong>Shallow clones: No.</strong> We use the <a href="https://libgit2.org/">libgit2</a> library,
|
||||
which <a href="https://github.com/libgit2/libgit2/issues/3058">doesn't have support for shallow clones</a>.</li>
|
||||
<li><strong>Shallow clones: Kind of.</strong> Shallow commits all have the virtual root commit as
|
||||
their parent. However, deepening or fully unshallowing a repository is currently not yet
|
||||
supported and will cause issues.</li>
|
||||
<li><strong>git-worktree: No.</strong> However, there's native support for multiple working
|
||||
copies backed by a single repo. See the <code>jj workspace</code> family of commands.</li>
|
||||
<li><strong>Sparse checkouts: No.</strong> However, there's native support for sparse
|
||||
|
@ -660,6 +660,15 @@
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#branch" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
Branch
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
@ -1638,6 +1647,15 @@
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#branch" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
Branch
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
@ -1873,11 +1891,11 @@
|
||||
|
||||
<h1 id="glossary">Glossary<a class="headerlink" href="#glossary" title="Permanent link">¶</a></h1>
|
||||
<h2 id="anonymous-branch">Anonymous branch<a class="headerlink" href="#anonymous-branch" title="Permanent link">¶</a></h2>
|
||||
<p>An anonymous branch is a chain of commits that doesn't have any
|
||||
<a href="#bookmark">named bookmarks</a> pointing to it or to any of its descendants. Unlike
|
||||
Git, 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 stores a list of <a href="#head">heads</a> of such branches.</p>
|
||||
<p>An anonymous branch is a chain of commits that doesn't necessarily have any
|
||||
<a href="#bookmark">bookmarks</a> pointing to it or to any of its descendants. Unlike Git,
|
||||
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
|
||||
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">¶</a></h2>
|
||||
<p>A backend is an implementation of the storage layer. There are currently two
|
||||
builtin commit backends: the Git backend and the native backend. The Git backend
|
||||
@ -1888,12 +1906,21 @@ wanted to use jj with a humongous monorepo (as Google does).</p>
|
||||
such as the "operation store backend" for storing
|
||||
<a href="#operation-log">the operation log</a>.</p>
|
||||
<h2 id="bookmark">Bookmark<a class="headerlink" href="#bookmark" title="Permanent link">¶</a></h2>
|
||||
<p>A bookmark is a named pointer to a <a href="#commit">commit</a>. They automatically follow
|
||||
the commit if it gets <a href="#rewrite">rewritten</a>. Bookmarks are sometimes called
|
||||
"named branches" to distinguish them from <a href="#anonymous-branch">anonymous branches</a>.
|
||||
They are similar to Git's branches and even more similar to
|
||||
<a href="https://wiki.mercurial-scm.org/Bookmarks">Mercurial's bookmarks</a>. See
|
||||
<a href="../bookmarks/">here</a> for details.</p>
|
||||
<p>A bookmark is a named pointer to a <a href="#commit">commit</a>. They are similar to Git's
|
||||
<a href="#branch">branches</a> and even more similar to <a href="https://wiki.mercurial-scm.org/Bookmarks">Mercurial's
|
||||
bookmarks</a>. See <a href="../bookmarks/">here</a>
|
||||
for details.</p>
|
||||
<p>Unlike in Git, there is no concept of a "current bookmark"; bookmarks <em>do not</em>
|
||||
move when you create a new commit. Bookmarks <em>do</em> automatically follow the
|
||||
commit if it gets <a href="#rewrite">rewritten</a>. </p>
|
||||
<h2 id="branch">Branch<a class="headerlink" href="#branch" title="Permanent link">¶</a></h2>
|
||||
<p>In the context of <code>jj</code>, the work "branch" usually refers to an <a href="#anonymous-branch">anonymous
|
||||
branch</a> or, less formally, a branch of the commit "tree"
|
||||
(which is itself an informal way to refer to the commit graph, parts of which
|
||||
might resemble a tree even when it's not mathematically a tree).</p>
|
||||
<p>We also sometimes discuss Git's branches and branches on Git remotes. Locally,
|
||||
these correspond to <a href="#bookmark">bookmarks</a>. In a co-located repository, each
|
||||
local Git branch corresponds to a <code>jj</code> bookmark.</p>
|
||||
<h2 id="change">Change<a class="headerlink" href="#change" title="Permanent link">¶</a></h2>
|
||||
<p>A change is a commit as it <a href="#rewrite">evolves over time</a>.</p>
|
||||
<h2 id="change-id">Change ID<a class="headerlink" href="#change-id" title="Permanent link">¶</a></h2>
|
||||
|
@ -1859,8 +1859,9 @@ cargo<span class="w"> </span>binstall<span class="w"> </span>--strategies<span c
|
||||
be compiled from the same source code.</p>
|
||||
<h3 id="linux">Linux<a class="headerlink" href="#linux" title="Permanent link">¶</a></h3>
|
||||
<h4 id="from-source">From Source<a class="headerlink" href="#from-source" title="Permanent link">¶</a></h4>
|
||||
<p>First make sure that you have the <code>libssl-dev</code>, <code>openssl</code>, <code>pkg-config</code>, and
|
||||
<code>build-essential</code> packages installed by running something like this:</p>
|
||||
<p>First make sure that you have a Rust version >= 1.76 and that the <code>libssl-dev</code>,
|
||||
<code>openssl</code>, <code>pkg-config</code>, and <code>build-essential</code> packages are installed by running
|
||||
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
|
||||
</code></pre></div>
|
||||
<p>Now run either:</p>
|
||||
@ -1903,7 +1904,7 @@ Details on how to enable the GURU repository can be found <a href="https://wiki.
|
||||
</code></pre></div>
|
||||
<h3 id="mac">Mac<a class="headerlink" href="#mac" title="Permanent link">¶</a></h3>
|
||||
<h4 id="from-source-vendored-openssl">From Source, Vendored OpenSSL<a class="headerlink" href="#from-source-vendored-openssl" title="Permanent link">¶</a></h4>
|
||||
<p>You may need to run:</p>
|
||||
<p>First make sure that you have a Rust version >= 1.76. You may also need to run:</p>
|
||||
<div class="highlight"><pre><span></span><code>xcode-select<span class="w"> </span>--install
|
||||
</code></pre></div>
|
||||
<p>Now run either:</p>
|
||||
@ -1913,11 +1914,12 @@ cargo<span class="w"> </span>install<span class="w"> </span>--git<span class="w"
|
||||
</code></pre></div>
|
||||
<p>or:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="c1"># To install the latest release</span>
|
||||
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>
|
||||
<h4 id="from-source-homebrew-openssl">From Source, Homebrew OpenSSL<a class="headerlink" href="#from-source-homebrew-openssl" title="Permanent link">¶</a></h4>
|
||||
<p>You will need <a href="https://brew.sh/">Homebrew</a> installed. You may then need to run
|
||||
some or all of these:</p>
|
||||
<p>First make sure that you have a Rust version >= 1.76. You will also need
|
||||
<a href="https://brew.sh/">Homebrew</a> installed. You may then need to run some or all of
|
||||
these:</p>
|
||||
<div class="highlight"><pre><span></span><code>xcode-select<span class="w"> </span>--install
|
||||
brew<span class="w"> </span>install<span class="w"> </span>openssl
|
||||
brew<span class="w"> </span>install<span class="w"> </span>pkg-config
|
||||
@ -1943,7 +1945,7 @@ port</a>:</p>
|
||||
sudo<span class="w"> </span>port<span class="w"> </span>install<span class="w"> </span>jujutsu
|
||||
</code></pre></div>
|
||||
<h3 id="windows">Windows<a class="headerlink" href="#windows" title="Permanent link">¶</a></h3>
|
||||
<p>Run either:</p>
|
||||
<p>First make sure that you have a Rust version >= 1.76. Now run either:</p>
|
||||
<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/martinvonz/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>
|
||||
|
@ -1653,6 +1653,9 @@ only symbols.</p>
|
||||
<p>(listed in order of binding strengths)</p>
|
||||
<p>You can use parentheses to control evaluation order, such as <code>(x & y) | z</code> or
|
||||
<code>x & (y | z)</code>.</p>
|
||||
<!-- The following format will be understood by the web site generator, and will
|
||||
generate a folded section that can be unfolded at will. -->
|
||||
|
||||
<details class="examples">
|
||||
<summary>Examples</summary>
|
||||
<p>Given this history:
|
||||
@ -1817,8 +1820,7 @@ aren't included in <code>remote_bookmarks()</code>.</p>
|
||||
is in a conflicted state, all its possible targets are included.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p><code>git_head()</code>: The Git <code>HEAD</code> target as of the last import. Equivalent to
|
||||
<code>present(HEAD@git)</code>.</p>
|
||||
<p><code>git_head()</code>: The Git <code>HEAD</code> target as of the last import.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p><code>visible_heads()</code>: All visible heads (same as <code>heads(all())</code>).</p>
|
||||
@ -1878,10 +1880,10 @@ given <a href="#string-patterns">string pattern</a>.</p>
|
||||
expression</a>.</p>
|
||||
<p>Paths are relative to the directory <code>jj</code> was invoked from. A directory name
|
||||
will match all files in that directory and its subdirectories.</p>
|
||||
<p>For example, <code>file(foo)</code> will match files <code>foo</code>, <code>foo/bar</code>, <code>foo/bar/baz</code>.
|
||||
<p>For example, <code>files(foo)</code> will match files <code>foo</code>, <code>foo/bar</code>, <code>foo/bar/baz</code>.
|
||||
It will <em>not</em> match <code>foobar</code> or <code>bar/foo</code>.</p>
|
||||
<p>Some file patterns might need quoting because the <code>expression</code> must also be
|
||||
parsable as a revset. For example, <code>.</code> has to be quoted in <code>file(".")</code>.</p>
|
||||
parsable as a revset. For example, <code>.</code> has to be quoted in <code>files(".")</code>.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p><code>diff_contains(text[, files])</code>: Commits containing diffs matching the given
|
||||
@ -1900,8 +1902,18 @@ is added to or removed from files under "src".</p>
|
||||
in <code>x</code> doesn't exist (e.g. is an unknown bookmark name.)</p>
|
||||
</li>
|
||||
<li>
|
||||
<p><code>coalesce(revsets...)</code>: Commits in the first revset in the list of <code>revsets</code>
|
||||
which does not evaluate to <code>none()</code>. If all revsets evaluate to <code>none()</code>, then
|
||||
the result of <code>coalesce</code> will also be <code>none()</code>.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p><code>working_copies()</code>: The working copy commits across all the workspaces.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p><code>at_operation(op, x)</code>: Evaluates <code>x</code> at the specified <a href="../glossary/#operation">operation</a>. For
|
||||
example, <code>at_operation(@-, visible_heads())</code> will return all heads which were
|
||||
visible at the previous operation.</p>
|
||||
</li>
|
||||
</ul>
|
||||
<details class="examples">
|
||||
<summary>Examples</summary>
|
||||
@ -2013,16 +2025,16 @@ always resolves to exactly one commit. For example:</p>
|
||||
</code></pre></div>
|
||||
</li>
|
||||
<li>
|
||||
<p><code>builtin_immutable_heads()</code>: Resolves to <code>trunk() | tags() | untracked_remote_bookmarks()</code>.
|
||||
It is used as the default definition for <code>immutable_heads()</code> below. it is not
|
||||
recommended to redefined this alias. Prefer to redefine <code>immutable_heads()</code>
|
||||
instead.</p>
|
||||
<p><code>builtin_immutable_heads()</code>: Resolves to
|
||||
<code>present(trunk()) | tags() | untracked_remote_bookmarks()</code>. It is used as the
|
||||
default definition for <code>immutable_heads()</code> below. it is not recommended to
|
||||
redefined this alias. Prefer to redefine <code>immutable_heads()</code> instead.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p><code>immutable_heads()</code>: Resolves to <code>trunk() | tags() | untracked_remote_bookmarks()</code>
|
||||
by default. It is actually defined as <code>builtin_immutable_heads()</code>, and can be
|
||||
overridden as required. See <a href="../config/#set-of-immutable-commits">here</a> for
|
||||
details.</p>
|
||||
<p><code>immutable_heads()</code>: Resolves to
|
||||
<code>present(trunk()) | tags() | untracked_remote_bookmarks()</code> by default. It is
|
||||
actually defined as <code>builtin_immutable_heads()</code>, and can be overridden as
|
||||
required. See <a href="../config/#set-of-immutable-commits">here</a> for details.</p>
|
||||
</li>
|
||||
<li>
|
||||
<p><code>immutable()</code>: The set of commits that <code>jj</code> treats as immutable. This is
|
||||
|
File diff suppressed because one or more lines are too long
@ -2,150 +2,150 @@
|
||||
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/FAQ/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/bookmarks/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/cli-reference/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/code-of-conduct/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/community_tools/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/config/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/conflicts/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/contributing/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design_doc_blueprint/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design_docs/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/filesets/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/git-comparison/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/git-compatibility/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/github/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/glossary/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/install-and-setup/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/operation-log/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/related-work/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/revsets/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/roadmap/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/sapling-comparison/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/templates/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/testimonials/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/tutorial/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/windows/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/working-copy/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/copy-tracking/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/git-submodule-storage/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/git-submodules/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/run/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/sparse-v2/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/tracking-branches/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/governance/temporary-voting/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/technical/architecture/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/technical/concurrency/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/technical/conflicts/</loc>
|
||||
<lastmod>2024-10-02</lastmod>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
</urlset>
|
Binary file not shown.
@ -1942,8 +1942,23 @@ type</a> are available as keywords. For example,
|
||||
the given <code>width</code>.</li>
|
||||
<li><code>indent(prefix: Template, content: Template) -> Template</code>: Indent
|
||||
non-empty lines by the given <code>prefix</code>.</li>
|
||||
<li><code>pad_start(width: Integer, content: Template[, fill_char: Template])</code>: Pad (or
|
||||
right-justify) content by adding leading fill characters. The <code>content</code>
|
||||
shouldn't have newline character.</li>
|
||||
<li><code>pad_end(width: Integer, content: Template[, fill_char: Template])</code>: Pad (or
|
||||
left-justify) content by adding trailing fill characters. The <code>content</code>
|
||||
shouldn't have newline character.</li>
|
||||
<li><code>truncate_start(width: Integer, content: Template)</code>: Truncate <code>content</code> by
|
||||
removing leading characters. The <code>content</code> shouldn't have newline character.</li>
|
||||
<li><code>truncate_end(width: Integer, content: Template)</code>: Truncate <code>content</code> by
|
||||
removing trailing characters. The <code>content</code> shouldn't have newline character.</li>
|
||||
<li><code>label(label: Template, content: Template) -> Template</code>: Apply label to
|
||||
the content. The <code>label</code> is evaluated as a space-separated string.</li>
|
||||
<li><code>raw_escape_sequence(content: Template) -> Template</code>: Preserves any escape
|
||||
sequences in <code>content</code> (i.e., bypasses sanitization) and strips labels.
|
||||
Note: This function is intended for escape sequences and as such, it's output
|
||||
is expected to be invisible / of no display width. Outputting content with
|
||||
nonzero display width may break wrapping, indentation etc.</li>
|
||||
<li><code>if(condition: Boolean, then: Template[, else: Template]) -> Template</code>:
|
||||
Conditionally evaluate <code>then</code>/<code>else</code> template content.</li>
|
||||
<li><code>coalesce(content: Template...) -> Template</code>: Returns the first <strong>non-empty</strong>
|
||||
@ -1980,7 +1995,7 @@ type</a> are available as keywords. For example,
|
||||
<li><code>remote_bookmarks() -> List<RefName></code>: All remote bookmarks pointing to the commit.</li>
|
||||
<li><code>tags() -> List<RefName></code></li>
|
||||
<li><code>git_refs() -> List<RefName></code></li>
|
||||
<li><code>git_head() -> Option<RefName></code></li>
|
||||
<li><code>git_head() -> Boolean</code>: True for the Git <code>HEAD</code> commit.</li>
|
||||
<li><code>divergent() -> Boolean</code>: True if the commit's change id corresponds to multiple
|
||||
visible commits.</li>
|
||||
<li><code>hidden() -> Boolean</code>: True if the commit is not visible (a.k.a. abandoned).</li>
|
||||
@ -2115,6 +2130,8 @@ A double-quoted string literal supports the following escape sequences:</p>
|
||||
<li><code>\r</code>: carriage return</li>
|
||||
<li><code>\n</code>: new line</li>
|
||||
<li><code>\0</code>: null</li>
|
||||
<li><code>\e</code>: escape (i.e., <code>\x1b</code>)</li>
|
||||
<li><code>\xHH</code>: byte with hex value <code>HH</code></li>
|
||||
</ul>
|
||||
<p>Other escape sequences are not supported. Any UTF-8 characters are allowed
|
||||
inside a string literal, with two exceptions: unescaped <code>"</code>-s and uses of <code>\</code>
|
||||
@ -2131,6 +2148,8 @@ inside a single-quoted string literal.</p>
|
||||
format string</a>.</li>
|
||||
<li><code>.utc() -> Timestamp</code>: Convert timestamp into UTC timezone.</li>
|
||||
<li><code>.local() -> Timestamp</code>: Convert timestamp into local timezone.</li>
|
||||
<li><code>.after(date: String) -> Boolean</code>: True if the timestamp is exactly at or after the given date.</li>
|
||||
<li><code>.before(date: String) -> Boolean</code>: True if the timestamp is before, but not including, the given date.</li>
|
||||
</ul>
|
||||
<h3 id="timestamprange-type">TimestampRange type<a class="headerlink" href="#timestamprange-type" title="Permanent link">¶</a></h3>
|
||||
<p>The following methods are defined.</p>
|
||||
|
@ -585,21 +585,15 @@
|
||||
</span>
|
||||
</a>
|
||||
|
||||
<nav class="md-nav" aria-label="Workspaces">
|
||||
<ul class="md-nav__list">
|
||||
|
||||
<li class="md-nav__item">
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#stale-working-copy" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
Stale working copy
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
@ -1455,21 +1449,15 @@
|
||||
</span>
|
||||
</a>
|
||||
|
||||
<nav class="md-nav" aria-label="Workspaces">
|
||||
<ul class="md-nav__list">
|
||||
|
||||
<li class="md-nav__item">
|
||||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#stale-working-copy" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
Stale working copy
|
||||
</span>
|
||||
</a>
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
@ -1503,7 +1491,7 @@ working copy, it will implicitly be untracked.</p>
|
||||
<p>The <code>snapshot.auto-track</code> config option controls which paths get automatically
|
||||
tracked when they're added to the working copy. See the
|
||||
<a href="../filesets/">fileset documentation</a> for the syntax. Files with paths matching
|
||||
<a href="#ignored-files">ignore files</a> are never tracked automatically</p>
|
||||
<a href="#ignored-files">ignore files</a> are never tracked automatically.</p>
|
||||
<p>You can use <code>jj file untrack</code> to untrack a file while keeping it in the working
|
||||
copy. However, first <a href="#ignored-files">ignore</a> them or remove them from the
|
||||
<code>snapshot.auto-track</code> patterns; otherwise they will be immediately tracked again.</p>
|
||||
@ -1558,12 +1546,29 @@ while you continue developing in another, for example. If needed,
|
||||
<p>When you're done using a workspace, use <code>jj workspace forget</code> to make the repo
|
||||
forget about it. The files can be deleted from disk separately (either before or
|
||||
after).</p>
|
||||
<h3 id="stale-working-copy">Stale working copy<a class="headerlink" href="#stale-working-copy" title="Permanent link">¶</a></h3>
|
||||
<p>When you modify workspace A's working-copy commit from workspace B, workspace
|
||||
A's working copy will become stale. By "stale", we mean that the files in the
|
||||
working copy don't match the desired commit indicated by the <code>@</code> symbol in
|
||||
<code>jj log</code>. When that happens, use <code>jj workspace update-stale</code> to update the files
|
||||
in the working copy.</p>
|
||||
<h2 id="stale-working-copy">Stale working copy<a class="headerlink" href="#stale-working-copy" title="Permanent link">¶</a></h2>
|
||||
<p>Almost all commands go through three main steps:</p>
|
||||
<ol>
|
||||
<li>Snapshot the working copy (which gets recorded as an operation)</li>
|
||||
<li>Create new commits etc. "in memory" and record that as a new operation</li>
|
||||
<li>Update the working copy to match the new operation, i.e. to the commit that
|
||||
the operation says that <code>@</code> should point to</li>
|
||||
</ol>
|
||||
<p>If step 3 doesn't happen for some reason, the working copy is considered
|
||||
"stale". We can detect that because the working copy (<code>.jj/working_copy/</code>)
|
||||
keeps track of which operation it was last updated to. When the working copy is
|
||||
stale, use <code>jj workspace update-stale</code> to update the files in the working copy.</p>
|
||||
<p>A common reason that step 3 doesn't happen for a working copy is that you
|
||||
rewrote the commit from another workspace. When you modify workspace A's
|
||||
working-copy commit from workspace B, workspace A's working copy will become
|
||||
stale.</p>
|
||||
<p>A working copy can also become stale because some error, such as <code>^C</code> prevented
|
||||
step 3 from completing. It's also possible that it was successfully updated in
|
||||
step 3 but the operation has then been lost (e.g. by <code>jj op abandon</code> or
|
||||
"spontaneously" by certain storage backends). If the operation has been lost,
|
||||
then <code>jj workspace update-stale</code> will create a recovery commit with the
|
||||
contents of the working copy but parented to the current operation's
|
||||
working-copy commit.</p>
|
||||
|
||||
|
||||
|
||||
|
1364
v0.23.0/404.html
Normal file
1364
v0.23.0/404.html
Normal file
File diff suppressed because it is too large
Load Diff
2000
v0.23.0/FAQ/index.html
Normal file
2000
v0.23.0/FAQ/index.html
Normal file
File diff suppressed because it is too large
Load Diff
BIN
v0.23.0/assets/images/favicon.png
Normal file
BIN
v0.23.0/assets/images/favicon.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.8 KiB |
16
v0.23.0/assets/javascripts/bundle.525ec568.min.js
vendored
Normal file
16
v0.23.0/assets/javascripts/bundle.525ec568.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
7
v0.23.0/assets/javascripts/bundle.525ec568.min.js.map
Normal file
7
v0.23.0/assets/javascripts/bundle.525ec568.min.js.map
Normal file
File diff suppressed because one or more lines are too long
1
v0.23.0/assets/javascripts/lunr/min/lunr.ar.min.js
vendored
Normal file
1
v0.23.0/assets/javascripts/lunr/min/lunr.ar.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
18
v0.23.0/assets/javascripts/lunr/min/lunr.da.min.js
vendored
Normal file
18
v0.23.0/assets/javascripts/lunr/min/lunr.da.min.js
vendored
Normal 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-stA-Za-z",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.23.0/assets/javascripts/lunr/min/lunr.de.min.js
vendored
Normal file
18
v0.23.0/assets/javascripts/lunr/min/lunr.de.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
18
v0.23.0/assets/javascripts/lunr/min/lunr.du.min.js
vendored
Normal file
18
v0.23.0/assets/javascripts/lunr/min/lunr.du.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
v0.23.0/assets/javascripts/lunr/min/lunr.el.min.js
vendored
Normal file
1
v0.23.0/assets/javascripts/lunr/min/lunr.el.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
18
v0.23.0/assets/javascripts/lunr/min/lunr.es.min.js
vendored
Normal file
18
v0.23.0/assets/javascripts/lunr/min/lunr.es.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
18
v0.23.0/assets/javascripts/lunr/min/lunr.fi.min.js
vendored
Normal file
18
v0.23.0/assets/javascripts/lunr/min/lunr.fi.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
18
v0.23.0/assets/javascripts/lunr/min/lunr.fr.min.js
vendored
Normal file
18
v0.23.0/assets/javascripts/lunr/min/lunr.fr.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
v0.23.0/assets/javascripts/lunr/min/lunr.he.min.js
vendored
Normal file
1
v0.23.0/assets/javascripts/lunr/min/lunr.he.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
v0.23.0/assets/javascripts/lunr/min/lunr.hi.min.js
vendored
Normal file
1
v0.23.0/assets/javascripts/lunr/min/lunr.hi.min.js
vendored
Normal 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-Za-zA-Z0-90-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.23.0/assets/javascripts/lunr/min/lunr.hu.min.js
vendored
Normal file
18
v0.23.0/assets/javascripts/lunr/min/lunr.hu.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
v0.23.0/assets/javascripts/lunr/min/lunr.hy.min.js
vendored
Normal file
1
v0.23.0/assets/javascripts/lunr/min/lunr.hy.min.js
vendored
Normal 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.23.0/assets/javascripts/lunr/min/lunr.it.min.js
vendored
Normal file
18
v0.23.0/assets/javascripts/lunr/min/lunr.it.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
v0.23.0/assets/javascripts/lunr/min/lunr.ja.min.js
vendored
Normal file
1
v0.23.0/assets/javascripts/lunr/min/lunr.ja.min.js
vendored
Normal 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-Za-zA-Z0-90-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.23.0/assets/javascripts/lunr/min/lunr.jp.min.js
vendored
Normal file
1
v0.23.0/assets/javascripts/lunr/min/lunr.jp.min.js
vendored
Normal file
@ -0,0 +1 @@
|
||||
module.exports=require("./lunr.ja");
|
1
v0.23.0/assets/javascripts/lunr/min/lunr.kn.min.js
vendored
Normal file
1
v0.23.0/assets/javascripts/lunr/min/lunr.kn.min.js
vendored
Normal 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.23.0/assets/javascripts/lunr/min/lunr.ko.min.js
vendored
Normal file
1
v0.23.0/assets/javascripts/lunr/min/lunr.ko.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
v0.23.0/assets/javascripts/lunr/min/lunr.multi.min.js
vendored
Normal file
1
v0.23.0/assets/javascripts/lunr/min/lunr.multi.min.js
vendored
Normal 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.23.0/assets/javascripts/lunr/min/lunr.nl.min.js
vendored
Normal file
18
v0.23.0/assets/javascripts/lunr/min/lunr.nl.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
18
v0.23.0/assets/javascripts/lunr/min/lunr.no.min.js
vendored
Normal file
18
v0.23.0/assets/javascripts/lunr/min/lunr.no.min.js
vendored
Normal 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-stA-Za-z",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.23.0/assets/javascripts/lunr/min/lunr.pt.min.js
vendored
Normal file
18
v0.23.0/assets/javascripts/lunr/min/lunr.pt.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
18
v0.23.0/assets/javascripts/lunr/min/lunr.ro.min.js
vendored
Normal file
18
v0.23.0/assets/javascripts/lunr/min/lunr.ro.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
18
v0.23.0/assets/javascripts/lunr/min/lunr.ru.min.js
vendored
Normal file
18
v0.23.0/assets/javascripts/lunr/min/lunr.ru.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
v0.23.0/assets/javascripts/lunr/min/lunr.sa.min.js
vendored
Normal file
1
v0.23.0/assets/javascripts/lunr/min/lunr.sa.min.js
vendored
Normal 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.23.0/assets/javascripts/lunr/min/lunr.stemmer.support.min.js
vendored
Normal file
1
v0.23.0/assets/javascripts/lunr/min/lunr.stemmer.support.min.js
vendored
Normal 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.23.0/assets/javascripts/lunr/min/lunr.sv.min.js
vendored
Normal file
18
v0.23.0/assets/javascripts/lunr/min/lunr.sv.min.js
vendored
Normal 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-stA-Za-z",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.23.0/assets/javascripts/lunr/min/lunr.ta.min.js
vendored
Normal file
1
v0.23.0/assets/javascripts/lunr/min/lunr.ta.min.js
vendored
Normal 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-Za-zA-Z0-90-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.23.0/assets/javascripts/lunr/min/lunr.te.min.js
vendored
Normal file
1
v0.23.0/assets/javascripts/lunr/min/lunr.te.min.js
vendored
Normal 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.23.0/assets/javascripts/lunr/min/lunr.th.min.js
vendored
Normal file
1
v0.23.0/assets/javascripts/lunr/min/lunr.th.min.js
vendored
Normal 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.23.0/assets/javascripts/lunr/min/lunr.tr.min.js
vendored
Normal file
18
v0.23.0/assets/javascripts/lunr/min/lunr.tr.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
v0.23.0/assets/javascripts/lunr/min/lunr.vi.min.js
vendored
Normal file
1
v0.23.0/assets/javascripts/lunr/min/lunr.vi.min.js
vendored
Normal 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.23.0/assets/javascripts/lunr/min/lunr.zh.min.js
vendored
Normal file
1
v0.23.0/assets/javascripts/lunr/min/lunr.zh.min.js
vendored
Normal 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.23.0/assets/javascripts/lunr/tinyseg.js
Normal file
206
v0.23.0/assets/javascripts/lunr/tinyseg.js
Normal 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-Za-zA-Z]":"A",
|
||||
"[0-90-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,"B1あ":1404,"B1同":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,"11":-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,"1":-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,"1":-514,"E2":-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,"1":-270,"E1":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.23.0/assets/javascripts/lunr/wordcut.js
Normal file
6708
v0.23.0/assets/javascripts/lunr/wordcut.js
Normal file
File diff suppressed because one or more lines are too long
42
v0.23.0/assets/javascripts/workers/search.6ce7567c.min.js
vendored
Normal file
42
v0.23.0/assets/javascripts/workers/search.6ce7567c.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
v0.23.0/assets/stylesheets/main.8c3ca2c6.min.css
vendored
Normal file
1
v0.23.0/assets/stylesheets/main.8c3ca2c6.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
1
v0.23.0/assets/stylesheets/main.8c3ca2c6.min.css.map
Normal file
1
v0.23.0/assets/stylesheets/main.8c3ca2c6.min.css.map
Normal file
File diff suppressed because one or more lines are too long
1
v0.23.0/assets/stylesheets/palette.06af60db.min.css
vendored
Normal file
1
v0.23.0/assets/stylesheets/palette.06af60db.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
1
v0.23.0/assets/stylesheets/palette.06af60db.min.css.map
Normal file
1
v0.23.0/assets/stylesheets/palette.06af60db.min.css.map
Normal 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"}
|
1870
v0.23.0/bookmarks/index.html
Normal file
1870
v0.23.0/bookmarks/index.html
Normal file
File diff suppressed because it is too large
Load Diff
15
v0.23.0/branches/index.html
Normal file
15
v0.23.0/branches/index.html
Normal file
@ -0,0 +1,15 @@
|
||||
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Redirecting...</title>
|
||||
<link rel="canonical" href="../bookmarks/">
|
||||
<meta name="robots" content="noindex">
|
||||
<script>var anchor=window.location.hash.substr(1);location.href="../bookmarks/"+(anchor?"#"+anchor:"")</script>
|
||||
<meta http-equiv="refresh" content="0; url=../bookmarks/">
|
||||
</head>
|
||||
<body>
|
||||
Redirecting...
|
||||
</body>
|
||||
</html>
|
8079
v0.23.0/cli-reference/index.html
Normal file
8079
v0.23.0/cli-reference/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1747
v0.23.0/code-of-conduct/index.html
Normal file
1747
v0.23.0/code-of-conduct/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1618
v0.23.0/community_tools/index.html
Normal file
1618
v0.23.0/community_tools/index.html
Normal file
File diff suppressed because it is too large
Load Diff
33
v0.23.0/config.toml
Normal file
33
v0.23.0/config.toml
Normal file
@ -0,0 +1,33 @@
|
||||
# Basic template of config settings
|
||||
|
||||
# Don't forget to change these to your own details!
|
||||
user.name = "YOUR NAME"
|
||||
user.email = "YOUR_EMAIL@example.com"
|
||||
|
||||
ui.color = "auto" # the default
|
||||
# ui.color = never # no color
|
||||
|
||||
ui.editor = "pico" # the default on Unix
|
||||
# ui.editor = "vim"
|
||||
|
||||
ui.diff-editor = ":builtin" # default, internal TUI tool
|
||||
# ui.diff-editor = "meld"
|
||||
# ui.diff-editor = "vimdiff"
|
||||
|
||||
ui.merge-editor = "meld" # default
|
||||
# ui.merge-editor = "vscode"
|
||||
# ui.merge-editor = "vimdiff"
|
||||
# ui.merge-editor = "kdiff3"
|
||||
|
||||
# Relative timestamp rendered as "x days/hours/seconds ago"
|
||||
template-aliases.'format_timestamp(timestamp)' = 'timestamp.ago()'
|
||||
|
||||
# The four merge tools listed above are pre-configured. For detailed information
|
||||
# about how to change the default configuration or how to configure another tool,
|
||||
# see documentation in config.md. An example:
|
||||
|
||||
# merge-tools.meld.program = "C:\\Program Files\\Meld\\meld.exe" # If not in PATH
|
||||
|
||||
# Change the default push/fetch remote for `jj git push` and `jj git fetch`
|
||||
# git.fetch = "upstream"
|
||||
# git.push = "myfork"
|
3439
v0.23.0/config/index.html
Normal file
3439
v0.23.0/config/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1588
v0.23.0/conflicts/index.html
Normal file
1588
v0.23.0/conflicts/index.html
Normal file
File diff suppressed because it is too large
Load Diff
2137
v0.23.0/contributing/index.html
Normal file
2137
v0.23.0/contributing/index.html
Normal file
File diff suppressed because it is too large
Load Diff
2057
v0.23.0/design/copy-tracking/index.html
Normal file
2057
v0.23.0/design/copy-tracking/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1838
v0.23.0/design/git-submodule-storage/index.html
Normal file
1838
v0.23.0/design/git-submodule-storage/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1961
v0.23.0/design/git-submodules/index.html
Normal file
1961
v0.23.0/design/git-submodules/index.html
Normal file
File diff suppressed because it is too large
Load Diff
2022
v0.23.0/design/run/index.html
Normal file
2022
v0.23.0/design/run/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1964
v0.23.0/design/sparse-v2/index.html
Normal file
1964
v0.23.0/design/sparse-v2/index.html
Normal file
File diff suppressed because it is too large
Load Diff
2277
v0.23.0/design/tracking-branches/index.html
Normal file
2277
v0.23.0/design/tracking-branches/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1671
v0.23.0/design_doc_blueprint/index.html
Normal file
1671
v0.23.0/design_doc_blueprint/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1497
v0.23.0/design_docs/index.html
Normal file
1497
v0.23.0/design_docs/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1575
v0.23.0/filesets/index.html
Normal file
1575
v0.23.0/filesets/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1885
v0.23.0/git-comparison/index.html
Normal file
1885
v0.23.0/git-comparison/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1789
v0.23.0/git-compatibility/index.html
Normal file
1789
v0.23.0/git-compatibility/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1942
v0.23.0/github/index.html
Normal file
1942
v0.23.0/github/index.html
Normal file
File diff suppressed because it is too large
Load Diff
2119
v0.23.0/glossary/index.html
Normal file
2119
v0.23.0/glossary/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1755
v0.23.0/governance/temporary-voting/index.html
Normal file
1755
v0.23.0/governance/temporary-voting/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1496
v0.23.0/index.html
Normal file
1496
v0.23.0/index.html
Normal file
File diff suppressed because it is too large
Load Diff
2036
v0.23.0/install-and-setup/index.html
Normal file
2036
v0.23.0/install-and-setup/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1548
v0.23.0/operation-log/index.html
Normal file
1548
v0.23.0/operation-log/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1428
v0.23.0/related-work/index.html
Normal file
1428
v0.23.0/related-work/index.html
Normal file
File diff suppressed because it is too large
Load Diff
2156
v0.23.0/revsets/index.html
Normal file
2156
v0.23.0/revsets/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1647
v0.23.0/roadmap/index.html
Normal file
1647
v0.23.0/roadmap/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1559
v0.23.0/sapling-comparison/index.html
Normal file
1559
v0.23.0/sapling-comparison/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1
v0.23.0/search/search_index.json
Normal file
1
v0.23.0/search/search_index.json
Normal file
File diff suppressed because one or more lines are too long
151
v0.23.0/sitemap.xml
Normal file
151
v0.23.0/sitemap.xml
Normal file
@ -0,0 +1,151 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/FAQ/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/bookmarks/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/cli-reference/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/code-of-conduct/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/community_tools/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/config/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/conflicts/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/contributing/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design_doc_blueprint/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design_docs/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/filesets/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/git-comparison/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/git-compatibility/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/github/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/glossary/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/install-and-setup/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/operation-log/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/related-work/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/revsets/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/roadmap/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/sapling-comparison/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/templates/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/testimonials/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/tutorial/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/windows/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/working-copy/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/copy-tracking/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/git-submodule-storage/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/git-submodules/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/run/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/sparse-v2/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/design/tracking-branches/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/governance/temporary-voting/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/technical/architecture/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/technical/concurrency/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/latest/technical/conflicts/</loc>
|
||||
<lastmod>2024-11-07</lastmod>
|
||||
</url>
|
||||
</urlset>
|
BIN
v0.23.0/sitemap.xml.gz
Normal file
BIN
v0.23.0/sitemap.xml.gz
Normal file
Binary file not shown.
2053
v0.23.0/technical/architecture/index.html
Normal file
2053
v0.23.0/technical/architecture/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1660
v0.23.0/technical/concurrency/index.html
Normal file
1660
v0.23.0/technical/concurrency/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1547
v0.23.0/technical/conflicts/index.html
Normal file
1547
v0.23.0/technical/conflicts/index.html
Normal file
File diff suppressed because it is too large
Load Diff
2250
v0.23.0/templates/index.html
Normal file
2250
v0.23.0/templates/index.html
Normal file
File diff suppressed because it is too large
Load Diff
1605
v0.23.0/testimonials/index.html
Normal file
1605
v0.23.0/testimonials/index.html
Normal file
File diff suppressed because it is too large
Load Diff
2007
v0.23.0/tutorial/index.html
Normal file
2007
v0.23.0/tutorial/index.html
Normal 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
Loading…
x
Reference in New Issue
Block a user