Skip to content

C
Chromium_Depot_tools
Commit aed3b0a9 authored by pgervais@chromium.org's avatar pgervais@chromium.org
Browse files
Options

Minor fixes 

BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@273851 0039d316-1c4b-4281-b951-d872f2087c98
parent 483a0ba3
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 66 deletions
man/html/depot_tools_tutorial.html
View file @ aed3b0a9
...@@ -988,7 +988,7 @@ commands:</p></div> ...@@ -988,7 +988,7 @@ commands:</p></div>
<strong><span class="white">$ gclient sync</span></strong> <strong><span class="white">$ gclient sync</span></strong>
<strong><span class="white">$</span></strong> # Make a new change and upload it for review <strong><span class="white">$</span></strong> # Make a new change and upload it for review
<strong><span class="white">$ git new-branch branchname</span></strong> <strong><span class="white">$ git new-branch &lt;branch_name&gt;</span></strong>
<strong><span class="white">$</span></strong> # repeat: [edit, git add, git commit] <strong><span class="white">$</span></strong> # repeat: [edit, git add, git commit]
<strong><span class="white">$ git cl upload</span></strong> <strong><span class="white">$ git cl upload</span></strong>
...@@ -1017,7 +1017,8 @@ directory:</p></div> ...@@ -1017,7 +1017,8 @@ directory:</p></div>
<pre><code><strong><span class="white">.gclient</span></strong> # A configuration file for you source checkout <pre><code><strong><span class="white">.gclient</span></strong> # A configuration file for you source checkout
<strong><span class="white">src/</span></strong> # Top-level Chromium source checkout.</code></pre> <strong><span class="white">src/</span></strong> # Top-level Chromium source checkout.</code></pre>
</div></div> </div></div>
<div class="paragraph"><p>If you are on linux, then you&#8217;ll need to run:</p></div> <div class="paragraph"><p>If you are on linux and fetching the code for the first time, then you&#8217;ll need
to run:</p></div>
<div class="listingblock"> <div class="listingblock">
<div class="content"> <div class="content">
<pre><code><strong><span class="white">$ cd src &amp;&amp; ./build/install-build-deps.sh</span></strong></code></pre> <pre><code><strong><span class="white">$ cd src &amp;&amp; ./build/install-build-deps.sh</span></strong></code></pre>
...@@ -1028,7 +1029,8 @@ directory:</p></div> ...@@ -1028,7 +1029,8 @@ directory:</p></div>
<pre><code><strong><span class="white">$ gclient sync</span></strong></code></pre> <pre><code><strong><span class="white">$ gclient sync</span></strong></code></pre>
</div></div> </div></div>
<div class="paragraph"><p>This will pull all dependencies of the Chromium src checkout. You will need <div class="paragraph"><p>This will pull all dependencies of the Chromium src checkout. You will need
to run this any time you update the main src checkout.</p></div> to run this any time you update the main src checkout, including when you
switch branches.</p></div>
</div> </div>
</div> </div>
<div class="sect1"> <div class="sect1">
...@@ -1044,23 +1046,23 @@ is the <code>src/</code> folder mentioned in <a href="#_getting_the_code">Gettin ...@@ -1044,23 +1046,23 @@ is the <code>src/</code> folder mentioned in <a href="#_getting_the_code">Gettin
</tr></table> </tr></table>
</div> </div>
<div class="paragraph"><p>Each CL corresponds exactly with a single branch in git. Any time you want to <div class="paragraph"><p>Each CL corresponds exactly with a single branch in git. Any time you want to
begin a new CL, just:</p></div> begin a new CL:</p></div>
<div class="listingblock"> <div class="listingblock">
<div class="content"> <div class="content">
<pre><code><strong><span class="white">$ git new-branch &lt;branch_name&gt;</span></strong></code></pre> <pre><code><strong><span class="white">$ git new-branch &lt;branch_name&gt;</span></strong></code></pre>
</div></div> </div></div>
<div class="paragraph"><p>This will create and checkout a new branch named <code>branch_name</code> which will track <div class="paragraph"><p>This will create and checkout a new branch named <code>branch_name</code> which will track
the default upstream (which is <code>origin/master</code>). See <a href="git-new-branch.html">git-new-branch(1)</a> the default upstream branch (<code>origin/master</code>). See
for more features, such as the ability to track <em>LKGR</em>.</p></div> <a href="git-new-branch.html">git-new-branch(1)</a> for more features.</p></div>
<div class="paragraph"><p>Commit as many changes as you like to this branch. When you want to upload it <div class="paragraph"><p>Commit as many changes as you like to this branch. When you want to upload it
for review, run:</p></div> for review, run:</p></div>
<div class="listingblock"> <div class="listingblock">
<div class="content"> <div class="content">
<pre><code><strong><span class="white">$ git cl upload</span></strong></code></pre> <pre><code><strong><span class="white">$ git cl upload</span></strong></code></pre>
</div></div> </div></div>
<div class="paragraph"><p>This will take the diff of your branch against its upstream (<code>origin/master</code>), <div class="paragraph"><p>This will take the diff of your branch against its upstream branch (in that
and will post it to the <a href="https://codereview.chromium.org">Chromium code case origin/master), and will post it to the
review site</a>.</p></div> <a href="https://codereview.chromium.org">Chromium code review site</a>.</p></div>
</div> </div>
</div> </div>
<div class="sect1"> <div class="sect1">
...@@ -1115,7 +1117,7 @@ automatically run <code>gclient sync</code> to update your dependencies.</td> ...@@ -1115,7 +1117,7 @@ automatically run <code>gclient sync</code> to update your dependencies.</td>
<div class="sectionbody"> <div class="sectionbody">
<div class="paragraph"><p>Sometimes you want to work on more than one CL at once (say, you have a CL <div class="paragraph"><p>Sometimes you want to work on more than one CL at once (say, you have a CL
posted for review and want to work on something else). For each CL that you posted for review and want to work on something else). For each CL that you
want to work on, just use <code>git new-branch &lt;branchname&gt;</code>.</p></div> want to work on, just use <code>git new-branch &lt;branch_name&gt;</code>.</p></div>
<div class="paragraph"><p>Once you start to have more than one CL at a time, it can be easy to lose your <div class="paragraph"><p>Once you start to have more than one CL at a time, it can be easy to lose your
bearings. Fortunately, <em>depot_tools</em> has two tools to help you out:</p></div> bearings. Fortunately, <em>depot_tools</em> has two tools to help you out:</p></div>
<div class="listingblock"> <div class="listingblock">
...@@ -1164,7 +1166,7 @@ bearings. Fortunately, <em>depot_tools</em> has two tools to help you out:</p></ ...@@ -1164,7 +1166,7 @@ bearings. Fortunately, <em>depot_tools</em> has two tools to help you out:</p></
</dt> </dt>
<dd> <dd>
<p> <p>
This tool just shows you which branches you have in your repo, and thier This tool just shows you which branches you have in your repo, and their
upstream relationship to each other (as well as which branch you have checked upstream relationship to each other (as well as which branch you have checked
out at the moment). out at the moment).
</p> </p>
...@@ -1236,9 +1238,9 @@ updating, and committing multiple CLs.</p></div> ...@@ -1236,9 +1238,9 @@ updating, and committing multiple CLs.</p></div>
</code></pre></div></div><p><div class="paragraph"> Let's fix something!</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git new-branch fix_typo</span> </code></pre></div></div><p><div class="paragraph"> Let's fix something!</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git new-branch fix_typo</span>
<span style="font-weight: bold; color: #ffffff">$ echo -e '/Banana\ns/Banana/Kuun\nwq' | ed build/whitespace_file.txt</span> <span style="font-weight: bold; color: #ffffff">$ echo -e '/Banana\ns/Banana/Kuun\nwq' | ed build/whitespace_file.txt</span>
1503 1503
1501
It was a Domo-Banana. It was a Domo-Banana.
It was a Domo-Kuun. It was a Domo-Kuun.
1501
<span style="font-weight: bold; color: #ffffff">$ git commit -am 'Fix terrible typo.'</span> <span style="font-weight: bold; color: #ffffff">$ git commit -am 'Fix terrible typo.'</span>
[fix_typo 615ffa7] Fix terrible typo. [fix_typo 615ffa7] Fix terrible typo.
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
...@@ -1252,10 +1254,10 @@ It was a Domo-Kuun. ...@@ -1252,10 +1254,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">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: #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> <span style="font-weight: bold; color: #ffffff">$ git status</span>
On branch fix_typo # On branch fix_typo
Your branch is ahead of 'origin/master' by 1 commit. # Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits) # (use "git push" to publish your local commits)
#
nothing to commit, working directory clean nothing to commit, working directory clean
<span style="font-weight: bold; color: #ffffff">$ git cl upload -r domo@chromium.org --send-mail</span> <span style="font-weight: bold; color: #ffffff">$ git cl upload -r domo@chromium.org --send-mail</span>
... truncated output ... ... truncated output ...
...@@ -1271,15 +1273,15 @@ overhead, barely disturbing the thick cigarette smoke. No doubt was left about ...@@ -1271,15 +1273,15 @@ overhead, barely disturbing the thick cigarette smoke. No doubt was left about
when the fan was last cleaned. when the fan was last cleaned.
EOF EOF
<span style="font-weight: bold; color: #ffffff">$ git status</span> <span style="font-weight: bold; color: #ffffff">$ git status</span>
On branch chap2 # On branch chap2
Your branch is up-to-date with 'origin/master'. # Your branch is up-to-date with 'origin/master'.
#
Changes not staged for commit: # Changes not staged for commit:
(use "git add &lt;file&gt;..." to update what will be committed) # (use "git add &lt;file&gt;..." to update what will be committed)
(use "git checkout -- &lt;file&gt;..." to discard changes in working directory) # (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
#
<span style="color: #e42e16">modified: build/whitespace_file.txt</span> # <span style="color: #e42e16">modified: build/whitespace_file.txt</span>
#
no changes added to commit (use "git add" and/or "git commit -a") 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> </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> <span style="font-weight: bold; color: #ffffff">$ git checkout fix_typo</span>
...@@ -1288,9 +1290,9 @@ Your branch is ahead of 'origin/master' by 1 commit. ...@@ -1288,9 +1290,9 @@ Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits) (use "git push" to publish your local commits)
<span style="font-weight: bold; color: #ffffff">$ echo -e '/Kuun\ns/Kuun/Kun\nwq' | ed build/whitespace_file.txt</span> <span style="font-weight: bold; color: #ffffff">$ echo -e '/Kuun\ns/Kuun/Kun\nwq' | ed build/whitespace_file.txt</span>
1501 1501
1500
It was a Domo-Kuun. It was a Domo-Kuun.
It was a Domo-Kun. It was a Domo-Kun.
1500
<span style="font-weight: bold; color: #ffffff">$ git upstream-diff --wordwise</span> <span style="font-weight: bold; color: #ffffff">$ git upstream-diff --wordwise</span>
<span style="font-weight: bold">diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt</span> <span style="font-weight: bold">diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt</span>
<span style="font-weight: bold">index 3eba355..57cdcee 100644</span> <span style="font-weight: bold">index 3eba355..57cdcee 100644</span>
...@@ -1579,7 +1581,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> ...@@ -1579,7 +1581,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
<div id="footnotes"><hr /></div> <div id="footnotes"><hr /></div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2014-04-28 13:55:43 PDT Last updated 2014-05-09 17:43:43 PDT
</div> </div>
</div> </div>
</body> </body>
......
man/man7/depot_tools_tutorial.7
View file @ aed3b0a9
'\" t '\" t
.\" Title: depot_tools_tutorial .\" Title: depot_tools_tutorial
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
.\" Date: 04/28/2014 .\" Date: 05/09/2014
.\" Manual: Chromium depot_tools Manual .\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 32af7d9 .\" Source: depot_tools 54dac93
.\" Language: English .\" Language: English
.\" .\"
.TH "DEPOT_TOOLS_TUTORIAL" "7" "04/28/2014" "depot_tools 32af7d9" "Chromium depot_tools Manual" .TH "DEPOT_TOOLS_TUTORIAL" "7" "05/09/2014" "depot_tools 54dac93" "Chromium depot_tools Manual"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
...@@ -41,6 +41,7 @@ The Chromium \fBdepot_tools\fR(7) suite contains many git workflow\-enhancing to ...@@ -41,6 +41,7 @@ The Chromium \fBdepot_tools\fR(7) suite contains many git workflow\-enhancing to
.sp -1 .sp -1
.IP \(bu 2.3 .IP \(bu 2.3
.\} .\}
Setting up Setting up
.RE .RE
.sp .sp
...@@ -52,6 +53,7 @@ Setting up ...@@ -52,6 +53,7 @@ Setting up
.sp -1 .sp -1
.IP \(bu 2.3 .IP \(bu 2.3
.\} .\}
Getting the code Getting the code
.RE .RE
.sp .sp
...@@ -63,6 +65,7 @@ Getting the code ...@@ -63,6 +65,7 @@ Getting the code
.sp -1 .sp -1
.IP \(bu 2.3 .IP \(bu 2.3
.\} .\}
TL;DR TL;DR
.RE .RE
.sp .sp
...@@ -74,6 +77,7 @@ TL;DR ...@@ -74,6 +77,7 @@ TL;DR
.sp -1 .sp -1
.IP \(bu 2.3 .IP \(bu 2.3
.\} .\}
Creating / Uploading a CL Creating / Uploading a CL
.RE .RE
.sp .sp
...@@ -85,6 +89,7 @@ Creating / Uploading a CL ...@@ -85,6 +89,7 @@ Creating / Uploading a CL
.sp -1 .sp -1
.IP \(bu 2.3 .IP \(bu 2.3
.\} .\}
Updating the code Updating the code
.RE .RE
.sp .sp
...@@ -96,6 +101,7 @@ Updating the code ...@@ -96,6 +101,7 @@ Updating the code
.sp -1 .sp -1
.IP \(bu 2.3 .IP \(bu 2.3
.\} .\}
Managing multiple CLs Managing multiple CLs
.RE .RE
.sp .sp
...@@ -107,6 +113,7 @@ Managing multiple CLs ...@@ -107,6 +113,7 @@ Managing multiple CLs
.sp -1 .sp -1
.IP \(bu 2.3 .IP \(bu 2.3
.\} .\}
Managing dependent CLs Managing dependent CLs
.RE .RE
.sp .sp
...@@ -118,6 +125,7 @@ Managing dependent CLs ...@@ -118,6 +125,7 @@ Managing dependent CLs
.sp -1 .sp -1
.IP \(bu 2.3 .IP \(bu 2.3
.\} .\}
Example Walkthrough Example Walkthrough
.RE .RE
.sp .sp
...@@ -150,6 +158,7 @@ This tutorial assumes basic familiarity with git terminology and concepts\&. If ...@@ -150,6 +158,7 @@ This tutorial assumes basic familiarity with git terminology and concepts\&. If
.sp -1 .sp -1
.IP \(bu 2.3 .IP \(bu 2.3
.\} .\}
\m[blue]\fBThink like (a) Git\fR\m[]\&\s-2\u[1]\d\s+2 \m[blue]\fBThink like (a) Git\fR\m[]\&\s-2\u[1]\d\s+2
\- A lighthearted overview of git\&. If you\(cqre sorta\-familiar with git, but not \- A lighthearted overview of git\&. If you\(cqre sorta\-familiar with git, but not
\fIcomfortable\fR \fIcomfortable\fR
...@@ -164,6 +173,7 @@ with it, then give this a look\&. ...@@ -164,6 +173,7 @@ with it, then give this a look\&.
.sp -1 .sp -1
.IP \(bu 2.3 .IP \(bu 2.3
.\} .\}
\m[blue]\fBGit Immersion Tutorial\fR\m[]\&\s-2\u[2]\d\s+2 \m[blue]\fBGit Immersion Tutorial\fR\m[]\&\s-2\u[2]\d\s+2
\- An in\-depth git tutorial\&. \- An in\-depth git tutorial\&.
.RE .RE
...@@ -176,6 +186,7 @@ with it, then give this a look\&. ...@@ -176,6 +186,7 @@ with it, then give this a look\&.
.sp -1 .sp -1
.IP \(bu 2.3 .IP \(bu 2.3
.\} .\}
\m[blue]\fBpcottle\(cqs Visual Git Branching\fR\m[]\&\s-2\u[3]\d\s+2 \m[blue]\fBpcottle\(cqs Visual Git Branching\fR\m[]\&\s-2\u[3]\d\s+2
\- An excellent interactive/graphical demo on how git handles commits, branches, and shows the operations git performs on them\&. \- An excellent interactive/graphical demo on how git handles commits, branches, and shows the operations git performs on them\&.
.RE .RE
...@@ -188,6 +199,7 @@ with it, then give this a look\&. ...@@ -188,6 +199,7 @@ with it, then give this a look\&.
.sp -1 .sp -1
.IP \(bu 2.3 .IP \(bu 2.3
.\} .\}
\m[blue]\fBPro Git book\fR\m[]\&\s-2\u[4]\d\s+2 \m[blue]\fBPro Git book\fR\m[]\&\s-2\u[4]\d\s+2
\- \(lqThe\(rq book for learning git from basics to advanced concepts\&. A bit dry, but very through\&. \- \(lqThe\(rq book for learning git from basics to advanced concepts\&. A bit dry, but very through\&.
.RE .RE
...@@ -267,7 +279,7 @@ If you have never used git before, you\(cqll need to set some global git configu ...@@ -267,7 +279,7 @@ If you have never used git before, you\(cqll need to set some global git configu
\fB$ gclient sync\fR \fB$ gclient sync\fR
\fB$\fR # Make a new change and upload it for review \fB$\fR # Make a new change and upload it for review
\fB$ git new\-branch branchname\fR \fB$ git new\-branch <branch_name>\fR
\fB$\fR # repeat: [edit, git add, git commit] \fB$\fR # repeat: [edit, git add, git commit]
\fB$ git cl upload\fR \fB$ git cl upload\fR
...@@ -312,7 +324,7 @@ When the fetch tool completes you should have the following in your working dire ...@@ -312,7 +324,7 @@ When the fetch tool completes you should have the following in your working dire
.\} .\}
.sp .sp
.sp .sp
If you are on linux, then you\(cqll need to run: If you are on linux and fetching the code for the first time, then you\(cqll need to run:
.sp .sp
.if n \{\ .if n \{\
.RS 4 .RS 4
...@@ -338,7 +350,7 @@ And finally: ...@@ -338,7 +350,7 @@ And finally:
.\} .\}
.sp .sp
.sp .sp
This will pull all dependencies of the Chromium src checkout\&. You will need to run this any time you update the main src checkout\&. This will pull all dependencies of the Chromium src checkout\&. You will need to run this any time you update the main src checkout, including when you switch branches\&.
.SH "CREATING / UPLOADING A CL" .SH "CREATING / UPLOADING A CL"
.if n \{\ .if n \{\
.sp .sp
...@@ -357,7 +369,7 @@ The remainder of the tutorial assumes that your current working directory is the ...@@ -357,7 +369,7 @@ The remainder of the tutorial assumes that your current working directory is the
.sp .5v .sp .5v
.RE .RE
.sp .sp
Each CL corresponds exactly with a single branch in git\&. Any time you want to begin a new CL, just: Each CL corresponds exactly with a single branch in git\&. Any time you want to begin a new CL:
.sp .sp
.if n \{\ .if n \{\
.RS 4 .RS 4
...@@ -370,7 +382,7 @@ Each CL corresponds exactly with a single branch in git\&. Any time you want to ...@@ -370,7 +382,7 @@ Each CL corresponds exactly with a single branch in git\&. Any time you want to
.\} .\}
.sp .sp
.sp .sp
This will create and checkout a new branch named branch_name which will track the default upstream (which is origin/master)\&. See \fBgit-new-branch\fR(1) for more features, such as the ability to track \fILKGR\fR\&. This will create and checkout a new branch named branch_name which will track the default upstream branch (origin/master)\&. See \fBgit-new-branch\fR(1) for more features\&.
.sp .sp
Commit as many changes as you like to this branch\&. When you want to upload it for review, run: Commit as many changes as you like to this branch\&. When you want to upload it for review, run:
.sp .sp
...@@ -385,7 +397,7 @@ Commit as many changes as you like to this branch\&. When you want to upload it ...@@ -385,7 +397,7 @@ Commit as many changes as you like to this branch\&. When you want to upload it
.\} .\}
.sp .sp
.sp .sp
This will take the diff of your branch against its upstream (origin/master), and will post it to the \m[blue]\fBChromium code review site\fR\m[]\&\s-2\u[5]\d\s+2\&. This will take the diff of your branch against its upstream branch (in that case origin/master), and will post it to the \m[blue]\fBChromium code review site\fR\m[]\&\s-2\u[5]\d\s+2\&.
.SH "UPDATING THE CODE" .SH "UPDATING THE CODE"
.sp .sp
Inevitably, you\(cqll want to pull in changes from the main Chromium repo\&. This is pretty easy with \fIdepot_tools\fR: Inevitably, you\(cqll want to pull in changes from the main Chromium repo\&. This is pretty easy with \fIdepot_tools\fR:
...@@ -426,7 +438,7 @@ Running git rebase\-update will update all your branches, but it will not automa ...@@ -426,7 +438,7 @@ Running git rebase\-update will update all your branches, but it will not automa
.RE .RE
.SH "MANAGING MULTIPLE CLS" .SH "MANAGING MULTIPLE CLS"
.sp .sp
Sometimes you want to work on more than one CL at once (say, you have a CL posted for review and want to work on something else)\&. For each CL that you want to work on, just use git new\-branch <branchname>\&. Sometimes you want to work on more than one CL at once (say, you have a CL posted for review and want to work on something else)\&. For each CL that you want to work on, just use git new\-branch <branch_name>\&.
.sp .sp
Once you start to have more than one CL at a time, it can be easy to lose your bearings\&. Fortunately, \fIdepot_tools\fR has two tools to help you out: Once you start to have more than one CL at a time, it can be easy to lose your bearings\&. Fortunately, \fIdepot_tools\fR has two tools to help you out:
.sp .sp
...@@ -473,7 +485,6 @@ origin/master ...@@ -473,7 +485,6 @@ origin/master
.RE .RE
.\} .\}
.sp .sp
.PP .PP
\fBgit-map\fR(1) \fBgit-map\fR(1)
.RS 4 .RS 4
...@@ -482,7 +493,7 @@ This tool shows you the history of all of your branches in a pseudo\-graphical f ...@@ -482,7 +493,7 @@ This tool shows you the history of all of your branches in a pseudo\-graphical f
.PP .PP
\fBgit-map-branches\fR(1) \fBgit-map-branches\fR(1)
.RS 4 .RS 4
This tool just shows you which branches you have in your repo, and thier upstream relationship to each other (as well as which branch you have checked out at the moment)\&. This tool just shows you which branches you have in your repo, and their upstream relationship to each other (as well as which branch you have checked out at the moment)\&.
.RE .RE
.sp .sp
Additionally, sometimes you need to switch between branches, but you\(cqve got work in progress\&. You could use \fBgit-stash\fR(1), but that can be tricky to manage because you need to remember which branches you stashed what changes on\&. Helpfully \fIdepot_tools\fR includes two tools which can greatly assist in case: Additionally, sometimes you need to switch between branches, but you\(cqve got work in progress\&. You could use \fBgit-stash\fR(1), but that can be tricky to manage because you need to remember which branches you stashed what changes on\&. Helpfully \fIdepot_tools\fR includes two tools which can greatly assist in case:
...@@ -567,9 +578,9 @@ Let\*(Aqs fix something! ...@@ -567,9 +578,9 @@ Let\*(Aqs fix something!
\fB$ git new\-branch fix_typo\fR \fB$ git new\-branch fix_typo\fR
\fB$ echo \-e \*(Aq/Banana\ens/Banana/Kuun\enwq\*(Aq | ed build/whitespace_file\&.txt\fR \fB$ echo \-e \*(Aq/Banana\ens/Banana/Kuun\enwq\*(Aq | ed build/whitespace_file\&.txt\fR
1503 1503
1501
It was a Domo\-Banana\&. It was a Domo\-Banana\&.
It was a Domo\-Kuun\&. It was a Domo\-Kuun\&.
1501
\fB$ git commit \-am \*(AqFix terrible typo\&.\*(Aq\fR \fB$ git commit \-am \*(AqFix terrible typo\&.\*(Aq\fR
[fix_typo 615ffa7] Fix terrible typo\&. [fix_typo 615ffa7] Fix terrible typo\&.
1 file changed, 1 insertion(+), 1 deletion(\-) 1 file changed, 1 insertion(+), 1 deletion(\-)
...@@ -583,10 +594,10 @@ It was a Domo\-Kuun\&. ...@@ -583,10 +594,10 @@ It was a Domo\-Kuun\&.
* \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path * \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
* \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr * \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr
\fB$ git status\fR \fB$ git status\fR
On branch fix_typo # On branch fix_typo
Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&. # Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&.
(use "git push" to publish your local commits) # (use "git push" to publish your local commits)
#
nothing to commit, working directory clean nothing to commit, working directory clean
\fB$ git cl upload \-r domo@chromium\&.org \-\-send\-mail\fR \fB$ git cl upload \-r domo@chromium\&.org \-\-send\-mail\fR
\&.\&.\&. truncated output \&.\&.\&. \&.\&.\&. truncated output \&.\&.\&.
...@@ -613,15 +624,15 @@ overhead, barely disturbing the thick cigarette smoke\&. No doubt was left about ...@@ -613,15 +624,15 @@ overhead, barely disturbing the thick cigarette smoke\&. No doubt was left about
when the fan was last cleaned\&. when the fan was last cleaned\&.
EOF EOF
\fB$ git status\fR \fB$ git status\fR
On branch chap2 # On branch chap2
Your branch is up\-to\-date with \*(Aqorigin/master\*(Aq\&. # Your branch is up\-to\-date with \*(Aqorigin/master\*(Aq\&.
#
Changes not staged for commit: # Changes not staged for commit:
(use "git add <file>\&.\&.\&." to update what will be committed) # (use "git add <file>\&.\&.\&." to update what will be committed)
(use "git checkout \-\- <file>\&.\&.\&." to discard changes in working directory) # (use "git checkout \-\- <file>\&.\&.\&." to discard changes in working directory)
#
modified: build/whitespace_file\&.txt # modified: build/whitespace_file\&.txt
#
no changes added to commit (use "git add" and/or "git commit \-a") no changes added to commit (use "git add" and/or "git commit \-a")
.fi .fi
.if n \{\ .if n \{\
...@@ -641,9 +652,9 @@ Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&. ...@@ -641,9 +652,9 @@ Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&.
(use "git push" to publish your local commits) (use "git push" to publish your local commits)
\fB$ echo \-e \*(Aq/Kuun\ens/Kuun/Kun\enwq\*(Aq | ed build/whitespace_file\&.txt\fR \fB$ echo \-e \*(Aq/Kuun\ens/Kuun/Kun\enwq\*(Aq | ed build/whitespace_file\&.txt\fR
1501 1501
1500
It was a Domo\-Kuun\&. It was a Domo\-Kuun\&.
It was a Domo\-Kun\&. It was a Domo\-Kun\&.
1500
\fB$ git upstream\-diff \-\-wordwise\fR \fB$ git upstream\-diff \-\-wordwise\fR
\fBdiff \-\-git a/build/whitespace_file\&.txt b/build/whitespace_file\&.txt\fR \fBdiff \-\-git a/build/whitespace_file\&.txt b/build/whitespace_file\&.txt\fR
\fBindex 3eba355\&.\&.57cdcee 100644\fR \fBindex 3eba355\&.\&.57cdcee 100644\fR
......
man/src/depot_tools_tutorial.txt
View file @ aed3b0a9
...@@ -156,7 +156,7 @@ TL;DR ...@@ -156,7 +156,7 @@ TL;DR
[white]**$ gclient sync** [white]**$ gclient sync**
[white]**$** # Make a new change and upload it for review [white]**$** # Make a new change and upload it for review
[white]**$ git new-branch branchname** [white]**$ git new-branch <branch_name>**
[white]**$** # repeat: [edit, git add, git commit] [white]**$** # repeat: [edit, git add, git commit]
[white]**$ git cl upload** [white]**$ git cl upload**
...@@ -188,7 +188,8 @@ directory: ...@@ -188,7 +188,8 @@ directory:
[white]**src/** # Top-level Chromium source checkout. [white]**src/** # Top-level Chromium source checkout.
---- ----
If you are on linux, then you'll need to run: If you are on linux and fetching the code for the first time, then you'll need
to run:
[subs="specialcharacters,quotes"] [subs="specialcharacters,quotes"]
---- ----
...@@ -203,7 +204,8 @@ And finally: ...@@ -203,7 +204,8 @@ And finally:
---- ----
This will pull all dependencies of the Chromium src checkout. You will need This will pull all dependencies of the Chromium src checkout. You will need
to run this any time you update the main src checkout. to run this any time you update the main src checkout, including when you
switch branches.
CREATING / UPLOADING A CL CREATING / UPLOADING A CL
...@@ -212,7 +214,7 @@ NOTE: The remainder of the tutorial assumes that your current working directory ...@@ -212,7 +214,7 @@ NOTE: The remainder of the tutorial assumes that your current working directory
is the `src/` folder mentioned in <<_getting_the_code,Getting the code>>. is the `src/` folder mentioned in <<_getting_the_code,Getting the code>>.
Each CL corresponds exactly with a single branch in git. Any time you want to Each CL corresponds exactly with a single branch in git. Any time you want to
begin a new CL, just: begin a new CL:
[subs="specialcharacters,quotes"] [subs="specialcharacters,quotes"]
---- ----
...@@ -220,8 +222,8 @@ begin a new CL, just: ...@@ -220,8 +222,8 @@ begin a new CL, just:
---- ----
This will create and checkout a new branch named `branch_name` which will track This will create and checkout a new branch named `branch_name` which will track
the default upstream (which is `origin/master`). See linkgit:git-new-branch[1] the default upstream branch (`origin/master`). See
for more features, such as the ability to track 'LKGR'. linkgit:git-new-branch[1] for more features.
Commit as many changes as you like to this branch. When you want to upload it Commit as many changes as you like to this branch. When you want to upload it
for review, run: for review, run:
...@@ -231,9 +233,9 @@ for review, run: ...@@ -231,9 +233,9 @@ for review, run:
[white]**$ git cl upload** [white]**$ git cl upload**
---- ----
This will take the diff of your branch against its upstream (`origin/master`), This will take the diff of your branch against its upstream branch (in that
and will post it to the link:https://codereview.chromium.org[Chromium code case origin/master), and will post it to the
review site]. link:https://codereview.chromium.org[Chromium code review site].
UPDATING THE CODE UPDATING THE CODE
...@@ -286,7 +288,7 @@ MANAGING MULTIPLE CLS ...@@ -286,7 +288,7 @@ MANAGING MULTIPLE CLS
--------------------- ---------------------
Sometimes you want to work on more than one CL at once (say, you have a CL Sometimes you want to work on more than one CL at once (say, you have a CL
posted for review and want to work on something else). For each CL that you posted for review and want to work on something else). For each CL that you
want to work on, just use `git new-branch <branchname>`. want to work on, just use `git new-branch <branch_name>`.
Once you start to have more than one CL at a time, it can be easy to lose your Once you start to have more than one CL at a time, it can be easy to lose your
bearings. Fortunately, 'depot_tools' has two tools to help you out: bearings. Fortunately, 'depot_tools' has two tools to help you out:
...@@ -329,7 +331,7 @@ linkgit:git-map[1]:: ...@@ -329,7 +331,7 @@ linkgit:git-map[1]::
doc for the full details. doc for the full details.
linkgit:git-map-branches[1]:: linkgit:git-map-branches[1]::
This tool just shows you which branches you have in your repo, and thier This tool just shows you which branches you have in your repo, and their
upstream relationship to each other (as well as which branch you have checked upstream relationship to each other (as well as which branch you have checked
out at the moment). out at the moment).
......
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