From 22bf491be5f25bccf779be53b2ad37836f0850b8 Mon Sep 17 00:00:00 2001
From: HampusM <hampus@hampusmat.com>
Date: Thu, 5 Aug 2021 15:18:39 +0200
Subject: The log API endpoint has a branch parameter & fixed the tree entry
 latest commit method

---
 packages/server/src/git/repository.ts |  7 ++++---
 packages/server/src/git/tree_entry.ts | 24 +++++++++++++++++-------
 2 files changed, 21 insertions(+), 10 deletions(-)

(limited to 'packages/server/src/git')

diff --git a/packages/server/src/git/repository.ts b/packages/server/src/git/repository.ts
index ccc8bcc..411c4fb 100644
--- a/packages/server/src/git/repository.ts
+++ b/packages/server/src/git/repository.ts
@@ -7,7 +7,7 @@ import { Commit } from "./commit";
 import { FastifyReply } from "fastify";
 import { Tag } from "./tag";
 import { Tree } from "./tree";
-import { BranchError, createError, RepositoryError } from "./error";
+import { createError, RepositoryError } from "./error";
 
 /**
  * Returns the full name of a git repository
@@ -86,7 +86,8 @@ export class Repository {
 	 */
 	public async commits(): Promise<Commit[]> {
 		const walker = NodeGitRevwalk.create(this.ng_repository);
-		walker.pushHead();
+
+		walker.pushRef(`refs/heads/${this._branch}`);
 
 		return Promise.all((await walker.getCommitsUntil(() => true)).map(commit => new Commit(this, commit)));
 	}
@@ -170,7 +171,7 @@ export class Repository {
 
 		if(branch) {
 			if(!await Branch.lookupExists(ng_repository, branch)) {
-				throw(createError(BranchError, 404, "Branch not found!"));
+				throw(createError(RepositoryError, 404, "Branch not found!"));
 			}
 		}
 
diff --git a/packages/server/src/git/tree_entry.ts b/packages/server/src/git/tree_entry.ts
index 99941cb..9d694c5 100644
--- a/packages/server/src/git/tree_entry.ts
+++ b/packages/server/src/git/tree_entry.ts
@@ -1,10 +1,11 @@
 import { Commit } from "./commit";
-import { TreeEntry as NodeGitTreeEntry } from "nodegit";
+import { Revwalk as NodeGitRevwalk, TreeEntry as NodeGitTreeEntry } from "nodegit";
 import { Repository } from "./repository";
 import { dirname } from "path";
 import { findAsync } from "./misc";
 import { Tree } from "./tree";
 import { Blob } from "./blob";
+import { createError, TreeError } from "./error";
 
 /**
  * The core structure of a tree entry
@@ -32,16 +33,25 @@ export abstract class BaseTreeEntry {
 	 * @returns An instance of a commit
 	 */
 	public async latestCommit(): Promise<Commit> {
-		const commits = await this._owner.commits();
+		const rev_walk = NodeGitRevwalk.create(this._owner.ng_repository);
+		rev_walk.pushRef(`refs/heads/${(await this._owner.branch()).name}`);
 
-		return findAsync(commits, async commit => {
-			const diff = await commit.diff();
-			const patches = await diff.patches();
+		const commits = await rev_walk.getCommitsUntil(() => true);
+
+		const latest_commit = await findAsync(commits, async commit => {
+			const diff = await commit.getDiff();
+			const patches = await diff[0].patches();
 
 			return Boolean(this instanceof TreeEntry
-				? patches.find(patch => patch.to === this.path)
-				: patches.find(patch => dirname(patch.to).startsWith(this.path)));
+				? patches.find(patch => dirname(patch.newFile().path()).startsWith(this.path))
+				: patches.find(patch => patch.newFile().path() === this.path));
 		});
+
+		if(!latest_commit) {
+			throw(createError(TreeError, 500, `Failed to get the latest commit of tree entry '${this.path}'!`));
+		}
+
+		return new Commit(this._owner, latest_commit);
 	}
 }
 
-- 
cgit v1.2.3-18-g5258