Project

General

Profile

Gerrit » History » Version 45

neels, 07/12/2016 01:19 PM

1 1 zecke
h1. Contributing using Gerrit
2 1 zecke
3 11 laforge
{{>toc}}
4 11 laforge
5 10 laforge
At [[OpenBSC:OsmoDevCon2016]] we discussed problems with our past contribution / patch submission process using mails on the mailing list as well as patchwork.  The result is that we want to give Gerrit a try for some time and see if it helps us to have a better process
6 1 zecke
7 10 laforge
Gerrit is a review tool that integrates nicely with git and ssh. You can find general information about Gerrit at https://www.gerritcodereview.com/
8 1 zecke
9 10 laforge
The advantages of Gerrit are:
10 10 laforge
* patch submission status is automatically tracked, also with several revisions for a patch set.
11 10 laforge
* patches are build-tested (and possibly even further tested) by jenkins before they are applied
12 10 laforge
* developers + maintainers can formally vote on a patch (developer: -1/0/+1, maintainer: -2/0/+2)
13 10 laforge
* once a patch has +2 score, it can be (automatically) merged into master
14 10 laforge
* patch sumissions not via git send-email but direcly from git
15 10 laforge
16 10 laforge
h2. Osmocom Subprojects using Gerrit
17 10 laforge
18 1 zecke
The following projects use Gerrit to contribute changes:
19 1 zecke
20 1 zecke
* libosmocore.git
21 1 zecke
* libosmo-abis.git
22 1 zecke
* libosmo-netif.git
23 1 zecke
* libosmo-sccp.git
24 1 zecke
* libsmpp34.git
25 1 zecke
* openbsc.git
26 1 zecke
* osmo-bts.git
27 1 zecke
* osmo-iuh.git
28 1 zecke
* osmo-pcu.git
29 5 zecke
* cellmgr-ng.git
30 1 zecke
* osmo-sip-connector.git
31 30 neels
32 1 zecke
h2. Configuring Gerrit/Account
33 1 zecke
34 10 laforge
You will need to sign-up at https://gerrit.osmocom.org/login/. If you have an Osmocom Redmine account you can use https://osmocom.org/openid as OpenID provider. If you have no Osmocom redmine account, you can simply create one online at the "Register" link in the upper right corner.
35 10 laforge
36 10 laforge
Even without an existing or new redmine account, you should also be able to use any other OpenID provider to authenticate against gerrit (untested).
37 10 laforge
38 10 laforge
After the initial sign-up you will need to:
39 1 zecke
40 1 zecke
* Pick a username (can not be changed)
41 1 zecke
* Add your public ssh key(s)
42 1 zecke
* Add email addresses you intend to use as author/comitter
43 30 neels
44 30 neels
If you would like to push private branches to the Gerrit repository, you also need to be added to the "known users" group.
45 30 neels
Please send a short requesting email to openbsc@lists.osmocom.org.
46 1 zecke
47 1 zecke
h2. Setting up Gerrit for commits and pushing
48 1 zecke
49 33 neels
*Note:* it is easiest to work with gerrit when gerrit is the only remote in your git clone.
50 33 neels
When you clone from git.osmocom.org and add the gerrit remote, git will have two remotes,
51 36 neels
so when you first checkout a branch you have to supply the remote explicitly (cumbersome).
52 34 neels
The gerrit repositories and git.osmocom.org are constantly synced, so it is sufficient
53 34 neels
to clone from gerrit only.
54 33 neels
55 33 neels
h3. Simplest: new clone
56 33 neels
57 35 neels
* Create a new clone from gerrit
58 35 neels
* Fetch the commit hook that adds Change-Id to each commit to uniquely identify a commit
59 42 neels
60 33 neels
<pre>
61 33 neels
git clone ssh://$USERNAME@gerrit.osmocom.org:29418/$PROJECT.git
62 33 neels
scp -P 29418 $USERNAME@gerrit.osmocom.org:hooks/commit-msg $PROJECT/.git/hooks/
63 33 neels
</pre>
64 33 neels
65 33 neels
h3. SSH config
66 33 neels
67 33 neels
In '~/.ssh/config', add these lines:
68 33 neels
<pre>
69 33 neels
Host foo
70 33 neels
Hostname gerrit.osmocom.org
71 33 neels
Port 29418
72 33 neels
User $USERNAME
73 33 neels
</pre>
74 33 neels
(replace 'foo' with your favorite shortcut name,
75 33 neels
replace '$USERNAME' with your user name as used on the gerrit website)
76 33 neels
77 33 neels
Then you can shorten above commands to
78 1 zecke
<pre>
79 33 neels
git clone ssh://foo/$PROJECT.git
80 35 neels
scp foo:hooks/commit-msg $PROJECT/.git/hooks/
81 33 neels
</pre>
82 33 neels
83 33 neels
h3. Add gerrit to an existing clone
84 33 neels
85 7 neels
* Add the remote to be able to fetch and push to gerrit
86 7 neels
* Fetch the commit hook that adds Change-Id to each commit to uniquely identify a commit
87 7 neels
88 7 neels
<pre>
89 7 neels
USERNAME=gerrit_user_name
90 7 neels
PROJECT=$(basename $PWD)
91 1 zecke
git remote add gerrit ssh://$USERNAME@gerrit.osmocom.org:29418/$PROJECT.git
92 1 zecke
scp -P 29418 $USERNAME@gerrit.osmocom.org:hooks/commit-msg .git/hooks/
93 1 zecke
</pre>
94 44 neels
95 44 neels
Now you need to use 'gerrit' instead of 'origin' in all of the other instructions shown
96 44 neels
on this page.
97 44 neels
98 7 neels
99 33 neels
h2. Push for review
100 1 zecke
101 38 neels
Checkout the revision or branch that you want to submit for review, then
102 38 neels
103 31 neels
<pre>
104 40 neels
git push origin HEAD:refs/for/master
105 1 zecke
</pre>
106 38 neels
107 1 zecke
You can optionally add a topic name with
108 40 neels
109 40 neels
<pre>
110 40 neels
git push origin HEAD:refs/for/master/my_topic
111 38 neels
</pre>
112 38 neels
113 1 zecke
114 38 neels
h2. Push a "private" user branch
115 33 neels
116 1 zecke
*Note* that you must be a member of the "known users" group, see above.
117 33 neels
118 43 neels
If your local branch name is of the form 'your_name/topic', you can just
119 1 zecke
<pre>
120 1 zecke
git push
121 33 neels
</pre>
122 41 neels
and git will tell you what to do.
123 1 zecke
124 41 neels
To push from a "nonstandard" local branch name, do
125 41 neels
<pre>
126 41 neels
git push origin HEAD:refs/heads/$USERNAME/branch_name
127 33 neels
</pre>
128 33 neels
129 39 neels
130 39 neels
h2. List changesets in gerrit
131 39 neels
132 7 neels
<pre>
133 7 neels
git ls-remote origin changes/*
134 2 zecke
</pre>
135 12 msuraev
136 17 neels
h1. Tips and Tricks
137 1 zecke
138 17 neels
h2. Throw-away branch
139 17 neels
140 17 neels
If you need to adjust and re-submit patches, it may be handy to create a throw-away branch ("R D" in magit-gerrit in emacs for example),
141 45 neels
make your changes/amendments and then send patch(es) back to gerrit while removing temporary branch automatically with "git review -f".
142 13 neels
143 25 neels
h2. Re-submit a Branch with Amended Commits
144 13 neels
145 1 zecke
On a feature branch, one typically has numerous commits that depend on their preceding commits.
146 29 neels
Often, some of the branch commits need to be amended for fixes. But, Gerrit will refuse your branch
147 29 neels
re-submission if the first branch commit is unchanged.
148 1 zecke
149 16 neels
To re-submit a branch, make sure to cosmetically tweak the branch's first commit log message
150 22 neels
before each re-submission (keep the Change-Id, really make just a cosmetic change).
151 13 neels
152 16 neels
<pre>
153 16 neels
git rebase -i master
154 16 neels
# replace the first line's 'pick' with 'r' (or 'reword'), exit editor
155 16 neels
# git presents you with commit log message, make any tiny modification.
156 1 zecke
</pre>
157 1 zecke
158 29 neels
The cause: Gerrit refuses to accept a commit with a Change-Id that it already knows and
159 29 neels
where the commit hash is identical.
160 1 zecke
161 29 neels
If you just cosmetically tweak the first commit's log message, the commit hash
162 29 neels
is changed. Since the following commits contain their predecessor's commit hash, now
163 29 neels
all of the branch's commit hashes are modified, and gerrit happily accepts them as a 
164 29 neels
new patch set. It will still pick up the Change-Ids (which you shouldn't edit) and 
165 29 neels
notice if commits have remained identical (keeping the votes). But with the minor
166 29 neels
commit log tweak, it will no longer thwart your re-submission with an error message.
167 29 neels
168 29 neels
Note: you could modify all the Change-Ids, but now your branch submission would
169 29 neels
open entirely new review entries and you would have to abandon your previous submission.
170 29 neels
Comments on the first submission are lost and you cannot diff between patch sets.
171 29 neels
172 29 neels
173 26 neels
h2. Re-submit Previously Abandoned Changes
174 16 neels
175 16 neels
You have to edit the Change-Ids, on a branch that would be every single commit log message.
176 16 neels
177 13 neels
<pre>
178 1 zecke
cd openbsc
179 1 zecke
git co my-branch
180 1 zecke
git rebase -i master
181 1 zecke
# replace all 'pick' with 'r' (or 'reword'), exit your editor
182 13 neels
# git presents each commit log message for editing
183 13 neels
</pre>
184 13 neels
185 27 neels
h2. Submit a "private" branch for master
186 21 neels
187 21 neels
If you've pushed a branch to refs/heads/* somewhere, gerrit will already know the Change-Ids on it.
188 24 neels
Make sure the option [[Gerrit#Private-Branches-Create-a-new-change-for-every-commit|Create a new change for every commit not in the target branch]] is _TRUE_ for your project,
189 21 neels
or gerrit will refuse to accept your submission.
190 21 neels
191 16 neels
h1. Reasons for Particular Configuration
192 13 neels
193 16 neels
h2. Rebase if necessary
194 16 neels
195 16 neels
There are different merge strategies that Gerrit performs to accept patches.
196 13 neels
Each project can be configured to a specific merge strategy, but unfortunately you can't
197 13 neels
decide on a strategy per patch submission.
198 13 neels
199 13 neels
It seems that the "Merge if Necessary" strategy is best supported, but it creates non-linear
200 13 neels
history with numerous merge commits that are usually not at all necessary.
201 13 neels
202 13 neels
Instead, the "Cherry Pick" strategy puts each patch onto current master's HEAD to create
203 13 neels
linear history. However, this will cause merge failures as soon as one patch depends on
204 13 neels
another submitted patch, as typical for a feature branch submission.
205 13 neels
206 1 zecke
So we prefer the "Rebase if Necessary" strategy, which always tries to apply your patches to
207 13 neels
the current master HEAD, in sequence with the previous patches on the same branch.
208 13 neels
However, some problems still remain, including some bugs in "Rebase if Necessary".
209 1 zecke
210 13 neels
There's a problem with "Rebase if Necessary": If your branch sits at master's HEAD, Gerrit
211 13 neels
refuses to accept the submission, because it thinks that no new changes are submitted.
212 13 neels
This is a bug in Gerrit, which holger has fixed manually in our Gerrit installation:
213 1 zecke
214 1 zecke
https://bugs.chromium.org/p/gerrit/issues/detail?id=4158
215 1 zecke
216 1 zecke
217 16 neels
h2. Private Branches: Create a new change for every commit...
218 1 zecke
219 13 neels
Say you have an extensive feature in development, and you want to keep it on the
220 13 neels
upstream git repository to a) keep it safe and b) collaborate with other devs on it.
221 16 neels
So, of course, you have regularly pushed to refs/heads/yoyodyne/feature.
222 13 neels
223 13 neels
Since you have the gerrit commit hook installed, your feature branch already has
224 13 neels
Change-Id tags in all commit log messages.
225 13 neels
226 13 neels
Now your feature is complete and you would like to submit it to master.
227 13 neels
Alas, Gerrit refuses to accept your patch submission for master, because it
228 13 neels
knows the Change-Ids are also on a different branch.
229 13 neels
230 16 neels
Gerrit by default enforces that a Change-Id must be unique across all branches,
231 16 neels
so that each submission for review is separate for each branch. Instead, we
232 16 neels
want to handle Change-Ids per-branch, so that you can have the same change
233 16 neels
submitted to different branches, as separate patch submissions, without having
234 16 neels
to cosmetically adjust the Change-Id.
235 13 neels
236 16 neels
Solution: set the option 
237 16 neels
_Create a new change for every commit not in the target branch_ to _TRUE_
238 13 neels
239 20 neels
h2. Allow content merges
240 14 neels
241 14 neels
By default, gerrit compares patches only by the files' paths. If two paths are the same,
242 14 neels
it immediately shows them as conflicts (path conflicts).
243 14 neels
244 14 neels
In software development, a conflict usually means an actual content conflict, so if the
245 14 neels
edits are in two entirely separate places in the file, we don't consider this a conflict.
246 14 neels
247 23 neels
By setting _Allow content merges_ to _TRUE_ in the git project config, we tell Gerrit to
248 14 neels
perform text merges of the submitted patches and only complain about actual content
249 14 neels
conflicts, in the usual software engineering sense.
250 32 neels
251 32 neels
h1. Admin
252 32 neels
253 32 neels
h2. Adding users to groups
254 32 neels
255 32 neels
Normally, the gerrit UI auto-completes a user name in the edit field. It has happened
256 32 neels
though that an existing user is not auto-completed, as if it didn't exist. In that case,
257 32 neels
find out the user ID (seven digit number like 1000123) and just enter that.
258 32 neels
259 32 neels
The user ID can be found on the user's "Settings" page, or in the database (s.b.).
260 32 neels
261 32 neels
h2. Querying the database directly
262 32 neels
263 32 neels
If your user has permission to access the database, you can place SQL queries using the
264 32 neels
'gerrit gsql' commands over ssh:
265 32 neels
266 32 neels
<pre>
267 32 neels
ssh -p 29418 $USERNAME@gerrit.osmocom.org 'gerrit gsql --format PRETTY -c "show tables"'
268 32 neels
ssh -p 29418 $USERNAME@gerrit.osmocom.org 'gerrit gsql --format PRETTY -c "select full_name,account_id from accounts"'
269 32 neels
</pre>
270 32 neels
271 32 neels
This seems to be the MySQL dialect.
Add picture from clipboard (Maximum size: 48.8 MB)