Skip to content

C
Chromium_Depot_tools
Commit 3c669839 authored by iannucci@chromium.org's avatar iannucci@chromium.org
Browse files
Options

Improvements and bugfixes to the depot_tools doc generation process. 

Works on linux in addition to OS X now.

TBR=agable@chromium.org
BUG=

Review URL: https://codereview.chromium.org/234733003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263292 0039d316-1c4b-4281-b951-d872f2087c98
parent f1eccafb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 158 deletions
docs/html/depot_tools_tutorial.html
View file @ 3c669839
......@@ -1047,10 +1047,10 @@ It was a Domo-Kuun.
* <span style="font-weight: bold; color: #e42e16">2250f53 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
* <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
<span style="font-weight: bold; color: #ffffff">$ git status</span>
On branch fix_typo
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
# On branch fix_typo
# Your branch is ahead of 'origin/master' by 1 commit.
# (use "git push" to publish your local commits)
#
nothing to commit, working directory clean
<span style="font-weight: bold; color: #ffffff">$ git cl upload -r domo@chromium.org --send-mail</span>
... truncated output ...
......@@ -1066,15 +1066,15 @@ overhead, barely disturbing the thick cigarette smoke. No doubt was left about
when the fan was last cleaned.
EOF
<span style="font-weight: bold; color: #ffffff">$ git status</span>
On branch chap2
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
(use "git add &lt;file&gt;..." to update what will be committed)
(use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
<span style="color: #e42e16">modified: build/whitespace_file.txt</span>
# On branch chap2
# Your branch is up-to-date with 'origin/master'.
#
# Changes not staged for commit:
# (use "git add &lt;file&gt;..." to update what will be committed)
# (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
#
# <span style="color: #e42e16">modified: build/whitespace_file.txt</span>
#
no changes added to commit (use "git add" and/or "git commit -a")
</code></pre></div></div><p><div class="paragraph"> Someone on the code review pointed out that our typo-fix has a typo :( We're still working on 'chap2' but we really want to land 'fix_typo', so let's switch over and fix it.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git freeze</span>
<span style="font-weight: bold; color: #ffffff">$ git checkout fix_typo</span>
......@@ -1223,7 +1223,7 @@ EOF
* <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
</code></pre></div></div><p><div class="paragraph"> We haven't updated the code in a while, so let's do that now.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git rebase-update</span>
Fetching origin
From /Users/iannucci/chromium/depot_tools/docs/src/demo_repo
From https://upstream
beec6f4..59cdb73 master -&gt; origin/master
Rebasing: chap2
Rebasing: fix_typo
......@@ -1251,7 +1251,7 @@ Deleted branch chap2 (was 5d26fec).
* <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
</code></pre></div></div><p><div class="paragraph"> Someone on IRC mentions that they actually landed a chapter 3 already! We should pull their changes before continuing. Brace for a code conflict!</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git rebase-update</span>
Fetching origin
From /Users/iannucci/chromium/depot_tools/docs/src/demo_repo
From https://upstream
5d26fec..59cdb73 master -&gt; origin/master
Rebasing: chap2
... lots of output, it's a conflict alright :(...
......
docs/html/git-freeze.html
View file @ 3c669839
......@@ -788,7 +788,7 @@ time you ran git freeze (freshly modified files, new files, etc.).</p></div>
<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 2903a59a5323dd12438a9b3912a878a546b5d68a</span>
<span style="color: #e7e71c">commit 648c29b68da0142bcad41872339f9732c6ec4470</span>
Author: local &lt;local@chromium.org&gt;
Date: Thu Apr 10 08:54:56 2014 +0000
......@@ -800,7 +800,7 @@ Date: Thu Apr 10 08:54:56 2014 +0000
unstaged_deleted_file | 1 <span style="color: #e42e16">-</span>
4 files changed, 2 insertions(+), 1 deletion(-)
<span style="color: #e7e71c">commit 19e09ed3f4a23417cf46ce0961fc7434132d0295</span>
<span style="color: #e7e71c">commit a4e49c2896814f52feec3fc06ef0454962ee6b8c</span>
Author: local &lt;local@chromium.org&gt;
Date: Thu Apr 10 08:54:56 2014 +0000
......
docs/html/git-map.html
View file @ 3c669839
This diff is collapsed.
docs/html/git-nav-downstream.html
View file @ 3c669839
......@@ -783,7 +783,7 @@ Please select a downstream branch
0. cool_feature
1. fixit
Selection (0-1)[0]: 0
Previous HEAD position was 619ccc9... Make ReflectorImpl use mailboxes
Previous HEAD position was beec6f4... Make ReflectorImpl use mailboxes
Switched to branch 'cool_feature'
Your branch is ahead of 'origin/master' by 4 commits.
(use "git push" to publish your local commits)
......
docs/html/git-nav-upstream.html
View file @ 3c669839
......@@ -798,7 +798,7 @@ do so (now or later) by using -b with the checkout command again. Example:
git checkout -b new_branch_name
HEAD is now at 619ccc9... Make ReflectorImpl use mailboxes
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/master *
</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> cool_feature
......
docs/html/git-new-branch.html
View file @ 3c669839
......@@ -854,6 +854,7 @@ defaults to <em>origin/master</em>. This is considered to be the <em>root</em>
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch
</span><span style="color: #19c518"></span><span style="color: #19c518"> independent_cl
</span><span style="font-weight: bold; color: #ffffff">$ git checkout cool_feature</span>
Switched to branch 'cool_feature'
Your branch is ahead of 'origin/master' by 4 commits.
(use "git push" to publish your local commits)
<span style="font-weight: bold; color: #ffffff">$ git new-branch --upstream_current cl_depends_on_cool_feature</span>
......
docs/html/git-squash-branch.html
View file @ 3c669839
This diff is collapsed.
docs/man1/git-freeze.1
View file @ 3c669839
......@@ -58,7 +58,7 @@ D deleted_file
\fB$ git freeze\fR
\fB$ git status \-\-short\fR
\fB$ git log \-n 2 \-\-stat\fR
commit bed4472f2ad34bebabd7cf79f3155ebc6d86707d
commit 85b90eda860a6f62d95efdb29a09ebe2bace018d
Author: local <local@chromium\&.org>
Date: Thu Apr 10 08:54:56 2014 +0000
......@@ -70,7 +70,7 @@ Date: Thu Apr 10 08:54:56 2014 +0000
unstaged_deleted_file | 1 \-
4 files changed, 2 insertions(+), 1 deletion(\-)
commit cde1eb5500ede60053ae47b3fb1231e9e62be793
commit 4d4db1b3bfbb42b0c9c87326bd522cc9d6946911
Author: local <local@chromium\&.org>
Date: Thu Apr 10 08:54:56 2014 +0000
......
docs/man1/git-map.1
View file @ 3c669839
......@@ -138,26 +138,26 @@ Running \fIgit map\fR would result in an output something like:
.\}
.nf
\fB$ git map\fR
\fB* a8f0220 \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ FREEZE\&.unindexed
* \fBc382556 \fR 2014\-04\-10 ~ modfile
* \fB06e399f \fR 2014\-04\-10 ~ a deleted file
* \fB20494d2 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen_branch)\fR
* \fBf734bbf \fR 2014\-04\-10 ~ Epic README update
| * \fB983a7b8 \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments
| | * \fB2f53c1f \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with CoolService
| | * \fBb4e5087 \fR 2014\-04\-10 ~ slick commenting action
\fB* d0fb9c7 \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ FREEZE\&.unindexed
* \fBf48f415 \fR 2014\-04\-10 ~ modfile
* \fB4c5b9c0 \fR 2014\-04\-10 ~ a deleted file
* \fBf7ce1e4 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen_branch)\fR
* \fB3726937 \fR 2014\-04\-10 ~ Epic README update
| * \fB14db2e5 \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments
| | * \fBee3f972 \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with CoolService
| | * \fB4f9f508 \fR 2014\-04\-10 ~ slick commenting action
| |/
| * \fBac10591 \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR
| * \fB088691d \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen
| * \fB206ceb2 \fR 2014\-04\-10 ~ Add widget
| * \fB7d84f85 \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR
| * \fB27abea4 \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen
| * \fBd8abe73 \fR 2014\-04\-10 ~ Add widget
|/
* \fB619ccc9 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR
* \fB40b838e \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fB65db351 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fBc1923e0 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fBccaca03 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB9b1c1ab \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fBa91bbf9 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
* \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR
* \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
.fi
.if n \{\
.RE
......
docs/man1/git-nav-downstream.1
View file @ 3c669839
......@@ -57,7 +57,7 @@ Please select a downstream branch
0\&. cool_feature
1\&. fixit
Selection (0\-1)[0]: 0
Previous HEAD position was 619ccc9\&.\&.\&. Make ReflectorImpl use mailboxes
Previous HEAD position was beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes
Switched to branch \*(Aqcool_feature\*(Aq
Your branch is ahead of \*(Aqorigin/master\*(Aq by 4 commits\&.
(use "git push" to publish your local commits)
......
docs/man1/git-nav-upstream.1
View file @ 3c669839
......@@ -74,7 +74,7 @@ do so (now or later) by using \-b with the checkout command again\&. Example:
git checkout \-b new_branch_name
HEAD is now at 619ccc9\&.\&.\&. Make ReflectorImpl use mailboxes
HEAD is now at beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes
\fB$ git map\-branches\fR
\fBorigin/master *
\fR cool_feature
......
docs/man1/git-new-branch.1
View file @ 3c669839
......@@ -101,6 +101,7 @@ origin/master
frozen_branch
independent_cl
\fB$ git checkout cool_feature\fR
Switched to branch \*(Aqcool_feature\*(Aq
Your branch is ahead of \*(Aqorigin/master\*(Aq by 4 commits\&.
(use "git push" to publish your local commits)
\fB$ git new\-branch \-\-upstream_current cl_depends_on_cool_feature\fR
......
docs/man1/git-squash-branch.1
View file @ 3c669839
......@@ -55,46 +55,46 @@ Optional message to use for the first line of the squashed commit\&. If omitted,
.\}
.nf
\fB$ git map\fR
\fB* a8f0220 \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ FREEZE\&.unindexed
* \fBc382556 \fR 2014\-04\-10 ~ modfile
* \fB06e399f \fR 2014\-04\-10 ~ a deleted file
* \fB20494d2 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen_branch)\fR
* \fBf734bbf \fR 2014\-04\-10 ~ Epic README update
| * \fB983a7b8 \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments
| | * \fB2f53c1f \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with CoolService
| | * \fBb4e5087 \fR 2014\-04\-10 ~ slick commenting action
\fB* d0fb9c7 \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ FREEZE\&.unindexed
* \fBf48f415 \fR 2014\-04\-10 ~ modfile
* \fB4c5b9c0 \fR 2014\-04\-10 ~ a deleted file
* \fBf7ce1e4 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen_branch)\fR
* \fB3726937 \fR 2014\-04\-10 ~ Epic README update
| * \fB14db2e5 \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments
| | * \fBee3f972 \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with CoolService
| | * \fB4f9f508 \fR 2014\-04\-10 ~ slick commenting action
| |/
| * \fBac10591 \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR
| * \fB088691d \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen
| * \fB206ceb2 \fR 2014\-04\-10 ~ Add widget
| * \fB7d84f85 \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR
| * \fB27abea4 \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen
| * \fBd8abe73 \fR 2014\-04\-10 ~ Add widget
|/
* \fB619ccc9 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR
* \fB40b838e \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fB65db351 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fBc1923e0 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fBccaca03 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB9b1c1ab \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fBa91bbf9 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
* \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR
* \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a74 \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
\fB* 5b451bd \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ cool squash demo
* \fB20494d2 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen_branch)\fR
* \fBf734bbf \fR 2014\-04\-10 ~ Epic README update
| * \fB983a7b8 \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments
| | * \fB2f53c1f \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with CoolService
| | * \fBb4e5087 \fR 2014\-04\-10 ~ slick commenting action
\fB* 98e69e8 \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ cool squash demo
* \fBf7ce1e4 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen_branch)\fR
* \fB3726937 \fR 2014\-04\-10 ~ Epic README update
| * \fB14db2e5 \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments
| | * \fBee3f972 \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with CoolService
| | * \fB4f9f508 \fR 2014\-04\-10 ~ slick commenting action
| |/
| * \fBac10591 \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR
| * \fB088691d \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen
| * \fB206ceb2 \fR 2014\-04\-10 ~ Add widget
| * \fB7d84f85 \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR
| * \fB27abea4 \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen
| * \fBd8abe73 \fR 2014\-04\-10 ~ Add widget
|/
* \fB619ccc9 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR
* \fB40b838e \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fB65db351 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fBc1923e0 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fBccaca03 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB9b1c1ab \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fBa91bbf9 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
* \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB <(cool_feature, fixit)\fR
* \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
* \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewRenderView
* \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
.fi
.if n \{\
.RE
......
docs/man7/depot_tools_tutorial.7
View file @ 3c669839
......@@ -376,10 +376,10 @@ It was a Domo\-Kuun\&.
* \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
\fB$ git status\fR
On branch fix_typo
Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&.
(use "git push" to publish your local commits)
# On branch fix_typo
# Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&.
# (use "git push" to publish your local commits)
#
nothing to commit, working directory clean
\fB$ git cl upload \-r domo@chromium\&.org \-\-send\-mail\fR
\&.\&.\&. truncated output \&.\&.\&.
......@@ -406,15 +406,15 @@ overhead, barely disturbing the thick cigarette smoke\&. No doubt was left about
when the fan was last cleaned\&.
EOF
\fB$ git status\fR
On branch chap2
Your branch is up\-to\-date with \*(Aqorigin/master\*(Aq\&.
Changes not staged for commit:
(use "git add <file>\&.\&.\&." to update what will be committed)
(use "git checkout \-\- <file>\&.\&.\&." to discard changes in working directory)
modified: build/whitespace_file\&.txt
# On branch chap2
# Your branch is up\-to\-date with \*(Aqorigin/master\*(Aq\&.
#
# Changes not staged for commit:
# (use "git add <file>\&.\&.\&." to update what will be committed)
# (use "git checkout \-\- <file>\&.\&.\&." to discard changes in working directory)
#
# modified: build/whitespace_file\&.txt
#
no changes added to commit (use "git add" and/or "git commit \-a")
.fi
.if n \{\
......@@ -640,7 +640,7 @@ We haven\*(Aqt updated the code in a while, so let\*(Aqs do that now\&.
.nf
\fB$ git rebase\-update\fR
Fetching origin
From /Users/iannucci/chromium/depot_tools/docs/src/demo_repo
From https://upstream
beec6f4\&.\&.59cdb73 master \-> origin/master
Rebasing: chap2
Rebasing: fix_typo
......@@ -690,7 +690,7 @@ Someone on IRC mentions that they actually landed a chapter 3 already! We should
.nf
\fB$ git rebase\-update\fR
Fetching origin
From /Users/iannucci/chromium/depot_tools/docs/src/demo_repo
From https://upstream
5d26fec\&.\&.59cdb73 master \-> origin/master
Rebasing: chap2
\&.\&.\&. lots of output, it\*(Aqs a conflict alright :(\&.\&.\&.
......
docs/src/common_demo_functions.sh
View file @ 3c669839
......@@ -47,7 +47,7 @@ run() {
}
comment() {
echo "# $@"
echo "###COMMENT### $@"
}
# run a silent command
......
docs/src/depot_tools_tutorial.demo.tldr.sh
View file @ 3c669839
......@@ -23,7 +23,7 @@ ed_ws() {
echo -ne "\x1B[37;1m$ echo -e "
echo -n "'$1'"
echo -e " | ed $WS\x1B[m"
echo -e "$1" | ed $WS
echo -e "$1" | ed $WS 2>&1
}
# needs an extra echo afterwards
......@@ -117,7 +117,7 @@ map
comment "We haven't updated the code in a while, so let's do that now."
pcommand git rebase-update
echo Fetching origin
git fetch origin 2>&1 | grep -v 'stage'
git fetch origin 2>&1 | grep -v 'stage' | sed 's+From.*+From https://upstream+'
silent git update-ref refs/remotes/origin/master stage_2
silent git tag -d $(git tag -l 'stage_*')
git rebase-update --no_fetch
......@@ -132,7 +132,7 @@ comment "We should pull their changes before continuing. Brace for"
comment "a code conflict!"
pcommand git rebase-update
echo Fetching origin
git fetch origin 2>&1 | grep -v 'stage'
git fetch origin 2>&1 | grep -v 'stage' | sed 's+From.*+From https://upstream+'
silent git tag -d $(git tag -l 'stage_*')
echo Rebasing: chap2
silent git rebase-update
......
docs/src/filter_demo_output.py
View file @ 3c669839
......@@ -77,6 +77,8 @@ def main():
w = sys.stdout.write
comment_marker = '###COMMENT###'
callout_counter = 1
if backend == 'xhtml11':
preamble = (
......@@ -88,11 +90,11 @@ def main():
in_code = False
body = c.convert(output, full=False)
for i, line in enumerate(body.splitlines()):
if line.startswith('# '):
if line.startswith(comment_marker):
if in_code:
w(postamble)
in_code = False
w(line[1:])
w(line[len(comment_marker):])
else:
if not in_code:
w(preamble)
......@@ -115,11 +117,11 @@ def main():
in_code = False
body = simpleXML(output)
for i, line in enumerate(body.splitlines()):
if line.startswith('# '):
if line.startswith(comment_marker):
if in_code:
w(postamble)
in_code = False
w(line[1:])
w(line[len(comment_marker):])
else:
if not in_code:
w(preamble)
......
docs/src/git-freeze.demo.1.sh
View file @ 3c669839
#!/bin/sh
#!/bin/bash
. demo_repo.sh
add deleted_file
......
docs/src/git-map-branches.demo.1.sh
View file @ 3c669839
#!/bin/sh
#!/bin/bash
. demo_repo.sh
silent git branch no_upstream HEAD~
......
docs/src/git-map.demo.1.sh
View file @ 3c669839
#!/bin/sh
#!/bin/bash
. demo_repo.sh
run git map
docs/src/git-nav-downstream.demo.1.sh
View file @ 3c669839
#!/bin/sh
#!/bin/bash
. demo_repo.sh
silent git checkout origin/master
......
docs/src/git-nav-upstream.demo.1.sh
View file @ 3c669839
#!/bin/sh
#!/bin/bash
. demo_repo.sh
silent git checkout subfeature
......
docs/src/git-new-branch.demo.1.sh
View file @ 3c669839
#!/bin/sh
#!/bin/bash
. demo_repo.sh
run git map-branches
......@@ -7,6 +7,6 @@ run git map-branches
run git new-branch --upstream subfeature nested_cl
callout 3
run git map-branches
run git checkout cool_feature
run git checkout cool_feature 2>&1
run git new-branch --upstream_current cl_depends_on_cool_feature
run git map-branches
docs/src/git-squash-branch.demo.1.sh
View file @ 3c669839
#!/bin/sh
#!/bin/bash
. demo_repo.sh
run git map
......
docs/src/make_docs.sh
View file @ 3c669839
......@@ -41,6 +41,8 @@ then
fi
echo Asciidoc up to date at $ASCIIDOC_HASH \($BRANCH\)
export PATH=`pwd`/asciidoc:$PATH
# We pull ansi2hash to convert demo script output
BRANCH=1.0.6
ANSI2HTML_HASH=6282ab7a24a5a7eab2e0b23bb0055234c533a6e9
......
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