diff options
Diffstat (limited to 'en/source/submit-patches.html')
-rw-r--r-- | en/source/submit-patches.html | 96 |
1 files changed, 6 insertions, 90 deletions
diff --git a/en/source/submit-patches.html b/en/source/submit-patches.html index 5620209e..c61fb2c7 100644 --- a/en/source/submit-patches.html +++ b/en/source/submit-patches.html @@ -74,7 +74,7 @@ repo start <var>NAME</var> . </pre> <p>You can start several independent branches at the same time in the same repository. The branch NAME is local to your workspace and will not be included -on gerrit or the final source tree.</p> +on Gerrit or the final source tree.</p> <h3 id="make-your-change">Make your change</h3> <p>Once you have modified the source files (and validated them, please) commit the changes to your local repository:</p> @@ -90,7 +90,7 @@ guidelines for writing changelist descriptions: </p> <li> <p>Start with a one-line summary (50 characters maximum), followed by a blank line. -This format is used by git and gerrit for various displays.</p> +This format is used by git and Gerrit for various displays.</p> </li> <li> @@ -115,9 +115,9 @@ which is likely to take up multiple lines. <p>A unique change ID and your name and email as provided during <code>repo init</code> will be automatically added to your commit message. </p> -<h3 id="upload-to-gerrit">Upload to gerrit</h3> +<h3 id="upload-to-gerrit">Upload to Gerrit</h3> <p>Once you have committed your change to your personal history, upload it -to gerrit with</p> +to Gerrit with</p> <pre class="devsite-terminal devsite-click-to-copy"> repo upload </pre> @@ -131,14 +131,14 @@ for your patch.</p> <h3 id="uploading-a-replacement-patch">Uploading a replacement patch</h3> <p>Suppose a reviewer has looked at your patch and requested a small modification. You can amend your commit within git, which will result in a -new patch on gerrit with the same change ID as the original.</p> +new patch on Gerrit with the same change ID as the original.</p> <aside class="note"><b>Note:</b> If you have made other commits since uploading this patch, you will need to manually move your git HEAD.</aside> <pre class="devsite-click-to-copy"> <code class="devsite-terminal">git add -A</code> <code class="devsite-terminal">git commit --amend</code> </pre> -<p>When you upload the amended patch, it will replace the original on gerrit +<p>When you upload the amended patch, it will replace the original on Gerrit and in your local git history.</p> <h3 id="resolving-sync-conflicts">Resolving sync conflicts</h3> @@ -169,90 +169,6 @@ Gerrit automatically merges the change into the public repository. Other users will be able to run <code>repo sync</code> to pull the update into their local client.</p> -<h2 id="for-reviewers-and-verifiers">For reviewers and verifiers</h2> - -<h3 id="reviewing-a-change">Reviewing a change</h3> -<p>If you are assigned to be the Approver for a change, you need to determine -the following:</p> -<ul> -<li> -<p>Does this change fit within this project's stated purpose?</p> -</li> -<li> -<p>Is this change valid within the project's existing architecture?</p> -</li> -<li> -<p>Does this change introduce design flaws that will cause problems in -the future?</p> -</li> -<li> -<p>Does this change follow the best practices that have been established -for this project?</p> -</li> -<li> -<p>Is this change a good way to perform the described function?</p> -</li> -<li> -<p>Does this change introduce any security or instability risks?</p> -</li> -</ul> -<p>If you approve of the change, mark it with LGTM ("Looks Good to Me") -within Gerrit.</p> -<h3 id="verifying-a-change">Verifying a change</h3> -<p>If you are assigned to be the Verifier for a change, you need to do the -following:</p> -<ul> -<li> -<p>Patch the change into your local client using one of the Download -commands.</p> -</li> -<li> -<p>Build and test the change.</p> -</li> -<li> -<p>Within Gerrit use Publish Comments to mark the commit as "Verified" or -"Fails," and add a message explaining what problems were identified.</p> -</li> -</ul> - -<h3 id="downloading-changes-from-gerrit">Downloading changes from Gerrit</h3> -<p>A submission that has been verified and merged will be downloaded with -the next <code>repo sync</code>. If you wish to download a specific change -that has not yet been approved, run</p> -<pre class="devsite-terminal devsite-click-to-copy"> -repo download <var>TARGET CHANGE</var> -</pre> -<p>where TARGET is the local directory into which the change should be -downloaded and CHANGE is the -change number as listed in <a -href="https://android-review.googlesource.com/">Gerrit</a>. For more -information, -see the <a href="/source/using-repo.html">Repo reference</a>.</p> -<h3 id="how-do-i-become-a-verifier-or-approver">How do I become a Verifier -or Approver?</h3> -<p>In short, contribute high-quality code to one or more of the Android -projects. -For details about the different roles in the Android Open Source community and -who plays them, see <a href="/source/roles.html">Project -Roles</a>.</p> -<h3 id="diffs-and-comments">Diffs and comments</h3> -<p>To open the details of the change within Gerrit, click on the "Id number" -or "Subject" of a change. To compare the established code with the updated -code, click the file name under "Side-by-side diffs."</p> -<h3 id="adding-comments">Adding comments</h3> -<p>Anyone in the community can use Gerrit to add inline comments to code -submissions. A good comment will be relevant to the line or section of code -to which it is attached in Gerrit. It might be a short and constructive -suggestion about how a line of code could be improved, or it might be an -explanation from the author about why the code makes sense the way it is.</p> -<p>To add an inline comment, double-click the relevant line of the code -and write your comment in the text box that opens. When you click Save, -only you can see your comment.</p> -<p>To publish your comments so that others using Gerrit will be able to see -them, click the Publish Comments button. Your comments will be emailed to -all relevant parties for this change, including the change owner, the patch -set uploader (if different from the owner), and all current reviewers.</p> -<p><a name="upstream-projects"></a></p> <h2 id="upstream-projects">Upstream Projects</h2> <p>Android makes use of a number of other open source projects, such as the Linux kernel and WebKit, as described in |