blob: 8ac9afec6c39b9e081d4a6c4f64b1ceb8bc381a9 [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*.
67* Enter a descriptive title and summary; add reviewers and mailing
68 lists that you want to be included in the review. If your patch is
69 for LLVM, cc llvm-commits; if your patch is for Clang, cc cfe-commits.
70* Click *Save*.
71
72To submit an updated patch:
73
74* Click *Differential*.
Sylvestre Ledrudef97f42013-11-11 14:27:56 +000075* Click *Create Diff*.
Manuel Klimek83981262012-10-11 19:40:46 +000076* Paste the updated diff.
77* Select the review you want to from the *Attach To* dropdown and click
78 *Continue*.
79* Click *Save*.
80
81Reviewing code with Phabricator
82-------------------------------
83
84Phabricator allows you to add inline comments as well as overall comments
85to a revision. To add an inline comment, select the lines of code you want
86to comment on by clicking and dragging the line numbers in the diff pane.
87
88You can add overall comments or submit your comments at the bottom of the page.
89
90Phabricator has many useful features, for example allowing you to select
91diffs between different versions of the patch as it was reviewed in the
92*Revision Update History*. Most features are self descriptive - explore, and
93if you have a question, drop by on #llvm in IRC to get help.
94
Manuel Klimek51e31d22013-02-13 09:07:18 +000095Note that as e-mail is the system of reference for code reviews, and some
96people prefer it over a web interface, we do not generate automated mail
97when a review changes state, for example by clicking "Accept Revision" in
98the web interface. Thus, please type LGTM into the comment box to accept
99a change from Phabricator.
100
Mark Seaborn6e15ee82014-02-11 16:58:03 +0000101Committing a change
102-------------------
103
Sylvestre Ledru4c16e612014-07-02 15:25:25 +0000104Arcanist can manage the commit transparently. It will retrieve the description,
105reviewers, the ``Differential Revision``, etc from the review and commit it to the repository.
106
107::
108
Sylvestre Ledruae0fc232014-07-04 09:00:35 +0000109 arc patch D<Revision>
Sylvestre Ledru4c16e612014-07-02 15:25:25 +0000110 arc commit --revision D<Revision>
111
112
Mark Seaborn6e15ee82014-02-11 16:58:03 +0000113When committing an LLVM change that has been reviewed using
114Phabricator, the convention is for the commit message to end with the
115line:
116
117::
118
119 Differential Revision: <URL>
120
121where ``<URL>`` is the URL for the code review, starting with
Manuel Klimek234b86b2014-04-07 10:21:33 +0000122``http://reviews.llvm.org/``.
Mark Seaborn6e15ee82014-02-11 16:58:03 +0000123
124Note that Arcanist will add this automatically.
125
126This allows people reading the version history to see the review for
127context. This also allows Phabricator to detect the commit, close the
128review, and add a link from the review to the commit.
129
Manuel Klimek83981262012-10-11 19:40:46 +0000130Status
131------
132
Sylvestre Ledru75a58f42014-05-14 09:22:15 +0000133Please let us know whether you like it and what could be improved!
Sean Silvab39f47b2012-10-12 01:21:24 +0000134
Manuel Klimek234b86b2014-04-07 10:21:33 +0000135.. _LLVM's Phabricator: http://reviews.llvm.org
Reid Kleckner8b91d362014-06-25 20:25:21 +0000136.. _`http://reviews.llvm.org`: http://reviews.llvm.org
Manuel Klimek234b86b2014-04-07 10:21:33 +0000137.. _Code Repository Browser: http://reviews.llvm.org/diffusion/
Sean Silvab39f47b2012-10-12 01:21:24 +0000138.. _Arcanist Quick Start: http://www.phabricator.com/docs/phabricator/article/Arcanist_Quick_Start.html
139.. _Arcanist User Guide: http://www.phabricator.com/docs/phabricator/article/Arcanist_User_Guide.html