Skip to content

C
Chromium_Depot_tools
Commit 8d2f7740 authored by Josip Sokcevic's avatar Josip Sokcevic Committed by LUCI CQ
Browse files
Options

Use py3 in documentation generation 

This change also updates version of git documentation to match one used in
depot_tools, asciidoc, and ansi2html. It also fixes reset signal.

R=gavinmak@google.com

Bug: 1357152
Change-Id: I998e7434dde8d82b491376b47a5993c6d91d64a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3856830Reviewed-by: 's avatarGavin Mak <gavinmak@google.com>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
parent 3528d4d3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 642 additions and 2151 deletions
man/html/depot_tools.html
View file @ 8d2f7740
......@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<meta name="generator" content="AsciiDoc 10.2.0" />
<title>depot_tools(7)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -780,15 +780,6 @@ Interact with code reviews on Gerrit and Rietveld
</p>
</dd>
<dt class="hdlist1">
<a href="git-drover.html">git-drover(1)</a>
</dt>
<dd>
<p>
Apply a commit from the trunk to a release branch, or from one release branch to
another.
</p>
</dd>
<dt class="hdlist1">
<a href="git-footers.html">git-footers(1)</a>
</dt>
<dd>
......@@ -929,7 +920,7 @@ Print a diff of the current branch, compared to its upstream.
<div id="footer">
<div id="footer-text">
Last updated
2021-07-01 07:07:00 PDT
2022-08-26 21:13:38 PDT
</div>
</div>
</body>
......
man/html/depot_tools_tutorial.html
View file @ 8d2f7740
This diff is collapsed.
man/html/git-cl.html
View file @ 8d2f7740
......@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<meta name="generator" content="AsciiDoc 10.2.0" />
<title>git-cl(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -1028,7 +1028,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2021-07-01 07:07:00 PDT
2022-08-30 07:25:33 PDT
</div>
</div>
</body>
......
man/html/git-drover.html deleted 100644 → 0
View file @ 3528d4d3
This diff is collapsed.
man/html/git-footers.html
View file @ 8d2f7740
......@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<meta name="generator" content="AsciiDoc 10.2.0" />
<title>git-footers(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -838,18 +838,22 @@ refs/branch-heads/branchname</code></pre>
<div class="sect1">
<h2 id="_example">EXAMPLE</h2>
<div class="sectionbody">
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git footers HEAD</span>
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git footers HEAD</span>
Tech-Debt-Introduced: -4 microMSOffices
Tech-Debt-Introduced: 17 microMSOffices
Cr-Commit-Position: refs/heads/main@{#292272}
<span style="font-weight: bold; color: #ffffff">$ git footers --key Tech-Debt-Introduced HEAD</span>
<span style="font-weight: bold; color: #BFBFBF">$ git footers --key Tech-Debt-Introduced HEAD</span>
-4 microMSOffices
17 microMSOffices
<span style="font-weight: bold; color: #ffffff">$ git footers --position HEAD</span>
<span style="font-weight: bold; color: #BFBFBF">$ git footers --position HEAD</span>
refs/heads/main@{#292272}
<span style="font-weight: bold; color: #ffffff">$ git footers --position-num HEAD</span>
<span style="font-weight: bold; color: #BFBFBF">$ git footers --position-num HEAD</span>
292272
<span style="font-weight: bold; color: #ffffff">$ git footers --position-ref HEAD</span>
<span style="font-weight: bold; color: #BFBFBF">$ git footers --position-ref HEAD</span>
refs/heads/main
</code></pre></div></div><p><div class="paragraph"></p></div>
</div>
......@@ -873,7 +877,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2021-10-05 09:49:24 PDT
2022-08-26 21:13:38 PDT
</div>
</div>
</body>
......
man/html/git-freeze.html
View file @ 8d2f7740
......@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<meta name="generator" content="AsciiDoc 10.2.0" />
<title>git-freeze(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -781,46 +781,51 @@ time you ran git freeze (freshly modified files, new files, etc.).</p></div>
<div class="sect1">
<h2 id="_example">EXAMPLE</h2>
<div class="sectionbody">
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git status --short</span>
<span style="color: #19c518">A</span> added_file
<span style="color: #19c518">A</span><span style="color: #e42e16">M</span> added_file_with_unstaged_changes
<span style="color: #19c518">D</span> deleted_file
<span style="color: #e42e16">M</span> modified_file
<span style="color: #e42e16">D</span> unstaged_deleted_file
<span style="color: #e42e16">??</span> unadded_file
<span style="font-weight: bold; color: #ffffff">$ git freeze</span>
<span style="font-weight: bold; color: #ffffff">$ git status --short</span>
<span style="font-weight: bold; color: #ffffff">$ git log -n 2 --stat</span>
<span style="color: #e7e71c">commit 2b8214881eb8a660a86c0551f84eb39e6763acf3</span>
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git status --short</span>
<span style="color: #50FA7B">A</span> added_file
<span style="color: #50FA7B">A</span><span style="color: #FF5555">M</span> added_file_with_unstaged_changes
<span style="color: #50FA7B">D</span> deleted_file
<span style="color: #FF5555">M</span> modified_file
<span style="color: #FF5555">D</span> unstaged_deleted_file
<span style="color: #FF5555">??</span> unadded_file
<span style="font-weight: bold; color: #BFBFBF">$ git freeze</span>
<span style="font-weight: bold; color: #BFBFBF">$ git status --short</span>
<span style="font-weight: bold; color: #BFBFBF">$ git log -n 2 --stat</span>
<span style="color: #F1FA8C">commit 0e48260b7ae6d82b41234fbe19ea6cb646a835de</span>
Author: local &lt;local@chromium.org&gt;
Date: Thu Apr 10 08:54:56 2014 +0000
FREEZE.unindexed
added_file_with_unstaged_changes | 1 <span style="color: #19c518">+</span>
modified_file | 1 <span style="color: #19c518">+</span>
added_file_with_unstaged_changes | 1 <span style="color: #50FA7B">+</span>
modified_file | 1 <span style="color: #50FA7B">+</span>
unadded_file | 0
unstaged_deleted_file | 1 <span style="color: #e42e16">-</span>
unstaged_deleted_file | 1 <span style="color: #FF5555">-</span>
4 files changed, 2 insertions(+), 1 deletion(-)
<span style="color: #e7e71c">commit 4e1ca78d22a542047891f597545223dc6ce1b757</span>
<span style="color: #F1FA8C">commit af7eb3e39942ada944e8489e6217753771f20562</span>
Author: local &lt;local@chromium.org&gt;
Date: Thu Apr 10 08:54:56 2014 +0000
FREEZE.indexed
added_file | 1 <span style="color: #19c518">+</span>
added_file_with_unstaged_changes | 1 <span style="color: #19c518">+</span>
deleted_file | 1 <span style="color: #e42e16">-</span>
added_file | 1 <span style="color: #50FA7B">+</span>
added_file_with_unstaged_changes | 1 <span style="color: #50FA7B">+</span>
deleted_file | 1 <span style="color: #FF5555">-</span>
3 files changed, 2 insertions(+), 1 deletion(-)
<span style="font-weight: bold; color: #ffffff">$ git thaw</span>
<span style="font-weight: bold; color: #ffffff">$ git status --short</span>
<span style="color: #19c518">A</span> added_file
<span style="color: #19c518">A</span><span style="color: #e42e16">M</span> added_file_with_unstaged_changes
<span style="color: #19c518">D</span> deleted_file
<span style="color: #e42e16">M</span> modified_file
<span style="color: #e42e16">D</span> unstaged_deleted_file
<span style="color: #e42e16">??</span> unadded_file
<span style="font-weight: bold; color: #BFBFBF">$ git thaw</span>
<span style="font-weight: bold; color: #BFBFBF">$ git status --short</span>
<span style="color: #50FA7B">A</span> added_file
<span style="color: #50FA7B">A</span><span style="color: #FF5555">M</span> added_file_with_unstaged_changes
<span style="color: #50FA7B">D</span> deleted_file
<span style="color: #FF5555">M</span> modified_file
<span style="color: #FF5555">D</span> unstaged_deleted_file
<span style="color: #FF5555">??</span> unadded_file
</code></pre></div></div><p><div class="paragraph"></p></div>
</div>
</div>
......@@ -854,7 +859,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2021-07-01 07:07:00 PDT
2022-08-26 21:13:38 PDT
</div>
</div>
</body>
......
man/html/git-hyper-blame.html
View file @ 8d2f7740
......@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<meta name="generator" content="AsciiDoc 10.2.0" />
<title>git-hyper-blame(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -816,7 +816,7 @@ and any commits mentioned in this file are added to the ignore list.</p></div>
<h2 id="_example">EXAMPLE</h2>
<div class="sectionbody">
<div class="paragraph"><p>Let&#8217;s run <code>git blame</code> on a file:</p></div>
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git blame ipsum.txt</span>
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git blame ipsum.txt</span>
c6eb3bfa (lorem 2014-08-11 23:15:57 +0000 1) LOREM IPSUM DOLOR SIT AMET, CONSECTETUR
3ddda43c (auto-uppercaser 2014-07-05 02:05:18 +0000 2) ADIPISCING ELIT, SED DO EIUSMOD TEMPOR
3ddda43c (auto-uppercaser 2014-07-05 02:05:18 +0000 3) INCIDIDUNT UT LABORE ET DOLORE MAGNA
......@@ -828,7 +828,7 @@ c6eb3bfa (lorem 2014-08-11 23:15:57 +0000 5) NOSTRUD EXERCITATION ULLA
aren&#8217;t interested in the uppercasing of the file. You want to know who
wrote/modified those lines in the first place. Just tell <code>hyper-blame</code> to ignore
that commit:</p></div>
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git hyper-blame -i 3ddda43c ipsum.txt</span>
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git hyper-blame -i 3ddda43c ipsum.txt</span>
c6eb3bfa (lorem 2014-08-11 23:15:57 +0000 1) LOREM IPSUM DOLOR SIT AMET, CONSECTETUR
134200d1 (lorem 2014-04-10 08:54:46 +0000 2*) ADIPISCING ELIT, SED DO EIUSMOD TEMPOR
a34a1d0d (ipsum 2014-04-11 11:25:04 +0000 3*) INCIDIDUNT UT LABORE ET DOLORE MAGNA
......@@ -873,7 +873,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2021-07-01 07:07:00 PDT
2022-08-26 21:13:38 PDT
</div>
</div>
</body>
......
man/html/git-map-branches.html
View file @ 8d2f7740
......@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<meta name="generator" content="AsciiDoc 10.2.0" />
<title>git-map-branches(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -849,22 +849,24 @@ Branches which have this as their parent are usually misconfigured, and
<div class="paragraph"><p>Given the hypothetical demo repo in <a href="git-map.html">git-map(1)</a>'s EXAMPLE section, and
assuming that the <code>frozen_changes</code> branch was currently checked out, running
<em>git map-branches</em> would result in an output like:</p></div>
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
<span style="color: #d338d3"></span><span style="color: #d338d3">{NO_UPSTREAM}
</span><span style="color: #19c518"></span><span style="color: #19c518"> no_upstream
</span><span style="color: #e42e16"></span><span style="color: #e42e16">origin/main
</span><span style="color: #19c518"></span><span style="color: #19c518"> cool_feature
</span><span style="color: #19c518"></span><span style="color: #19c518"> subfeature
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> frozen_branch *
</span><span style="font-weight: bold; color: #ffffff">$ git map-branches -v</span>
<span style="color: #d338d3"></span><span style="color: #d338d3">{NO_UPSTREAM} </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #19c518"></span><span style="color: #19c518"> no_upstream </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #e42e16"></span><span style="color: #e42e16">origin/main </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
</span><span style="color: #19c518"></span><span style="color: #19c518"> cool_feature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">4 commits </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> subfeature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> frozen_branch * </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">3 commits </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">]</span>
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git map-branches</span>
<span style="color: #FF79C6"></span><span style="color: #FF79C6">{NO_UPSTREAM}
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> no_upstream
</span><span style="color: #FF5555"></span><span style="color: #FF5555">origin/main
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> cool_feature
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> subfeature
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> fixit
</span><span style="color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD"> frozen_branch *
</span>
<span style="font-weight: bold; color: #BFBFBF">$ git map-branches -v</span>
<span style="color: #FF79C6"></span><span style="color: #FF79C6">{NO_UPSTREAM} </span><span style="color: #BFBFBF"> </span><span style="color: #FF79C6"> </span><span style="color: #BFBFBF"> </span><span style="color: #FF79C6"> </span><span style="color: #BFBFBF">
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> no_upstream </span><span style="color: #BFBFBF"> </span><span style="color: #FF79C6"> </span><span style="color: #BFBFBF"> </span><span style="color: #FF79C6"> </span><span style="color: #BFBFBF">
</span><span style="color: #FF5555"></span><span style="color: #FF5555">origin/main </span><span style="color: #BFBFBF"> </span><span style="color: #FF79C6"> </span><span style="color: #BFBFBF"> </span><span style="color: #FF79C6"> </span><span style="color: #BFBFBF">
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> cool_feature </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">4 commits </span><span style="color: #BFBFBF"> </span><span style="color: #FF79C6"> </span><span style="color: #BFBFBF">]
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> subfeature </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">2 commits </span><span style="color: #BFBFBF">| </span><span style="color: #FF79C6">behind 1 </span><span style="color: #BFBFBF">]
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> fixit </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">2 commits </span><span style="color: #BFBFBF"> </span><span style="color: #FF79C6"> </span><span style="color: #BFBFBF">]
</span><span style="color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD"> frozen_branch * </span><span style="font-weight: bold; color: #BFBFBF">[ </span><span style="font-weight: bold; color: #FF79C6">3 commits </span><span style="font-weight: bold; color: #BFBFBF"> </span><span style="font-weight: bold; color: #FF79C6"> </span><span style="font-weight: bold; color: #BFBFBF">]
</span>
</code></pre></div></div><p><div class="paragraph"></p></div>
</div>
</div>
......@@ -899,7 +901,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2021-10-26 10:54:02 PDT
2022-08-26 21:13:38 PDT
</div>
</div>
</body>
......
man/html/git-map.html
View file @ 8d2f7740
This diff is collapsed.
man/html/git-mark-merge-base.html
View file @ 8d2f7740
......@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<meta name="generator" content="AsciiDoc 10.2.0" />
<title>git-mark-merge-base(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -821,7 +821,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2021-07-01 07:07:00 PDT
2022-08-26 21:13:38 PDT
</div>
</div>
</body>
......
man/html/git-nav-downstream.html
View file @ 8d2f7740
......@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<meta name="generator" content="AsciiDoc 10.2.0" />
<title>git-nav-downstream(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -773,13 +773,14 @@ command will prompt you with a selection of the branches.</p></div>
<div class="sect1">
<h2 id="_example">EXAMPLE</h2>
<div class="sectionbody">
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
<span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">origin/main
</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> cool_feature
</span><span style="color: #19c518"></span><span style="color: #19c518"> subfeature
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch
</span><span style="font-weight: bold; color: #ffffff">$ git nav-downstream</span>
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git map-branches</span>
<span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">origin/main
</span><span style="font-weight: bold; color: #50FA7B"></span><span style="color: #50FA7B"> cool_feature
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> subfeature
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> fixit
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> frozen_branch
</span>
<span style="font-weight: bold; color: #BFBFBF">$ git nav-downstream</span>
Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes
Switched to branch 'cool_feature'
Your branch is ahead of 'origin/main' by 4 commits.
......@@ -788,23 +789,26 @@ Please select a downstream branch
0. cool_feature
1. fixit
Selection (0-1)[0]: 0
<span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> cool_feature *
</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> subfeature
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch
</span><span style="font-weight: bold; color: #ffffff">$ git nav-downstream</span>
<span style="font-weight: bold; color: #BFBFBF">$ git map-branches</span>
<span style="color: #FF5555"></span><span style="color: #FF5555">origin/main
</span><span style="color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD"> cool_feature *
</span><span style="font-weight: bold; color: #50FA7B"></span><span style="color: #50FA7B"> subfeature
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> fixit
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> frozen_branch
</span>
<span style="font-weight: bold; color: #BFBFBF">$ git nav-downstream</span>
Switched to branch 'subfeature'
Your branch and 'cool_feature' have diverged,
and have 2 and 1 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
<span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main
</span><span style="color: #19c518"></span><span style="color: #19c518"> cool_feature
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> subfeature *
</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> fixit
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch</span>
<span style="font-weight: bold; color: #BFBFBF">$ git map-branches</span>
<span style="color: #FF5555"></span><span style="color: #FF5555">origin/main
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> cool_feature
</span><span style="color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD"> subfeature *
</span><span style="font-weight: bold; color: #50FA7B"></span><span style="color: #50FA7B"> fixit
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> frozen_branch
</span>
</code></pre></div></div><p><div class="paragraph"></p></div>
</div>
</div>
......@@ -839,7 +843,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2021-10-26 10:54:02 PDT
2022-08-26 21:13:38 PDT
</div>
</div>
</body>
......
man/html/git-nav-upstream.html
View file @ 8d2f7740
......@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<meta name="generator" content="AsciiDoc 10.2.0" />
<title>git-nav-upstream(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -771,23 +771,26 @@ checks that out.</p></div>
<div class="sect1">
<h2 id="_example">EXAMPLE</h2>
<div class="sectionbody">
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main
</span><span style="color: #19c518"></span><span style="color: #19c518"> cool_feature
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> subfeature *
</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> fixit
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch
</span><span style="font-weight: bold; color: #ffffff">$ git nav-upstream</span>
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git map-branches</span>
<span style="color: #FF5555"></span><span style="color: #FF5555">origin/main
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> cool_feature
</span><span style="color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD"> subfeature *
</span><span style="font-weight: bold; color: #50FA7B"></span><span style="color: #50FA7B"> fixit
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> frozen_branch
</span>
<span style="font-weight: bold; color: #BFBFBF">$ git nav-upstream</span>
Switched to branch 'cool_feature'
Your branch is ahead of 'origin/main' by 4 commits.
(use "git push" to publish your local commits)
<span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> cool_feature *
</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> subfeature
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch
</span><span style="font-weight: bold; color: #ffffff">$ git nav-upstream</span>
<span style="font-weight: bold; color: #BFBFBF">$ git map-branches</span>
<span style="color: #FF5555"></span><span style="color: #FF5555">origin/main
</span><span style="color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD"> cool_feature *
</span><span style="font-weight: bold; color: #50FA7B"></span><span style="color: #50FA7B"> subfeature
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> fixit
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> frozen_branch
</span>
<span style="font-weight: bold; color: #BFBFBF">$ git nav-upstream</span>
Note: switching to 'origin/main'.
You are in 'detached HEAD' state. You can look around, make experimental</span> <b>&lt;1&gt;</b><span>
......@@ -806,12 +809,14 @@ Or undo this operation with:
Turn off this advice by setting config variable advice.detachedHead to false
HEAD is now at beec6f4 Make ReflectorImpl use mailboxes
<span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
<span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">origin/main
</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> cool_feature
</span><span style="color: #19c518"></span><span style="color: #19c518"> subfeature
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch</span>
<span style="font-weight: bold; color: #BFBFBF">$ git map-branches</span>
<span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">origin/main
</span><span style="font-weight: bold; color: #50FA7B"></span><span style="color: #50FA7B"> cool_feature
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> subfeature
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> fixit
</span><span style="color: #50FA7B"></span><span style="color: #50FA7B"> frozen_branch
</span>
</code></pre></div></div><p><div class="paragraph">
1. Note that being in a <em>detached HEAD</em> state is OK. You&#8217;ll just want to create
a <a href="git-new-branch.html">git-new-branch(1)</a> from here.</p></div>
......@@ -848,7 +853,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2021-10-26 10:54:02 PDT
2022-08-26 21:13:38 PDT
</div>
</div>
</body>
......
man/html/git-new-branch.html
View file @ 8d2f7740
This diff is collapsed.
man/html/git-rebase-update.html
View file @ 8d2f7740
......@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<meta name="generator" content="AsciiDoc 10.2.0" />
<title>git-rebase-update(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -956,7 +956,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2021-10-26 10:54:02 PDT
2022-08-26 21:13:38 PDT
</div>
</div>
</body>
......
man/html/git-rename-branch.html
View file @ 8d2f7740
......@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<meta name="generator" content="AsciiDoc 10.2.0" />
<title>git-rename-branch(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -789,7 +789,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2021-07-01 07:07:00 PDT
2022-08-26 21:13:38 PDT
</div>
</div>
</body>
......
man/html/git-reparent-branch.html
View file @ 8d2f7740
......@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<meta name="generator" content="AsciiDoc 10.2.0" />
<title>git-reparent-branch(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -842,7 +842,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2021-10-26 10:54:02 PDT
2022-08-26 21:13:38 PDT
</div>
</div>
</body>
......
man/html/git-retry.html
View file @ 8d2f7740
......@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<meta name="generator" content="AsciiDoc 10.2.0" />
<title>git-retry(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -853,7 +853,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2021-07-01 07:07:00 PDT
2022-08-26 21:13:38 PDT
</div>
</div>
</body>
......
man/html/git-squash-branch.html
View file @ 8d2f7740
This diff is collapsed.
man/html/git-thaw.html
View file @ 8d2f7740
......@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<meta name="generator" content="AsciiDoc 10.2.0" />
<title>git-thaw(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -789,7 +789,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2021-07-01 07:07:00 PDT
2022-08-26 21:13:38 PDT
</div>
</div>
</body>
......
man/html/git-upstream-diff.html
View file @ 8d2f7740
......@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 9.1.0" />
<meta name="generator" content="AsciiDoc 10.2.0" />
<title>git-upstream-diff(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
......@@ -918,7 +918,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2021-10-26 10:54:02 PDT
2022-08-26 21:13:38 PDT
</div>
</div>
</body>
......
man/man1/git-cl.1
View file @ 8d2f7740
......@@ -2,12 +2,12 @@
.\" Title: git-cl
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Date: 08/30/2022
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 906b5026
.\" Source: depot_tools d6a493e4
.\" Language: English
.\"
.TH "GIT\-CL" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.TH "GIT\-CL" "1" "08/30/2022" "depot_tools d6a493e4" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......
man/man1/git-drover.1 deleted 100644 → 0
View file @ 3528d4d3
This diff is collapsed.
man/man1/git-footers.1
View file @ 8d2f7740
......@@ -2,12 +2,12 @@
.\" Title: git-footers
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 10/05/2021
.\" Date: 08/26/2022
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools a594dbdd
.\" Source: depot_tools 59e95c91
.\" Language: English
.\"
.TH "GIT\-FOOTERS" "1" "10/05/2021" "depot_tools a594dbdd" "Chromium depot_tools Manual"
.TH "GIT\-FOOTERS" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -116,13 +116,17 @@ in the example above)\&.
Tech\-Debt\-Introduced: \-4 microMSOffices
Tech\-Debt\-Introduced: 17 microMSOffices
Cr\-Commit\-Position: refs/heads/main@{#292272}
\fB$ git footers \-\-key Tech\-Debt\-Introduced HEAD\fR
\-4 microMSOffices
17 microMSOffices
\fB$ git footers \-\-position HEAD\fR
refs/heads/main@{#292272}
\fB$ git footers \-\-position\-num HEAD\fR
292272
\fB$ git footers \-\-position\-ref HEAD\fR
refs/heads/main
.fi
......
man/man1/git-freeze.1
View file @ 8d2f7740
......@@ -2,12 +2,12 @@
.\" Title: git-freeze
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Date: 08/26/2022
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 906b5026
.\" Source: depot_tools 59e95c91
.\" Language: English
.\"
.TH "GIT\-FREEZE" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.TH "GIT\-FREEZE" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -57,10 +57,13 @@ D deleted_file
M modified_file
D unstaged_deleted_file
?? unadded_file
\fB$ git freeze\fR
\fB$ git status \-\-short\fR
\fB$ git log \-n 2 \-\-stat\fR
commit 288d7302bb306adec039d7ca24870d8d0ca14f36
commit 3eb0e183eb4b1f8d5ce1ff29be3ced2ca85d8951
Author: local <local@chromium\&.org>
Date: Thu Apr 10 08:54:56 2014 +0000
......@@ -72,7 +75,7 @@ Date: Thu Apr 10 08:54:56 2014 +0000
unstaged_deleted_file | 1 \-
4 files changed, 2 insertions(+), 1 deletion(\-)
commit 9533cdaea75b6973d439f91b7f6007479db0f5a4
commit b57d611f2738de2193ec16f150991a4bc8dbd2fe
Author: local <local@chromium\&.org>
Date: Thu Apr 10 08:54:56 2014 +0000
......@@ -82,7 +85,9 @@ Date: Thu Apr 10 08:54:56 2014 +0000
added_file_with_unstaged_changes | 1 +
deleted_file | 1 \-
3 files changed, 2 insertions(+), 1 deletion(\-)
\fB$ git thaw\fR
\fB$ git status \-\-short\fR
A added_file
AM added_file_with_unstaged_changes
......
man/man1/git-hyper-blame.1
View file @ 8d2f7740
......@@ -2,12 +2,12 @@
.\" Title: git-hyper-blame
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Date: 08/26/2022
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 906b5026
.\" Source: depot_tools 59e95c91
.\" Language: English
.\"
.TH "GIT\-HYPER\-BLAME" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.TH "GIT\-HYPER\-BLAME" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......
man/man1/git-map-branches.1
View file @ 8d2f7740
......@@ -2,12 +2,12 @@
.\" Title: git-map-branches
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 10/26/2021
.\" Date: 08/26/2022
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 5c9e8b47
.\" Source: depot_tools 59e95c91
.\" Language: English
.\"
.TH "GIT\-MAP\-BRANCHES" "1" "10/26/2021" "depot_tools 5c9e8b47" "Chromium depot_tools Manual"
.TH "GIT\-MAP\-BRANCHES" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -168,14 +168,16 @@ origin/main
subfeature
fixit
\fB frozen_branch *
$ git map\-branches \-v\fR
\fR
\fB$ git map\-branches \-v\fR
{NO_UPSTREAM}
no_upstream
origin/main
cool_feature [ 4 commits ]
subfeature [ 2 commits | behind 1 ]
fixit [ 2 commits ]
\fB frozen_branch * [ 3 commits ]\fR
\fB frozen_branch * [ 3 commits ]
\fR
.fi
.if n \{\
.RE
......
man/man1/git-map.1
View file @ 8d2f7740
......@@ -2,12 +2,12 @@
.\" Title: git-map
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Date: 08/26/2022
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 906b5026
.\" Source: depot_tools 59e95c91
.\" Language: English
.\"
.TH "GIT\-MAP" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.TH "GIT\-MAP" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......
man/man1/git-mark-merge-base.1
View file @ 8d2f7740
......@@ -2,12 +2,12 @@
.\" Title: git-mark-merge-base
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Date: 08/26/2022
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 906b5026
.\" Source: depot_tools 59e95c91
.\" Language: English
.\"
.TH "GIT\-MARK\-MERGE\-BA" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.TH "GIT\-MARK\-MERGE\-BA" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......
man/man1/git-nav-downstream.1
View file @ 8d2f7740
......@@ -2,12 +2,12 @@
.\" Title: git-nav-downstream
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 10/26/2021
.\" Date: 08/26/2022
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 5c9e8b47
.\" Source: depot_tools 59e95c91
.\" Language: English
.\"
.TH "GIT\-NAV\-DOWNSTREAM" "1" "10/26/2021" "depot_tools 5c9e8b47" "Chromium depot_tools Manual"
.TH "GIT\-NAV\-DOWNSTREAM" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -52,6 +52,7 @@ git-nav-downstream \- Checkout a downstream branch of the currently checked out
subfeature
fixit
frozen_branch
\fB$ git nav\-downstream\fR
Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes
Switched to branch \*(Aqcool_feature\*(Aq
......@@ -67,11 +68,13 @@ origin/main
\fR subfeature
fixit
frozen_branch
\fB$ git nav\-downstream\fR
Switched to branch \*(Aqsubfeature\*(Aq
Your branch and \*(Aqcool_feature\*(Aq have diverged,
and have 2 and 1 different commits each, respectively\&.
(use "git pull" to merge the remote branch into yours)
\fB$ git map\-branches\fR
origin/main
cool_feature
......
man/man1/git-nav-upstream.1
View file @ 8d2f7740
......@@ -2,12 +2,12 @@
.\" Title: git-nav-upstream
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 10/26/2021
.\" Date: 08/26/2022
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 5c9e8b47
.\" Source: depot_tools 59e95c91
.\" Language: English
.\"
.TH "GIT\-NAV\-UPSTREAM" "1" "10/26/2021" "depot_tools 5c9e8b47" "Chromium depot_tools Manual"
.TH "GIT\-NAV\-UPSTREAM" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -52,16 +52,19 @@ origin/main
\fB subfeature *
\fR fixit
frozen_branch
\fB$ git nav\-upstream\fR
Switched to branch \*(Aqcool_feature\*(Aq
Your branch is ahead of \*(Aqorigin/main\*(Aq by 4 commits\&.
(use "git push" to publish your local commits)
\fB$ git map\-branches\fR
origin/main
\fB cool_feature *
\fR subfeature
fixit
frozen_branch
\fB$ git nav\-upstream\fR
Note: switching to \*(Aqorigin/main\*(Aq\&.
......@@ -81,6 +84,7 @@ Or undo this operation with:
Turn off this advice by setting config variable advice\&.detachedHead to false
HEAD is now at beec6f4 Make ReflectorImpl use mailboxes
\fB$ git map\-branches\fR
\fBorigin/main
\fR cool_feature
......
man/man1/git-new-branch.1
View file @ 8d2f7740
......@@ -2,12 +2,12 @@
.\" Title: git-new-branch
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 10/26/2021
.\" Date: 08/26/2022
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 5c9e8b47
.\" Source: depot_tools 59e95c91
.\" Language: English
.\"
.TH "GIT\-NEW\-BRANCH" "1" "10/26/2021" "depot_tools 5c9e8b47" "Chromium depot_tools Manual"
.TH "GIT\-NEW\-BRANCH" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -100,7 +100,9 @@ origin/main
subfeature [ 2 commits | behind 1 ]
fixit [ 2 commits ]
\fB frozen_branch * [ 3 commits ]
$ git new\-branch independent_cl\fR
\fR
\fB$ git new\-branch independent_cl\fR
\fB$ git map\-branches \-v\fR
\fBorigin/main
\fR cool_feature [ 4 commits ]
......@@ -108,7 +110,8 @@ $ git new\-branch independent_cl\fR
fixit [ 2 commits ]
frozen_branch [ 3 commits ]
\fB independent_cl *
$ vi foo && git add \-A && git commit \-m foo\fR
\fR
\fB$ vi foo && git add \-A && git commit \-m foo\fR
\fB$ git map\-branches \-v\fR
origin/main
cool_feature [ 4 commits ]
......@@ -116,7 +119,9 @@ origin/main
fixit [ 2 commits ]
frozen_branch [ 3 commits ]
\fB independent_cl * [ 1 commit ]
$ git new\-branch \-\-upstream subfeature nested_cl\fR
\fR
\fB$ git new\-branch \-\-upstream subfeature nested_cl\fR
\fB$ git map\-branches \-v\fR
origin/main
cool_feature [ 4 commits ]
......@@ -125,11 +130,14 @@ origin/main
\fR fixit [ 2 commits ]
frozen_branch [ 3 commits ]
independent_cl [ 1 commit ]
\fB$ git checkout cool_feature\fR
Switched to branch \*(Aqcool_feature\*(Aq
Your branch is ahead of \*(Aqorigin/main\*(Aq by 4 commits\&.
(use "git push" to publish your local commits)
\fB$ git new\-branch \-\-upstream_current cl_depends_on_cool_feature\fR
\fB$ git map\-branches \-v\fR
origin/main
\fB cool_feature [ 4 commits ]
......@@ -139,11 +147,14 @@ origin/main
fixit [ 2 commits ]
frozen_branch [ 3 commits ]
independent_cl [ 1 commit ]
\fB$ git checkout subfeature\fR
Your branch and \*(Aqcool_feature\*(Aq have diverged,
and have 2 and 1 different commits each, respectively\&.
(use "git pull" to merge the remote branch into yours)
\fB$ git new\-branch \-\-inject_current injected_cl\fR
\fB$ git map\-branches \-v\fR
origin/main
\fB cool_feature [ 4 commits ]
......
man/man1/git-rebase-update.1
View file @ 8d2f7740
......@@ -2,12 +2,12 @@
.\" Title: git-rebase-update
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 10/26/2021
.\" Date: 08/26/2022
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 5c9e8b47
.\" Source: depot_tools 59e95c91
.\" Language: English
.\"
.TH "GIT\-REBASE\-UPDATE" "1" "10/26/2021" "depot_tools 5c9e8b47" "Chromium depot_tools Manual"
.TH "GIT\-REBASE\-UPDATE" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......
man/man1/git-rename-branch.1
View file @ 8d2f7740
......@@ -2,12 +2,12 @@
.\" Title: git-rename-branch
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Date: 08/26/2022
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 906b5026
.\" Source: depot_tools 59e95c91
.\" Language: English
.\"
.TH "GIT\-RENAME\-BRANCH" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.TH "GIT\-RENAME\-BRANCH" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......
man/man1/git-reparent-branch.1
View file @ 8d2f7740
......@@ -2,12 +2,12 @@
.\" Title: git-reparent-branch
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 10/26/2021
.\" Date: 08/26/2022
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 5c9e8b47
.\" Source: depot_tools 59e95c91
.\" Language: English
.\"
.TH "GIT\-REPARENT\-BRANC" "1" "10/26/2021" "depot_tools 5c9e8b47" "Chromium depot_tools Manual"
.TH "GIT\-REPARENT\-BRANC" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......
man/man1/git-retry.1
View file @ 8d2f7740
......@@ -2,12 +2,12 @@
.\" Title: git-retry
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Date: 08/26/2022
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 906b5026
.\" Source: depot_tools 59e95c91
.\" Language: English
.\"
.TH "GIT\-RETRY" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.TH "GIT\-RETRY" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......
man/man1/git-squash-branch.1
View file @ 8d2f7740
......@@ -2,12 +2,12 @@
.\" Title: git-squash-branch
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 10/26/2021
.\" Date: 08/26/2022
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 5c9e8b47
.\" Source: depot_tools 59e95c91
.\" Language: English
.\"
.TH "GIT\-SQUASH\-BRANCH" "1" "10/26/2021" "depot_tools 5c9e8b47" "Chromium depot_tools Manual"
.TH "GIT\-SQUASH\-BRANCH" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -76,6 +76,7 @@ Optional message to use for the first line of the squashed commit\&. If omitted,
* \fB2250f532d7\fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a742b7\fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
\fB$ git squash\-branch \-m \*(Aqcool squash demo\*(Aq\fR
\fB$ git map\fR
* \fB98e69e80b9\fR \fB(HEAD \-> frozen_branch\fR\fB) \fR2014\-04\-10 ~ cool squash demo
......
man/man1/git-thaw.1
View file @ 8d2f7740
......@@ -2,12 +2,12 @@
.\" Title: git-thaw
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Date: 08/26/2022
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 906b5026
.\" Source: depot_tools 59e95c91
.\" Language: English
.\"
.TH "GIT\-THAW" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.TH "GIT\-THAW" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......
man/man1/git-upstream-diff.1
View file @ 8d2f7740
......@@ -2,12 +2,12 @@
.\" Title: git-upstream-diff
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 10/26/2021
.\" Date: 08/26/2022
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 5c9e8b47
.\" Source: depot_tools 59e95c91
.\" Language: English
.\"
.TH "GIT\-UPSTREAM\-DIFF" "1" "10/26/2021" "depot_tools 5c9e8b47" "Chromium depot_tools Manual"
.TH "GIT\-UPSTREAM\-DIFF" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......
man/man7/depot_tools.7
View file @ 8d2f7740
......@@ -2,12 +2,12 @@
.\" Title: depot_tools
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 07/01/2021
.\" Date: 08/26/2022
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 906b5026
.\" Source: depot_tools 59e95c91
.\" Language: English
.\"
.TH "DEPOT_TOOLS" "7" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
.TH "DEPOT_TOOLS" "7" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -47,11 +47,6 @@ A tutorial for these tools can be found at \fBdepot_tools_tutorial\fR(7)\&.
Interact with code reviews on Gerrit and Rietveld
.RE
.PP
\fBgit-drover\fR(1)
.RS 4
Apply a commit from the trunk to a release branch, or from one release branch to another\&.
.RE
.PP
\fBgit-footers\fR(1)
.RS 4
Extract meta\-information expressed as footers in a commit message\&.
......
man/man7/depot_tools_tutorial.7
View file @ 8d2f7740
This diff is collapsed.
man/src/_git-drover_desc.helper.txt deleted 100644 → 0
View file @ 3528d4d3
Apply a commit from the trunk to a release branch, or from one release branch to
another.
man/src/common_demo_functions.sh
View file @ 8d2f7740
......@@ -30,20 +30,20 @@ c() {
}
praw() {
echo -e "\x1B[37;1m$ $@\x1B[m"
echo -e "\x1B[37;1m$ $@\x1B[0m"
}
# print a visible command (but don't run it)
pcommand() {
praw "$(python -c '\
import sys, pipes; \
print(" ".join(map(pipes.quote, sys.argv[1:])))' "$@")"
praw "$(python3 -c 'import sys, pipes; print(" ".join(map(pipes.quote, sys.argv[1:])))' "$@")"
}
# run a visible command
run() {
pcommand "$@"
"$@"
# Some commands may not reset style, so issue reset command
echo -e "\x1B[0m"
}
comment() {
......@@ -70,8 +70,7 @@ add() {
local CONTENT=$2
if [[ ! $CONTENT ]]
then
CONTENT=$(python -c 'import random, string; \
print("".join(random.sample(string.lowercase, 16)))')
CONTENT=$(python3 -c 'import random, string; print("".join(random.sample(string.ascii_lowercase, 16)))')
fi
echo "$CONTENT" > $1
silent git add $1
......
man/src/depot_tools_tutorial.demo.walkthrough.sh
View file @ 8d2f7740
......@@ -22,7 +22,7 @@ add_ws() {
ed_ws() {
echo -ne "\x1B[37;1m$ echo -e "
echo -n "'$1'"
echo -e " | ed $WS\x1B[m"
echo -e " | ed $WS\x1B[0m"
echo -e "$1" | ed $WS 2>&1
}
......
man/src/filter_demo_output.py
View file @ 8d2f7740
#!/usr/bin/env python
#!/usr/bin/env python3
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
......@@ -11,8 +11,7 @@ import re
import sys
from xml.sax.saxutils import escape
from cStringIO import StringIO
from io import StringIO
if not os.path.exists('ansi2html'):
print('You must run ./make_docs.sh once before running this script.')
......@@ -60,11 +59,6 @@ def simpleXML(string):
def main():
ansi2html.converter.SCHEME['custom'] = (
"#000000", "#e42e16", "#19c518", "#e7e71c", "#492ee1",
"#d338d3", "#33d6e5", "#ffffff",
)
backend = sys.argv[1]
output = sys.stdin.read().rstrip()
......@@ -87,7 +81,7 @@ def main():
'</p></div><div class="listingblock"><div class="content"><pre><code>'
)
postamble = '</code></pre></div></div><p><div class="paragraph">'
c = ansi2html.Ansi2HTMLConverter(inline=True, scheme='custom')
c = ansi2html.Ansi2HTMLConverter(inline=True, scheme='dracula')
in_code = False
body = c.convert(output, full=False)
......@@ -102,7 +96,7 @@ def main():
w(preamble)
in_code = True
ext = ''
for _ in xrange(callouts[i]):
for _ in range(callouts[i]):
if not ext:
ext += '</span>'
ext += ' <b>&lt;%d&gt;</b>' % callout_counter
......@@ -129,7 +123,7 @@ def main():
w(preamble)
in_code = True
ext = ''
for _ in xrange(callouts[i]):
for _ in range(callouts[i]):
ext += ' <emphasis role="strong">(%d)</emphasis>' % callout_counter
callout_counter += 1
w(line + ext + '\n')
......
man/src/git-drover.demo.1.sh deleted 100755 → 0
View file @ 3528d4d3
#!/usr/bin/env bash
. git-drover.demo.common.sh
drover_c "This change needs to go to branch 9999"
echo "# Here's a commit (from some.committer) that we want to 'drover'."
run git log -n 1 --pretty=fuller
echo
echo "# Now do the 'drover'."
pcommand git drover --branch 9999 \
--cherry-pick $(git show-ref -s pick_commit)
echo "Going to cherry-pick"
echo '"""'
output git log -n 1
echo '"""'
echo "to 9999. Continue (y/n)? y"
echo
echo "# A cl is uploaded to rietveld, where it can be reviewed before landing."
echo
echo "About to land on 9999. Continue (y/n)? y"
echo "# The cherry-pick cl is landed on the branch 9999."
man/src/git-drover.demo.2.sh deleted 100755 → 0
View file @ 3528d4d3
#!/usr/bin/env bash
. git-drover.demo.common.sh
echo "# Make sure we have the most up-to-date branch sources."
run git fetch
echo
echo "# Checkout the branch with the change we want to revert."
run git checkout -b drover_9999 branch-heads/9999
echo
drover_c "This change is horribly broken."
echo "# Here's the commit we want to revert."
run git log -n 1
echo
echo "# Now do the revert."
silent git revert --no-edit $(git show-ref -s pick_commit)
pcommand git revert $(git show-ref -s pick_commit)
echo
echo "# That reverted the change and committed the revert."
run git log -n 1
echo
echo "# As with old drover, reverts are generally OK to commit without LGTM."
pcommand git cl upload -r some.committer@chromium.org --send-mail
run git cl land --bypass-hooks
man/src/git-drover.demo.3.sh deleted 100755 → 0
View file @ 3528d4d3
#!/usr/bin/env bash
. git-drover.demo.common.sh
drover_c "This change needs to go to branch 9999"
echo "# Make sure we have the most up-to-date branch sources."
run git fetch
echo
echo "# Here's a commit (from some.committer) that we want to 'drover'."
run git log -n 1 --pretty=fuller
echo
echo "# Checkout the branch we want to 'drover' to."
run git checkout -b drover_9999 branch-heads/9999
echo
echo "# Now do the 'drover'."
echo "# IMPORTANT!!! Do Not leave off the '-x' flag"
run git cherry-pick -x $(git show-ref -s pick_commit)
echo
echo "# That took the code authored by some.committer and committed it to"
echo "# the branch by the person who drovered it (i.e. you)."
run git log -n 1 --pretty=fuller
echo
echo "# Looks good. Ship it!"
pcommand git cl upload
echo "# Wait for LGTM or TBR it."
run git cl land
echo "# Or skip the LGTM/TBR and just 'git cl land --bypass-hooks'"
man/src/git-drover.demo.4.sh deleted 100755 → 0
View file @ 3528d4d3
#!/usr/bin/env bash
. git-drover.demo.common.sh
drover_c "This change needs to go to branch 9999"
echo "# Here's a commit (from some.committer) that we want to 'drover'."
run git log -n 1 --pretty=fuller
echo
echo "# Now do the 'drover'."
pcommand git drover --branch 9999 \
--cherry-pick $(git show-ref -s pick_commit)
echo "Going to cherry-pick"
echo '"""'
output git log -n 1
echo '"""'
echo "to 9999. Continue (y/n)? y"
echo
echo "Error: Patch failed to apply."
echo
echo "A workdir for this cherry-pick has been created in"
echo " /tmp/drover_9999"
echo
echo "To continue, resolve the conflicts there and run"
echo " git drover --continue /tmp/drover_9999"
echo
echo "To abort this cherry-pick run"
echo " git drover --abort /tmp/drover_9999"
echo
pcommand pushd /tmp/drover_9999
echo "# Manually resolve conflicts."
pcommand git add path/to/file_with_conflicts
pcommand popd
pcommand git drover --continue /tmp/drover_9999
echo
echo "# A cl is uploaded to rietveld, where it can be reviewed before landing."
echo
echo "About to land on 9999. Continue (y/n)? y"
echo "# The cherry-pick cl is landed on the branch 9999."
man/src/git-drover.demo.common.sh deleted 100755 → 0
View file @ 3528d4d3
#!/usr/bin/env bash
. demo_repo.sh
# Add and tag a dummy commit to refer to later.
drover_c() {
add modified_file
set_user some.committer
c "$1"
silent git tag -f pick_commit
set_user you
tick 1000
}
silent git push origin refs/remotes/origin/main:refs/branch-heads/9999
silent git config --add remote.origin.fetch \
+refs/branch-heads/*:refs/remotes/branch-heads/*
silent git fetch origin
silent git checkout -B main origin/main
man/src/git-drover.txt deleted 100644 → 0
View file @ 3528d4d3
git-drover(1)
=============
NAME
----
git-drover -
include::_git-drover_desc.helper.txt[]
SYNOPSIS
--------
[verse]
'git drover' --branch <branch>
(--cherry-pick <change> | --continue [path_to_workdir] |
--abort [path_to_workdir])
[--parent_checkout <path-to-existing-checkout>]
[--verbose] [--dry-run]
DESCRIPTION
-----------
`git drover` applies a commit to a release branch. It creates a new workdir from
an existing checkout to avoid downloading a new checkout without affecting the
existing checkout.
`git drover` does not support reverts. See the EXAMPLE section for the
equivalent sequence of commands to run.
OPTIONS
-------
--branch <branch>::
The branch to cherry-pick the commit to.
--cherry-pick <commit>::
The commit to cherry-pick.
--continue [path_to_workdir]::
Continue a cherry-pick that required manual resolution. The path to the drover
workdir is optional. If unspecified, the current directory is used.
--abort [path_to_workdir]::
Abort a cherry-pick that required manual resolution and clean up its workdir.
The path to the drover workdir is optional. If unspecified, the current
directory is used.
--parent_checkout::
The path to the chromium checkout to use as the source for a creating
git-new-workdir workdir to use for cherry-picking. If unspecified, the current
directory is used.
-v::
--verbose::
Enable verbose logging.
--dry-run::
Skip landing the cherry-pick. Just ensure that the commit can be cherry-picked
into the branch.
EXAMPLE
-------
PREREQUISITES
~~~~~~~~~~~~~
Before working with branches, you must
ifdef::backend-xhtml11[]
`gclient sync --with_branch_heads`
endif::backend-xhtml11[]
ifdef::backend-docbook[]
'gclient sync --with_branch_heads'
endif::backend-docbook[]
at least once to fetch the branches.
Merge Example
^^^^^^^^^^^^^
demo:1[]
Merge with Conflicts Example
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
demo:4[]
Revert Example
^^^^^^^^^^^^^^
demo:2[]
If your cherrypick onto a release branch gets reverted, do not create a new
cherrypick from main onto that release branch. Instead, use the "Reland"
button on the original cherrypick CL.
Manual Merge Example
^^^^^^^^^^^^^^^^^^^^
demo:3[]
If `git cl upload` errors out, the branch you're uploading to probably has a CL
with the same Change-Id. Instead of cherry-picking manually, use the Reland
button in the Gerrit UI to create a new CL, and patch that CL into your client.
SEE ALSO
--------
linkgit:git-cherry-pick[1], linkgit:git-revert[1]
include::_footer.txt[]
// vim: ft=asciidoc:
man/src/make_docs.sh
View file @ 8d2f7740
......@@ -4,6 +4,9 @@ set -e
shopt -s nullglob
# disable metrics report
export DEPOT_TOOLS_METRICS=0
cd $(dirname "$0")
# Script which takes all the asciidoc git-*.txt files in this directory, renders
......@@ -34,22 +37,22 @@ then
fi
# We pull asciidoc to get the right version
BRANCH=9.1.0
ASCIIDOC_HASH=9705d428439530104ce55d0ba12e8ef9d1b57ad1
BRANCH=10.2.0
ASCIIDOC_HASH=545b79b8d7dae70d12bf0657359bdd36de0c5c26
if [[ ! -d asciidoc || $(cd asciidoc && git rev-parse HEAD) != $ASCIIDOC_HASH ]]
then
echo Cloning asciidoc
rm -rf asciidoc
git clone --branch $BRANCH https://github.com/asciidoc-py/asciidoc-py asciidoc
(cd asciidoc && ln -s asciidoc.py asciidoc)
(cd asciidoc/asciidoc && ln -s asciidoc.py asciidoc)
fi
echo Asciidoc up to date at $ASCIIDOC_HASH \($BRANCH\)
export PATH=`pwd`/asciidoc:$PATH
export PATH=`pwd`/asciidoc/asciidoc:$PATH
# We pull ansi2hash to convert demo script output
BRANCH=1.6.0
ANSI2HTML_HASH=1ca0e862dda765c55e9124bf50a06a3e2f769521
BRANCH=1.8.0
ANSI2HTML_HASH=545b79b8d7dae70d12bf0657359bdd36de0c5c26
if [[ ! -d ansi2html || $(git -C ansi2html rev-parse HEAD) != $ANSI2HTML_HASH ]]
then
echo Cloning ansi2html
......@@ -61,8 +64,8 @@ fi
echo ansi2html up to date at $ANSI2HTML_HASH \($BRANCH\)
# We pull git to get its documentation toolchain
BRANCH=v2.32.0
GITHASH=ebf3c04b262aa27fbb97f8a0156c2347fecafafb
BRANCH=v2.35.1
GITHASH=4c53a8c20f8984adb226293a3ffd7b88c3f4ac1a
if [[ ! -d git || $(git -C git rev-parse HEAD) != $GITHASH ]]
then
echo Cloning git
......@@ -71,7 +74,7 @@ then
https://kernel.googlesource.com/pub/scm/git/git.git 2> /dev/null
ed git/Documentation/Makefile <<EOF
H
141
142
s/Git Manual/Chromium depot_tools Manual
s/Git/depot_tools
wq
......@@ -131,7 +134,7 @@ EOF
(?su)[\\\\]?(?P<name>demo):(?P<target>\S*?)\[\]=
[demo-inlinemacro]
{sys3:cd $(pwd); ./{docname}.demo.{target}.sh | python filter_demo_output.py {backend} }
{sys3:cd $(pwd); ./{docname}.demo.{target}.sh | python3 filter_demo_output.py {backend} }
EOF
fi
......@@ -229,7 +232,7 @@ fi
(
export GIT_DIR="$(git rev-parse --git-dir)" &&
cd git/Documentation &&
GIT_EDITOR=true make -j"$JOBS" "${MAN1_TARGETS[@]}" "${MAN7_TARGETS[@]}" "${HTML_TARGETS[@]}"
GIT_EDITOR=true make "${MAN1_TARGETS[@]}" "${MAN7_TARGETS[@]}" "${HTML_TARGETS[@]}"
)
for x in "${HTML_TARGETS[@]}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment