OLD | NEW |
1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" | 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" |
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> | 2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> | 3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> |
4 <head> | 4 <head> |
5 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /
> | 5 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /
> |
6 <meta name="generator" content="AsciiDoc 8.6.9" /> | 6 <meta name="generator" content="AsciiDoc 8.6.9" /> |
7 <title>depot_tools_tutorial(7)</title> | 7 <title>depot_tools_tutorial(7)</title> |
8 <style type="text/css"> | 8 <style type="text/css"> |
9 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */ | 9 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */ |
10 | 10 |
(...skipping 884 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
895 </td> | 895 </td> |
896 <td class="content"><strong>DO NOT</strong> use drag-n-drop or copy-n-paste extr
act from Explorer, this will not | 896 <td class="content"><strong>DO NOT</strong> use drag-n-drop or copy-n-paste extr
act from Explorer, this will not |
897 extract the hidden “.git” folder which is necessary for <em>depot_to
ols</em> to | 897 extract the hidden “.git” folder which is necessary for <em>depot_to
ols</em> to |
898 autoupdate itself. You can use “Extract all…” from the context
menu though.</td> | 898 autoupdate itself. You can use “Extract all…” from the context
menu though.</td> |
899 </tr></table> | 899 </tr></table> |
900 </div> | 900 </div> |
901 <div class="paragraph"><p>Add <em>depot_tools</em> to the <em>end</em> of your P
ATH. Assuming you unzipped the | 901 <div class="paragraph"><p>Add <em>depot_tools</em> to the <em>end</em> of your P
ATH. Assuming you unzipped the |
902 bundle to <code>C:\workspace\depot_tools</code>:</p></div> | 902 bundle to <code>C:\workspace\depot_tools</code>:</p></div> |
903 <div class="dlist"><dl> | 903 <div class="dlist"><dl> |
904 <dt class="hdlist1"> | 904 <dt class="hdlist1"> |
905 With Administrator access: | 905 With Administrator access: |
906 </dt> | 906 </dt> |
907 <dd> | 907 <dd> |
908 <p> | 908 <p> |
909 <strong>Control Panel → System and Security → System → Advan
ced system settings</strong> | 909 <strong>Control Panel → System and Security → System → Advan
ced system settings</strong> |
910 </p> | 910 </p> |
911 <div class="paragraph"><p>Modify the PATH system variable to include <code>C:\wo
rkspace\depot_tools</code>.</p></div> | 911 <div class="paragraph"><p>Modify the PATH system variable to include <code>C:\wo
rkspace\depot_tools</code>.</p></div> |
912 </dd> | 912 </dd> |
913 <dt class="hdlist1"> | 913 <dt class="hdlist1"> |
914 Without Administrator access: | 914 Without Administrator access: |
915 </dt> | 915 </dt> |
916 <dd> | 916 <dd> |
917 <p> | 917 <p> |
918 <strong>Control Panel → User Accounts → User Accounts → Chan
ge my environment variables</strong> | 918 <strong>Control Panel → User Accounts → User Accounts → Chan
ge my environment variables</strong> |
919 </p> | 919 </p> |
920 <div class="paragraph"><p>Add a PATH user variable: <code>%PATH%;C:\workspace\de
pot_tools</code>.</p></div> | 920 <div class="paragraph"><p>Add a PATH user variable: <code>%PATH%;C:\workspace\de
pot_tools</code>.</p></div> |
921 </dd> | 921 </dd> |
922 </dl></div> | 922 </dl></div> |
923 <div class="paragraph"><p>From a <code>cmd.exe</code> shell, run the command <co
de>gclient</code> (without arguments). On first | 923 <div class="paragraph"><p>From a <code>cmd.exe</code> shell, run the command <co
de>gclient</code> (without arguments). On first |
924 run, gclient will install all the Windows-specific bits needed to work with the | 924 run, gclient will install all the Windows-specific bits needed to work with the |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
958 </div> | 958 </div> |
959 </div> | 959 </div> |
960 </div> | 960 </div> |
961 <div class="sect2"> | 961 <div class="sect2"> |
962 <h3 id="_bootstrapping_configuration">BOOTSTRAPPING CONFIGURATION</h3> | 962 <h3 id="_bootstrapping_configuration">BOOTSTRAPPING CONFIGURATION</h3> |
963 <div class="paragraph"><p>If you have never used git before, you’ll need to set
some global git | 963 <div class="paragraph"><p>If you have never used git before, you’ll need to set
some global git |
964 configurations; substitute your name and email address in the following | 964 configurations; substitute your name and email address in the following |
965 commands:</p></div> | 965 commands:</p></div> |
966 <div class="listingblock"> | 966 <div class="listingblock"> |
967 <div class="content"> | 967 <div class="content"> |
968 <pre><code><strong><span class="white">$ git config --global user.name “Jo
hn Doe”</span></strong> | 968 <pre><code><strong><span class="white">$ git config --global user.name "John Doe
"</span></strong> |
969 <strong><span class="white">$ git config --global user.email “jdoe@email.c
om”</span></strong> | 969 <strong><span class="white">$ git config --global user.email "jdoe@email.com"</s
pan></strong> |
970 <strong><span class="white">$ git config --global core.autocrlf false</span></st
rong> | 970 <strong><span class="white">$ git config --global core.autocrlf false</span></st
rong> |
971 <strong><span class="white">$ git config --global core.filemode false</span></st
rong> | 971 <strong><span class="white">$ git config --global core.filemode false</span></st
rong> |
972 <strong><span class="white">$</span></strong> # and for fun! | 972 <strong><span class="white">$</span></strong> # and for fun! |
973 <strong><span class="white">$ git config --global color.ui true</span></strong><
/code></pre> | 973 <strong><span class="white">$ git config --global color.ui true</span></strong><
/code></pre> |
974 </div></div> | 974 </div></div> |
975 </div> | 975 </div> |
976 </div> | 976 </div> |
977 </div> | 977 </div> |
978 <div class="sect1"> | 978 <div class="sect1"> |
979 <h2 id="_tl_dr">TL;DR</h2> | 979 <h2 id="_tl_dr">TL;DR</h2> |
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1231 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten
t"><pre><code><span style="font-weight: bold; color: #ffffff">$ fetch chromium</
span> | 1231 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten
t"><pre><code><span style="font-weight: bold; color: #ffffff">$ fetch chromium</
span> |
1232 ... truncated output ... | 1232 ... truncated output ... |
1233 <span style="font-weight: bold; color: #ffffff">$ cd src</span> | 1233 <span style="font-weight: bold; color: #ffffff">$ cd src</span> |
1234 </code></pre></div></div><p><div class="paragraph"> (only on linux)</p></div><di
v class="listingblock"><div class="content"><pre><code><span style="font-weight:
bold; color: #ffffff">$ ./build/install-build-deps.sh</span> | 1234 </code></pre></div></div><p><div class="paragraph"> (only on linux)</p></div><di
v class="listingblock"><div class="content"><pre><code><span style="font-weight:
bold; color: #ffffff">$ ./build/install-build-deps.sh</span> |
1235 ... truncated output ... | 1235 ... truncated output ... |
1236 </code></pre></div></div><p><div class="paragraph"> Pull in all dependencies for
HEAD</p></div><div class="listingblock"><div class="content"><pre><code><span s
tyle="font-weight: bold; color: #ffffff">$ gclient sync</span> | 1236 </code></pre></div></div><p><div class="paragraph"> Pull in all dependencies for
HEAD</p></div><div class="listingblock"><div class="content"><pre><code><span s
tyle="font-weight: bold; color: #ffffff">$ gclient sync</span> |
1237 ... truncated output ... | 1237 ... truncated output ... |
1238 </code></pre></div></div><p><div class="paragraph"> Let's fix something!</p></di
v><div class="listingblock"><div class="content"><pre><code><span style="font-we
ight: bold; color: #ffffff">$ git new-branch fix_typo</span> | 1238 </code></pre></div></div><p><div class="paragraph"> Let's fix something!</p></di
v><div class="listingblock"><div class="content"><pre><code><span style="font-we
ight: bold; color: #ffffff">$ git new-branch fix_typo</span> |
1239 <span style="font-weight: bold; color: #ffffff">$ echo -e '/Banana\ns/Banana/Kuu
n\nwq' | ed build/whitespace_file.txt</span> | 1239 <span style="font-weight: bold; color: #ffffff">$ echo -e '/Banana\ns/Banana/Kuu
n\nwq' | ed build/whitespace_file.txt</span> |
1240 1503 | 1240 1503 |
1241 1501 | |
1242 It was a Domo-Banana. | 1241 It was a Domo-Banana. |
1243 It was a Domo-Kuun. | 1242 It was a Domo-Kuun. |
| 1243 1501 |
1244 <span style="font-weight: bold; color: #ffffff">$ git commit -am 'Fix terrible t
ypo.'</span> | 1244 <span style="font-weight: bold; color: #ffffff">$ git commit -am 'Fix terrible t
ypo.'</span> |
1245 [fix_typo 615ffa7] Fix terrible typo. | 1245 [fix_typo 615ffa7] Fix terrible typo. |
1246 1 file changed, 1 insertion(+), 1 deletion(-) | 1246 1 file changed, 1 insertion(+), 1 deletion(-) |
1247 <span style="font-weight: bold; color: #ffffff">$ git map</span> | 1247 <span style="font-weight: bold; color: #ffffff">$ git map</span> |
1248 <span style="background-color: #492ee1"></span><span style="font-weight: bold; b
ackground-color: #492ee1">* </span><span style="font-weight: bold; color: #e42e1
6; background-color: #492ee1">615ffa7 </span><span style="color: #19c518"> (</
span><span style="color: #33d6e5"></span><span style="font-weight: bold; color:
#33d6e5">fix_typo</span><span style="font-weight: bold"></span><span style="font
-weight: bold"></span><span style="color: #19c518">) </span><span style="color:
#e7e71c">2014-04-10</span> ~ Fix terrible typo. | 1248 <span style="background-color: #492ee1"></span><span style="font-weight: bold; b
ackground-color: #492ee1">* </span><span style="font-weight: bold; color: #e42e1
6; background-color: #492ee1">615ffa7 </span><span style="color: #19c518"> (</
span><span style="color: #33d6e5"></span><span style="font-weight: bold; color:
#33d6e5">fix_typo</span><span style="font-weight: bold"></span><span style="font
-weight: bold"></span><span style="color: #19c518">) </span><span style="color:
#e7e71c">2014-04-10</span> ~ Fix terrible typo. |
1249 * <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span sty
le="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><s
pan style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</sp
an><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10
</span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span
><span style="font-weight: bold; color: #ffffff"> <(fix_typo)</span><span
style="font-weight: bold"></span><span style="font-weight: bold"></span> | 1249 * <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span sty
le="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><s
pan style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</sp
an><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10
</span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span
><span style="font-weight: bold; color: #ffffff"> <(fix_typo)</span><span
style="font-weight: bold"></span><span style="font-weight: bold"></span> |
1250 * <span style="font-weight: bold; color: #e42e16">41290e0 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don
't use glibc-specific execinfo.h on uclibc builds | 1250 * <span style="font-weight: bold; color: #e42e16">41290e0 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don
't use glibc-specific execinfo.h on uclibc builds |
1251 * <span style="font-weight: bold; color: #e42e16">a76fde7 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fs
p] Add requestUnmount() method together with the request manager. | 1251 * <span style="font-weight: bold; color: #e42e16">a76fde7 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fs
p] Add requestUnmount() method together with the request manager. |
1252 * <span style="font-weight: bold; color: #e42e16">9de7a71 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ lin
ux_aura: Use system configuration for middle clicking the titlebar. | 1252 * <span style="font-weight: bold; color: #e42e16">9de7a71 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ lin
ux_aura: Use system configuration for middle clicking the titlebar. |
1253 * <span style="font-weight: bold; color: #e42e16">073b0c2 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Con
tentView->ContentViewCore in ContentViewRenderView | 1253 * <span style="font-weight: bold; color: #e42e16">073b0c2 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Con
tentView->ContentViewCore in ContentViewRenderView |
(...skipping 29 matching lines...) Expand all Loading... |
1283 # <span style="color: #e42e16">modified: build/whitespace_file.txt</span
> | 1283 # <span style="color: #e42e16">modified: build/whitespace_file.txt</span
> |
1284 # | 1284 # |
1285 no changes added to commit (use "git add" and/or "git commit -a") | 1285 no changes added to commit (use "git add" and/or "git commit -a") |
1286 </code></pre></div></div><p><div class="paragraph"> Someone on the code review p
ointed 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: b
old; color: #ffffff">$ git freeze</span> | 1286 </code></pre></div></div><p><div class="paragraph"> Someone on the code review p
ointed 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: b
old; color: #ffffff">$ git freeze</span> |
1287 <span style="font-weight: bold; color: #ffffff">$ git checkout fix_typo</span> | 1287 <span style="font-weight: bold; color: #ffffff">$ git checkout fix_typo</span> |
1288 Switched to branch 'fix_typo' | 1288 Switched to branch 'fix_typo' |
1289 Your branch is ahead of 'origin/master' by 1 commit. | 1289 Your branch is ahead of 'origin/master' by 1 commit. |
1290 (use "git push" to publish your local commits) | 1290 (use "git push" to publish your local commits) |
1291 <span style="font-weight: bold; color: #ffffff">$ echo -e '/Kuun\ns/Kuun/Kun\nwq
' | ed build/whitespace_file.txt</span> | 1291 <span style="font-weight: bold; color: #ffffff">$ echo -e '/Kuun\ns/Kuun/Kun\nwq
' | ed build/whitespace_file.txt</span> |
1292 1501 | 1292 1501 |
1293 1500 | |
1294 It was a Domo-Kuun. | 1293 It was a Domo-Kuun. |
1295 It was a Domo-Kun. | 1294 It was a Domo-Kun. |
| 1295 1500 |
1296 <span style="font-weight: bold; color: #ffffff">$ git upstream-diff --wordwise</
span> | 1296 <span style="font-weight: bold; color: #ffffff">$ git upstream-diff --wordwise</
span> |
1297 <span style="font-weight: bold">diff --git a/build/whitespace_file.txt b/build/w
hitespace_file.txt</span> | 1297 <span style="font-weight: bold">diff --git a/build/whitespace_file.txt b/build/w
hitespace_file.txt</span> |
1298 <span style="font-weight: bold">index 3eba355..57cdcee 100644</span> | 1298 <span style="font-weight: bold">index 3eba355..57cdcee 100644</span> |
1299 <span style="font-weight: bold">--- a/build/whitespace_file.txt</span> | 1299 <span style="font-weight: bold">--- a/build/whitespace_file.txt</span> |
1300 <span style="font-weight: bold">+++ b/build/whitespace_file.txt</span> | 1300 <span style="font-weight: bold">+++ b/build/whitespace_file.txt</span> |
1301 <span style="color: #33d6e5">@@ -17,7 +17,7 @@</span> swept up the streets (for
it is in London that our scene lies), rattling along | 1301 <span style="color: #33d6e5">@@ -17,7 +17,7 @@</span> swept up the streets (for
it is in London that our scene lies), rattling along |
1302 the housetops, and fiercely agitating the scanty flame of the lamps that | 1302 the housetops, and fiercely agitating the scanty flame of the lamps that |
1303 struggled against the elements. A hooded figure emerged. | 1303 struggled against the elements. A hooded figure emerged. |
1304 | 1304 |
1305 It was a Domo-<span style="color: #e42e16">Banana</span><span style="color: #19c
518">Kun</span>. | 1305 It was a Domo-<span style="color: #e42e16">Banana</span><span style="color: #19c
518">Kun</span>. |
(...skipping 29 matching lines...) Expand all Loading... |
1335 changes and commit them, and you can discard any commits you make in this | 1335 changes and commit them, and you can discard any commits you make in this |
1336 state without impacting any branches by performing another checkout. | 1336 state without impacting any branches by performing another checkout. |
1337 | 1337 |
1338 If you want to create a new branch to retain commits you create, you may | 1338 If you want to create a new branch to retain commits you create, you may |
1339 do so (now or later) by using -b with the checkout command again. Example: | 1339 do so (now or later) by using -b with the checkout command again. Example: |
1340 | 1340 |
1341 git checkout -b new_branch_name | 1341 git checkout -b new_branch_name |
1342 | 1342 |
1343 HEAD is now at beec6f4... Make ReflectorImpl use mailboxes | 1343 HEAD is now at beec6f4... Make ReflectorImpl use mailboxes |
1344 <span style="font-weight: bold; color: #ffffff">$ git nav-downstream</span> | 1344 <span style="font-weight: bold; color: #ffffff">$ git nav-downstream</span> |
| 1345 Previous HEAD position was beec6f4... Make ReflectorImpl use mailboxes |
| 1346 Switched to branch 'chap2' |
| 1347 Your branch is ahead of 'origin/master' by 1 commit. |
| 1348 (use "git push" to publish your local commits) |
1345 Please select a downstream branch | 1349 Please select a downstream branch |
1346 0. chap2 | 1350 0. chap2 |
1347 1. fix_typo | 1351 1. fix_typo |
1348 Selection (0-1)[0]: 0 | 1352 Selection (0-1)[0]: 0 |
1349 Previous HEAD position was beec6f4... Make ReflectorImpl use mailboxes | |
1350 Switched to branch 'chap2' | |
1351 Your branch is ahead of 'origin/master' by 1 commit. | |
1352 (use "git push" to publish your local commits) | |
1353 <span style="font-weight: bold; color: #ffffff">$ git map-branches</span> | 1353 <span style="font-weight: bold; color: #ffffff">$ git map-branches</span> |
1354 <span style="color: #e42e16"></span><span style="color: #e42e16">origin/master | 1354 <span style="color: #e42e16"></span><span style="color: #e42e16">origin/master |
1355 </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color
: #33d6e5"> chap2 * | 1355 </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color
: #33d6e5"> chap2 * |
1356 </span><span style="font-weight: bold; color: #19c518"></span><span style="color
: #19c518"> fix_typo | 1356 </span><span style="font-weight: bold; color: #19c518"></span><span style="color
: #19c518"> fix_typo |
1357 </code></pre></div></div><p><div class="paragraph"> Now we can pick up on chapte
r2 where we left off.</p></div><div class="listingblock"><div class="content"><p
re><code></span><span style="font-weight: bold; color: #ffffff">$ git thaw</span
> | 1357 </code></pre></div></div><p><div class="paragraph"> Now we can pick up on chapte
r2 where we left off.</p></div><div class="listingblock"><div class="content"><p
re><code></span><span style="font-weight: bold; color: #ffffff">$ git thaw</span
> |
1358 <span style="font-weight: bold; color: #ffffff">$ git diff</span> | 1358 <span style="font-weight: bold; color: #ffffff">$ git diff</span> |
1359 <span style="font-weight: bold">diff --git a/build/whitespace_file.txt b/build/w
hitespace_file.txt</span> | 1359 <span style="font-weight: bold">diff --git a/build/whitespace_file.txt b/build/w
hitespace_file.txt</span> |
1360 <span style="font-weight: bold">index 3eba355..9d08d9d 100644</span> | 1360 <span style="font-weight: bold">index 3eba355..9d08d9d 100644</span> |
1361 <span style="font-weight: bold">--- a/build/whitespace_file.txt</span> | 1361 <span style="font-weight: bold">--- a/build/whitespace_file.txt</span> |
1362 <span style="font-weight: bold">+++ b/build/whitespace_file.txt</span> | 1362 <span style="font-weight: bold">+++ b/build/whitespace_file.txt</span> |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1574 <div class="sectionbody"> | 1574 <div class="sectionbody"> |
1575 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_
tools(7)</a> suite. These tools are meant to | 1575 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_
tools(7)</a> suite. These tools are meant to |
1576 assist with the development of chromium and related projects. Download the tools | 1576 assist with the development of chromium and related projects. Download the tools |
1577 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
here</a>.</p></div> | 1577 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
here</a>.</p></div> |
1578 </div> | 1578 </div> |
1579 </div> | 1579 </div> |
1580 </div> | 1580 </div> |
1581 <div id="footnotes"><hr /></div> | 1581 <div id="footnotes"><hr /></div> |
1582 <div id="footer"> | 1582 <div id="footer"> |
1583 <div id="footer-text"> | 1583 <div id="footer-text"> |
1584 Last updated 2014-05-09 17:43:43 PDT | 1584 Last updated 2015-01-13 15:27:56 PST |
1585 </div> | 1585 </div> |
1586 </div> | 1586 </div> |
1587 </body> | 1587 </body> |
1588 </html> | 1588 </html> |
OLD | NEW |