diff --git a/man/html/depot_tools_tutorial.html b/man/html/depot_tools_tutorial.html index 0ac3272ca..3cad3baed 100644 --- a/man/html/depot_tools_tutorial.html +++ b/man/html/depot_tools_tutorial.html @@ -977,7 +977,11 @@ commands:

-
$ # get the code
+
$ # Set up auth in Git config
+$ # In your home directory:
+$ git cl creds-check
+
+$ # get the code
 $ # In an empty directory:
 $ fetch {chromium,...}
 
@@ -999,6 +1003,12 @@ commands:

GETTING THE CODE

+

Unless you plan on only fetching code anonymously, you’ll need to set +up your auth config in Git. Run this in your home directory:

+
+
+
$ git cl creds-check
+

Pick an empty directory and run one of the following:

@@ -1248,17 +1258,27 @@ updating, and committing multiple CLs.

Let's fix something!

$ git new-branch fix_typo
 
 $ echo -e '/Banana\ns/Banana/Kuun\nwq' | ed build/whitespace_file.txt
-1503
-It was a Domo-Banana.
-It was a Domo-Kuun.
-1501
+1772
+?
+?
+1772
 $ git commit -am 'Fix terrible typo.'
-[fix_typo 615ffa7] Fix terrible typo.
- 1 file changed, 1 insertion(+), 1 deletion(-)
+On branch fix_typo
+Your branch is up to date with 'origin/master'.
+
+nothing to commit, working tree clean
 
 $ git map
-* 615ffa720f	(HEAD -> fix_typo) 2014-04-10 ~ Fix terrible typo.
-* beec6f4746	(origin/main, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes
+* 59cdb7335b	(HEAD -> fix_typo, origin/master, origin/HEAD) 2014-04-10 ~ Refactor data interchange format.
+* 34676a3583	2014-04-10 ~ Ensure FS is exited for all not-in-same-page navigations.
+* 7d4784e867	2014-04-10 ~ Add best chapter2 ever!
+* 5d26fec369	2014-04-10 ~ Finish chapter 2
+* df7fefbf06	2014-04-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly.
+* 4b39cda0ac	2014-04-10 ~ Fix terrible typo.
+* 248c5b6fe3	2014-04-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup.
+* 8171df8af9	2014-04-10 ~ Remove AMD family check for the flapper crypto accelerator.
+* d6a30d2e56	2014-04-10 ~ Change the Pica load benchmark to listen for the polymer-ready event
+* beec6f4746	(origin/main, master) 2014-04-10 ~ Make ReflectorImpl use mailboxes    <(master)
 * 41290e02b7	2014-04-10 ~ don't use glibc-specific execinfo.h on uclibc builds
 * a76fde7b7b	2014-04-10 ~ [fsp] Add requestUnmount() method together with the request manager.
 * 9de7a713b3	2014-04-10 ~ linux_aura: Use system configuration for middle clicking the titlebar.
@@ -1269,8 +1289,7 @@ It was a Domo-Kuun.
 
 $ git status
 On branch fix_typo
-Your branch is ahead of 'origin/main' by 1 commit.
-  (use "git push" to publish your local commits)
+Your branch is up to date with 'origin/master'.
 
 nothing to commit, working tree clean
 
@@ -1279,9 +1298,10 @@ nothing to commit, working tree clean

While we wait for feedback, let's do something else.

$ git new-branch chap2
 
 $ git map-branches
-origin/main
+origin/master
   chap2 *
-  fix_typo
+  fix_typo
+  master
 
 $ cat >> build/whitespace_file.txt <<EOF
 
@@ -1291,7 +1311,7 @@ when the fan was last cleaned.
 EOF
 $ git status
 On branch chap2
-Your branch is up to date with 'origin/main'.
+Your branch is up to date with 'origin/master'.
 
 Changes not staged for commit:
   (use "git add <file>..." to update what will be committed)
@@ -1304,41 +1324,36 @@ no changes added to commit (use "git add" and/or "git commit -a")
 
 $ git checkout fix_typo
 Switched to branch 'fix_typo'
-Your branch is ahead of 'origin/main' by 1 commit.
-  (use "git push" to publish your local commits)
+Your branch is up to date with 'origin/master'.
 
 $ echo -e '/Kuun\ns/Kuun/Kun\nwq' | ed build/whitespace_file.txt
-1501
-It was a Domo-Kuun.
-It was a Domo-Kun.
-1500
+1772
+?
+?
+1772
 $ git upstream-diff --wordwise
-diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt
-index 3eba355..57cdcee 100644
---- a/build/whitespace_file.txt
-+++ b/build/whitespace_file.txt
-@@ -17,7 +17,7 @@ swept up the streets (for it is in London that our scene lies), rattling along
-the housetops, and fiercely agitating the scanty flame of the lamps that
-struggled against the elements. A hooded figure emerged.
-
-It was a Domo-BananaKun.
-
-"What took you so long?", inquired his wife.
-
 
 $ git commit -am 'Fix typo for good!'
-[fix_typo 2c0ad9c] Fix typo for good!
- 1 file changed, 1 insertion(+), 1 deletion(-)
+On branch fix_typo
+Your branch is up to date with 'origin/master'.
+
+nothing to commit, working tree clean
 
 $ git cl upload
 ... truncated output ...

Since we got lgtm, let the CQ land it.

$ git cl set_commit
 $ git map
-* 0e2e52e72e	(chap2) 2014-04-10 ~ FREEZE.unindexed
-| * 2c0ad9c59b	(HEAD -> fix_typo) 2014-04-10 ~ Fix typo for good!
-| * 615ffa720f	2014-04-10 ~ Fix terrible typo.
-|/
-* beec6f4746	(origin/main, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes    <(chap2)
+* a939958dff	(chap2) 2014-04-10 ~ FREEZE.unindexed
+* 59cdb7335b	(HEAD -> fix_typo, origin/master, origin/HEAD) 2014-04-10 ~ Refactor data interchange format.    <(chap2)
+* 34676a3583	2014-04-10 ~ Ensure FS is exited for all not-in-same-page navigations.
+* 7d4784e867	2014-04-10 ~ Add best chapter2 ever!
+* 5d26fec369	2014-04-10 ~ Finish chapter 2
+* df7fefbf06	2014-04-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly.
+* 4b39cda0ac	2014-04-10 ~ Fix terrible typo.
+* 248c5b6fe3	2014-04-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup.
+* 8171df8af9	2014-04-10 ~ Remove AMD family check for the flapper crypto accelerator.
+* d6a30d2e56	2014-04-10 ~ Change the Pica load benchmark to listen for the polymer-ready event
+* beec6f4746	(origin/main, master) 2014-04-10 ~ Make ReflectorImpl use mailboxes    <(master)
 * 41290e02b7	2014-04-10 ~ don't use glibc-specific execinfo.h on uclibc builds
 * a76fde7b7b	2014-04-10 ~ [fsp] Add requestUnmount() method together with the request manager.
 * 9de7a713b3	2014-04-10 ~ linux_aura: Use system configuration for middle clicking the titlebar.
@@ -1348,90 +1363,82 @@ It was a Domo-Banana Switch back to where we were using the nav* commands (for fun... git checkout would work here too)
$ git map-branches
-origin/main
-  chap2
+origin/master
+  chap2
   fix_typo *
+  master
 
 $ git nav-upstream
-Note: switching to 'origin/main'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at beec6f4 Make ReflectorImpl use mailboxes
+HEAD is now at 59cdb73 Refactor data interchange format.
 
 $ git nav-downstream
-Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes
+Previous HEAD position was 59cdb73 Refactor data interchange format.
 Switched to branch 'chap2'
-Your branch is ahead of 'origin/main' by 1 commit.
+Your branch is ahead of 'origin/master' by 1 commit.
   (use "git push" to publish your local commits)
 Please select a downstream branch
   0. chap2
   1. fix_typo
-Selection (0-1)[0]: 0
+  2. master
+Selection (0-2)[0]: 0
 $ git map-branches
-origin/main
+origin/master
   chap2 *
   fix_typo
+  master

Now we can pick up on chapter2 where we left off.

$ git thaw
 
 $ git diff
-diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt
-index 3eba355..9d08d9d 100644
---- a/build/whitespace_file.txt
-+++ b/build/whitespace_file.txt
-@@ -34,3 +34,7 @@ with his fork, watching the runny jelly spread and pool across his plate,
- like the blood of a dying fawn. \"It reminds me of that time --\" he started, as
- his wife cut in quickly: \"-- please. I can't bear to hear it.\". A flury of
- images coming from the past flowed through his mind.
-+
-+"You recall what happened on Mulholland drive?" The ceiling fan rotated slowly
-+overhead, barely disturbing the thick cigarette smoke. No doubt was left about
-+when the fan was last cleaned.
+diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt
+index 1293282..0ae5a14 100644
+--- a/build/whitespace_file.txt
++++ b/build/whitespace_file.txt
+@@ -43,3 +43,7 @@ There was an poignant pause.
+
+ CHAPTER 3:
+ Hilariousness! This chapter is awesome!
++
++"You recall what happened on Mulholland drive?" The ceiling fan rotated slowly
++overhead, barely disturbing the thick cigarette smoke. No doubt was left about
++when the fan was last cleaned.
 
 $ cat >> build/whitespace_file.txt <<EOF
 
 There was an poignant pause.
 EOF
 $ git diff
-diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt
-index 3eba355..e3a55de 100644
---- a/build/whitespace_file.txt
-+++ b/build/whitespace_file.txt
-@@ -34,3 +34,9 @@ with his fork, watching the runny jelly spread and pool across his plate,
- like the blood of a dying fawn. \"It reminds me of that time --\" he started, as
- his wife cut in quickly: \"-- please. I can't bear to hear it.\". A flury of
- images coming from the past flowed through his mind.
-+
-+"You recall what happened on Mulholland drive?" The ceiling fan rotated slowly
-+overhead, barely disturbing the thick cigarette smoke. No doubt was left about
-+when the fan was last cleaned.
-+
-+There was an poignant pause.
+diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt
+index 1293282..a63d04e 100644
+--- a/build/whitespace_file.txt
++++ b/build/whitespace_file.txt
+@@ -43,3 +43,9 @@ There was an poignant pause.
+
+ CHAPTER 3:
+ Hilariousness! This chapter is awesome!
++
++"You recall what happened on Mulholland drive?" The ceiling fan rotated slowly
++overhead, barely disturbing the thick cigarette smoke. No doubt was left about
++when the fan was last cleaned.
++
++There was an poignant pause.
 
 $ git commit -am 'Finish chapter 2'
-[chap2 ceef712] Finish chapter 2
+[chap2 d4a9451] Finish chapter 2
  1 file changed, 6 insertions(+)
 
 $ git map
-* ceef712d7f	(HEAD -> chap2) 2014-04-10 ~ Finish chapter 2
-| * 2c0ad9c59b	(fix_typo) 2014-04-10 ~ Fix typo for good!
-| * 615ffa720f	2014-04-10 ~ Fix terrible typo.
-|/
-* beec6f4746	(origin/main, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes    <(fix_typo)
+* d4a945118e	(HEAD -> chap2) 2014-04-10 ~ Finish chapter 2
+* 59cdb7335b	(origin/master, origin/HEAD, fix_typo) 2014-04-10 ~ Refactor data interchange format.    <(fix_typo)
+* 34676a3583	2014-04-10 ~ Ensure FS is exited for all not-in-same-page navigations.
+* 7d4784e867	2014-04-10 ~ Add best chapter2 ever!
+* 5d26fec369	2014-04-10 ~ Finish chapter 2
+* df7fefbf06	2014-04-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly.
+* 4b39cda0ac	2014-04-10 ~ Fix terrible typo.
+* 248c5b6fe3	2014-04-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup.
+* 8171df8af9	2014-04-10 ~ Remove AMD family check for the flapper crypto accelerator.
+* d6a30d2e56	2014-04-10 ~ Change the Pica load benchmark to listen for the polymer-ready event
+* beec6f4746	(origin/main, master) 2014-04-10 ~ Make ReflectorImpl use mailboxes    <(master)
 * 41290e02b7	2014-04-10 ~ don't use glibc-specific execinfo.h on uclibc builds
 * a76fde7b7b	2014-04-10 ~ [fsp] Add requestUnmount() method together with the request manager.
 * 9de7a713b3	2014-04-10 ~ linux_aura: Use system configuration for middle clicking the titlebar.
@@ -1452,16 +1459,22 @@ Mr. Usagi felt that something wasn't right. Shortly after the Domo-Kun left he
 began feeling sick.
 EOF
 $ git commit -am 'beginning of chapter 3'
-[chap3 7d4238a] beginning of chapter 3
+[chap3 d2902ef] beginning of chapter 3
  1 file changed, 4 insertions(+)
 
 $ git map
-* 7d4238a1e2	(HEAD -> chap3) 2014-04-10 ~ beginning of chapter 3
-* ceef712d7f	(chap2) 2014-04-10 ~ Finish chapter 2
-| * 2c0ad9c59b	(fix_typo) 2014-04-10 ~ Fix typo for good!
-| * 615ffa720f	2014-04-10 ~ Fix terrible typo.
-|/
-* beec6f4746	(origin/main, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes    <(fix_typo, chap2)
+* d2902efc4d	(HEAD -> chap3) 2014-04-10 ~ beginning of chapter 3
+* d4a945118e	(chap2) 2014-04-10 ~ Finish chapter 2
+* 59cdb7335b	(origin/master, origin/HEAD, fix_typo) 2014-04-10 ~ Refactor data interchange format.    <(fix_typo, chap2)
+* 34676a3583	2014-04-10 ~ Ensure FS is exited for all not-in-same-page navigations.
+* 7d4784e867	2014-04-10 ~ Add best chapter2 ever!
+* 5d26fec369	2014-04-10 ~ Finish chapter 2
+* df7fefbf06	2014-04-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly.
+* 4b39cda0ac	2014-04-10 ~ Fix terrible typo.
+* 248c5b6fe3	2014-04-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup.
+* 8171df8af9	2014-04-10 ~ Remove AMD family check for the flapper crypto accelerator.
+* d6a30d2e56	2014-04-10 ~ Change the Pica load benchmark to listen for the polymer-ready event
+* beec6f4746	(origin/main, master) 2014-04-10 ~ Make ReflectorImpl use mailboxes    <(master)
 * 41290e02b7	2014-04-10 ~ don't use glibc-specific execinfo.h on uclibc builds
 * a76fde7b7b	2014-04-10 ~ [fsp] Add requestUnmount() method together with the request manager.
 * 9de7a713b3	2014-04-10 ~ linux_aura: Use system configuration for middle clicking the titlebar.
@@ -1473,21 +1486,23 @@ EOF

We haven't updated the code in a while, so let's do that now.

$ git rebase-update
 Fetching origin
 From https://upstream
-   beec6f4..59cdb73  main       -> origin/main
-Rebasing: chap2
-Rebasing: fix_typo
-Failed! Attempting to squash fix_typo ... Success!
-Rebasing: chap3
-Reparented chap3 to track origin/main (was tracking chap2)
-Deleted branch fix_typo (was 5d26fec).
-Deleted branch chap2 (was 5d26fec).
+chap2 up-to-date
+fix_typo up-to-date
+Rebasing: master
+chap3 up-to-date
+Deleted branch fix_typo (was 59cdb73).
+Deleted branch master (was 59cdb73).
 
 Running `git gc --auto` - Ctrl-C to abort is OK.

Well look at that. The CQ landed our typo and chapter2 branches already and git rebase-update cleaned them up for us.

$ gclient sync
 ... truncated output ...
 $ git map
-* 93fe917ad1	(HEAD -> chap3) 2014-04-10 ~ beginning of chapter 3
-* 5d26fec369	(origin/main, origin/HEAD) 2014-04-10 ~ Finish chapter 2
+* d2902efc4d	(HEAD -> chap3) 2014-04-10 ~ beginning of chapter 3
+* d4a945118e	(chap2) 2014-04-10 ~ Finish chapter 2
+* 59cdb7335b	(origin/master, origin/HEAD) 2014-04-10 ~ Refactor data interchange format.    <(chap2)
+* 34676a3583	2014-04-10 ~ Ensure FS is exited for all not-in-same-page navigations.
+* 7d4784e867	2014-04-10 ~ Add best chapter2 ever!
+* 5d26fec369	(origin/main) 2014-04-10 ~ Finish chapter 2
 * df7fefbf06	2014-04-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly.
 * 4b39cda0ac	2014-04-10 ~ Fix terrible typo.
 * 248c5b6fe3	2014-04-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup.
@@ -1505,60 +1520,34 @@ Running `git gc --auto` - Ctrl-C to abort is OK.

Someone on IRC mentions that they actually landed a chapter 3 already! We should pull their changes before continuing. Brace for a code conflict!

$ git rebase-update
 Fetching origin
 From https://upstream
-   5d26fec..59cdb73  main       -> origin/main
 Rebasing: chap2
 ... lots of output, it's a conflict alright :(...
 $ git diff
-diff --cc build/whitespace_file.txt
-index 1293282,f903ea2..0000000
---- a/build/whitespace_file.txt
-+++ b/build/whitespace_file.txt
-@@@ -42,4 -42,5 +42,9 @@@ when the fan was last cleaned
-  There was an poignant pause.
-
-  CHAPTER 3:
-++<<<<<<< HEAD
- +Hilariousness! This chapter is awesome!
-++=======
-+ Mr. Usagi felt that something wasn't right. Shortly after the Domo-Kun left he
-+ began feeling sick.
-++>>>>>>> 93fe917 (beginning of chapter 3)

Oh, well, that's not too bad. In fact... that's a terrible chapter 3!

$ $EDITOR build/whitespace_file.txt
 ... /me deletes bad chapter 3 ...
 $ git add build/whitespace_file.txt
 
 $ git diff --cached
-diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt
-index 1293282..f903ea2 100644
---- a/build/whitespace_file.txt
-+++ b/build/whitespace_file.txt
-@@ -42,4 +42,5 @@ when the fan was last cleaned.
- There was an poignant pause.
-
- CHAPTER 3:
--Hilariousness! This chapter is awesome!
-+Mr. Usagi felt that something wasn't right. Shortly after the Domo-Kun left he
-+began feeling sick.

Much better

$ git rebase --continue
-[detached HEAD 1cb4f5b] beginning of chapter 3
- 1 file changed, 2 insertions(+), 1 deletion(-)
 
 $ git rebase-update
 Fetching origin
-chap3 up-to-date
+chap2 up-to-date
+chap3 up-to-date
 
 Running `git gc --auto` - Ctrl-C to abort is OK.
 
 $ gclient sync
 ... truncated output ...
 $ git map
-* 1cb4f5b622	(HEAD -> chap3) 2014-04-10 ~ beginning of chapter 3
-* 59cdb7335b	(origin/main, origin/HEAD) 2014-04-10 ~ Refactor data interchange format.
+* d2902efc4d	(HEAD -> chap3) 2014-04-10 ~ beginning of chapter 3
+* d4a945118e	(chap2) 2014-04-10 ~ Finish chapter 2
+* 59cdb7335b	(origin/master, origin/HEAD) 2014-04-10 ~ Refactor data interchange format.    <(chap2)
 * 34676a3583	2014-04-10 ~ Ensure FS is exited for all not-in-same-page navigations.
 * 7d4784e867	2014-04-10 ~ Add best chapter2 ever!
-* 5d26fec369	2014-04-10 ~ Finish chapter 2
+* 5d26fec369	(origin/main) 2014-04-10 ~ Finish chapter 2
 * df7fefbf06	2014-04-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly.
 * 4b39cda0ac	2014-04-10 ~ Fix terrible typo.
 * 248c5b6fe3	2014-04-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup.
@@ -1638,7 +1627,7 @@ by checking out the 
 

 Last updated
- 2025-02-20 16:05:41 PST
+ 2025-04-04 22:26:10 UTC
diff --git a/man/man7/depot_tools_tutorial.7 b/man/man7/depot_tools_tutorial.7 index 40e1338aa..a235cf7c1 100644 --- a/man/man7/depot_tools_tutorial.7 +++ b/man/man7/depot_tools_tutorial.7 @@ -2,12 +2,12 @@ .\" Title: depot_tools_tutorial .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 02/20/2025 +.\" Date: 04/04/2025 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 8a5ec2b9 +.\" Source: depot_tools a7d7eadae .\" Language: English .\" -.TH "DEPOT_TOOLS_TUTORIAL" "7" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual" +.TH "DEPOT_TOOLS_TUTORIAL" "7" "04/04/2025" "depot_tools a7d7eadae" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -259,6 +259,10 @@ If you have never used git before, you\(cqll need to set some global git configu .RS 4 .\} .nf +\fB$\fR # Set up auth in Git config +\fB$\fR # In your home directory: +\fB$ git cl creds\-check\fR + \fB$\fR # get the code \fB$\fR # In an empty directory: \fB$ fetch {chromium,\&.\&.\&.}\fR @@ -282,6 +286,19 @@ If you have never used git before, you\(cqll need to set some global git configu .sp .SH "GETTING THE CODE" .sp +Unless you plan on only fetching code anonymously, you\(cqll need to set up your auth config in Git\&. Run this in your home directory: +.sp +.if n \{\ +.RS 4 +.\} +.nf +\fB$ git cl creds\-check\fR +.fi +.if n \{\ +.RE +.\} +.sp +.sp Pick an empty directory and run one of the following: .sp .if n \{\ @@ -568,17 +585,27 @@ Let\*(Aqs fix something! \fB$ git new\-branch fix_typo\fR \fB$ echo \-e \*(Aq/Banana\ens/Banana/Kuun\enwq\*(Aq | ed build/whitespace_file\&.txt\fR -1503 -It was a Domo\-Banana\&. -It was a Domo\-Kuun\&. -1501 +1772 +? +? +1772 \fB$ git commit \-am \*(AqFix terrible typo\&.\*(Aq\fR -[fix_typo 615ffa7] Fix terrible typo\&. - 1 file changed, 1 insertion(+), 1 deletion(\-) +On branch fix_typo +Your branch is up to date with \*(Aqorigin/master\*(Aq\&. + +nothing to commit, working tree clean \fB$ git map\fR -* \fB615ffa720f\fR \fB(HEAD \-> fix_typo\fR\fB) \fR2014\-04\-10 ~ Fix terrible typo\&. -* \fBbeec6f4746\fR \fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes +* \fB59cdb7335b\fR \fB(HEAD \-> fix_typo\fR\fB, origin/master\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Refactor data interchange format\&. +* \fB34676a3583\fR 2014\-04\-10 ~ Ensure FS is exited for all not\-in\-same\-page navigations\&. +* \fB7d4784e867\fR 2014\-04\-10 ~ Add best chapter2 ever! +* \fB5d26fec369\fR 2014\-04\-10 ~ Finish chapter 2 +* \fBdf7fefbf06\fR 2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&. +* \fB4b39cda0ac\fR 2014\-04\-10 ~ Fix terrible typo\&. +* \fB248c5b6fe3\fR 2014\-04\-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup\&. +* \fB8171df8af9\fR 2014\-04\-10 ~ Remove AMD family check for the flapper crypto accelerator\&. +* \fBd6a30d2e56\fR 2014\-04\-10 ~ Change the Pica load benchmark to listen for the polymer\-ready event +* \fBbeec6f4746\fR \fB(origin/main\fR\fB, master\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes <(\fBmaster\fR) * \fB41290e02b7\fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds * \fBa76fde7b7b\fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&. * \fB9de7a713b3\fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&. @@ -589,8 +616,7 @@ It was a Domo\-Kuun\&. \fB$ git status\fR On branch fix_typo -Your branch is ahead of \*(Aqorigin/main\*(Aq by 1 commit\&. - (use "git push" to publish your local commits) +Your branch is up to date with \*(Aqorigin/master\*(Aq\&. nothing to commit, working tree clean @@ -610,9 +636,10 @@ While we wait for feedback, let\*(Aqs do something else\&. \fB$ git new\-branch chap2\fR \fB$ git map\-branches\fR -\fBorigin/main +\fBorigin/master chap2 * -\fR fix_typo + fix_typo +\fR master \fB$ cat >> build/whitespace_file\&.txt <\&.\&.\&." to update what will be committed) @@ -646,31 +673,20 @@ Someone on the code review pointed out that our typo\-fix has a typo :( We\*(Aqr \fB$ git checkout fix_typo\fR Switched to branch \*(Aqfix_typo\*(Aq -Your branch is ahead of \*(Aqorigin/main\*(Aq by 1 commit\&. - (use "git push" to publish your local commits) +Your branch is up to date with \*(Aqorigin/master\*(Aq\&. \fB$ echo \-e \*(Aq/Kuun\ens/Kuun/Kun\enwq\*(Aq | ed build/whitespace_file\&.txt\fR -1501 -It was a Domo\-Kuun\&. -It was a Domo\-Kun\&. -1500 +1772 +? +? +1772 \fB$ git upstream\-diff \-\-wordwise\fR -\fBdiff \-\-git a/build/whitespace_file\&.txt b/build/whitespace_file\&.txt -index 3eba355\&.\&.57cdcee 100644 -\-\-\- a/build/whitespace_file\&.txt -+++ b/build/whitespace_file\&.txt -@@ \-17,7 +17,7 @@ swept up the streets (for it is in London that our scene lies), rattling along -the housetops, and fiercely agitating the scanty flame of the lamps that -struggled against the elements\&. A hooded figure emerged\&. -It was a Domo\-BananaKun\&. - -"What took you so long?", inquired his wife\&. - -\fR \fB$ git commit \-am \*(AqFix typo for good!\*(Aq\fR -[fix_typo 2c0ad9c] Fix typo for good! - 1 file changed, 1 insertion(+), 1 deletion(\-) +On branch fix_typo +Your branch is up to date with \*(Aqorigin/master\*(Aq\&. + +nothing to commit, working tree clean \fB$ git cl upload\fR \&.\&.\&. truncated output \&.\&.\&. @@ -687,11 +703,17 @@ Since we got lgtm, let the CQ land it\&. .nf \fB$ git cl set_commit\fR \fB$ git map\fR -* \fB0e2e52e72e\fR \fB(chap2\fR\fB) \fR2014\-04\-10 ~ FREEZE\&.unindexed -| * \fB2c0ad9c59b\fR \fB(HEAD \-> fix_typo\fR\fB) \fR2014\-04\-10 ~ Fix typo for good! -| * \fB615ffa720f\fR 2014\-04\-10 ~ Fix terrible typo\&. -|/ -* \fBbeec6f4746\fR \fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes <(\fBchap2\fR) +* \fBa939958dff\fR \fB(chap2\fR\fB) \fR2014\-04\-10 ~ FREEZE\&.unindexed +* \fB59cdb7335b\fR \fB(HEAD \-> fix_typo\fR\fB, origin/master\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Refactor data interchange format\&. <(\fBchap2\fR) +* \fB34676a3583\fR 2014\-04\-10 ~ Ensure FS is exited for all not\-in\-same\-page navigations\&. +* \fB7d4784e867\fR 2014\-04\-10 ~ Add best chapter2 ever! +* \fB5d26fec369\fR 2014\-04\-10 ~ Finish chapter 2 +* \fBdf7fefbf06\fR 2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&. +* \fB4b39cda0ac\fR 2014\-04\-10 ~ Fix terrible typo\&. +* \fB248c5b6fe3\fR 2014\-04\-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup\&. +* \fB8171df8af9\fR 2014\-04\-10 ~ Remove AMD family check for the flapper crypto accelerator\&. +* \fBd6a30d2e56\fR 2014\-04\-10 ~ Change the Pica load benchmark to listen for the polymer\-ready event +* \fBbeec6f4746\fR \fB(origin/main\fR\fB, master\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes <(\fBmaster\fR) * \fB41290e02b7\fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds * \fBa76fde7b7b\fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&. * \fB9de7a713b3\fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&. @@ -712,43 +734,29 @@ Switch back to where we were using the nav* commands (for fun\&.\&.\&. git check .\} .nf \fB$ git map\-branches\fR -origin/main - chap2 +\fBorigin/master +\fR chap2 \fB fix_typo * -\fR -\fB$ git nav\-upstream\fR -Note: switching to \*(Aqorigin/main\*(Aq\&. - -You are in \*(Aqdetached HEAD\*(Aq state\&. You can look around, make experimental -changes and commit them, and you can discard any commits you make in this -state without impacting any branches by switching back to a branch\&. - -If you want to create a new branch to retain commits you create, you may -do so (now or later) by using \-c with the switch command\&. Example: - - git switch \-c - -Or undo this operation with: - - git switch \- +\fR master -Turn off this advice by setting config variable advice\&.detachedHead to false - -HEAD is now at beec6f4 Make ReflectorImpl use mailboxes +\fB$ git nav\-upstream\fR +HEAD is now at 59cdb73 Refactor data interchange format\&. \fB$ git nav\-downstream\fR -Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes +Previous HEAD position was 59cdb73 Refactor data interchange format\&. Switched to branch \*(Aqchap2\*(Aq -Your branch is ahead of \*(Aqorigin/main\*(Aq by 1 commit\&. +Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&. (use "git push" to publish your local commits) Please select a downstream branch 0\&. chap2 1\&. fix_typo -Selection (0\-1)[0]: 0 + 2\&. master +Selection (0\-2)[0]: 0 \fB$ git map\-branches\fR -origin/main +origin/master \fB chap2 * \fR fix_typo + master .fi .if n \{\ @@ -764,49 +772,55 @@ Now we can pick up on chapter2 where we left off\&. \fB$ git thaw\fR \fB$ git diff\fR -\fBdiff \-\-git a/build/whitespace_file\&.txt b/build/whitespace_file\&.txt -index 3eba355\&.\&.9d08d9d 100644 +diff \-\-git a/build/whitespace_file\&.txt b/build/whitespace_file\&.txt +index 1293282\&.\&.0ae5a14 100644 \-\-\- a/build/whitespace_file\&.txt +++ b/build/whitespace_file\&.txt -@@ \-34,3 +34,7 @@ with his fork, watching the runny jelly spread and pool across his plate, - like the blood of a dying fawn\&. \e"It reminds me of that time \-\-\e" he started, as - his wife cut in quickly: \e"\-\- please\&. I can\*(Aqt bear to hear it\&.\e"\&. A flury of - images coming from the past flowed through his mind\&. +@@ \-43,3 +43,7 @@ There was an poignant pause\&. + + CHAPTER 3: + Hilariousness! This chapter is awesome! + +"You recall what happened on Mulholland drive?" The ceiling fan rotated slowly +overhead, barely disturbing the thick cigarette smoke\&. No doubt was left about +when the fan was last cleaned\&. -\fR + \fB$ cat >> build/whitespace_file\&.txt < chap2\fR\fB) \fR2014\-04\-10 ~ Finish chapter 2 -| * \fB2c0ad9c59b\fR \fB(fix_typo\fR\fB) \fR2014\-04\-10 ~ Fix typo for good! -| * \fB615ffa720f\fR 2014\-04\-10 ~ Fix terrible typo\&. -|/ -* \fBbeec6f4746\fR \fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes <(\fBfix_typo\fR) +* \fBd4a945118e\fR \fB(HEAD \-> chap2\fR\fB) \fR2014\-04\-10 ~ Finish chapter 2 +* \fB59cdb7335b\fR \fB(origin/master\fR\fB, origin/HEAD\fR\fB, fix_typo\fR\fB) \fR2014\-04\-10 ~ Refactor data interchange format\&. <(\fBfix_typo\fR) +* \fB34676a3583\fR 2014\-04\-10 ~ Ensure FS is exited for all not\-in\-same\-page navigations\&. +* \fB7d4784e867\fR 2014\-04\-10 ~ Add best chapter2 ever! +* \fB5d26fec369\fR 2014\-04\-10 ~ Finish chapter 2 +* \fBdf7fefbf06\fR 2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&. +* \fB4b39cda0ac\fR 2014\-04\-10 ~ Fix terrible typo\&. +* \fB248c5b6fe3\fR 2014\-04\-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup\&. +* \fB8171df8af9\fR 2014\-04\-10 ~ Remove AMD family check for the flapper crypto accelerator\&. +* \fBd6a30d2e56\fR 2014\-04\-10 ~ Change the Pica load benchmark to listen for the polymer\-ready event +* \fBbeec6f4746\fR \fB(origin/main\fR\fB, master\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes <(\fBmaster\fR) * \fB41290e02b7\fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds * \fBa76fde7b7b\fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&. * \fB9de7a713b3\fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&. @@ -849,16 +863,22 @@ Mr\&. Usagi felt that something wasn\*(Aqt right\&. Shortly after the Domo\-Kun began feeling sick\&. EOF \fB$ git commit \-am \*(Aqbeginning of chapter 3\*(Aq\fR -[chap3 7d4238a] beginning of chapter 3 +[chap3 d2902ef] beginning of chapter 3 1 file changed, 4 insertions(+) \fB$ git map\fR -* \fB7d4238a1e2\fR \fB(HEAD \-> chap3\fR\fB) \fR2014\-04\-10 ~ beginning of chapter 3 -* \fBceef712d7f\fR \fB(chap2\fR\fB) \fR2014\-04\-10 ~ Finish chapter 2 -| * \fB2c0ad9c59b\fR \fB(fix_typo\fR\fB) \fR2014\-04\-10 ~ Fix typo for good! -| * \fB615ffa720f\fR 2014\-04\-10 ~ Fix terrible typo\&. -|/ -* \fBbeec6f4746\fR \fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes <(\fBchap2, fix_typo\fR) +* \fBd2902efc4d\fR \fB(HEAD \-> chap3\fR\fB) \fR2014\-04\-10 ~ beginning of chapter 3 +* \fBd4a945118e\fR \fB(chap2\fR\fB) \fR2014\-04\-10 ~ Finish chapter 2 +* \fB59cdb7335b\fR \fB(origin/master\fR\fB, origin/HEAD\fR\fB, fix_typo\fR\fB) \fR2014\-04\-10 ~ Refactor data interchange format\&. <(\fBchap2, fix_typo\fR) +* \fB34676a3583\fR 2014\-04\-10 ~ Ensure FS is exited for all not\-in\-same\-page navigations\&. +* \fB7d4784e867\fR 2014\-04\-10 ~ Add best chapter2 ever! +* \fB5d26fec369\fR 2014\-04\-10 ~ Finish chapter 2 +* \fBdf7fefbf06\fR 2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&. +* \fB4b39cda0ac\fR 2014\-04\-10 ~ Fix terrible typo\&. +* \fB248c5b6fe3\fR 2014\-04\-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup\&. +* \fB8171df8af9\fR 2014\-04\-10 ~ Remove AMD family check for the flapper crypto accelerator\&. +* \fBd6a30d2e56\fR 2014\-04\-10 ~ Change the Pica load benchmark to listen for the polymer\-ready event +* \fBbeec6f4746\fR \fB(origin/main\fR\fB, master\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes <(\fBmaster\fR) * \fB41290e02b7\fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds * \fBa76fde7b7b\fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&. * \fB9de7a713b3\fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&. @@ -881,14 +901,12 @@ We haven\*(Aqt updated the code in a while, so let\*(Aqs do that now\&. \fB$ git rebase\-update\fR Fetching origin From https://upstream - beec6f4\&.\&.59cdb73 main \-> origin/main -Rebasing: chap2 -Rebasing: fix_typo -Failed! Attempting to squash fix_typo \&.\&.\&. Success! -Rebasing: chap3 -Reparented chap3 to track origin/main (was tracking chap2) -Deleted branch fix_typo (was 5d26fec)\&. -Deleted branch chap2 (was 5d26fec)\&. +\fBchap2\fR up\-to\-date +\fBfix_typo\fR up\-to\-date +Rebasing: \fBmaster\fR +\fBchap3\fR up\-to\-date +Deleted branch fix_typo (was 59cdb73)\&. +Deleted branch master (was 59cdb73)\&. Running `git gc \-\-auto` \- Ctrl\-C to abort is OK\&. .fi @@ -905,8 +923,12 @@ Well look at that\&. The CQ landed our typo and chapter2 branches already and gi \fB$ gclient sync\fR \&.\&.\&. truncated output \&.\&.\&. \fB$ git map\fR -* \fB93fe917ad1\fR \fB(HEAD \-> chap3\fR\fB) \fR2014\-04\-10 ~ beginning of chapter 3 -* \fB5d26fec369\fR \fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Finish chapter 2 +* \fBd2902efc4d\fR \fB(HEAD \-> chap3\fR\fB) \fR2014\-04\-10 ~ beginning of chapter 3 +* \fBd4a945118e\fR \fB(chap2\fR\fB) \fR2014\-04\-10 ~ Finish chapter 2 +* \fB59cdb7335b\fR \fB(origin/master\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Refactor data interchange format\&. <(\fBchap2\fR) +* \fB34676a3583\fR 2014\-04\-10 ~ Ensure FS is exited for all not\-in\-same\-page navigations\&. +* \fB7d4784e867\fR 2014\-04\-10 ~ Add best chapter2 ever! +* \fB5d26fec369\fR \fB(origin/main\fR\fB) \fR2014\-04\-10 ~ Finish chapter 2 * \fBdf7fefbf06\fR 2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&. * \fB4b39cda0ac\fR 2014\-04\-10 ~ Fix terrible typo\&. * \fB248c5b6fe3\fR 2014\-04\-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup\&. @@ -935,25 +957,10 @@ Someone on IRC mentions that they actually landed a chapter 3 already! We should \fB$ git rebase\-update\fR Fetching origin From https://upstream - 5d26fec\&.\&.59cdb73 main \-> origin/main Rebasing: chap2 \&.\&.\&. lots of output, it\*(Aqs a conflict alright :(\&.\&.\&. \fB$ git diff\fR -\fBdiff \-\-cc build/whitespace_file\&.txt -index 1293282,f903ea2\&.\&.0000000 -\-\-\- a/build/whitespace_file\&.txt -+++ b/build/whitespace_file\&.txt -@@@ \-42,4 \-42,5 +42,9 @@@ when the fan was last cleaned - There was an poignant pause\&. - CHAPTER 3: -++<<<<<<< HEAD - +Hilariousness! This chapter is awesome! -++======= -+ Mr\&. Usagi felt that something wasn\*(Aqt right\&. Shortly after the Domo\-Kun left he -+ began feeling sick\&. -++>>>>>>> 93fe917 (beginning of chapter 3) -\fR .fi .if n \{\ .RE @@ -970,18 +977,7 @@ Oh, well, that\*(Aqs not too bad\&. In fact\&.\&.\&. that\*(Aqs a terrible chapt \fB$ git add build/whitespace_file\&.txt\fR \fB$ git diff \-\-cached\fR -\fBdiff \-\-git a/build/whitespace_file\&.txt b/build/whitespace_file\&.txt -index 1293282\&.\&.f903ea2 100644 -\-\-\- a/build/whitespace_file\&.txt -+++ b/build/whitespace_file\&.txt -@@ \-42,4 +42,5 @@ when the fan was last cleaned\&. - There was an poignant pause\&. - CHAPTER 3: -\-Hilariousness! This chapter is awesome! -+Mr\&. Usagi felt that something wasn\*(Aqt right\&. Shortly after the Domo\-Kun left he -+began feeling sick\&. -\fR .fi .if n \{\ .RE @@ -994,23 +990,23 @@ Much better .\} .nf \fB$ git rebase \-\-continue\fR -[detached HEAD 1cb4f5b] beginning of chapter 3 - 1 file changed, 2 insertions(+), 1 deletion(\-) \fB$ git rebase\-update\fR Fetching origin -chap3 up\-to\-date +\fBchap2\fR up\-to\-date +\fBchap3\fR up\-to\-date Running `git gc \-\-auto` \- Ctrl\-C to abort is OK\&. \fB$ gclient sync\fR \&.\&.\&. truncated output \&.\&.\&. \fB$ git map\fR -* \fB1cb4f5b622\fR \fB(HEAD \-> chap3\fR\fB) \fR2014\-04\-10 ~ beginning of chapter 3 -* \fB59cdb7335b\fR \fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Refactor data interchange format\&. +* \fBd2902efc4d\fR \fB(HEAD \-> chap3\fR\fB) \fR2014\-04\-10 ~ beginning of chapter 3 +* \fBd4a945118e\fR \fB(chap2\fR\fB) \fR2014\-04\-10 ~ Finish chapter 2 +* \fB59cdb7335b\fR \fB(origin/master\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Refactor data interchange format\&. <(\fBchap2\fR) * \fB34676a3583\fR 2014\-04\-10 ~ Ensure FS is exited for all not\-in\-same\-page navigations\&. * \fB7d4784e867\fR 2014\-04\-10 ~ Add best chapter2 ever! -* \fB5d26fec369\fR 2014\-04\-10 ~ Finish chapter 2 +* \fB5d26fec369\fR \fB(origin/main\fR\fB) \fR2014\-04\-10 ~ Finish chapter 2 * \fBdf7fefbf06\fR 2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&. * \fB4b39cda0ac\fR 2014\-04\-10 ~ Fix terrible typo\&. * \fB248c5b6fe3\fR 2014\-04\-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup\&. diff --git a/man/src/depot_tools_tutorial.txt b/man/src/depot_tools_tutorial.txt index a1169556c..943dc69d4 100644 --- a/man/src/depot_tools_tutorial.txt +++ b/man/src/depot_tools_tutorial.txt @@ -151,6 +151,10 @@ TL;DR ----- [postsubs="quotes"] ---- +[white]**$** # Set up auth in Git config +[white]**$** # In your home directory: +[white]**$ git cl creds-check** + [white]**$** # get the code [white]**$** # In an empty directory: [white]**$ fetch {chromium,...}** @@ -172,6 +176,15 @@ TL;DR GETTING THE CODE ---------------- + +Unless you plan on only fetching code anonymously, you'll need to set +up your auth config in Git. Run this in your home directory: + +[subs="quotes"] +---- +[white]**$ git cl creds-check** +---- + Pick an empty directory and run one of the following: [subs="quotes"]