blob: f7238afafc7e8539fc4d830c3473c4d38c1c0c54 [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*.
Hans Wennborgac1d6a02013-07-25 22:58:31 +000063* Click *Create Diff*.
Manuel Klimek83981262012-10-11 19:40:46 +000064* Paste the text diff or upload the patch file.
65 Note that TODO
66* 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
Paul Robinson6f4a19f2015-01-13 00:50:31 +000071 for LLVM, add llvm-commits as a subscriber; if your patch is for Clang,
72 add cfe-commits.
Manuel Klimek83981262012-10-11 19:40:46 +000073* Click *Save*.
74
75To submit an updated patch:
76
77* Click *Differential*.
Sylvestre Ledrudef97f42013-11-11 14:27:56 +000078* Click *Create Diff*.
Manuel Klimek83981262012-10-11 19:40:46 +000079* Paste the updated diff.
80* Select the review you want to from the *Attach To* dropdown and click
81 *Continue*.
82* Click *Save*.
83
84Reviewing code with Phabricator
85-------------------------------
86
87Phabricator allows you to add inline comments as well as overall comments
88to a revision. To add an inline comment, select the lines of code you want
89to comment on by clicking and dragging the line numbers in the diff pane.
Paul Robinsonc02e8582015-03-30 21:27:28 +000090When you have added all your comments, scroll to the bottom of the page and
91click the Submit button.
Manuel Klimek83981262012-10-11 19:40:46 +000092
Paul Robinsonc02e8582015-03-30 21:27:28 +000093You can add overall comments in the text box at the bottom of the page.
94When you're done, click the Submit button.
Manuel Klimek83981262012-10-11 19:40:46 +000095
96Phabricator has many useful features, for example allowing you to select
97diffs between different versions of the patch as it was reviewed in the
98*Revision Update History*. Most features are self descriptive - explore, and
99if you have a question, drop by on #llvm in IRC to get help.
100
Manuel Klimek51e31d22013-02-13 09:07:18 +0000101Note that as e-mail is the system of reference for code reviews, and some
102people prefer it over a web interface, we do not generate automated mail
103when a review changes state, for example by clicking "Accept Revision" in
104the web interface. Thus, please type LGTM into the comment box to accept
105a change from Phabricator.
106
Mark Seaborn6e15ee82014-02-11 16:58:03 +0000107Committing a change
108-------------------
109
Sylvestre Ledru4c16e612014-07-02 15:25:25 +0000110Arcanist can manage the commit transparently. It will retrieve the description,
111reviewers, the ``Differential Revision``, etc from the review and commit it to the repository.
112
113::
114
Sylvestre Ledruae0fc232014-07-04 09:00:35 +0000115 arc patch D<Revision>
Sylvestre Ledru4c16e612014-07-02 15:25:25 +0000116 arc commit --revision D<Revision>
117
118
Mark Seaborn6e15ee82014-02-11 16:58:03 +0000119When committing an LLVM change that has been reviewed using
120Phabricator, the convention is for the commit message to end with the
121line:
122
123::
124
125 Differential Revision: <URL>
126
127where ``<URL>`` is the URL for the code review, starting with
Manuel Klimek234b86b2014-04-07 10:21:33 +0000128``http://reviews.llvm.org/``.
Mark Seaborn6e15ee82014-02-11 16:58:03 +0000129
130Note that Arcanist will add this automatically.
131
132This allows people reading the version history to see the review for
133context. This also allows Phabricator to detect the commit, close the
134review, and add a link from the review to the commit.
135
Paul Robinsonc02e8582015-03-30 21:27:28 +0000136Abandoning a change
137-------------------
138
139If you decide you should not commit the patch, you should explicitly abandon
140the review so that reviewers don't think it is still open. In the web UI,
141scroll to the bottom of the page where normally you would enter an overall
142comment. In the drop-down Action list, which defaults to "Comment," you should
143select "Abandon Revision" and then enter a comment explaining why. Click the
144Submit button to finish closing the review.
145
Manuel Klimek83981262012-10-11 19:40:46 +0000146Status
147------
148
Chandler Carruth792b94c2015-05-27 07:20:46 +0000149Please let us know whether you like it and what could be improved! We're still
150working on setting up a bug tracker, but you can email klimek-at-google-dot-com
151and chandlerc-at-gmail-dot-com and CC the llvmdev mailing list with questions
152until then. We also could use help implementing improvements. This sadly is
153really painful and hard because the Phabricator codebase is in PHP and not as
154testable as you might like. However, we've put exactly what we're deploying up
155on an `llvm-reviews GitHub project`_ where folks can hack on it and post pull
156requests. We're looking into what the right long-term hosting for this is, but
157note that it is a derivative of an existing open source project, and so not
158trivially a good fit for an official LLVM project.
Sean Silvab39f47b2012-10-12 01:21:24 +0000159
Manuel Klimek234b86b2014-04-07 10:21:33 +0000160.. _LLVM's Phabricator: http://reviews.llvm.org
Reid Kleckner8b91d362014-06-25 20:25:21 +0000161.. _`http://reviews.llvm.org`: http://reviews.llvm.org
Manuel Klimek234b86b2014-04-07 10:21:33 +0000162.. _Code Repository Browser: http://reviews.llvm.org/diffusion/
Sean Silvab39f47b2012-10-12 01:21:24 +0000163.. _Arcanist Quick Start: http://www.phabricator.com/docs/phabricator/article/Arcanist_Quick_Start.html
164.. _Arcanist User Guide: http://www.phabricator.com/docs/phabricator/article/Arcanist_User_Guide.html
Chandler Carruth792b94c2015-05-27 07:20:46 +0000165.. _llvm-reviews GitHub project: https://github.com/r4nt/llvm-reviews/