Revision API: add cherry pick method

This change adds cherry pick function to the Revision API:

  @Inject GerritApi gApi;

  [...]

  Project.NameKey project = ...
  String changeId = ...
  String resvision = ...

  CherryPickInput in = new CherryPickInput();
  in.destination = "foo";
  gApi.projects()
      .name(project.get())
      .branch(in.destination)
      .create(new BranchInput());
  gApi.projects()
      .name(project.get())
      .branch(in.destination)
      .create(new BranchInput());
  ChangeApi cApi = gApi.changes()
      .id(changeId)
      .revision(resvision)
      .cherryPick(in);
  cApi.current()
      .review(approve());
  cApi.current()
      .submit();

Change-Id: Ie291a824720bc1e81c8636773e3a570778383953
This commit is contained in:
David Ostrovsky
2013-11-19 21:44:45 +01:00
parent cd2fc945ae
commit 3bd8c9a338
5 changed files with 84 additions and 18 deletions

View File

@@ -25,8 +25,10 @@ import com.google.gerrit.acceptance.SshSession;
import com.google.gerrit.acceptance.TestAccount;
import com.google.gerrit.acceptance.git.PushOneCommit;
import com.google.gerrit.extensions.api.GerritApi;
import com.google.gerrit.extensions.api.changes.ChangeApi;
import com.google.gerrit.extensions.api.changes.CherryPickInput;
import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.extensions.api.changes.RevisionApi;
import com.google.gerrit.extensions.api.projects.BranchInput;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.server.ReviewDb;
@@ -63,12 +65,13 @@ public class RevisionIT extends AbstractDaemonTest {
private TestAccount admin;
private Git git;
private ReviewDb db;
private Project.NameKey project;
@Before
public void setUp() throws Exception {
admin = accounts.admin();
initSsh(admin);
Project.NameKey project = new Project.NameKey("p");
project = new Project.NameKey("p");
SshSession sshSession = new SshSession(server, admin);
createProject(sshSession, project.get());
git = cloneProject(sshSession.getUrl() + "/" + project.get());
@@ -106,11 +109,14 @@ public class RevisionIT extends AbstractDaemonTest {
public void submit() throws GitAPIException,
IOException, RestApiException {
PushOneCommit.Result r = createChange();
RevisionApi rApi = gApi.changes()
gApi.changes()
.id("p~master~" + r.getChangeId())
.current();
rApi.review(approve());
rApi.submit();
.current()
.review(approve());
gApi.changes()
.id("p~master~" + r.getChangeId())
.current()
.submit();
}
@Test
@@ -123,6 +129,27 @@ public class RevisionIT extends AbstractDaemonTest {
.delete();
}
@Test
public void cherryPick() throws GitAPIException,
IOException, RestApiException {
PushOneCommit.Result r = createChange();
CherryPickInput in = new CherryPickInput();
in.destination = "foo";
in.message = "it goes to stable branch";
gApi.projects()
.name(project.get())
.branch(in.destination)
.create(new BranchInput());
ChangeApi cApi = gApi.changes()
.id(r.getChangeId())
.revision(r.getCommit().name())
.cherryPick(in);
cApi.current()
.review(approve());
cApi.current()
.submit();
}
private PushOneCommit.Result createChange() throws GitAPIException,
IOException {
PushOneCommit push = new PushOneCommit(db, admin.getIdent());