Merge "Add javadoc for Change.Id"
diff --git a/WORKSPACE b/WORKSPACE
index 2a02f6e..127ca3b 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -819,12 +819,6 @@
# Test-only dependencies below.
maven_jar(
- name = "jimfs",
- artifact = "com.google.jimfs:jimfs:1.1",
- sha1 = "8fbd0579dc68aba6186935cc1bee21d2f3e7ec1c",
-)
-
-maven_jar(
name = "junit",
artifact = "junit:junit:4.12",
sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec",
diff --git a/java/com/google/gerrit/server/restapi/project/CommitsCollection.java b/java/com/google/gerrit/server/restapi/project/CommitsCollection.java
index 21d7f0b..9e0661c 100644
--- a/java/com/google/gerrit/server/restapi/project/CommitsCollection.java
+++ b/java/com/google/gerrit/server/restapi/project/CommitsCollection.java
@@ -93,10 +93,12 @@
try (Repository repo = repoManager.openRepository(parent.getNameKey());
RevWalk rw = new RevWalk(repo)) {
RevCommit commit = rw.parseCommit(objectId);
- rw.parseBody(commit);
if (!canRead(parent.getProjectState(), repo, commit)) {
throw new ResourceNotFoundException(id);
}
+ // GetCommit depends on the body of both the commit and parent being parsed, to get the
+ // subject.
+ rw.parseBody(commit);
for (int i = 0; i < commit.getParentCount(); i++) {
rw.parseBody(rw.parseCommit(commit.getParent(i)));
}
diff --git a/java/com/google/gerrit/server/restapi/project/FilesInCommitCollection.java b/java/com/google/gerrit/server/restapi/project/FilesInCommitCollection.java
index 0d5ab88..0f408db 100644
--- a/java/com/google/gerrit/server/restapi/project/FilesInCommitCollection.java
+++ b/java/com/google/gerrit/server/restapi/project/FilesInCommitCollection.java
@@ -39,6 +39,10 @@
import org.eclipse.jgit.revwalk.RevCommit;
import org.kohsuke.args4j.Option;
+/**
+ * like {@link FilesCollection}, but for commits that are specified as hex ID, rather than branch
+ * names.
+ */
@Singleton
public class FilesInCommitCollection implements ChildCollection<CommitResource, FileResource> {
private final DynamicMap<RestView<FileResource>> views;
diff --git a/lib/nongoogle_test.sh b/lib/nongoogle_test.sh
index 4a09d80..bf53eb6 100755
--- a/lib/nongoogle_test.sh
+++ b/lib/nongoogle_test.sh
@@ -31,6 +31,7 @@
j2objc
jackson-annotations
jackson-core
+jimfs
jna
jruby
mina-core
diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl
index b3f355b..52c9ca0 100644
--- a/tools/nongoogle.bzl
+++ b/tools/nongoogle.bzl
@@ -250,3 +250,9 @@
artifact = "net.java.dev.jna:jna:5.5.0",
sha1 = "0e0845217c4907822403912ad6828d8e0b256208",
)
+
+ maven_jar(
+ name = "jimfs",
+ artifact = "com.google.jimfs:jimfs:1.1",
+ sha1 = "8fbd0579dc68aba6186935cc1bee21d2f3e7ec1c",
+ )
