opendev/gerrit
Code Issues Proposed changes

Merge "Add parent(s) revision information to output of query."

Browse Source
This commit is contained in:
Shawn Pearce
2012-04-23 09:03:49 -07:00
committed by gerrit code review
parent 27f73c816c 661bb85b94
commit ecbadaba97
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java
View File

@@ -39,6 +39,8 @@ import com.google.inject.Provider;
import com.google.inject.Singleton;
import org.eclipse.jgit.lib.ObjectId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Collection;
@@ -48,6 +50,7 @@ import javax.annotation.Nullable;
@Singleton
public class EventFactory {
private static final Logger log = LoggerFactory.getLogger(EventFactory.class);
private final AccountCache accountCache;
private final Provider<String> urlProvider;
private final ApprovalTypes approvalTypes;
@@ -273,6 +276,20 @@ public class EventFactory {
p.ref = patchSet.getRefName();
p.uploader = asAccountAttribute(patchSet.getUploader());
p.createdOn = patchSet.getCreatedOn().getTime() / 1000L;
try {
final ReviewDb db = schema.open();
try {
p.parents = new ArrayList<String>();
for (PatchSetAncestor a : db.patchSetAncestors().ancestorsOf(
patchSet.getId())) {
p.parents.add(a.getAncestorRevision().get());
}
} finally {
db.close();
}
} catch (OrmException e) {
log.error("Cannot load patch set data for " + patchSet.getId(), e);
}
return p;
}

17
gerrit-server/src/main/java/com/google/gerrit/server/events/PatchSetAttribute.java
View File

@@ -17,13 +17,14 @@ package com.google.gerrit.server.events;
import java.util.List;
public class PatchSetAttribute {
public String number;
public String revision;
public String ref;
public AccountAttribute uploader;
public Long createdOn;
public String number;
public String revision;
public List<String> parents;
public String ref;
public AccountAttribute uploader;
public Long createdOn;
public List<ApprovalAttribute> approvals;
public List<PatchSetCommentAttribute> comments;
public List<PatchAttribute> files;
public List<ApprovalAttribute> approvals;
public List<PatchSetCommentAttribute> comments;
public List<PatchAttribute> files;
}