| 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 970 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 981 <div class="listingblock"> | 981 <div class="listingblock"> |
| 982 <div class="content"> | 982 <div class="content"> |
| 983 <pre><code><strong><span class="white">$</span></strong> # get the code | 983 <pre><code><strong><span class="white">$</span></strong> # get the code |
| 984 <strong><span class="white">$</span></strong> # In an empty directory: | 984 <strong><span class="white">$</span></strong> # In an empty directory: |
| 985 <strong><span class="white">$ fetch {chromium,blink,...}</span></strong> | 985 <strong><span class="white">$ fetch {chromium,blink,...}</span></strong> |
| 986 | 986 |
| 987 <strong><span class="white">$</span></strong> # Update third_party repos and run
pre-compile hooks | 987 <strong><span class="white">$</span></strong> # Update third_party repos and run
pre-compile hooks |
| 988 <strong><span class="white">$ gclient sync</span></strong> | 988 <strong><span class="white">$ gclient sync</span></strong> |
| 989 | 989 |
| 990 <strong><span class="white">$</span></strong> # Make a new change and upload it
for review | 990 <strong><span class="white">$</span></strong> # Make a new change and upload it
for review |
| 991 <strong><span class="white">$ git new-branch branchname</span></strong> | 991 <strong><span class="white">$ git new-branch <branch_name></span></strong> |
| 992 <strong><span class="white">$</span></strong> # repeat: [edit, git add, git comm
it] | 992 <strong><span class="white">$</span></strong> # repeat: [edit, git add, git comm
it] |
| 993 <strong><span class="white">$ git cl upload</span></strong> | 993 <strong><span class="white">$ git cl upload</span></strong> |
| 994 | 994 |
| 995 <strong><span class="white">$</span></strong> # After change is reviewed, commit
with the CQ | 995 <strong><span class="white">$</span></strong> # After change is reviewed, commit
with the CQ |
| 996 <strong><span class="white">$ git cl set_commit</span></strong> | 996 <strong><span class="white">$ git cl set_commit</span></strong> |
| 997 <strong><span class="white">$</span></strong> # Note that the committed hash whi
ch lands will /not/ match the | 997 <strong><span class="white">$</span></strong> # Note that the committed hash whi
ch lands will /not/ match the |
| 998 <strong><span class="white">$</span></strong> # commit hashes of your local bran
ch.</code></pre> | 998 <strong><span class="white">$</span></strong> # commit hashes of your local bran
ch.</code></pre> |
| 999 </div></div> | 999 </div></div> |
| 1000 </div> | 1000 </div> |
| 1001 </div> | 1001 </div> |
| 1002 <div class="sect1"> | 1002 <div class="sect1"> |
| 1003 <h2 id="_getting_the_code">GETTING THE CODE</h2> | 1003 <h2 id="_getting_the_code">GETTING THE CODE</h2> |
| 1004 <div class="sectionbody"> | 1004 <div class="sectionbody"> |
| 1005 <div class="paragraph"><p>Pick an empty directory and run one of the following:<
/p></div> | 1005 <div class="paragraph"><p>Pick an empty directory and run one of the following:<
/p></div> |
| 1006 <div class="listingblock"> | 1006 <div class="listingblock"> |
| 1007 <div class="content"> | 1007 <div class="content"> |
| 1008 <pre><code><strong><span class="white">$ fetch chromium</span></strong> # Basic
checkout for desktop Chromium | 1008 <pre><code><strong><span class="white">$ fetch chromium</span></strong> # Basic
checkout for desktop Chromium |
| 1009 <strong><span class="white">$ fetch blink</span></strong> # Chromium code wi
th Blink checked out to tip-of-tree | 1009 <strong><span class="white">$ fetch blink</span></strong> # Chromium code wi
th Blink checked out to tip-of-tree |
| 1010 <strong><span class="white">$ fetch android</span></strong> # Chromium checkou
t for Android platform | 1010 <strong><span class="white">$ fetch android</span></strong> # Chromium checkou
t for Android platform |
| 1011 <strong><span class="white">$ fetch ios</span></strong> # Chromium checkou
t for iOS platform</code></pre> | 1011 <strong><span class="white">$ fetch ios</span></strong> # Chromium checkou
t for iOS platform</code></pre> |
| 1012 </div></div> | 1012 </div></div> |
| 1013 <div class="paragraph"><p>When the <code>fetch</code> tool completes you should
have the following in your working | 1013 <div class="paragraph"><p>When the <code>fetch</code> tool completes you should
have the following in your working |
| 1014 directory:</p></div> | 1014 directory:</p></div> |
| 1015 <div class="listingblock"> | 1015 <div class="listingblock"> |
| 1016 <div class="content"> | 1016 <div class="content"> |
| 1017 <pre><code><strong><span class="white">.gclient</span></strong> # A configurat
ion file for you source checkout | 1017 <pre><code><strong><span class="white">.gclient</span></strong> # A configurat
ion file for you source checkout |
| 1018 <strong><span class="white">src/</span></strong> # Top-level Chromium sour
ce checkout.</code></pre> | 1018 <strong><span class="white">src/</span></strong> # Top-level Chromium sour
ce checkout.</code></pre> |
| 1019 </div></div> | 1019 </div></div> |
| 1020 <div class="paragraph"><p>If you are on linux, then you’ll need to run:</p
></div> | 1020 <div class="paragraph"><p>If you are on linux and fetching the code for the firs
t time, then you’ll need |
| 1021 to run:</p></div> |
| 1021 <div class="listingblock"> | 1022 <div class="listingblock"> |
| 1022 <div class="content"> | 1023 <div class="content"> |
| 1023 <pre><code><strong><span class="white">$ cd src && ./build/install-build
-deps.sh</span></strong></code></pre> | 1024 <pre><code><strong><span class="white">$ cd src && ./build/install-build
-deps.sh</span></strong></code></pre> |
| 1024 </div></div> | 1025 </div></div> |
| 1025 <div class="paragraph"><p>And finally:</p></div> | 1026 <div class="paragraph"><p>And finally:</p></div> |
| 1026 <div class="listingblock"> | 1027 <div class="listingblock"> |
| 1027 <div class="content"> | 1028 <div class="content"> |
| 1028 <pre><code><strong><span class="white">$ gclient sync</span></strong></code></pr
e> | 1029 <pre><code><strong><span class="white">$ gclient sync</span></strong></code></pr
e> |
| 1029 </div></div> | 1030 </div></div> |
| 1030 <div class="paragraph"><p>This will pull all dependencies of the Chromium src ch
eckout. You will need | 1031 <div class="paragraph"><p>This will pull all dependencies of the Chromium src ch
eckout. You will need |
| 1031 to run this any time you update the main src checkout.</p></div> | 1032 to run this any time you update the main src checkout, including when you |
| 1033 switch branches.</p></div> |
| 1032 </div> | 1034 </div> |
| 1033 </div> | 1035 </div> |
| 1034 <div class="sect1"> | 1036 <div class="sect1"> |
| 1035 <h2 id="_creating_uploading_a_cl">CREATING / UPLOADING A CL</h2> | 1037 <h2 id="_creating_uploading_a_cl">CREATING / UPLOADING A CL</h2> |
| 1036 <div class="sectionbody"> | 1038 <div class="sectionbody"> |
| 1037 <div class="admonitionblock"> | 1039 <div class="admonitionblock"> |
| 1038 <table><tr> | 1040 <table><tr> |
| 1039 <td class="icon"> | 1041 <td class="icon"> |
| 1040 <div class="title">Note</div> | 1042 <div class="title">Note</div> |
| 1041 </td> | 1043 </td> |
| 1042 <td class="content">The remainder of the tutorial assumes that your current work
ing directory | 1044 <td class="content">The remainder of the tutorial assumes that your current work
ing directory |
| 1043 is the <code>src/</code> folder mentioned in <a href="#_getting_the_code">Gettin
g the code</a>.</td> | 1045 is the <code>src/</code> folder mentioned in <a href="#_getting_the_code">Gettin
g the code</a>.</td> |
| 1044 </tr></table> | 1046 </tr></table> |
| 1045 </div> | 1047 </div> |
| 1046 <div class="paragraph"><p>Each CL corresponds exactly with a single branch in gi
t. Any time you want to | 1048 <div class="paragraph"><p>Each CL corresponds exactly with a single branch in gi
t. Any time you want to |
| 1047 begin a new CL, just:</p></div> | 1049 begin a new CL:</p></div> |
| 1048 <div class="listingblock"> | 1050 <div class="listingblock"> |
| 1049 <div class="content"> | 1051 <div class="content"> |
| 1050 <pre><code><strong><span class="white">$ git new-branch <branch_name></spa
n></strong></code></pre> | 1052 <pre><code><strong><span class="white">$ git new-branch <branch_name></spa
n></strong></code></pre> |
| 1051 </div></div> | 1053 </div></div> |
| 1052 <div class="paragraph"><p>This will create and checkout a new branch named <code
>branch_name</code> which will track | 1054 <div class="paragraph"><p>This will create and checkout a new branch named <code
>branch_name</code> which will track |
| 1053 the default upstream (which is <code>origin/master</code>). See <a href="git-new
-branch.html">git-new-branch(1)</a> | 1055 the default upstream branch (<code>origin/master</code>). See |
| 1054 for more features, such as the ability to track <em>LKGR</em>.</p></div> | 1056 <a href="git-new-branch.html">git-new-branch(1)</a> for more features.</p></div> |
| 1055 <div class="paragraph"><p>Commit as many changes as you like to this branch. Whe
n you want to upload it | 1057 <div class="paragraph"><p>Commit as many changes as you like to this branch. Whe
n you want to upload it |
| 1056 for review, run:</p></div> | 1058 for review, run:</p></div> |
| 1057 <div class="listingblock"> | 1059 <div class="listingblock"> |
| 1058 <div class="content"> | 1060 <div class="content"> |
| 1059 <pre><code><strong><span class="white">$ git cl upload</span></strong></code></p
re> | 1061 <pre><code><strong><span class="white">$ git cl upload</span></strong></code></p
re> |
| 1060 </div></div> | 1062 </div></div> |
| 1061 <div class="paragraph"><p>This will take the diff of your branch against its ups
tream (<code>origin/master</code>), | 1063 <div class="paragraph"><p>This will take the diff of your branch against its ups
tream branch (in that |
| 1062 and will post it to the <a href="https://codereview.chromium.org">Chromium code | 1064 case origin/master), and will post it to the |
| 1063 review site</a>.</p></div> | 1065 <a href="https://codereview.chromium.org">Chromium code review site</a>.</p></di
v> |
| 1064 </div> | 1066 </div> |
| 1065 </div> | 1067 </div> |
| 1066 <div class="sect1"> | 1068 <div class="sect1"> |
| 1067 <h2 id="_updating_the_code">UPDATING THE CODE</h2> | 1069 <h2 id="_updating_the_code">UPDATING THE CODE</h2> |
| 1068 <div class="sectionbody"> | 1070 <div class="sectionbody"> |
| 1069 <div class="paragraph"><p>Inevitably, you’ll want to pull in changes from
the main Chromium repo. This is | 1071 <div class="paragraph"><p>Inevitably, you’ll want to pull in changes from
the main Chromium repo. This is |
| 1070 pretty easy with <em>depot_tools</em>:</p></div> | 1072 pretty easy with <em>depot_tools</em>:</p></div> |
| 1071 <div class="listingblock"> | 1073 <div class="listingblock"> |
| 1072 <div class="content"> | 1074 <div class="content"> |
| 1073 <pre><code><strong><span class="white">$ git rebase-update</span></strong></code
></pre> | 1075 <pre><code><strong><span class="white">$ git rebase-update</span></strong></code
></pre> |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1108 automatically run <code>gclient sync</code> to update your dependencies.</td> | 1110 automatically run <code>gclient sync</code> to update your dependencies.</td> |
| 1109 </tr></table> | 1111 </tr></table> |
| 1110 </div> | 1112 </div> |
| 1111 </div> | 1113 </div> |
| 1112 </div> | 1114 </div> |
| 1113 <div class="sect1"> | 1115 <div class="sect1"> |
| 1114 <h2 id="_managing_multiple_cls">MANAGING MULTIPLE CLS</h2> | 1116 <h2 id="_managing_multiple_cls">MANAGING MULTIPLE CLS</h2> |
| 1115 <div class="sectionbody"> | 1117 <div class="sectionbody"> |
| 1116 <div class="paragraph"><p>Sometimes you want to work on more than one CL at once
(say, you have a CL | 1118 <div class="paragraph"><p>Sometimes you want to work on more than one CL at once
(say, you have a CL |
| 1117 posted for review and want to work on something else). For each CL that you | 1119 posted for review and want to work on something else). For each CL that you |
| 1118 want to work on, just use <code>git new-branch <branchname></code>.</p></d
iv> | 1120 want to work on, just use <code>git new-branch <branch_name></code>.</p></
div> |
| 1119 <div class="paragraph"><p>Once you start to have more than one CL at a time, it
can be easy to lose your | 1121 <div class="paragraph"><p>Once you start to have more than one CL at a time, it
can be easy to lose your |
| 1120 bearings. Fortunately, <em>depot_tools</em> has two tools to help you out:</p></
div> | 1122 bearings. Fortunately, <em>depot_tools</em> has two tools to help you out:</p></
div> |
| 1121 <div class="listingblock"> | 1123 <div class="listingblock"> |
| 1122 <div class="content"> | 1124 <div class="content"> |
| 1123 <pre><code><strong><span class="white">$ git map</span></strong> | 1125 <pre><code><strong><span class="white">$ git map</span></strong> |
| 1124 <span class="white blue-background">*</span>​<strong><span class="blue-bac
kground red"> 7dcfe47 </span></strong> <span class="green">(</span>​
<strong><span class="aqua">frozen_changes</span></strong>​<span class="gre
en">)</span> <span class="yellow">2014-03-12</span> ~ FREEZE.unindexed | 1126 <span class="white blue-background">*</span>​<strong><span class="blue-bac
kground red"> 7dcfe47 </span></strong> <span class="green">(</span>​
<strong><span class="aqua">frozen_changes</span></strong>​<span class="gre
en">)</span> <span class="yellow">2014-03-12</span> ~ FREEZE.unindexed |
| 1125 * <strong><span class="red">4b0c180</span></strong> <span class="yellow">
2014-03-12</span> ~ modfile | 1127 * <strong><span class="red">4b0c180</span></strong> <span class="yellow">
2014-03-12</span> ~ modfile |
| 1126 * <strong><span class="red">59a7cca</span></strong> <span class="yellow">
2014-03-12</span> ~ a deleted file | 1128 * <strong><span class="red">59a7cca</span></strong> <span class="yellow">
2014-03-12</span> ~ a deleted file |
| 1127 * <strong><span class="red">6bec695</span></strong> <span class="green">(
</span>​<span class="red">origin/master</span>​<span class="green">)
</span> <span class="yellow">2014-03-11</span> ~ Add neat feature <strong><sp
an class="white"><(frozen_changes)</span></strong> | 1129 * <strong><span class="red">6bec695</span></strong> <span class="green">(
</span>​<span class="red">origin/master</span>​<span class="green">)
</span> <span class="yellow">2014-03-11</span> ~ Add neat feature <strong><sp
an class="white"><(frozen_changes)</span></strong> |
| 1128 * <strong><span class="red">d15a38a</span></strong> <span class="yellow">
2014-03-11</span> ~ Epic README update | 1130 * <strong><span class="red">d15a38a</span></strong> <span class="yellow">
2014-03-11</span> ~ Epic README update |
| (...skipping 28 matching lines...) Expand all Loading... |
| 1157 format. In particular, it will show you which commits all of your branches | 1159 format. In particular, it will show you which commits all of your branches |
| 1158 are on, which commit you currently have checked out, and more. Check out the | 1160 are on, which commit you currently have checked out, and more. Check out the |
| 1159 doc for the full details. | 1161 doc for the full details. |
| 1160 </p> | 1162 </p> |
| 1161 </dd> | 1163 </dd> |
| 1162 <dt class="hdlist1"> | 1164 <dt class="hdlist1"> |
| 1163 <a href="git-map-branches.html">git-map-branches(1)</a> | 1165 <a href="git-map-branches.html">git-map-branches(1)</a> |
| 1164 </dt> | 1166 </dt> |
| 1165 <dd> | 1167 <dd> |
| 1166 <p> | 1168 <p> |
| 1167 This tool just shows you which branches you have in your repo, and thier | 1169 This tool just shows you which branches you have in your repo, and their |
| 1168 upstream relationship to each other (as well as which branch you have checked | 1170 upstream relationship to each other (as well as which branch you have checked |
| 1169 out at the moment). | 1171 out at the moment). |
| 1170 </p> | 1172 </p> |
| 1171 </dd> | 1173 </dd> |
| 1172 </dl></div> | 1174 </dl></div> |
| 1173 <div class="paragraph"><p>Additionally, sometimes you need to switch between bra
nches, but you’ve got work | 1175 <div class="paragraph"><p>Additionally, sometimes you need to switch between bra
nches, but you’ve got work |
| 1174 in progress. You could use <a href="git-stash.html">git-stash(1)</a>, but that c
an be tricky to | 1176 in progress. You could use <a href="git-stash.html">git-stash(1)</a>, but that c
an be tricky to |
| 1175 manage because you need to remember which branches you stashed what changes on. | 1177 manage because you need to remember which branches you stashed what changes on. |
| 1176 Helpfully <em>depot_tools</em> includes two tools which can greatly assist in ca
se:</p></div> | 1178 Helpfully <em>depot_tools</em> includes two tools which can greatly assist in ca
se:</p></div> |
| 1177 <div class="paragraph"><p><a href="git-freeze.html">git-freeze(1)</a> allows you
to put the current branch in 'suspended | 1179 <div class="paragraph"><p><a href="git-freeze.html">git-freeze(1)</a> allows you
to put the current branch in 'suspended |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1229 <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> |
| 1230 ... truncated output ... | 1232 ... truncated output ... |
| 1231 <span style="font-weight: bold; color: #ffffff">$ cd src</span> | 1233 <span style="font-weight: bold; color: #ffffff">$ cd src</span> |
| 1232 </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> |
| 1233 ... truncated output ... | 1235 ... truncated output ... |
| 1234 </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> |
| 1235 ... truncated output ... | 1237 ... truncated output ... |
| 1236 </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> |
| 1237 <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> |
| 1238 1503 | 1240 1503 |
| 1241 1501 |
| 1239 It was a Domo-Banana. | 1242 It was a Domo-Banana. |
| 1240 It was a Domo-Kuun. | 1243 It was a Domo-Kuun. |
| 1241 1501 | |
| 1242 <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> |
| 1243 [fix_typo 615ffa7] Fix terrible typo. | 1245 [fix_typo 615ffa7] Fix terrible typo. |
| 1244 1 file changed, 1 insertion(+), 1 deletion(-) | 1246 1 file changed, 1 insertion(+), 1 deletion(-) |
| 1245 <span style="font-weight: bold; color: #ffffff">$ git map</span> | 1247 <span style="font-weight: bold; color: #ffffff">$ git map</span> |
| 1246 <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. |
| 1247 * <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> |
| 1248 * <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 |
| 1249 * <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. |
| 1250 * <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. |
| 1251 * <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 |
| 1252 * <span style="font-weight: bold; color: #e42e16">2250f53 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozo
ne: evdev: Filter devices by path | 1254 * <span style="font-weight: bold; color: #e42e16">2250f53 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozo
ne: evdev: Filter devices by path |
| 1253 * <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Alw
ays output seccomp error messages to stderr | 1255 * <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Alw
ays output seccomp error messages to stderr |
| 1254 <span style="font-weight: bold; color: #ffffff">$ git status</span> | 1256 <span style="font-weight: bold; color: #ffffff">$ git status</span> |
| 1255 On branch fix_typo | 1257 # On branch fix_typo |
| 1256 Your branch is ahead of 'origin/master' by 1 commit. | 1258 # Your branch is ahead of 'origin/master' by 1 commit. |
| 1257 (use "git push" to publish your local commits) | 1259 # (use "git push" to publish your local commits) |
| 1258 | 1260 # |
| 1259 nothing to commit, working directory clean | 1261 nothing to commit, working directory clean |
| 1260 <span style="font-weight: bold; color: #ffffff">$ git cl upload -r domo@chromium
.org --send-mail</span> | 1262 <span style="font-weight: bold; color: #ffffff">$ git cl upload -r domo@chromium
.org --send-mail</span> |
| 1261 ... truncated output ... | 1263 ... truncated output ... |
| 1262 </code></pre></div></div><p><div class="paragraph"> While we wait for feedback,
let's do something else.</p></div><div class="listingblock"><div class="content"
><pre><code><span style="font-weight: bold; color: #ffffff">$ git new-branch cha
p2</span> | 1264 </code></pre></div></div><p><div class="paragraph"> While we wait for feedback,
let's do something else.</p></div><div class="listingblock"><div class="content"
><pre><code><span style="font-weight: bold; color: #ffffff">$ git new-branch cha
p2</span> |
| 1263 <span style="font-weight: bold; color: #ffffff">$ git map-branches</span> | 1265 <span style="font-weight: bold; color: #ffffff">$ git map-branches</span> |
| 1264 <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e
16">origin/master | 1266 <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e
16">origin/master |
| 1265 </span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-
weight: bold; color: #33d6e5"> chap2 * | 1267 </span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-
weight: bold; color: #33d6e5"> chap2 * |
| 1266 </span><span style="font-weight: bold; color: #19c518"></span><span style="color
: #19c518"> fix_typo | 1268 </span><span style="font-weight: bold; color: #19c518"></span><span style="color
: #19c518"> fix_typo |
| 1267 </span><span style="font-weight: bold; color: #ffffff">$ cat >> build/whit
espace_file.txt <<EOF</span> | 1269 </span><span style="font-weight: bold; color: #ffffff">$ cat >> build/whit
espace_file.txt <<EOF</span> |
| 1268 | 1270 |
| 1269 "You recall what happened on Mulholland drive?" The ceiling fan rotated slowly | 1271 "You recall what happened on Mulholland drive?" The ceiling fan rotated slowly |
| 1270 overhead, barely disturbing the thick cigarette smoke. No doubt was left about | 1272 overhead, barely disturbing the thick cigarette smoke. No doubt was left about |
| 1271 when the fan was last cleaned. | 1273 when the fan was last cleaned. |
| 1272 EOF | 1274 EOF |
| 1273 <span style="font-weight: bold; color: #ffffff">$ git status</span> | 1275 <span style="font-weight: bold; color: #ffffff">$ git status</span> |
| 1274 On branch chap2 | 1276 # On branch chap2 |
| 1275 Your branch is up-to-date with 'origin/master'. | 1277 # Your branch is up-to-date with 'origin/master'. |
| 1276 | 1278 # |
| 1277 Changes not staged for commit: | 1279 # Changes not staged for commit: |
| 1278 (use "git add <file>..." to update what will be committed) | 1280 # (use "git add <file>..." to update what will be committed) |
| 1279 (use "git checkout -- <file>..." to discard changes in working directory
) | 1281 # (use "git checkout -- <file>..." to discard changes in working directo
ry) |
| 1280 | 1282 # |
| 1281 » <span style="color: #e42e16">modified: build/whitespace_file.txt</span
> | 1283 #» <span style="color: #e42e16">modified: build/whitespace_file.txt</span
> |
| 1282 | 1284 # |
| 1283 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") |
| 1284 </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> |
| 1285 <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> |
| 1286 Switched to branch 'fix_typo' | 1288 Switched to branch 'fix_typo' |
| 1287 Your branch is ahead of 'origin/master' by 1 commit. | 1289 Your branch is ahead of 'origin/master' by 1 commit. |
| 1288 (use "git push" to publish your local commits) | 1290 (use "git push" to publish your local commits) |
| 1289 <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> |
| 1290 1501 | 1292 1501 |
| 1293 1500 |
| 1291 It was a Domo-Kuun. | 1294 It was a Domo-Kuun. |
| 1292 It was a Domo-Kun. | 1295 It was a Domo-Kun. |
| 1293 1500 | |
| 1294 <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> |
| 1295 <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> |
| 1296 <span style="font-weight: bold">index 3eba355..57cdcee 100644</span> | 1298 <span style="font-weight: bold">index 3eba355..57cdcee 100644</span> |
| 1297 <span style="font-weight: bold">--- a/build/whitespace_file.txt</span> | 1299 <span style="font-weight: bold">--- a/build/whitespace_file.txt</span> |
| 1298 <span style="font-weight: bold">+++ b/build/whitespace_file.txt</span> | 1300 <span style="font-weight: bold">+++ b/build/whitespace_file.txt</span> |
| 1299 <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 |
| 1300 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 |
| 1301 struggled against the elements. A hooded figure emerged. | 1303 struggled against the elements. A hooded figure emerged. |
| 1302 | 1304 |
| 1303 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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1572 <div class="sectionbody"> | 1574 <div class="sectionbody"> |
| 1573 <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 |
| 1574 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 |
| 1575 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> |
| 1576 </div> | 1578 </div> |
| 1577 </div> | 1579 </div> |
| 1578 </div> | 1580 </div> |
| 1579 <div id="footnotes"><hr /></div> | 1581 <div id="footnotes"><hr /></div> |
| 1580 <div id="footer"> | 1582 <div id="footer"> |
| 1581 <div id="footer-text"> | 1583 <div id="footer-text"> |
| 1582 Last updated 2014-04-28 13:55:43 PDT | 1584 Last updated 2014-05-09 17:43:43 PDT |
| 1583 </div> | 1585 </div> |
| 1584 </div> | 1586 </div> |
| 1585 </body> | 1587 </body> |
| 1586 </html> | 1588 </html> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 268543013:
Minor fixes (Closed)
Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master