opendev/gerrit
Code Issues Proposed changes

Remove ReceiveCommits.insertAncestors()

Browse Source 
Reuse the already existing code in ChangeUtil.

Change-Id: I427552485f7b8bf7a2012d5e0fc1a5dd5008936c
This commit is contained in:
Gustaf Lundh
2013-03-11 14:36:33 +01:00
parent e1710b7338
commit 30808317d2
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
View File

@@ -48,7 +48,6 @@ import com.google.gerrit.reviewdb.client.Branch;
import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.ChangeMessage; import com.google.gerrit.reviewdb.client.ChangeMessage;
import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.PatchSetAncestor;
import com.google.gerrit.reviewdb.client.PatchSetApproval; import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.reviewdb.client.PatchSetInfo; import com.google.gerrit.reviewdb.client.PatchSetInfo;
import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.Project;
@@ -1460,7 +1459,7 @@ public class ReceiveCommits {
db.changes().beginTransaction(change.getId()); db.changes().beginTransaction(change.getId());
try { try {
insertAncestors(db, ps.getId(), commit); ChangeUtil.insertAncestors(db, ps.getId(), commit);
db.patchSets().insert(Collections.singleton(ps)); db.patchSets().insert(Collections.singleton(ps));
db.changes().insert(Collections.singleton(change)); db.changes().insert(Collections.singleton(change));
ChangeUtil.updateTrackingIds(db, change, trackingFooters, footerLines); ChangeUtil.updateTrackingIds(db, change, trackingFooters, footerLines);
@@ -1761,7 +1760,7 @@ public class ReceiveCommits {
return null; return null;
} }
insertAncestors(db, newPatchSet.getId(), newCommit); ChangeUtil.insertAncestors(db, newPatchSet.getId(), newCommit);
db.patchSets().insert(Collections.singleton(newPatchSet)); db.patchSets().insert(Collections.singleton(newPatchSet));
if (checkMergedInto) { if (checkMergedInto) {
@@ -2179,20 +2178,6 @@ public class ReceiveCommits {
})); }));
} }
private void insertAncestors(ReviewDb db, PatchSet.Id id, RevCommit src)
throws OrmException {
final int cnt = src.getParentCount();
List<PatchSetAncestor> toInsert = new ArrayList<PatchSetAncestor>(cnt);
for (int p = 0; p < cnt; p++) {
PatchSetAncestor a;
a = new PatchSetAncestor(new PatchSetAncestor.Id(id, p + 1));
a.setAncestorRevision(toRevId(src.getParent(p)));
toInsert.add(a);
}
db.patchSetAncestors().insert(toInsert);
}
private static RevId toRevId(final RevCommit src) { private static RevId toRevId(final RevCommit src) {
return new RevId(src.getId().name()); return new RevId(src.getId().name());
} }