Phabricator.rst 10 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250
  1. .. _phabricator-reviews:
  2. =============================
  3. Code Reviews with Phabricator
  4. =============================
  5. .. contents::
  6. :local:
  7. If you prefer to use a web user interface for code reviews, you can now submit
  8. your patches for Clang and LLVM at `LLVM's Phabricator`_ instance.
  9. While Phabricator is a useful tool for some, the relevant -commits mailing list
  10. is the system of record for all LLVM code review. The mailing list should be
  11. added as a subscriber on all reviews, and Phabricator users should be prepared
  12. to respond to free-form comments in mail sent to the commits list.
  13. Sign up
  14. -------
  15. To get started with Phabricator, navigate to `https://reviews.llvm.org`_ and
  16. click the power icon in the top right. You can register with a GitHub account,
  17. a Google account, or you can create your own profile.
  18. Make *sure* that the email address registered with Phabricator is subscribed
  19. to the relevant -commits mailing list. If you are not subscribed to the commit
  20. list, all mail sent by Phabricator on your behalf will be held for moderation.
  21. Note that if you use your Subversion user name as Phabricator user name,
  22. Phabricator will automatically connect your submits to your Phabricator user in
  23. the `Code Repository Browser`_.
  24. Requesting a review via the command line
  25. ----------------------------------------
  26. Phabricator has a tool called *Arcanist* to upload patches from
  27. the command line. To get you set up, follow the
  28. `Arcanist Quick Start`_ instructions.
  29. You can learn more about how to use arc to interact with
  30. Phabricator in the `Arcanist User Guide`_.
  31. .. _phabricator-request-review-web:
  32. Requesting a review via the web interface
  33. -----------------------------------------
  34. The tool to create and review patches in Phabricator is called
  35. *Differential*.
  36. Note that you can upload patches created through various diff tools,
  37. including git and svn. To make reviews easier, please always include
  38. **as much context as possible** with your diff! Don't worry, Phabricator
  39. will automatically send a diff with a smaller context in the review
  40. email, but having the full file in the web interface will help the
  41. reviewer understand your code.
  42. To get a full diff, use one of the following commands (or just use Arcanist
  43. to upload your patch):
  44. * ``git show HEAD -U999999 > mypatch.patch``
  45. * ``git format-patch -U999999 @{u}``
  46. * ``svn diff --diff-cmd=diff -x -U999999``
  47. To upload a new patch:
  48. * Click *Differential*.
  49. * Click *+ Create Diff*.
  50. * Paste the text diff or browse to the patch file. Click *Create Diff*.
  51. * Leave this first Repository field blank. (We'll fill in the Repository
  52. later, when sending the review.)
  53. * Leave the drop down on *Create a new Revision...* and click *Continue*.
  54. * Enter a descriptive title and summary. The title and summary are usually
  55. in the form of a :ref:`commit message <commit messages>`.
  56. * Add reviewers (see below for advice). (If you set the Repository field
  57. correctly, llvm-commits or cfe-commits will be subscribed automatically;
  58. otherwise, you will have to manually subscribe them.)
  59. * In the Repository field, enter the name of the project (LLVM, Clang,
  60. etc.) to which the review should be sent.
  61. * Click *Save*.
  62. To submit an updated patch:
  63. * Click *Differential*.
  64. * Click *+ Create Diff*.
  65. * Paste the updated diff or browse to the updated patch file. Click *Create Diff*.
  66. * Select the review you want to from the *Attach To* dropdown and click
  67. *Continue*.
  68. * Leave the Repository field blank. (We previously filled out the Repository
  69. for the review request.)
  70. * Add comments about the changes in the new diff. Click *Save*.
  71. Choosing reviewers: You typically pick one or two people as initial reviewers.
  72. This choice is not crucial, because you are merely suggesting and not requiring
  73. them to participate. Many people will see the email notification on cfe-commits
  74. or llvm-commits, and if the subject line suggests the patch is something they
  75. should look at, they will.
  76. .. _finding-potential-reviewers:
  77. Finding potential reviewers
  78. ---------------------------
  79. Here are a couple of ways to pick the initial reviewer(s):
  80. * Use ``svn blame`` and the commit log to find names of people who have
  81. recently modified the same area of code that you are modifying.
  82. * Look in CODE_OWNERS.TXT to see who might be responsible for that area.
  83. * If you've discussed the change on a dev list, the people who participated
  84. might be appropriate reviewers.
  85. Even if you think the code owner is the busiest person in the world, it's still
  86. okay to put them as a reviewer. Being the code owner means they have accepted
  87. responsibility for making sure the review happens.
  88. Reviewing code with Phabricator
  89. -------------------------------
  90. Phabricator allows you to add inline comments as well as overall comments
  91. to a revision. To add an inline comment, select the lines of code you want
  92. to comment on by clicking and dragging the line numbers in the diff pane.
  93. When you have added all your comments, scroll to the bottom of the page and
  94. click the Submit button.
  95. You can add overall comments in the text box at the bottom of the page.
  96. When you're done, click the Submit button.
  97. Phabricator has many useful features, for example allowing you to select
  98. diffs between different versions of the patch as it was reviewed in the
  99. *Revision Update History*. Most features are self descriptive - explore, and
  100. if you have a question, drop by on #llvm in IRC to get help.
  101. Note that as e-mail is the system of reference for code reviews, and some
  102. people prefer it over a web interface, we do not generate automated mail
  103. when a review changes state, for example by clicking "Accept Revision" in
  104. the web interface. Thus, please type LGTM into the comment box to accept
  105. a change from Phabricator.
  106. Committing a change
  107. -------------------
  108. Once a patch has been reviewed and approved on Phabricator it can then be
  109. committed to trunk. If you do not have commit access, someone has to
  110. commit the change for you (with attribution). It is sufficient to add
  111. a comment to the approved review indicating you cannot commit the patch
  112. yourself. If you have commit access, there are multiple workflows to commit the
  113. change. Whichever method you follow it is recommended that your commit message
  114. ends with the line:
  115. ::
  116. Differential Revision: <URL>
  117. where ``<URL>`` is the URL for the code review, starting with
  118. ``https://reviews.llvm.org/``.
  119. This allows people reading the version history to see the review for
  120. context. This also allows Phabricator to detect the commit, close the
  121. review, and add a link from the review to the commit.
  122. Note that if you use the Arcanist tool the ``Differential Revision`` line will
  123. be added automatically. If you don't want to use Arcanist, you can add the
  124. ``Differential Revision`` line (as the last line) to the commit message
  125. yourself.
  126. Using the Arcanist tool can simplify the process of committing reviewed code as
  127. it will retrieve reviewers, the ``Differential Revision``, etc from the review
  128. and place it in the commit message. You may also commit an accepted change
  129. directly using ``git llvm push``, per the section in the :ref:`getting started
  130. guide <commit_from_git>`.
  131. Note that if you commit the change without using Arcanist and forget to add the
  132. ``Differential Revision`` line to your commit message then it is recommended
  133. that you close the review manually. In the web UI, under "Leap Into Action" put
  134. the SVN revision number in the Comment, set the Action to "Close Revision" and
  135. click Submit. Note the review must have been Accepted first.
  136. Committing someone's change from Phabricator
  137. ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  138. On a clean Git repository on an up to date ``master`` branch run the
  139. following (where ``<Revision>`` is the Phabricator review number):
  140. ::
  141. arc patch D<Revision>
  142. This will create a new branch called ``arcpatch-D<Revision>`` based on the
  143. current ``master`` and will create a commit corresponding to ``D<Revision>`` with a
  144. commit message derived from information in the Phabricator review.
  145. Check you are happy with the commit message and amend it if necessary. Then,
  146. make sure the commit is up-to-date, and commit it. This can be done by running
  147. the following:
  148. ::
  149. git pull --rebase origin master
  150. git show # Ensure the patch looks correct.
  151. ninja check-$whatever # Rerun the appropriate tests if needed.
  152. git llvm push
  153. Subversion and Arcanist (deprecated)
  154. ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  155. To download a change from Phabricator and commit it with subversion, you should
  156. first make sure you have a clean working directory. Then run the following
  157. (where ``<Revision>`` is the Phabricator review number):
  158. ::
  159. arc patch D<Revision>
  160. arc commit --revision D<Revision>
  161. The first command will take the latest version of the reviewed patch and apply
  162. it to the working copy. The second command will commit this revision to trunk.
  163. Abandoning a change
  164. -------------------
  165. If you decide you should not commit the patch, you should explicitly abandon
  166. the review so that reviewers don't think it is still open. In the web UI,
  167. scroll to the bottom of the page where normally you would enter an overall
  168. comment. In the drop-down Action list, which defaults to "Comment," you should
  169. select "Abandon Revision" and then enter a comment explaining why. Click the
  170. Submit button to finish closing the review.
  171. Status
  172. ------
  173. Please let us know whether you like it and what could be improved! We're still
  174. working on setting up a bug tracker, but you can email klimek-at-google-dot-com
  175. and chandlerc-at-gmail-dot-com and CC the llvm-dev mailing list with questions
  176. until then. We also could use help implementing improvements. This sadly is
  177. really painful and hard because the Phabricator codebase is in PHP and not as
  178. testable as you might like. However, we've put exactly what we're deploying up
  179. on an `llvm-reviews GitHub project`_ where folks can hack on it and post pull
  180. requests. We're looking into what the right long-term hosting for this is, but
  181. note that it is a derivative of an existing open source project, and so not
  182. trivially a good fit for an official LLVM project.
  183. .. _LLVM's Phabricator: https://reviews.llvm.org
  184. .. _`https://reviews.llvm.org`: https://reviews.llvm.org
  185. .. _Code Repository Browser: https://reviews.llvm.org/diffusion/
  186. .. _Arcanist Quick Start: https://secure.phabricator.com/book/phabricator/article/arcanist_quick_start/
  187. .. _Arcanist User Guide: https://secure.phabricator.com/book/phabricator/article/arcanist/
  188. .. _llvm-reviews GitHub project: https://github.com/r4nt/llvm-reviews/