2 .\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
4 .\" Copyright (c) 2021 Daniel Ebdrup Jensen
6 .\" Redistribution and use in source and binary forms, with or without
7 .\" modification, are permitted provided that the following conditions
9 .\" 1. Redistributions of source code must retain the above copyright
10 .\" notice, this list of conditions and the following disclaimer.
11 .\" 2. Redistributions in binary form must reproduce the above copyright
12 .\" notice, this list of conditions and the following disclaimer in the
13 .\" documentation and/or other materials provided with the distribution.
15 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
16 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
17 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
18 .\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
19 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 .Nd a wrapper to improve integration betwen git and arcanist
37 .Op Fl r Ar reviewer1 Ns Op Cm \&, Ns Ar reviewer2 ...
38 .Op Fl s Ar subscriber1 Ns Op Cm \&, Ns Ar subscriber2 ...
39 .Op Ar commit Ns | Ns Ar commit-range
41 .Cm list Ar commit Ns | Ns Ar commit-range
43 .Cm patch Ar diff1 Ns Op Cm \&, Ns Ar diff2
47 .Op Ar commit Ns | Ns Ar commit-range
50 .Op Ar commit Ns | Ns Ar commit-range Oc
54 utility creates and manages
56 Phabricator reviews based on git commits.
59 assumes a one-to-one relationship between git commits and
60 Differential Revisions, and the Differential Revision title must match
61 the summary line of the corresponding commit.
62 In particular, the commit summaries must be unique across all open
63 Differential Revisions authored the submitter.
65 The first parameter must be a verb.
66 The available verbs are:
67 .Bl -tag -width "create"
69 Create new Differential Revisions from the specified commits.
71 .Bl -tag -width subscriber
73 Before processing commit(s) display list of commits to be processed
74 and wait for confirmation.
76 Add one or more reviewers, separated by commas, to revision(s) being created.
77 Argument(s) must be existing Phabricator user or group.
78 .It Fl r Ar subscriber
79 Add one or more subscribers, separated by commas, to revision(s) being created.
80 Argument(s) must be existing Phabricator user or group.
83 Print the associated Differential Revisions for the specified commits.
85 Try to apply a patch from a Differential revision to the currently
88 Prepare a series of commits to be pushed to the upstream
91 The commits are cherry-picked to a branch (by default the
93 branch), review tags are added to the commit log message, and
94 the log message is opened in an editor for any last-minute
96 The commits need not have associated Differential
99 Synchronize the Differential Revisions associated with the
101 Currently only the diff is updated; the review description and other
102 metadata is not synchronized.
105 These are manipulated by
107 .Bl -tag -width "arc.assume_yes"
108 .It Va arc.assume_yes
111 answer to all prompts instead of
118 Try to open newly created reviews in a browser tab.
125 In this mode, the list of git revisions to create reviews for
126 is listed with a single prompt before creating reviews.
127 The diffs for individual commits are not shown.
130 Always use verbose output.
137 The typical end-to-end usage looks something like this.
139 Commit changes with a message and create a Differential review:
140 .Bd -literal -offset indent
141 $ git commit -m "kern: Rewrite in Rust"
142 $ git arc create HEAD
145 Make changes to the diff based on review feedback, then amend the
146 changes to the existing commit and update the Differential review:
147 .Bd -literal -offset indent
149 $ git arc update HEAD
152 Now that all reviewers are happy, it is time to stage the commit and
154 .Bd -literal -offset indent
156 $ git push freebsd HEAD:main
159 Create a Phabricator review using the contents of the most recent
160 commit in your git checkout:
161 .Bd -literal -offset indent
162 $ git arc create -r markj HEAD
165 The commit title is used as the review title, the commit log
166 message is used as the review description, and
167 .Aq Mt markj@FreeBSD.org
168 is added as a reviewer.
170 Create a series of Phabricator reviews for each of HEAD~2, HEAD~ and
172 .Bd -literal -offset indent
173 $ git arc create HEAD~3..HEAD
176 Pairs of consecutive commits are linked into a patch stack.
177 Note that the first commit in the specified range is excluded.
179 Update the review corresponding to commit b409afcfedcdda:
180 .Bd -literal -offset indent
181 $ git arc update b409afcfedcdda
184 The title of the commit must be the same as it was when the review
186 Note that the review description is not automatically updated.
188 Apply the patch in review D12345 to the currently checked-out tree,
190 .Bd -literal -offset indent
191 $ git arc patch D12345
194 List the status of reviews for all the commits in the branch
196 .Bd -literal -offset indent
197 $ git arc list main..feature
205 utility appeared in the src tools collection in
210 utility was written by
212 .An Mark Johnston Aq Mt markj@FreeBSD.org
213 and the manual page was written by
214 .An Daniel Ebdrup Jensen Aq Mt debdrup@FreeBSD.org .