opendev/gerrit
Code Issues Proposed changes

Merge changes from topic 'batch-update-cleanup'

Browse Source 
* changes:
  PreviewSubmit: Pass open ObjectReader to BundleWriter
  Update JGit to 4.7.0.201704051617-r.37-gc80d8c590
  RepoContext: Add convenience method for addRefUpdate
  Require all BatchUpdates executed are from different projects
This commit is contained in:
ekempin
2017-04-18 08:46:00 +00:00
committed by Gerrit Code Review
parent e79dca600b 4a0681ac88
commit eaf28d2f90
18 changed files with 59 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java
View File

@@ -67,7 +67,6 @@ import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.transport.ReceiveCommand;
import org.junit.Before;
import org.junit.Test;
@@ -919,7 +918,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest {
new BatchUpdateOp() {
@Override
public void updateRepo(RepoContext ctx) throws IOException {
ctx.addRefUpdate(new ReceiveCommand(oldId, newId, dest));
ctx.addRefUpdate(oldId, newId, dest);
}
@Override

3
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java
View File

@@ -40,7 +40,6 @@ import java.util.Optional;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.transport.ReceiveCommand;
import org.junit.Before;
import org.junit.Test;
@@ -71,7 +70,7 @@ public class NoteDbOnlyIT extends AbstractDaemonTest {
public void updateRepo(RepoContext ctx) throws IOException {
ObjectId oldId = ctx.getRepoView().getRef(backup).orElse(ObjectId.zeroId());
newId = ctx.getRepoView().getRef(master).get();
ctx.addRefUpdate(new ReceiveCommand(oldId, newId, backup));
ctx.addRefUpdate(oldId, newId, backup);
}
@Override