Project

General

Profile

Gerrit » History » Version 108

stsp, 12/18/2018 04:52 PM
spelling fixes

1 99 fixeria
2 99 fixeria
{{>toc}}
3 93 neels
4 1 zecke
h1. Contributing using Gerrit
5 11 laforge
6 106 stsp
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 was that we wanted to give Gerrit a try for some time and see if it helps us to have a better process
7 1 zecke
8 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/
9 1 zecke
10 10 laforge
The advantages of Gerrit are:
11 10 laforge
* patch submission status is automatically tracked, also with several revisions for a patch set.
12 10 laforge
* patches are build-tested (and possibly even further tested) by jenkins before they are applied
13 108 stsp
* patch submissions not via git send-email but direcly from git
14 10 laforge
15 10 laforge
h2. Osmocom Subprojects using Gerrit
16 10 laforge
17 73 laforge
The majority of Osmocom sub-projects have chosen to use Gerrit for patch review.  In order to check if a given program uses Gerrit, please check the auto-generated list at https://gerrit.osmocom.org/#/admin/projects/
18 1 zecke
19 75 laforge
If the project is listed there, then it uses Gerrit.   If the project is not listed there, please send patches by e-mail to the respective project [[Mailing_Lists]] instead.
20 30 neels
21 1 zecke
h2. Configuring Gerrit/Account
22 1 zecke
23 54 neels
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.
24 1 zecke
25 68 neels
* first sign in on https://osmocom.org. Do this before logging in on gerrit (the redmine login process loses the gerrit login data and you'd have to do the same thing twice if not logged in on osmocom.org already).
26 55 neels
* go to https://gerrit.osmocom.org and click the "Sign in" link.
27 68 neels
* click the "Sign in with Osmocom":https://gerrit.osmocom.org/login/%23%2Fq%2Fstatus%3Aopen?id=https://osmocom.org/openid link (can be bookmarked). -- This is the same as entering https://osmocom.org/openid as OpenID provider and hitting the "Sign in" button.
28 61 neels
29 61 neels
*careful:* enter 'https' to ensure that your openid credentials are passed on encryptedly.
30 68 neels
*pitfall:* if you're logged in on 'projects.osmocom.org' (including the 'projects.' part), you should also use the openid provider: https://projects.osmocom.org/openid; the 'projects.' part may be omitted, what's important is that redmine login and OpenID URLs match. Also, decide for one of those URLs once, because when picking a different OpenID URL next time, you will create a new user instead of logging in as yourself.
31 61 neels
*note:* gerrit will create a distinct user for each openid URL you pass. If you logged in successfully but your user seems to have lost permissions, you may have created an evil twin user: contact us on the mailing list so we can fix it in the user database.
32 54 neels
33 54 neels
If you have no Osmocom redmine account, you can simply create one online at the "Register" link in the upper right corner.
34 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).
35 10 laforge
36 10 laforge
After the initial sign-up you will need to:
37 1 zecke
38 1 zecke
* Pick a username (can not be changed)
39 1 zecke
* Add your public ssh key(s)
40 1 zecke
* Add email addresses you intend to use as author/comitter
41 30 neels
42 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.
43 30 neels
Please send a short requesting email to openbsc@lists.osmocom.org.
44 1 zecke
45 1 zecke
h2. Setting up Gerrit for commits and pushing
46 1 zecke
47 33 neels
*Note:* it is easiest to work with gerrit when gerrit is the only remote in your git clone.
48 33 neels
When you clone from git.osmocom.org and add the gerrit remote, git will have two remotes,
49 36 neels
so when you first checkout a branch you have to supply the remote explicitly (cumbersome).
50 34 neels
The gerrit repositories and git.osmocom.org are constantly synced, so it is sufficient
51 34 neels
to clone from gerrit only.
52 33 neels
53 33 neels
h3. Simplest: new clone
54 33 neels
55 35 neels
* Create a new clone from gerrit
56 35 neels
* Fetch the commit hook that adds Change-Id to each commit to uniquely identify a commit
57 42 neels
58 33 neels
<pre>
59 33 neels
git clone ssh://$USERNAME@gerrit.osmocom.org:29418/$PROJECT.git
60 33 neels
scp -P 29418 $USERNAME@gerrit.osmocom.org:hooks/commit-msg $PROJECT/.git/hooks/
61 33 neels
</pre>
62 33 neels
63 33 neels
h3. SSH config
64 33 neels
65 33 neels
In '~/.ssh/config', add these lines:
66 33 neels
<pre>
67 52 neels
Host go
68 33 neels
Hostname gerrit.osmocom.org
69 33 neels
Port 29418
70 33 neels
User $USERNAME
71 33 neels
</pre>
72 52 neels
('go' means gerrit.osmocom, replace with your favorite shortcut name,
73 33 neels
replace '$USERNAME' with your user name as used on the gerrit website)
74 33 neels
75 33 neels
Then you can shorten above commands to
76 1 zecke
<pre>
77 52 neels
git clone ssh://go/$PROJECT.git
78 51 neels
cd $PROJECT
79 51 neels
scp go:hooks/commit-msg .git/hooks/
80 33 neels
</pre>
81 33 neels
82 1 zecke
h3. Committer must match
83 46 neels
84 1 zecke
Your email address on gerrit and the email address git places in your
85 46 neels
commits must match, or you will get rejected with an error message like
86 108 stsp
"invalid committer". You can add email addresses on the gerrit web UI.
87 47 neels
88 1 zecke
h3. Add gerrit to an existing clone
89 1 zecke
90 1 zecke
* Add the remote to be able to fetch and push to gerrit
91 46 neels
* Fetch the commit hook that adds Change-Id to each commit to uniquely identify a commit
92 1 zecke
93 46 neels
<pre>
94 1 zecke
USERNAME=gerrit_user_name
95 1 zecke
PROJECT=$(basename $PWD)
96 1 zecke
git remote add gerrit ssh://$USERNAME@gerrit.osmocom.org:29418/$PROJECT.git
97 1 zecke
scp -P 29418 $USERNAME@gerrit.osmocom.org:hooks/commit-msg .git/hooks/
98 1 zecke
</pre>
99 1 zecke
100 1 zecke
h2. Push for review
101 1 zecke
102 1 zecke
Prerequisites:
103 1 zecke
104 1 zecke
* your user on gerrit has an SSH public key
105 1 zecke
* your patch is committed in your local clone
106 1 zecke
* the commit log message has a Change-Id (see 'commit-msg' hook above, and 'Tips and Tricks' below to add a Change-Id to a commit that lacks one.)
107 1 zecke
108 1 zecke
<pre>
109 1 zecke
git push $REMOTE $GITHASH:refs/for/$BRANCH/$TOPIC
110 1 zecke
</pre>
111 1 zecke
112 1 zecke
$REMOTE: from above instructions, that's either 'origin' (cloned from gerrit) or 'gerrit' (if you added a second remote).
113 1 zecke
$GITHASH: the committed patch to push, typically you're on your branch and simply push 'HEAD'.
114 1 zecke
$BRANCH: you will typically intend a patch to go to 'master'.
115 1 zecke
$TOPIC: an optional name you may choose.
116 1 zecke
117 1 zecke
For example, checkout the revision or branch that you want to submit for review,
118 1 zecke
i.e. the one where your patch or several patches are committed on top of the current master, then:
119 1 zecke
120 1 zecke
If you cloned directly from gerrit:
121 1 zecke
122 1 zecke
<pre>
123 1 zecke
git push origin HEAD:refs/for/master
124 1 zecke
</pre>
125 1 zecke
126 1 zecke
If you added 'gerrit' as a second remote to an existing clone:
127 1 zecke
128 1 zecke
<pre>
129 1 zecke
git push gerrit HEAD:refs/for/master
130 1 zecke
</pre>
131 1 zecke
132 1 zecke
You can optionally add a topic name with
133 1 zecke
134 1 zecke
<pre>
135 1 zecke
git push origin HEAD:refs/for/master/my_topic
136 1 zecke
</pre>
137 1 zecke
138 102 stsp
h2. Voting Rules for merging a patch to master
139 7 neels
140 103 stsp
Please follow these voting rules:
141 44 neels
142 102 stsp
h3. Code Review ("CR")
143 77 neels
144 102 stsp
* Please review patches by others.
145 102 stsp
* Do not vote for your own patches (exceptions below).
146 102 stsp
* Before merging, each patch should receive at least two reviews that approve merging.
147 77 neels
148 102 stsp
When voting, please follow this social contract:
149 77 neels
150 102 stsp
* When you approve, vote CR +1.
151 102 stsp
* If there already is someone else's CR +1, you may also choose to vote CR +2.
152 102 stsp
* If the patch owner sees two or more CR +1, the patch owner may apply to self a CR +2.
153 102 stsp
* Once there is at least one CR +2 and one CR +1 vote, a patch may be merged ("Submit" button), except:
154 102 stsp
** If there are two -1 votes, you should not merge, instead clarify the reason and try to fix it.
155 102 stsp
** If there is a single -1 vote, you may still merge the patch, if you are sure that the opinion of the -1 vote does not carry.
156 102 stsp
* Give the benefit of the doubt to the -1 vote, do not lightheartedly overrule.
157 102 stsp
* If there is a CR -2 vote, the patch will likely never pass review, it marks a fundamental flaw.
158 102 stsp
* Merging a patch ("Submit" button) may be done by a reviewer or by the patch owner,
159 102 stsp
  But if there is any negative vote, rather leave merging up to the patch owner.
160 102 stsp
* If you remove a +1 vote, try to make sure that there are no other CR +2 votes left alone
161 102 stsp
  (to prevent accidental "Submit including parents"). If needed, ping other reviewer / admin on IRC.
162 102 stsp
  But try to vote +1 only when you're sure, hence this situation should be rare.
163 102 stsp
* To prevent merging of your own patch before some issue is resolved, consider marking it Work In Progress.
164 102 stsp
165 104 stsp
h3. Exceptions for Trivial / Urgent Patches
166 102 stsp
167 102 stsp
A patch may receive a direct +2 when:
168 102 stsp
169 102 stsp
* it is very trivial, like a typo fix in a comment or log string, so that it is not worth wasting review time on.
170 102 stsp
* it reverts an earlier change that broke the master builds.
171 102 stsp
172 102 stsp
In these cases, the patch submitter may decide to +2 to self, after careful consideration. This should be rare.
173 102 stsp
174 102 stsp
h3. Verification ("V")
175 102 stsp
176 102 stsp
* For most projects, jenkins takes care of voting V +1 automatically.
177 102 stsp
* If you have actually tried out a patch and verified that it works, you may vote V +1.
178 102 stsp
* A patch owner may vote V +1 to self in a project that has no Jenkins verification job.
179 102 stsp
180 102 stsp
h3. Rationale
181 102 stsp
182 102 stsp
Gerrit allows merging a patch as soon as a CR +2 vote and a V +1 vote are in.
183 102 stsp
For quite some time, we had CR +2 permissions for only very few gatekeeper reviewers.
184 102 stsp
The result was that non-gatekeepers' votes seemed to not matter.
185 102 stsp
186 102 stsp
To encourage more peer review that actually has an effect, we would like to sum up +1 votes.
187 102 stsp
We have tried to apply a summing of votes in Gerrit with automatic enforcing
188 102 stsp
( https://gerrit-review.googlesource.com/Documentation/prolog-cookbook.html#_example_13_1_1_2_code_review )
189 102 stsp
but this had numerous quirks, particularly the issues summary shows wildly mismatching voting status.
190 102 stsp
191 102 stsp
The solution is to agree on a social contract: everyone gets +2 permissions,
192 102 stsp
but you shall only use it when it makes sense. Thanks!
193 102 stsp
194 1 zecke
195 84 neels
h2. Manage private branches
196 1 zecke
197 84 neels
Use a sub-directory with your name to group your own branches, please.
198 1 zecke
*Note* that you must be a member of the "known users" group, see above.
199 1 zecke
200 85 neels
To share / backup local branches to git.osmocom.org, without starting a code review process on gerrit.osmocom.org, just push them as usual to gerrit.
201 84 neels
202 84 neels
* Note that the git repository must be cloned from the gerrit SSH URL -- all pushing goes to gerrit ("pushurl" as described below also works).
203 84 neels
* All private branches are automatically synced to git.osmocom.org in a matter of minutes.
204 86 neels
* Private branches do not kick off patch sets for review, they are just branches. To kick off review for all patches on your branch, you'd use a 'refs/for/master' URL, as shown in the example below.
205 84 neels
206 84 neels
The typical transcript for "Fred" developing feature "Kazoo" looks like this:
207 84 neels
208 1 zecke
<pre>
209 84 neels
# Set up ~/.ssh/config so that 'go' points at gerrit.osmocom.org
210 84 neels
git clone ssh://go/libosmocore
211 84 neels
212 84 neels
cd libosmocore
213 84 neels
git checkout -b fred/kazoo   # create local branch
214 84 neels
215 84 neels
$EDITOR
216 84 neels
git add kazoo.c
217 84 neels
git commit -m "implement kazoo"
218 84 neels
219 84 neels
# just invoke 'git push' and git tells you how to create the branch once-off:
220 1 zecke
git push
221 84 neels
|fatal: The current branch asdf has no upstream branch.
222 84 neels
|To push the current branch and set the remote as upstream, use
223 84 neels
|
224 84 neels
|    git push --set-upstream origin fred/kazoo
225 1 zecke
226 84 neels
git push --set-upstream origin fred/kazoo
227 84 neels
# Now the branch exists on gerrit, very soon will also exist on git.osmocom.org
228 84 neels
229 84 neels
# Further tweaks
230 84 neels
$EDITOR
231 84 neels
git add kazoo.h
232 84 neels
git commit --amend
233 84 neels
234 84 neels
# You are free to force-push private branches
235 84 neels
git push -f
236 84 neels
237 84 neels
# origin/master has changed? Rebase onto the latest.
238 84 neels
git fetch
239 84 neels
git rebase -i origin/master
240 84 neels
# resolve conflicts...
241 84 neels
git push -f
242 84 neels
243 84 neels
# Feature is ready
244 84 neels
git push origin HEAD:refs/for/master/kazoo
245 39 neels
</pre>
246 7 neels
247 48 ahuemer
h2. List changesets in gerrit
248 2 zecke
249 12 msuraev
<pre>
250 17 neels
git ls-remote gerrit changes/*
251 1 zecke
</pre>
252 80 neels
253 80 neels
h1. Tips and Tricks
254 80 neels
255 80 neels
h2. A commit lacks a Change-Id
256 80 neels
257 80 neels
once you added the commit hook as above, just re-edit the commit log message, e.g. with
258 80 neels
259 80 neels
<pre>
260 80 neels
git commit --amend
261 80 neels
</pre>
262 80 neels
263 80 neels
or by
264 80 neels
265 80 neels
<pre>
266 80 neels
git rebase -i
267 80 neels
</pre>
268 80 neels
269 80 neels
and in the upcoming editor replacing 'pick' with 'r' in front of the commit to edit.
270 74 neels
271 74 neels
No need to change the commit log if you don't want to, just exit the editor and the commit hook will add a Change-Id.
272 79 neels
273 87 msuraev
h2. Ignore WIP patches
274 87 msuraev
275 87 msuraev
Using following operators in "search" field of web UI allows to ignore Work-in-progress changes:
276 87 msuraev
<pre>
277 87 msuraev
status:open AND -is:wip
278 87 msuraev
</pre>
279 87 msuraev
280 79 neels
h2. Fetch fast from git.osmocom.org, push to gerrit
281 79 neels
282 1 zecke
Gerrit has moved to a faster host, so this should no longer be necessary. Anyway...
283 74 neels
284 74 neels
Adding a second remote forces you to often pass the remote on the command line ("origin").
285 79 neels
It is possible to have only one remote for cmdline convenience, with differing push and pull URLs:
286 79 neels
287 74 neels
<pre>
288 1 zecke
git remote set-url origin git://git.osmocom.org/$PROJECT
289 74 neels
git remote set-url --push origin ssh://$USERNAME@gerrit.osmocom.org:29418/$PROJECT
290 74 neels
</pre>
291 79 neels
292 74 neels
With above .ssh config you can also use the shorter ssh:// URL:
293 74 neels
<pre>
294 79 neels
git remote set-url --push origin ssh://go/$PROJECT
295 74 neels
</pre>
296 74 neels
297 74 neels
The resulting .git/config in libosmocore would look something like:
298 74 neels
<pre>
299 74 neels
[remote "origin"]
300 74 neels
        url = git://git.osmocom.org/libosmocore
301 74 neels
        pushurl = ssh://go/libosmocore
302 74 neels
        fetch = +refs/heads/*:refs/remotes/origin/*
303 74 neels
</pre>
304 17 neels
305 17 neels
Now you're fetching from git.osmocom.org, which is lightning fast, while pushing patches will still go to gerrit as usual.
306 17 neels
307 45 neels
h2. Throw-away branch
308 13 neels
309 56 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),
310 56 neels
make your changes/amendments and then send patch(es) back to gerrit while removing temporary branch automatically with "git review -f".
311 56 neels
312 56 neels
h2. Fetch a patch from gerrit
313 56 neels
314 56 neels
This script (I called it @P@) makes fetching a patch set from gerrit a breeze:
315 56 neels
<pre>
316 56 neels
#!/bin/sh
317 56 neels
# fetch gerrit patch into new branch named like the patch number.
318 56 neels
#
319 56 neels
# Usage: go to a git clone and pass a patch number:
320 56 neels
#
321 56 neels
#   cd openbsc
322 56 neels
#   P 973
323 56 neels
# or
324 56 neels
#   P 973/2
325 56 neels
#
326 56 neels
# Will create new local branches '973_4' (if 4 is the latest patch set)
327 56 neels
# or '973_2', respectively.
328 56 neels
329 56 neels
patch="$1"
330 56 neels
331 56 neels
if [ -z "$patch" ]; then
332 56 neels
  echo "Usage: P 1234[/5]"
333 56 neels
  exit 1
334 56 neels
fi
335 56 neels
336 56 neels
if [ -z "$(echo "$patch" | grep '/')" ]; then
337 56 neels
  patch="/$patch/"
338 56 neels
fi
339 56 neels
340 56 neels
if [ -z "$(echo "$patch" | grep '^/')" ]; then
341 56 neels
  patch="/$patch"
342 56 neels
fi
343 56 neels
344 56 neels
last_set="$(git ls-remote origin "changes/*" | grep "$patch" | sed 's#.*/\([^/]*\)$#\1 &#' | sort -n | tail -n 1)"
345 56 neels
if [ -z "$last_set" ]; then
346 56 neels
  echo "Not found: $patch"
347 56 neels
  exit 1
348 56 neels
fi
349 56 neels
350 56 neels
change_name="$(echo "$last_set" | sed 's/.*\(refs.*\)/\1/')"
351 56 neels
branch_name="$(echo "$change_name" | sed 's#refs/changes/../\([0-9]*\)/\([0-9]*\)#\1_\2#')"
352 56 neels
353 56 neels
set -x
354 56 neels
git fetch origin "$change_name"
355 25 neels
git co -b "$branch_name" FETCH_HEAD
356 13 neels
</pre>
357 1 zecke
358 58 neels
h2. Re-submit a Branch with Amended Commits
359 58 neels
360 22 neels
On a feature branch, one typically has numerous commits that depend on their preceding commits.
361 58 neels
Often, some of the branch commits need to be amended for fixes. You can re-submit changes to
362 58 neels
patches on your branch by pushing in the same way that you first submitted the branch.
363 58 neels
364 29 neels
Note: if you modify the Change-Ids in the commit logs, your push would open entirely new
365 58 neels
review entries and you would have to abandon your previous submission. Comments on the first
366 58 neels
submission are "lost" and you cannot diff between patch sets.
367 29 neels
368 26 neels
369 1 zecke
h2. Re-submit Previously Abandoned Changes
370 1 zecke
371 1 zecke
You have to edit the Change-Ids, on a branch that would be every single commit log message.
372 1 zecke
373 1 zecke
<pre>
374 1 zecke
cd openbsc
375 1 zecke
git co my-branch
376 1 zecke
git rebase -i master
377 1 zecke
# replace all 'pick' with 'r' (or 'reword'), exit your editor
378 1 zecke
# git presents each commit log message for editing
379 1 zecke
</pre>
380 1 zecke
381 78 neels
h2. 502 Bad Gateway
382 78 neels
383 78 neels
When getting a "Bad Gateway" error message upon trying to login on gerrit, you probably just need to restart your web browser. The reason is not clear.
384 78 neels
385 78 neels
386 78 neels
h2. Commit hook: Always put Change-Id at the bottom of the log message
387 78 neels
388 78 neels
The commit-msg hook places a Change-Id tag in the footer, often above other tags like 'Depends:' or 'Related:'. Since the Change-Id is an implementation detail for Gerrit, I personally prefer it always placed right at the bottom. This simple edit changes the commit-msg hook to add Change-Id at the bottom unconditionally:
389 78 neels
390 78 neels
<pre>
391 78 neels
cd $PROJECT
392 78 neels
sed -i 's/if (unprinted /if (0 \&\& unprinted /' .git/hooks/commit-msg
393 78 neels
</pre>
394 78 neels
395 78 neels
The goal is to disable the condition in line 163 with an 'if (0...':
396 78 neels
397 78 neels
<pre>
398 78 neels
                        if (0 && unprinted && match(tolower(footer[line]), changeIdAfter) != 1) {
399 78 neels
                                unprinted = 0
400 78 neels
                                print "Change-Id: I'"$id"'"
401 78 neels
                        }
402 60 neels
</pre>
403 16 neels
404 13 neels
Then the Change-Id will be placed by line 170 instead.
405 16 neels
406 16 neels
h1. Reasons for Particular Configuration
407 16 neels
408 13 neels
h2. Rebase if necessary
409 13 neels
410 13 neels
There are different merge strategies that Gerrit performs to accept patches.
411 13 neels
Each project can be configured to a specific merge strategy, but unfortunately you can't
412 13 neels
decide on a strategy per patch submission.
413 13 neels
414 13 neels
It seems that the "Merge if Necessary" strategy is best supported, but it creates non-linear
415 13 neels
history with numerous merge commits that are usually not at all necessary.
416 13 neels
417 13 neels
Instead, the "Cherry Pick" strategy puts each patch onto current master's HEAD to create
418 1 zecke
linear history. However, this will cause merge failures as soon as one patch depends on
419 13 neels
another submitted patch, as typical for a feature branch submission.
420 13 neels
421 1 zecke
So we prefer the "Rebase if Necessary" strategy, which always tries to apply your patches to
422 13 neels
the current master HEAD, in sequence with the previous patches on the same branch.
423 13 neels
424 13 neels
h2. Private Branches: Create a new change for every commit...
425 16 neels
426 13 neels
Say you have an extensive feature in development, and you want to keep it on the
427 13 neels
upstream git repository to a) keep it safe and b) collaborate with other devs on it.
428 13 neels
So, of course, you have regularly pushed to refs/heads/yoyodyne/feature.
429 13 neels
430 13 neels
Since you have the gerrit commit hook installed, your feature branch already has
431 13 neels
Change-Id tags in all commit log messages.
432 13 neels
433 13 neels
Now your feature is complete and you would like to submit it to master.
434 16 neels
Alas, Gerrit refuses to accept your patch submission for master, because it
435 16 neels
knows the Change-Ids are also on a different branch.
436 16 neels
437 16 neels
Gerrit by default enforces that a Change-Id must be unique across all branches,
438 16 neels
so that each submission for review is separate for each branch. Instead, we
439 13 neels
want to handle Change-Ids per-branch, so that you can have the same change
440 16 neels
submitted to different branches, as separate patch submissions, without having
441 16 neels
to cosmetically adjust the Change-Id.
442 13 neels
443 20 neels
Solution: set the option 
444 14 neels
_Create a new change for every commit not in the target branch_ to _TRUE_
445 14 neels
446 14 neels
h2. Allow content merges
447 14 neels
448 14 neels
By default, gerrit compares patches only by the files' paths. If two paths are the same,
449 14 neels
it immediately shows them as conflicts (path conflicts).
450 14 neels
451 23 neels
In software development, a conflict usually means an actual content conflict, so if the
452 14 neels
edits are in two entirely separate places in the file, we don't consider this a conflict.
453 14 neels
454 32 neels
By setting _Allow content merges_ to _TRUE_ in the git project config, we tell Gerrit to
455 32 neels
perform text merges of the submitted patches and only complain about actual content
456 32 neels
conflicts, in the usual software engineering sense.
457 72 laforge
458 72 laforge
h1. Admin
459 72 laforge
460 72 laforge
h2. Adding a new repository
461 72 laforge
462 72 laforge
* create the repository in the Gerrit Ui, inherit from "All-Projects"
463 72 laforge
* create an empty git repository using gitosis on git.osmcoom.org
464 88 osmith
* configure a jenkins build testing job for this project (see gerrit-verifications.yml in osmo-ci.git/jobs)
465 92 osmith
466 72 laforge
467 32 neels
git replication to gerrit.osmocom.org is enabled automatically, nothing to be done here.  In case of doubt, try
468 32 neels
@ssh -p 29418 gerrit.osmocom.org replication start --all --wait@
469 32 neels
470 32 neels
h2. Adding users to groups
471 32 neels
472 32 neels
Normally, the gerrit UI auto-completes a user name in the edit field. It has happened
473 32 neels
though that an existing user is not auto-completed, as if it didn't exist. In that case,
474 32 neels
find out the user ID (seven digit number like 1000123) and just enter that.
475 32 neels
476 32 neels
The user ID can be found on the user's "Settings" page, or in the database (s.b.).
477 32 neels
478 32 neels
h2. Querying the database directly
479 32 neels
480 32 neels
If your user has permission to access the database, you can place SQL queries using the
481 71 neels
'gerrit gsql' commands over ssh:
482 71 neels
483 1 zecke
<pre>
484 53 neels
ssh go "gerrit gsql -c \"show tables\""
485 53 neels
ssh go "gerrit gsql -c \"select full_name,account_id from accounts\""
486 1 zecke
</pre>
487 1 zecke
488 71 neels
(see ~/.ssh/config above for the 'go' shortcut)
489 71 neels
490 62 neels
This seems to be the MySQL dialect.
491 62 neels
492 62 neels
The "...\"...\"" quoting allows including single-quotes in the SQL statements.
493 62 neels
494 62 neels
h2. Fix evil twin users
495 62 neels
496 64 neels
If differing openid URLs have lead to evil twin users shadowing the same email address just without the permissions, you can fix it like this:
497 62 neels
498 62 neels
<pre>
499 62 neels
ssh go "gerrit gsql -c \"select * from account_external_ids where email_address like '%foo%'\""
500 62 neels
# ACCOUNT_ID | EMAIL_ADDRESS   | PASSWORD | EXTERNAL_ID
501 62 neels
# -----------+-----------------+----------+----------------------------------
502 64 neels
# 100004     | foo@example.com | NULL     | https://osmocom.org/openid/user/777
503 62 neels
# 100021     | foo@example.com | NULL     | https://projects.osmocom.org/openid/user/777
504 64 neels
505 62 neels
ssh go "gerrit gsql -c \"update account_external_ids set account_id = 100004 where email_address like '%foo%'\""
506 62 neels
507 62 neels
ssh go "gerrit gsql -c \"select * from account_external_ids where email_address like '%foo%'\""
508 62 neels
# ACCOUNT_ID | EMAIL_ADDRESS   | PASSWORD | EXTERNAL_ID
509 62 neels
# -----------+-----------------+----------+----------------------------------
510 1 zecke
# 100004     | foo@example.com | NULL     | https://osmocom.org/openid/user/777
511 1 zecke
# 100004     | foo@example.com | NULL     | https://projects.osmocom.org/openid/user/777
512 1 zecke
</pre>
Add picture from clipboard (Maximum size: 48.8 MB)