opendev/gerrit
Code Issues Proposed changes

Fix displaying diff for commit message

Browse Source 
This was broken by change If0c172 which removed '/COMMIT_MSG' from the
files collection.

Change-Id: I02d6efc5b22a4b4b25ea885c9529550493f58531
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2016-08-23 20:36:46 +02:00
parent 04cc51d446
commit f059c8c119
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-server/src/main/java/com/google/gerrit/server/change/Files.java
View File

@@ -29,6 +29,7 @@ import com.google.gerrit.extensions.restapi.Response;
import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.extensions.restapi.RestView; import com.google.gerrit.extensions.restapi.RestView;
import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Patch;
import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.reviewdb.server.ReviewDb;
@@ -92,6 +93,9 @@ public class Files implements ChildCollection<RevisionResource, FileResource> {
@Override @Override
public FileResource parse(RevisionResource rev, IdString id) public FileResource parse(RevisionResource rev, IdString id)
throws ResourceNotFoundException, IOException { throws ResourceNotFoundException, IOException {
if (Patch.COMMIT_MSG.equals(id.get())) {
return new FileResource(rev, id.get());
}
try (Repository repo = repoManager.openRepository(rev.getProject()); try (Repository repo = repoManager.openRepository(rev.getProject());
RevWalk rw = new RevWalk(repo)) { RevWalk rw = new RevWalk(repo)) {
RevTree tree = rw.parseTree( RevTree tree = rw.parseTree(

5
gerrit-server/src/main/java/com/google/gerrit/server/project/FilesInCommitCollection.java
View File

@@ -19,6 +19,7 @@ import com.google.gerrit.extensions.restapi.ChildCollection;
import com.google.gerrit.extensions.restapi.IdString; import com.google.gerrit.extensions.restapi.IdString;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.RestView; import com.google.gerrit.extensions.restapi.RestView;
import com.google.gerrit.reviewdb.client.Patch;
import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Singleton; import com.google.inject.Singleton;
@@ -46,6 +47,10 @@ public class FilesInCommitCollection implements
@Override @Override
public FileResource parse(CommitResource parent, IdString id) public FileResource parse(CommitResource parent, IdString id)
throws ResourceNotFoundException, IOException { throws ResourceNotFoundException, IOException {
if (Patch.COMMIT_MSG.equals(id.get())) {
return new FileResource(parent.getProject(), parent.getCommit(),
id.get());
}
return FileResource.create(repoManager, parent.getProject(), return FileResource.create(repoManager, parent.getProject(),
parent.getCommit(), id.get()); parent.getCommit(), id.get());
} }