commit 9f681db10537b0fe04f493d26f203ea0d3b84bd3
author Jonathan Nieder <jrn@google.com> Wed Oct 31 18:15:38 2018 -0700
committer Han-Wen Nienhuys <hanwen@google.com> Mon Dec 10 17:34:05 2018 +0000
tree fe68544cc8d45e220c28f7c4798f97e0f02bacbd
parent c0841c77f427468e338cf181502a73b3d95e99f7

Update JGit

PiperOrigin-RevId: 219569400
Change-Id: I97404b554c06a238eaa2dce5ece806d0bd74ce5e

java/com/googlesource/gerrit/plugins/supermanifest/SuperManifestRefUpdatedListener.java

diff --git a/java/com/googlesource/gerrit/plugins/supermanifest/SuperManifestRefUpdatedListener.java b/java/com/googlesource/gerrit/plugins/supermanifest/SuperManifestRefUpdatedListener.java
index 0424d02..6bee434 100644
--- a/java/com/googlesource/gerrit/plugins/supermanifest/SuperManifestRefUpdatedListener.java
+++ b/java/com/googlesource/gerrit/plugins/supermanifest/SuperManifestRefUpdatedListener.java
@@ -58,12 +58,16 @@
 import org.eclipse.jgit.api.errors.RefNotFoundException;
 import org.eclipse.jgit.errors.ConfigInvalidException;
 import org.eclipse.jgit.errors.RepositoryNotFoundException;
+import org.eclipse.jgit.errors.RevisionSyntaxException;
 import org.eclipse.jgit.gitrepo.RepoCommand;
+import org.eclipse.jgit.gitrepo.RepoCommand.RemoteFile;
 import org.eclipse.jgit.lib.Config;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.PersonIdent;
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.treewalk.TreeWalk;
 
 /**
  * This plugin will listen for changes to XML files in manifest repositories. When it finds such
@@ -390,11 +394,19 @@
     }
 
     @Override
-    public byte[] readFile(String repoName, String ref, String path)
+    public RemoteFile readFileWithMode(String repoName, String ref, String path)
         throws GitAPIException, IOException {
-      Repository repo;
-      repo = openRepository(repoName);
-      return Utils.readBlob(repo, ref + ":" + path);
+      Repository repo = openRepository(repoName);
+      Ref r = repo.findRef(ref);
+      if (r == null || r.getObjectId() == null) {
+        throw new RevisionSyntaxException(
+            String.format("repo %s does not have ref %s", repo.toString(), ref), ref);
+      }
+      RevCommit commit = repo.parseCommit(r.getObjectId());
+      TreeWalk tw = TreeWalk.forPath(repo, path, commit.getTree());
+      return new RemoteFile(
+          tw.getObjectReader().open(tw.getObjectId(0)).getCachedBytes(Integer.MAX_VALUE),
+          tw.getFileMode(0));
     }
 
     public Repository openRepository(String name) throws IOException {