blob: 1dcd6a0859d12cff409b25db718419f0a84852f8 [file] [log] [blame]
Manuel Klimek83981262012-10-11 19:40:46 +00001=============================
2Code Reviews with Phabricator
3=============================
4
5.. contents::
6 :local:
7
Reid Kleckner8b91d362014-06-25 20:25:21 +00008If you prefer to use a web user interface for code reviews, you can now submit
9your patches for Clang and LLVM at `LLVM's Phabricator`_ instance.
10
11While Phabricator is a useful tool for some, the relevant -commits mailing list
12is the system of record for all LLVM code review. The mailing list should be
Sanjay Patelec0c53d2014-06-26 18:12:42 +000013added as a subscriber on all reviews, and Phabricator users should be prepared
14to respond to free-form comments in mail sent to the commits list.
Manuel Klimek83981262012-10-11 19:40:46 +000015
16Sign up
17-------
18
Reid Kleckner8b91d362014-06-25 20:25:21 +000019To get started with Phabricator, navigate to `http://reviews.llvm.org`_ and
20click the power icon in the top right. You can register with a GitHub account,
21a Google account, or you can create your own profile.
22
Sanjay Patelec0c53d2014-06-26 18:12:42 +000023Make *sure* that the email address registered with Phabricator is subscribed
Reid Kleckner8b91d362014-06-25 20:25:21 +000024to the relevant -commits mailing list. If your are not subscribed to the commit
25list, all mail sent by Phabricator on your behalf will be held for moderation.
26
Chandler Carruth34e34772012-10-27 09:47:33 +000027Note that if you use your Subversion user name as Phabricator user name,
28Phabricator will automatically connect your submits to your Phabricator user in
29the `Code Repository Browser`_.
Manuel Klimek83981262012-10-11 19:40:46 +000030
Manuel Klimek83981262012-10-11 19:40:46 +000031Requesting a review via the command line
32----------------------------------------
33
34Phabricator has a tool called *Arcanist* to upload patches from
35the command line. To get you set up, follow the
36`Arcanist Quick Start`_ instructions.
37
38You can learn more about how to use arc to interact with
39Phabricator in the `Arcanist User Guide`_.
40
41Requesting a review via the web interface
42-----------------------------------------
43
44The tool to create and review patches in Phabricator is called
45*Differential*.
46
47Note that you can upload patches created through various diff tools,
48including git and svn. To make reviews easier, please always include
49**as much context as possible** with your diff! Don't worry, Phabricator
50will automatically send a diff with a smaller context in the review
51email, but having the full file in the web interface will help the
52reviewer understand your code.
53
54To get a full diff, use one of the following commands (or just use Arcanist
55to upload your patch):
56
Alexey Samsonovbdb25942012-11-06 15:04:37 +000057* ``git diff -U999999 other-branch``
58* ``svn diff --diff-cmd=diff -x -U999999``
Manuel Klimek83981262012-10-11 19:40:46 +000059
60To upload a new patch:
61
62* Click *Differential*.
Scott Douglassa0cda9b2015-07-01 13:41:18 +000063* Click *+ Create Diff*.
64* Paste the text diff or browse to the patch file. Click *Create Diff*.
65* Leave the Repository field blank.
Manuel Klimek83981262012-10-11 19:40:46 +000066* Leave the drop down on *Create a new Revision...* and click *Continue*.
Scott Douglassdb322772015-03-31 15:07:53 +000067* Enter a descriptive title and summary. The title and summary are usually
68 in the form of a :ref:`commit message <commit messages>`.
69* Add reviewers and mailing
Manuel Klimek83981262012-10-11 19:40:46 +000070 lists that you want to be included in the review. If your patch is
Scott Douglassa0cda9b2015-07-01 13:41:18 +000071 for LLVM, add llvm-commits as a Subscriber; if your patch is for Clang,
Paul Robinson6f4a19f2015-01-13 00:50:31 +000072 add cfe-commits.
Scott Douglassa0cda9b2015-07-01 13:41:18 +000073* Leave the Repository and Project fields blank.
Manuel Klimek83981262012-10-11 19:40:46 +000074* Click *Save*.
75
76To submit an updated patch:
77
78* Click *Differential*.
Scott Douglassa0cda9b2015-07-01 13:41:18 +000079* Click *+ Create Diff*.
80* Paste the updated diff or browse to the updated patch file. Click *Create Diff*.
Manuel Klimek83981262012-10-11 19:40:46 +000081* Select the review you want to from the *Attach To* dropdown and click
82 *Continue*.
Scott Douglassa0cda9b2015-07-01 13:41:18 +000083* Leave the Repository and Project fields blank.
84* Add comments about the changes in the new diff. Click *Save*.
Manuel Klimek83981262012-10-11 19:40:46 +000085
86Reviewing code with Phabricator
87-------------------------------
88
89Phabricator allows you to add inline comments as well as overall comments
90to a revision. To add an inline comment, select the lines of code you want
91to comment on by clicking and dragging the line numbers in the diff pane.
Paul Robinsonc02e8582015-03-30 21:27:28 +000092When you have added all your comments, scroll to the bottom of the page and
93click the Submit button.
Manuel Klimek83981262012-10-11 19:40:46 +000094
Paul Robinsonc02e8582015-03-30 21:27:28 +000095You can add overall comments in the text box at the bottom of the page.
96When you're done, click the Submit button.
Manuel Klimek83981262012-10-11 19:40:46 +000097
98Phabricator has many useful features, for example allowing you to select
99diffs between different versions of the patch as it was reviewed in the
100*Revision Update History*. Most features are self descriptive - explore, and
101if you have a question, drop by on #llvm in IRC to get help.
102
Manuel Klimek51e31d22013-02-13 09:07:18 +0000103Note that as e-mail is the system of reference for code reviews, and some
104people prefer it over a web interface, we do not generate automated mail
105when a review changes state, for example by clicking "Accept Revision" in
106the web interface. Thus, please type LGTM into the comment box to accept
107a change from Phabricator.
108
Mark Seaborn6e15ee82014-02-11 16:58:03 +0000109Committing a change
110-------------------
111
Sylvestre Ledru4c16e612014-07-02 15:25:25 +0000112Arcanist can manage the commit transparently. It will retrieve the description,
113reviewers, the ``Differential Revision``, etc from the review and commit it to the repository.
114
115::
116
Sylvestre Ledruae0fc232014-07-04 09:00:35 +0000117 arc patch D<Revision>
Sylvestre Ledru4c16e612014-07-02 15:25:25 +0000118 arc commit --revision D<Revision>
119
120
Mark Seaborn6e15ee82014-02-11 16:58:03 +0000121When committing an LLVM change that has been reviewed using
122Phabricator, the convention is for the commit message to end with the
123line:
124
125::
126
127 Differential Revision: <URL>
128
129where ``<URL>`` is the URL for the code review, starting with
Manuel Klimek234b86b2014-04-07 10:21:33 +0000130``http://reviews.llvm.org/``.
Mark Seaborn6e15ee82014-02-11 16:58:03 +0000131
132Note that Arcanist will add this automatically.
133
134This allows people reading the version history to see the review for
135context. This also allows Phabricator to detect the commit, close the
136review, and add a link from the review to the commit.
137
Paul Robinsonc02e8582015-03-30 21:27:28 +0000138Abandoning a change
139-------------------
140
141If you decide you should not commit the patch, you should explicitly abandon
142the review so that reviewers don't think it is still open. In the web UI,
143scroll to the bottom of the page where normally you would enter an overall
144comment. In the drop-down Action list, which defaults to "Comment," you should
145select "Abandon Revision" and then enter a comment explaining why. Click the
146Submit button to finish closing the review.
147
Manuel Klimek83981262012-10-11 19:40:46 +0000148Status
149------
150
Chandler Carruth792b94c2015-05-27 07:20:46 +0000151Please let us know whether you like it and what could be improved! We're still
152working on setting up a bug tracker, but you can email klimek-at-google-dot-com
153and chandlerc-at-gmail-dot-com and CC the llvmdev mailing list with questions
154until then. We also could use help implementing improvements. This sadly is
155really painful and hard because the Phabricator codebase is in PHP and not as
156testable as you might like. However, we've put exactly what we're deploying up
157on an `llvm-reviews GitHub project`_ where folks can hack on it and post pull
158requests. We're looking into what the right long-term hosting for this is, but
159note that it is a derivative of an existing open source project, and so not
160trivially a good fit for an official LLVM project.
Sean Silvab39f47b2012-10-12 01:21:24 +0000161
Manuel Klimek234b86b2014-04-07 10:21:33 +0000162.. _LLVM's Phabricator: http://reviews.llvm.org
Reid Kleckner8b91d362014-06-25 20:25:21 +0000163.. _`http://reviews.llvm.org`: http://reviews.llvm.org
Manuel Klimek234b86b2014-04-07 10:21:33 +0000164.. _Code Repository Browser: http://reviews.llvm.org/diffusion/
Sean Silvab39f47b2012-10-12 01:21:24 +0000165.. _Arcanist Quick Start: http://www.phabricator.com/docs/phabricator/article/Arcanist_Quick_Start.html
166.. _Arcanist User Guide: http://www.phabricator.com/docs/phabricator/article/Arcanist_User_Guide.html
Chandler Carruth792b94c2015-05-27 07:20:46 +0000167.. _llvm-reviews GitHub project: https://github.com/r4nt/llvm-reviews/