How to git-pull a given patch set from Gerrit?

问题

When working with Gerrit (Code Review), I often need to get a copy of a given patch set for testing or validation purpose. The obvious and easiest way is to download the archive or the patch file through the Gerrit Web interface and manually apply it to my local source.

While the above steps are pretty straightforward and fulfill my needs, in the best world I would like to have the patch set appearing as a commit in my local Git.

I was looking around and didn't find the solution. I found some sparse info that once compiled together gives the following solution.

Say that you want to pull the patch set 2 of the Gerrit change 1222:

Find the remote refs we are interested in:

$ git ls-remote | grep 1220
From http://something.com:8081/MyProject
e2e0212a59240ac5cd7c11220c35542523f44b59        refs/changes/13/713/1
b8c4dceea5eaf1bad711b0ea6938c80ec932726a        refs/changes/20/1220/1
6f20c182ec7f54a2aa9e8f6188a0eef1b0790df4        refs/changes/20/1220/2
ed94a98386d224ce3d86004ce99f61220905a077        refs/changes/22/1222/1

Pull the refs:

git pull origin refs/changes/20/1220/2

This will create a Git commit point that you could eventually rebase:

git rebase

回答1:

This feature is standard in the Gerrit UI.

On the top right of the UI for a patch, click Download, and you will see something like:

When you are navigating the patches you go to the download section and copy the command line command for checking out the patch set, for example like this:

git fetch https://gerrit.googlesource.com/gerrit refs/changes/03/64403/2 && git checkout FETCH_HEAD

Then I normally create a branch with the review number and patchset as name

git checkout -b b64403-2

For here you can work normally and commit your changes or cherry-pick/rebase your changes on this change.

Once the review of r64403 is done your code can be merged or when there is another patchset submitted you will need to do the same thing again.

If you do not see the options to download the option to Checkout or Cherry Pick you need to edit the gerrit.config, something like this:

[download]
    scheme = ssh
    command = checkout
    command = cherry_pick

More details can be found in the Gerrit Documentation

Update: As barryku correctly points out, in the later version you need to download the downloads-commands plugin. This can be done during the initial setup or by using the following command:

java -jar gerrit-2.11.4.war init -d review_site --batch --install-plugin download-commands

回答2:

Or you can use the -d option to git-review. For example, assuming you were working the with nova-docker repository and were interested in this change in gerrit:

https://review.openstack.org/#/c/148486/

You could download the latest patchset like this:

git review -d 148486

Or you can use the change id:

git review -d I35729a86e211391f67cc959d19416c9125c6f9eb

You can also request a specific revision of the patch by appending a comma and the patch number. E.g, to get the second revision of that patch:

git review -d 148486,2

回答3:

I am not 100% sure what your question is. Sounds like you want to easy the workflow or typing. larsks mentioned already git review which is mostly used.

For your case, maybe it helps to download all ref's automatically so you can reference them directly. You can always all specified ref's like with

git fetch origin "+refs/changes/*:refs/remotes/origin/changes/*"

Then you can work locally with the commit id.

A simple git alias or scripting it for all refs can be easily done. An example of such a while loop can be found in the script on https://github.com/saper/gerrit-fetch-all With such a small shell snippet you can easily accomplish to skip one part of the ref id to easier reference them:

    Server side:                 Client side:
    refs/changes/13/713/1        refs/head/713/1
    refs/changes/20/1220/1       refs/head/1220/1
    refs/changes/20/1220/2       refs/head/1220/2
    refs/changes/22/1222/1       refs/head/1222/1

回答4:

As mentioned in the comments, you can just get the right git command from the gerrit GUI. If you really dislike GUIs, or you want to automate it (and for some reason can't use git-review), you can use the gerrit API:

curl -s 'https://<your gerrit server>/r/changes/<change id>?o=CURRENT_REVISION&o=DOWNLOAD_COMMANDS' | tail -n+2 | jq -r '.revisions[.current_revision].fetch["anonymous http"].commands.Pull' | bash -

git pull origin `curl -s 'https://<your gerrit server>/r/changes/<change id>?o=CURRENT_REVISION' | tail -n+2 | jq -r '.revisions[.current_revision].ref'`

来源：https://stackoverflow.com/questions/28370567/how-to-git-pull-a-given-patch-set-from-gerrit

标签

git

gerrit