From 2af67f6044af1cad7136ce8c123e37ab090ca9bc Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Fri, 19 Apr 2019 14:17:27 +0200 Subject: Improve listing performance by using go-git (#6478) * Use go-git for tree reading and commit info lookup. Signed-off-by: Filip Navara * Use TreeEntry.IsRegular() instead of ObjectType that was removed. Signed-off-by: Filip Navara * Use the treePath to optimize commit info search. Signed-off-by: Filip Navara * Extract the latest commit at treePath along with the other commits. Signed-off-by: Filip Navara * Fix listing commit info for a directory that was created in one commit and never modified after. Signed-off-by: Filip Navara * Avoid nearly all external 'git' invocations when doing directory listing (.editorconfig code path is still hit). Signed-off-by: Filip Navara * Use go-git for reading blobs. Signed-off-by: Filip Navara * Make SHA1 type alias for plumbing.Hash in go-git. Signed-off-by: Filip Navara * Make Signature type alias for object.Signature in go-git. Signed-off-by: Filip Navara * Fix GetCommitsInfo for repository with only one commit. Signed-off-by: Filip Navara * Fix PGP signature verification. Signed-off-by: Filip Navara * Fix issues with walking commit graph across merges. Signed-off-by: Filip Navara * Fix typo in condition. Signed-off-by: Filip Navara * Speed up loading branch list by keeping the repository reference (and thus all the loaded packfile indexes). Signed-off-by: Filip Navara * Fix lising submodules. Signed-off-by: Filip Navara * Fix build Signed-off-by: Filip Navara * Add back commit cache because of name-rev Signed-off-by: Filip Navara * Fix tests Signed-off-by: Filip Navara * Fix code style * Fix spelling * Address PR feedback Signed-off-by: Filip Navara * Update vendor module list Signed-off-by: Filip Navara * Fix getting trees by commit id Signed-off-by: Filip Navara * Fix remaining unit test failures * Fix GetTreeBySHA * Avoid running `git name-rev` if not necessary Signed-off-by: Filip Navara * Move Branch code to git module * Clean up GPG signature verification and fix it for tagged commits * Address PR feedback (import formatting, copyright headers) * Make blob lookup by SHA working * Update tests to use public API * Allow getting content from any type of object through the blob interface * Change test to actually expect the object content that is in the GIT repository * Change one more test to actually expect the object content that is in the GIT repository * Add comments --- models/pull.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'models/pull.go') diff --git a/models/pull.go b/models/pull.go index 88f9b1f6e8..d059081a44 100644 --- a/models/pull.go +++ b/models/pull.go @@ -1,4 +1,5 @@ // Copyright 2015 The Gogs Authors. All rights reserved. +// Copyright 2019 The Gitea Authors. All rights reserved. // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. @@ -165,8 +166,8 @@ func (pr *PullRequest) APIFormat() *api.PullRequest { func (pr *PullRequest) apiFormat(e Engine) *api.PullRequest { var ( - baseBranch *Branch - headBranch *Branch + baseBranch *git.Branch + headBranch *git.Branch baseCommit *git.Commit headCommit *git.Commit err error -- cgit v1.2.3