Skip to content

Commit 26adc2a

Browse files
sokcevicGLUCI CQ
sokcevicG
authored and
LUCI CQ
committed
Fix generating man pages
Relevant change is in make_docs.sh, all other files were generated. [email protected] Changes: * upgrade to latest asciidoc, ansi2html and git * disable interactive git editor (happens during rebase) * minor tweaks Change-Id: Ie4b19aa12b8a76826f66e3088c985b99e55164c7 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3000882 Reviewed-by: Robbie Iannucci <[email protected]> Commit-Queue: Josip Sokcevic <[email protected]>
1 parent 4362da4 commit 26adc2a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+710
-664
lines changed

‎man/html/depot_tools.html

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
23
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
34
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
45
<head>
56
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
6-
<meta name="generator" content="AsciiDoc 8.6.9" />
7+
<meta name="generator" content="AsciiDoc 9.1.0" />
78
<title>depot_tools(7)</title>
89
<style type="text/css">
910
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -435,7 +436,7 @@
435436
p.table {
436437
margin-top: 0;
437438
}
438-
/* Because the table frame attribute is overriden by CSS in most browsers. */
439+
/* Because the table frame attribute is overridden by CSS in most browsers. */
439440
div.tableblock > table[frame="void"] {
440441
border-style: none;
441442
}
@@ -927,7 +928,8 @@ <h2 id="_helper_tools">HELPER TOOLS</h2>
927928
<div id="footnotes"><hr /></div>
928929
<div id="footer">
929930
<div id="footer-text">
930-
Last updated 2020-08-10 17:51:13 CEST
931+
Last updated
932+
2021-07-01 07:07:00 PDT
931933
</div>
932934
</div>
933935
</body>

‎man/html/depot_tools_tutorial.html

+96-94
Large diffs are not rendered by default.

‎man/html/git-cl.html

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
23
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
34
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
45
<head>
56
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
6-
<meta name="generator" content="AsciiDoc 8.6.9" />
7+
<meta name="generator" content="AsciiDoc 9.1.0" />
78
<title>git-cl(1)</title>
89
<style type="text/css">
910
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -435,7 +436,7 @@
435436
p.table {
436437
margin-top: 0;
437438
}
438-
/* Because the table frame attribute is overriden by CSS in most browsers. */
439+
/* Because the table frame attribute is overridden by CSS in most browsers. */
439440
div.tableblock > table[frame="void"] {
440441
border-style: none;
441442
}
@@ -1026,7 +1027,8 @@ <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
10261027
<div id="footnotes"><hr /></div>
10271028
<div id="footer">
10281029
<div id="footer-text">
1029-
Last updated 2020-08-10 17:51:13 CEST
1030+
Last updated
1031+
2021-07-01 07:07:00 PDT
10301032
</div>
10311033
</div>
10321034
</body>

‎man/html/git-drover.html

+20-18
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
23
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
34
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
45
<head>
56
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
6-
<meta name="generator" content="AsciiDoc 8.6.9" />
7+
<meta name="generator" content="AsciiDoc 9.1.0" />
78
<title>git-drover(1)</title>
89
<style type="text/css">
910
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -435,7 +436,7 @@
435436
p.table {
436437
margin-top: 0;
437438
}
438-
/* Because the table frame attribute is overriden by CSS in most browsers. */
439+
/* Because the table frame attribute is overridden by CSS in most browsers. */
439440
div.tableblock > table[frame="void"] {
440441
border-style: none;
441442
}
@@ -858,7 +859,7 @@ <h3 id="_prerequisites">PREREQUISITES</h3>
858859
<h4 id="_merge_example">Merge Example</h4>
859860
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Here's a commit (from some.committer) that we want to 'drover'.
860861
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
861-
<span style="color: #e7e71c">commit c980d966aab8516cc651409da4bf21ca8a4a3613</span>
862+
<span style="color: #e7e71c">commit 62472550afc1d8c317c49bdda05a241e1477e438</span>
862863
Author: some.committer &lt;[email protected]&gt;
863864
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
864865
Commit: some.committer &lt;[email protected]&gt;
@@ -867,10 +868,10 @@ <h4 id="_merge_example">Merge Example</h4>
867868
This change needs to go to branch 9999
868869

869870
# Now do the 'drover'.
870-
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick c980d966aab8516cc651409da4bf21ca8a4a3613</span>
871+
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick 62472550afc1d8c317c49bdda05a241e1477e438</span>
871872
Going to cherry-pick
872873
"""
873-
<span style="color: #e7e71c">commit c980d966aab8516cc651409da4bf21ca8a4a3613</span>
874+
<span style="color: #e7e71c">commit 62472550afc1d8c317c49bdda05a241e1477e438</span>
874875
Author: some.committer &lt;[email protected]&gt;
875876
Date: Thu Apr 10 08:54:46 2014 +0000
876877

@@ -888,7 +889,7 @@ <h4 id="_merge_example">Merge Example</h4>
888889
<h4 id="_merge_with_conflicts_example">Merge with Conflicts Example</h4>
889890
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Here's a commit (from some.committer) that we want to 'drover'.
890891
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
891-
<span style="color: #e7e71c">commit 2d78cf765179c7be5e7e6d1e4565a0d3769e9174</span>
892+
<span style="color: #e7e71c">commit 7fd5f30fcbf6010bb579794d3080ea37d050b26d</span>
892893
Author: some.committer &lt;[email protected]&gt;
893894
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
894895
Commit: some.committer &lt;[email protected]&gt;
@@ -897,10 +898,10 @@ <h4 id="_merge_with_conflicts_example">Merge with Conflicts Example</h4>
897898
This change needs to go to branch 9999
898899

899900
# Now do the 'drover'.
900-
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick 2d78cf765179c7be5e7e6d1e4565a0d3769e9174</span>
901+
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick 7fd5f30fcbf6010bb579794d3080ea37d050b26d</span>
901902
Going to cherry-pick
902903
"""
903-
<span style="color: #e7e71c">commit 2d78cf765179c7be5e7e6d1e4565a0d3769e9174</span>
904+
<span style="color: #e7e71c">commit 7fd5f30fcbf6010bb579794d3080ea37d050b26d</span>
904905
Author: some.committer &lt;[email protected]&gt;
905906
Date: Thu Apr 10 08:54:46 2014 +0000
906907

@@ -942,24 +943,24 @@ <h4 id="_revert_example">Revert Example</h4>
942943

943944
# Here's the commit we want to revert.
944945
<span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
945-
<span style="color: #e7e71c">commit 54f88a53372983c7aecacfb9a4d2fa63501fda58</span>
946+
<span style="color: #e7e71c">commit fe52372519f5152cb7198467ed1a4f3c6f2bd8e5</span>
946947
Author: some.committer &lt;[email protected]&gt;
947948
Date: Thu Apr 10 08:54:46 2014 +0000
948949

949950
This change is horribly broken.
950951

951952
# Now do the revert.
952-
<span style="font-weight: bold; color: #ffffff">$ git revert 54f88a53372983c7aecacfb9a4d2fa63501fda58</span>
953+
<span style="font-weight: bold; color: #ffffff">$ git revert fe52372519f5152cb7198467ed1a4f3c6f2bd8e5</span>
953954

954955
# That reverted the change and committed the revert.
955956
<span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
956-
<span style="color: #e7e71c">commit 4d932bdd1071e318e6a4d3d6fd6034f9105cad5a</span>
957+
<span style="color: #e7e71c">commit 72fef2931683370c31c218f114deed6f507df942</span>
957958
Author: you &lt;[email protected]&gt;
958959
Date: Thu Apr 10 09:11:36 2014 +0000
959960

960961
Revert "This change is horribly broken."
961962

962-
This reverts commit 54f88a53372983c7aecacfb9a4d2fa63501fda58.
963+
This reverts commit fe52372519f5152cb7198467ed1a4f3c6f2bd8e5.
963964

964965
# As with old drover, reverts are generally OK to commit without LGTM.
965966
<span style="font-weight: bold; color: #ffffff">$ git cl upload -r [email protected] --send-mail</span>
@@ -976,7 +977,7 @@ <h4 id="_manual_merge_example">Manual Merge Example</h4>
976977

977978
# Here's a commit (from some.committer) that we want to 'drover'.
978979
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
979-
<span style="color: #e7e71c">commit 8ed5a6585548f2092890b404f6ff49bd5ce6ab9a</span>
980+
<span style="color: #e7e71c">commit 068a64822d90ab3b918425679816aee2d9be1e24</span>
980981
Author: some.committer &lt;[email protected]&gt;
981982
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
982983
Commit: some.committer &lt;[email protected]&gt;
@@ -990,8 +991,8 @@ <h4 id="_manual_merge_example">Manual Merge Example</h4>
990991

991992
# Now do the 'drover'.
992993
# IMPORTANT!!! Do Not leave off the '-x' flag
993-
<span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x 8ed5a6585548f2092890b404f6ff49bd5ce6ab9a</span>
994-
[drover_9999 77a956b] This change needs to go to branch 9999
994+
<span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x 068a64822d90ab3b918425679816aee2d9be1e24</span>
995+
[drover_9999 cda4a18] This change needs to go to branch 9999
995996
Author: some.committer &lt;[email protected]&gt;
996997
Date: Thu Apr 10 08:54:46 2014 +0000
997998
1 file changed, 1 insertion(+)
@@ -1000,15 +1001,15 @@ <h4 id="_manual_merge_example">Manual Merge Example</h4>
10001001
# That took the code authored by some.committer and committed it to
10011002
# the branch by the person who drovered it (i.e. you).
10021003
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
1003-
<span style="color: #e7e71c">commit 77a956ba0f28eb29ed009f58a5d71b6a10283358</span>
1004+
<span style="color: #e7e71c">commit cda4a18321ef3f603e955da6e263b6cadff11885</span>
10041005
Author: some.committer &lt;[email protected]&gt;
10051006
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
10061007
Commit: you &lt;[email protected]&gt;
10071008
CommitDate: Thu Apr 10 09:11:36 2014 +0000
10081009

10091010
This change needs to go to branch 9999
10101011

1011-
(cherry picked from commit 8ed5a6585548f2092890b404f6ff49bd5ce6ab9a)
1012+
(cherry picked from commit 068a64822d90ab3b918425679816aee2d9be1e24)
10121013

10131014
# Looks good. Ship it!
10141015
<span style="font-weight: bold; color: #ffffff">$ git cl upload</span>
@@ -1041,7 +1042,8 @@ <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
10411042
<div id="footnotes"><hr /></div>
10421043
<div id="footer">
10431044
<div id="footer-text">
1044-
Last updated 2020-08-10 17:51:13 CEST
1045+
Last updated
1046+
2021-07-01 07:07:00 PDT
10451047
</div>
10461048
</div>
10471049
</body>

‎man/html/git-footers.html

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
23
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
34
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
45
<head>
56
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
6-
<meta name="generator" content="AsciiDoc 8.6.9" />
7+
<meta name="generator" content="AsciiDoc 9.1.0" />
78
<title>git-footers(1)</title>
89
<style type="text/css">
910
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -435,7 +436,7 @@
435436
p.table {
436437
margin-top: 0;
437438
}
438-
/* Because the table frame attribute is overriden by CSS in most browsers. */
439+
/* Because the table frame attribute is overridden by CSS in most browsers. */
439440
div.tableblock > table[frame="void"] {
440441
border-style: none;
441442
}
@@ -871,7 +872,8 @@ <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
871872
<div id="footnotes"><hr /></div>
872873
<div id="footer">
873874
<div id="footer-text">
874-
Last updated 2020-08-10 17:51:13 CEST
875+
Last updated
876+
2021-07-01 07:07:00 PDT
875877
</div>
876878
</div>
877879
</body>

‎man/html/git-freeze.html

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
23
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
34
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
45
<head>
56
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
6-
<meta name="generator" content="AsciiDoc 8.6.9" />
7+
<meta name="generator" content="AsciiDoc 9.1.0" />
78
<title>git-freeze(1)</title>
89
<style type="text/css">
910
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -435,7 +436,7 @@
435436
p.table {
436437
margin-top: 0;
437438
}
438-
/* Because the table frame attribute is overriden by CSS in most browsers. */
439+
/* Because the table frame attribute is overridden by CSS in most browsers. */
439440
div.tableblock > table[frame="void"] {
440441
border-style: none;
441442
}
@@ -790,7 +791,7 @@ <h2 id="_example">EXAMPLE</h2>
790791
<span style="font-weight: bold; color: #ffffff">$ git freeze</span>
791792
<span style="font-weight: bold; color: #ffffff">$ git status --short</span>
792793
<span style="font-weight: bold; color: #ffffff">$ git log -n 2 --stat</span>
793-
<span style="color: #e7e71c">commit 7aeb49f4c5b451bbb7eacecae9d505d7225b93b4</span>
794+
<span style="color: #e7e71c">commit 2b8214881eb8a660a86c0551f84eb39e6763acf3</span>
794795
Author: local &lt;[email protected]&gt;
795796
Date: Thu Apr 10 08:54:56 2014 +0000
796797

@@ -802,7 +803,7 @@ <h2 id="_example">EXAMPLE</h2>
802803
unstaged_deleted_file | 1 <span style="color: #e42e16">-</span>
803804
4 files changed, 2 insertions(+), 1 deletion(-)
804805

805-
<span style="color: #e7e71c">commit d0f7d7d198cc9274ef8e7467a4a817a47eb80a13</span>
806+
<span style="color: #e7e71c">commit 4e1ca78d22a542047891f597545223dc6ce1b757</span>
806807
Author: local &lt;[email protected]&gt;
807808
Date: Thu Apr 10 08:54:56 2014 +0000
808809

@@ -852,7 +853,8 @@ <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
852853
<div id="footnotes"><hr /></div>
853854
<div id="footer">
854855
<div id="footer-text">
855-
Last updated 2020-08-10 17:51:13 CEST
856+
Last updated
857+
2021-07-01 07:07:00 PDT
856858
</div>
857859
</div>
858860
</body>

‎man/html/git-hyper-blame.html

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
23
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
34
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
45
<head>
56
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
6-
<meta name="generator" content="AsciiDoc 8.6.9" />
7+
<meta name="generator" content="AsciiDoc 9.1.0" />
78
<title>git-hyper-blame(1)</title>
89
<style type="text/css">
910
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -435,7 +436,7 @@
435436
p.table {
436437
margin-top: 0;
437438
}
438-
/* Because the table frame attribute is overriden by CSS in most browsers. */
439+
/* Because the table frame attribute is overridden by CSS in most browsers. */
439440
div.tableblock > table[frame="void"] {
440441
border-style: none;
441442
}
@@ -871,7 +872,8 @@ <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
871872
<div id="footnotes"><hr /></div>
872873
<div id="footer">
873874
<div id="footer-text">
874-
Last updated 2020-08-10 17:51:13 CEST
875+
Last updated
876+
2021-07-01 07:07:00 PDT
875877
</div>
876878
</div>
877879
</body>

‎man/html/git-map-branches.html

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
23
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
34
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
45
<head>
56
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
6-
<meta name="generator" content="AsciiDoc 8.6.9" />
7+
<meta name="generator" content="AsciiDoc 9.1.0" />
78
<title>git-map-branches(1)</title>
89
<style type="text/css">
910
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -435,7 +436,7 @@
435436
p.table {
436437
margin-top: 0;
437438
}
438-
/* Because the table frame attribute is overriden by CSS in most browsers. */
439+
/* Because the table frame attribute is overridden by CSS in most browsers. */
439440
div.tableblock > table[frame="void"] {
440441
border-style: none;
441442
}
@@ -857,9 +858,9 @@ <h2 id="_example">EXAMPLE</h2>
857858
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
858859
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> frozen_branch *
859860
</span><span style="font-weight: bold; color: #ffffff">$ git map-branches -v</span>
860-
<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">
861-
</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">
862-
</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">
861+
<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">
862+
</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">
863+
</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">
863864
</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">]
864865
</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">]
865866
</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">]
@@ -897,7 +898,8 @@ <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
897898
<div id="footnotes"><hr /></div>
898899
<div id="footer">
899900
<div id="footer-text">
900-
Last updated 2020-08-10 17:51:13 CEST
901+
Last updated
902+
2021-07-01 07:07:00 PDT
901903
</div>
902904
</div>
903905
</body>

0 commit comments

Comments
 (0)