Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 13:35:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings in JGitUtil (#3683)

Browse Source
This commit is contained in:
Naoki Takezoe
2025-01-05 14:35:50 +09:00
committed by GitHub
parent 4cf924bee0
commit f1fc794c0c
5 changed files with 104 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/scala/gitbucket/core/controller/api/ApiRepositoryBranchControllerBase.scala
View File

@@ -23,10 +23,7 @@ trait ApiRepositoryBranchControllerBase extends ControllerBase {
Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git => Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
JsonFormat( JsonFormat(
JGitUtil JGitUtil
.getBranchesNoMergeInfo( .getBranchesNoMergeInfo(git)
git = git,
defaultBranch = repository.repository.defaultBranch
)
.map { br => .map { br =>
ApiBranchForList(br.name, ApiBranchCommit(br.commitId)) ApiBranchForList(br.name, ApiBranchCommit(br.commitId))
} }
@@ -42,10 +39,7 @@ trait ApiRepositoryBranchControllerBase extends ControllerBase {
Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git => Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
(for { (for {
branch <- params.get("splat") if repository.branchList.contains(branch) branch <- params.get("splat") if repository.branchList.contains(branch)
br <- getBranchesNoMergeInfo( br <- getBranchesNoMergeInfo(git).find(_.name == branch)
git,
repository.repository.defaultBranch
).find(_.name == branch)
} yield { } yield {
val protection = getProtectedBranchInfo(repository.owner, repository.name, branch) val protection = getProtectedBranchInfo(repository.owner, repository.name, branch)
JsonFormat( JsonFormat(
@@ -269,10 +263,7 @@ trait ApiRepositoryBranchControllerBase extends ControllerBase {
(for { (for {
branch <- params.get("splat") if repository.branchList.contains(branch) branch <- params.get("splat") if repository.branchList.contains(branch)
protection <- extractFromJsonBody[ApiBranchProtection.EnablingAndDisabling].map(_.protection) protection <- extractFromJsonBody[ApiBranchProtection.EnablingAndDisabling].map(_.protection)
br <- getBranchesNoMergeInfo( br <- getBranchesNoMergeInfo(git).find(_.name == branch)
git,
repository.repository.defaultBranch
).find(_.name == branch)
} yield { } yield {
if (protection.enabled) { if (protection.enabled) {
enableBranchProtection( enableBranchProtection(

2
src/main/scala/gitbucket/core/controller/api/ApiRepositoryCommitControllerBase.scala
View File

@@ -159,7 +159,7 @@ trait ApiRepositoryCommitControllerBase extends ControllerBase {
Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git => Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
val apiBranchForCommits = for { val apiBranchForCommits = for {
branch <- getBranchesOfCommit(git, sha) branch <- getBranchesOfCommit(git, sha)
br <- getBranchesNoMergeInfo(git, branch).find(_.name == branch) br <- getBranchesNoMergeInfo(git).find(_.name == branch)
} yield { } yield {
val protection = getProtectedBranchInfo(repository.owner, repository.name, branch) val protection = getProtectedBranchInfo(repository.owner, repository.name, branch)
ApiBranchForHeadCommit(branch, ApiBranchCommit(br.commitId), protection.enabled) ApiBranchForHeadCommit(branch, ApiBranchCommit(br.commitId), protection.enabled)

2
src/main/scala/gitbucket/core/service/PullRequestService.scala
View File

@@ -313,7 +313,7 @@ trait PullRequestService {
base.foreach { _base => base.foreach { _base =>
if (pr.branch != _base) { if (pr.branch != _base) {
Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git => Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
getBranchesNoMergeInfo(git, repository.repository.defaultBranch) getBranchesNoMergeInfo(git)
.find(_.name == _base) .find(_.name == _base)
.foreach(br => updateBaseBranch(repository.owner, repository.name, issueId, br.name, br.commitId)) .foreach(br => updateBaseBranch(repository.owner, repository.name, issueId, br.name, br.commitId))
} }

175
src/main/scala/gitbucket/core/util/JGitUtil.scala
View File

@@ -1,19 +1,19 @@
package gitbucket.core.util package gitbucket.core.util
import java.io._ import java.io.*
import gitbucket.core.service.RepositoryService import gitbucket.core.service.RepositoryService
import org.eclipse.jgit.api.Git import org.eclipse.jgit.api.Git
import Directory._ import Directory.*
import StringUtil._ import StringUtil.*
import scala.annotation.tailrec import scala.annotation.tailrec
import scala.jdk.CollectionConverters._ import scala.jdk.CollectionConverters.*
import scala.util.Using import scala.util.Using
import org.eclipse.jgit.lib._ import org.eclipse.jgit.lib.*
import org.eclipse.jgit.revwalk._ import org.eclipse.jgit.revwalk.*
import org.eclipse.jgit.revwalk.filter._ import org.eclipse.jgit.revwalk.filter.*
import org.eclipse.jgit.treewalk._ import org.eclipse.jgit.treewalk.*
import org.eclipse.jgit.treewalk.filter._ import org.eclipse.jgit.treewalk.filter.*
import org.eclipse.jgit.diff.DiffEntry.ChangeType import org.eclipse.jgit.diff.DiffEntry.ChangeType
import org.eclipse.jgit.errors.{ConfigInvalidException, IncorrectObjectTypeException, MissingObjectException} import org.eclipse.jgit.errors.{ConfigInvalidException, IncorrectObjectTypeException, MissingObjectException}
import org.eclipse.jgit.transport.RefSpec import org.eclipse.jgit.transport.RefSpec
@@ -21,7 +21,7 @@ import org.eclipse.jgit.transport.RefSpec
import java.util.Date import java.util.Date
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import org.cache2k.{Cache, Cache2kBuilder} import org.cache2k.{Cache, Cache2kBuilder}
import org.eclipse.jgit.api.errors._ import org.eclipse.jgit.api.errors.*
import org.eclipse.jgit.diff.{DiffEntry, DiffFormatter, RawTextComparator} import org.eclipse.jgit.diff.{DiffEntry, DiffFormatter, RawTextComparator}
import org.eclipse.jgit.dircache.DirCacheEntry import org.eclipse.jgit.dircache.DirCacheEntry
import org.eclipse.jgit.util.io.DisabledOutputStream import org.eclipse.jgit.util.io.DisabledOutputStream
@@ -39,7 +39,7 @@ object JGitUtil {
private implicit val objectDatabaseReleasable: Releasable[ObjectDatabase] = private implicit val objectDatabaseReleasable: Releasable[ObjectDatabase] =
_.close() _.close()
private def isCacheEnabled(): Boolean = private def isCacheEnabled: Boolean =
!ConfigUtil.getConfigValue[Boolean]("gitbucket.disableCache").getOrElse(false) !ConfigUtil.getConfigValue[Boolean]("gitbucket.disableCache").getOrElse(false)
/** /**
@@ -90,8 +90,6 @@ object JGitUtil {
/** /**
* The verified gpg sign data. * The verified gpg sign data.
* @param signedUser
* @param signedKeyId
*/ */
case class GpgVerifyInfo(signedUser: String, signedKeyId: String) case class GpgVerifyInfo(signedUser: String, signedKeyId: String)
@@ -127,7 +125,7 @@ object JGitUtil {
os.write('\n') os.write('\n')
if (!rev.getFullMessage.isEmpty) { if (rev.getFullMessage.nonEmpty) {
w.write(rev.getFullMessage) w.write(rev.getFullMessage)
w.flush() w.flush()
} }
@@ -168,7 +166,7 @@ object JGitUtil {
rev.getName, rev.getName,
rev.getShortMessage, rev.getShortMessage,
rev.getFullMessage, rev.getFullMessage,
rev.getParents().map(_.name).toList, rev.getParents.map(_.name).toList,
rev.getAuthorIdent.getWhen, rev.getAuthorIdent.getWhen,
rev.getAuthorIdent.getName, rev.getAuthorIdent.getName,
rev.getAuthorIdent.getEmailAddress, rev.getAuthorIdent.getEmailAddress,
@@ -181,9 +179,9 @@ object JGitUtil {
None None
) )
val summary = getSummaryMessage(fullMessage, shortMessage) val summary: String = getSummaryMessage(fullMessage, shortMessage)
val description = { val description: Option[String] = {
val i = fullMessage.trim.indexOf('\n') val i = fullMessage.trim.indexOf('\n')
if (i >= 0) { if (i >= 0) {
Some(fullMessage.trim.substring(i).trim) Some(fullMessage.trim.substring(i).trim)
@@ -290,11 +288,11 @@ object JGitUtil {
case r: RevTag => revWalk.parseCommit(r.getObject) case r: RevTag => revWalk.parseCommit(r.getObject)
case _ => revWalk.parseCommit(objectId) case _ => revWalk.parseCommit(objectId)
} }
revWalk.dispose revWalk.dispose()
revCommit revCommit
} }
private val cache: Cache[String, Int] = if (isCacheEnabled()) { private val cache: Cache[String, Int] = if (isCacheEnabled) {
Cache2kBuilder Cache2kBuilder
.of(classOf[String], classOf[Int]) .of(classOf[String], classOf[Int])
.name("commit-count") .name("commit-count")
@@ -303,7 +301,7 @@ object JGitUtil {
.build() .build()
} else null } else null
private val objectCommitCache: Cache[ObjectId, RevCommit] = if (isCacheEnabled()) { private val objectCommitCache: Cache[ObjectId, RevCommit] = if (isCacheEnabled) {
Cache2kBuilder Cache2kBuilder
.of(classOf[ObjectId], classOf[RevCommit]) .of(classOf[ObjectId], classOf[RevCommit])
.name("object-commit") .name("object-commit")
@@ -312,7 +310,7 @@ object JGitUtil {
} else null } else null
def removeCache(git: Git): Unit = { def removeCache(git: Git): Unit = {
if (isCacheEnabled()) { if (isCacheEnabled) {
val dir = git.getRepository.getDirectory val dir = git.getRepository.getDirectory
val keyPrefix = dir.getAbsolutePath + "@" val keyPrefix = dir.getAbsolutePath + "@"
@@ -331,7 +329,7 @@ object JGitUtil {
def getCommitCount(git: Git, branch: String, max: Int = 10001): Int = { def getCommitCount(git: Git, branch: String, max: Int = 10001): Int = {
val dir = git.getRepository.getDirectory val dir = git.getRepository.getDirectory
if (isCacheEnabled()) { if (isCacheEnabled) {
val key = dir.getAbsolutePath + "@" + branch val key = dir.getAbsolutePath + "@" + branch
val entry = cache.getEntry(key) val entry = cache.getEntry(key)
@@ -387,7 +385,7 @@ object JGitUtil {
) )
} catch { } catch {
// not initialized // not initialized
case e: NoHeadException => RepositoryInfo(owner, repository, Nil, Nil) case _: NoHeadException => RepositoryInfo(owner, repository, Nil, Nil)
} }
} }
} }
@@ -424,7 +422,7 @@ object JGitUtil {
} else { } else {
val treeWalk = TreeWalk.forPath(git.getRepository, path, rev.getTree) val treeWalk = TreeWalk.forPath(git.getRepository, path, rev.getTree)
if (treeWalk != null) { if (treeWalk != null) {
treeWalk.enterSubtree treeWalk.enterSubtree()
Using.resource(treeWalk)(f) Using.resource(treeWalk)(f)
} }
} }
@@ -435,7 +433,7 @@ object JGitUtil {
): (ObjectId, FileMode, String, String, Option[String], Option[RevCommit]) = ): (ObjectId, FileMode, String, String, Option[String], Option[RevCommit]) =
tuple match { tuple match {
case (oid, FileMode.TREE, name, path, _, commit) => case (oid, FileMode.TREE, name, path, _, commit) =>
(Using.resource(new TreeWalk(git.getRepository)) { walk => Using.resource(new TreeWalk(git.getRepository)) { walk =>
walk.addTree(oid) walk.addTree(oid)
// single tree child, or None // single tree child, or None
if (walk.next() && walk.getFileMode(0) == FileMode.TREE) { if (walk.next() && walk.getFileMode(0) == FileMode.TREE) {
@@ -452,7 +450,7 @@ object JGitUtil {
} else { } else {
None None
} }
}) match { } match {
case Some(child) => simplifyPath(child) case Some(child) => simplifyPath(child)
case _ => tuple case _ => tuple
} }
@@ -468,7 +466,7 @@ object JGitUtil {
(id, mode, name, path, opt, None) (id, mode, name, path, opt, None)
} else if (commitCount < 10000) { } else if (commitCount < 10000) {
(id, mode, name, path, opt, Some(getCommit(path))) (id, mode, name, path, opt, Some(getCommit(path)))
} else if (isCacheEnabled()) { } else if (isCacheEnabled) {
// Use in-memory cache if the commit count is too big. // Use in-memory cache if the commit count is too big.
val cached = objectCommitCache.getEntry(id) val cached = objectCommitCache.getEntry(id)
if (cached == null) { if (cached == null) {
@@ -504,9 +502,7 @@ object JGitUtil {
} else None } else None
fileList +:= ( fileList +:= (
treeWalk.getObjectId(0), treeWalk.getObjectId(0),
treeWalk.getFileMode( treeWalk.getFileMode(0),
0
),
treeWalk.getNameString, treeWalk.getNameString,
treeWalk.getPathString, treeWalk.getPathString,
linkUrl linkUrl
@@ -558,9 +554,12 @@ object JGitUtil {
def getTreeId(git: Git, revision: String): Option[String] = { def getTreeId(git: Git, revision: String): Option[String] = {
Using.resource(new RevWalk(git.getRepository)) { revWalk => Using.resource(new RevWalk(git.getRepository)) { revWalk =>
val objectId = git.getRepository.resolve(revision) val objectId = git.getRepository.resolve(revision)
if (objectId == null) return None if (objectId == null) {
val revCommit = revWalk.parseCommit(objectId) None
Some(revCommit.getTree.name) } else {
val revCommit = revWalk.parseCommit(objectId)
Some(revCommit.getTree.name)
}
} }
} }
@@ -568,20 +567,18 @@ object JGitUtil {
* get all file list by tree object id. * get all file list by tree object id.
*/ */
def getAllFileListByTreeId(git: Git, treeId: String): List[String] = { def getAllFileListByTreeId(git: Git, treeId: String): List[String] = {
Using.resource(new RevWalk(git.getRepository)) { revWalk => val objectId = git.getRepository.resolve(treeId + "^{tree}")
val objectId = git.getRepository.resolve(treeId + "^{tree}") if (objectId == null) return Nil
if (objectId == null) return Nil Using.resource(new TreeWalk(git.getRepository)) { treeWalk =>
Using.resource(new TreeWalk(git.getRepository)) { treeWalk => treeWalk.addTree(objectId)
treeWalk.addTree(objectId) treeWalk.setRecursive(true)
treeWalk.setRecursive(true) var ret: List[String] = Nil
var ret: List[String] = Nil if (treeWalk != null) {
if (treeWalk != null) { while (treeWalk.next()) {
while (treeWalk.next()) { ret +:= treeWalk.getPathString
ret +:= treeWalk.getPathString
}
} }
ret.reverse
} }
ret.reverse
} }
} }
@@ -610,22 +607,21 @@ object JGitUtil {
count: Int, count: Int,
logs: List[CommitInfo] logs: List[CommitInfo]
): (List[CommitInfo], Boolean) = ): (List[CommitInfo], Boolean) =
i.hasNext match { if (i.hasNext) {
case true if (limit <= 0 || logs.size < limit) => { val commit = i.next
val commit = i.next getCommitLog(
getCommitLog( i,
i, count + 1,
count + 1, if (limit <= 0 || (fixedPage - 1) * limit <= count) logs :+ new CommitInfo(commit) else logs
if (limit <= 0 || (fixedPage - 1) * limit <= count) logs :+ new CommitInfo(commit) else logs )
) } else {
} (logs, i.hasNext)
case _ => (logs, i.hasNext)
} }
Using.resource(new RevWalk(git.getRepository)) { revWalk => Using.resource(new RevWalk(git.getRepository)) { revWalk =>
val objectId = git.getRepository.resolve(revision) val objectId = git.getRepository.resolve(revision)
if (objectId == null) { if (objectId == null) {
Left(s"${revision} can't be resolved.") Left(s"$revision can't be resolved.")
} else { } else {
revWalk.markStart(revWalk.parseCommit(objectId)) revWalk.markStart(revWalk.parseCommit(objectId))
if (path.nonEmpty) { if (path.nonEmpty) {
@@ -641,16 +637,15 @@ object JGitUtil {
): List[CommitInfo] = { ): List[CommitInfo] = {
@scala.annotation.tailrec @scala.annotation.tailrec
def getCommitLog(i: java.util.Iterator[RevCommit], logs: List[CommitInfo]): List[CommitInfo] = def getCommitLog(i: java.util.Iterator[RevCommit], logs: List[CommitInfo]): List[CommitInfo] =
i.hasNext match { if (i.hasNext) {
case true => { val revCommit = i.next
val revCommit = i.next if (endCondition(revCommit)) {
if (endCondition(revCommit)) { if (includesLastCommit) logs :+ new CommitInfo(revCommit) else logs
if (includesLastCommit) logs :+ new CommitInfo(revCommit) else logs } else {
} else { getCommitLog(i, logs :+ new CommitInfo(revCommit))
getCommitLog(i, logs :+ new CommitInfo(revCommit))
}
} }
case false => logs } else {
logs
} }
Using.resource(new RevWalk(git.getRepository)) { revWalk => Using.resource(new RevWalk(git.getRepository)) { revWalk =>
@@ -872,7 +867,7 @@ object JGitUtil {
private def getTextContent(git: Git, objectId: ObjectId): Option[String] = { private def getTextContent(git: Git, objectId: ObjectId): Option[String] = {
JGitUtil JGitUtil
.getContentFromId(git, objectId, false) .getContentFromId(git, objectId, fetchLargeFile = false)
.filter(FileUtil.isText) .filter(FileUtil.isText)
.map(convertFromByteArray) .map(convertFromByteArray)
} }
@@ -897,10 +892,7 @@ object JGitUtil {
.getRefsByPrefix(Constants.R_HEADS) .getRefsByPrefix(Constants.R_HEADS)
.asScala .asScala
.filter { e => .filter { e =>
(revWalk.isMergedInto( revWalk.isMergedInto(commit, revWalk.parseCommit(e.getObjectId))
commit,
revWalk.parseCommit(e.getObjectId)
))
} }
.map { e => .map { e =>
e.getName.substring(Constants.R_HEADS.length) e.getName.substring(Constants.R_HEADS.length)
@@ -939,10 +931,7 @@ object JGitUtil {
.getRefsByPrefix(Constants.R_TAGS) .getRefsByPrefix(Constants.R_TAGS)
.asScala .asScala
.filter { e => .filter { e =>
(revWalk.isMergedInto( revWalk.isMergedInto(commit, revWalk.parseCommit(e.getObjectId))
commit,
revWalk.parseCommit(e.getObjectId)
))
} }
.map { e => .map { e =>
e.getName.substring(Constants.R_TAGS.length) e.getName.substring(Constants.R_TAGS.length)
@@ -969,7 +958,7 @@ object JGitUtil {
private def setReceivePack(repository: org.eclipse.jgit.lib.Repository): Unit = { private def setReceivePack(repository: org.eclipse.jgit.lib.Repository): Unit = {
val config = repository.getConfig val config = repository.getConfig
config.setBoolean("http", null, "receivepack", true) config.setBoolean("http", null, "receivepack", true)
config.save config.save()
} }
def getDefaultBranch( def getDefaultBranch(
@@ -986,7 +975,7 @@ object JGitUtil {
}.find(_._1 != null) }.find(_._1 != null)
} }
def createTag(git: Git, name: String, message: Option[String], commitId: String) = { def createTag(git: Git, name: String, message: Option[String], commitId: String): Either[String, String] = {
try { try {
val objectId: ObjectId = git.getRepository.resolve(commitId) val objectId: ObjectId = git.getRepository.resolve(commitId)
Using.resource(new RevWalk(git.getRepository)) { walk => Using.resource(new RevWalk(git.getRepository)) { walk =>
@@ -1005,7 +994,7 @@ object JGitUtil {
} }
} }
def createBranch(git: Git, fromBranch: String, newBranch: String) = { def createBranch(git: Git, fromBranch: String, newBranch: String): Either[String, String] = {
try { try {
git.branchCreate().setStartPoint(fromBranch).setName(newBranch).call() git.branchCreate().setStartPoint(fromBranch).setName(newBranch).call()
Right("Branch created.") Right("Branch created.")
@@ -1060,19 +1049,18 @@ object JGitUtil {
*/ */
def getSubmodules(git: Git, tree: RevTree, baseUrl: Option[String]): List[SubmoduleInfo] = { def getSubmodules(git: Git, tree: RevTree, baseUrl: Option[String]): List[SubmoduleInfo] = {
val repository = git.getRepository val repository = git.getRepository
getContentFromPath(git, tree, ".gitmodules", true).map { bytes => getContentFromPath(git, tree, ".gitmodules", fetchLargeFile = true).map { bytes =>
(try { (try {
val config = new BlobBasedConfig(repository.getConfig(), bytes) val config = new BlobBasedConfig(repository.getConfig, bytes)
config.getSubsections("submodule").asScala.map { module => config.getSubsections("submodule").asScala.map { module =>
val path = config.getString("submodule", module, "path") val path = config.getString("submodule", module, "path")
val url = config.getString("submodule", module, "url") val url = config.getString("submodule", module, "url")
SubmoduleInfo(module, path, url, StringUtil.getRepositoryViewerUrl(url, baseUrl)) SubmoduleInfo(module, path, url, StringUtil.getRepositoryViewerUrl(url, baseUrl))
} }
} catch { } catch {
case e: ConfigInvalidException => { case e: ConfigInvalidException =>
logger.error("Failed to load .gitmodules file for " + repository.getDirectory(), e) logger.error("Failed to load .gitmodules file for " + repository.getDirectory, e)
Nil Nil
}
}).toList }).toList
} getOrElse Nil } getOrElse Nil
} }
@@ -1090,9 +1078,9 @@ object JGitUtil {
@scala.annotation.tailrec @scala.annotation.tailrec
def getPathObjectId(path: String, walk: TreeWalk): Option[ObjectId] = def getPathObjectId(path: String, walk: TreeWalk): Option[ObjectId] =
walk.next match { walk.next match {
case true if (walk.getPathString == path) => Some(walk.getObjectId(0)) case true if walk.getPathString == path => Some(walk.getObjectId(0))
case true => getPathObjectId(path, walk) case true => getPathObjectId(path, walk)
case false => None case false => None
} }
Using.resource(new TreeWalk(git.getRepository)) { treeWalk => Using.resource(new TreeWalk(git.getRepository)) { treeWalk =>
@@ -1145,7 +1133,7 @@ object JGitUtil {
val isLfs = isLfsPointer(loader) val isLfs = isLfsPointer(loader)
val large = FileUtil.isLarge(loader.getSize) val large = FileUtil.isLarge(loader.getSize)
val viewer = if (FileUtil.isImage(path, safeMode)) "image" else if (large) "large" else "other" val viewer = if (FileUtil.isImage(path, safeMode)) "image" else if (large) "large" else "other"
val bytes = if (viewer == "other") JGitUtil.getContentFromId(git, objectId, false) else None val bytes = if (viewer == "other") JGitUtil.getContentFromId(git, objectId, fetchLargeFile = false) else None
val size = Some(getContentSize(loader)) val size = Some(getContentSize(loader))
if (viewer == "other") { if (viewer == "other") {
@@ -1180,7 +1168,7 @@ object JGitUtil {
try { try {
Using.resource(git.getRepository.getObjectDatabase) { db => Using.resource(git.getRepository.getObjectDatabase) { db =>
val loader = db.open(id) val loader = db.open(id)
if (loader.isLarge || (fetchLargeFile == false && FileUtil.isLarge(loader.getSize))) { if (loader.isLarge || (!fetchLargeFile && FileUtil.isLarge(loader.getSize))) {
None None
} else { } else {
Some(loader.getBytes) Some(loader.getBytes)
@@ -1250,7 +1238,7 @@ object JGitUtil {
requestBranch: String requestBranch: String
): String = { ): String = {
val existIds = getAllCommitIds(oldGit) val existIds = getAllCommitIds(oldGit)
getCommitLogs(newGit, requestBranch, true) { commit => getCommitLogs(newGit, requestBranch, includesLastCommit = true) { commit =>
existIds.contains(commit.name) && getBranchesOfCommit(oldGit, commit.getName).contains(branch) existIds.contains(commit.name) && getBranchesOfCommit(oldGit, commit.getName).contains(branch)
}.head.id }.head.id
} }
@@ -1274,10 +1262,10 @@ object JGitUtil {
) { (oldGit, newGit) => ) { (oldGit, newGit) =>
oldGit.fetch oldGit.fetch
.setRemote(Directory.getRepositoryDir(requestUserName, requestRepositoryName).toURI.toString) .setRemote(Directory.getRepositoryDir(requestUserName, requestRepositoryName).toURI.toString)
.setRefSpecs(new RefSpec(s"refs/heads/${requestBranch}:refs/pull/${issueId}/head").setForceUpdate(true)) .setRefSpecs(new RefSpec(s"refs/heads/$requestBranch:refs/pull/$issueId/head").setForceUpdate(true))
.call .call
val commitIdTo = oldGit.getRepository.resolve(s"refs/pull/${issueId}/head").getName val commitIdTo = oldGit.getRepository.resolve(s"refs/pull/$issueId/head").getName
val commitIdFrom = getForkedCommitId( val commitIdFrom = getForkedCommitId(
oldGit, oldGit,
newGit, newGit,
@@ -1303,9 +1291,8 @@ object JGitUtil {
git.log.add(startCommit).addPath(path).setMaxCount(1).call.iterator.next git.log.add(startCommit).addPath(path).setMaxCount(1).call.iterator.next
} }
def getBranchesNoMergeInfo(git: Git, defaultBranch: String): Seq[BranchInfoSimple] = { def getBranchesNoMergeInfo(git: Git): Seq[BranchInfoSimple] = {
val repo = git.getRepository val repo = git.getRepository
val defaultObject = repo.resolve(defaultBranch)
git.branchList.call.asScala.map { ref => git.branchList.call.asScala.map { ref =>
val walk = new RevWalk(repo) val walk = new RevWalk(repo)
@@ -1369,7 +1356,7 @@ object JGitUtil {
val blame = blamer.call() val blame = blamer.call()
var blameMap = Map[String, JGitUtil.BlameInfo]() var blameMap = Map[String, JGitUtil.BlameInfo]()
var idLine = List[(String, Int)]() var idLine = List[(String, Int)]()
0.until(blame.getResultContents().size()).foreach { i => 0.until(blame.getResultContents.size()).foreach { i =>
val c = blame.getSourceCommit(i) val c = blame.getSourceCommit(i)
if (!blameMap.contains(c.name)) { if (!blameMap.contains(c.name)) {
blameMap += c.name -> JGitUtil.BlameInfo( blameMap += c.name -> JGitUtil.BlameInfo(
@@ -1406,7 +1393,7 @@ object JGitUtil {
*/ */
def getShaByRef(owner: String, name: String, revstr: String): Option[String] = { def getShaByRef(owner: String, name: String, revstr: String): Option[String] = {
Using.resource(Git.open(getRepositoryDir(owner, name))) { git => Using.resource(Git.open(getRepositoryDir(owner, name))) { git =>
Option(git.getRepository.resolve(revstr)).map(ObjectId.toString(_)) Option(git.getRepository.resolve(revstr)).map(ObjectId.toString)
} }
} }

36
src/test/scala/gitbucket/core/util/JGitUtilSpec.scala
View File

@@ -13,10 +13,10 @@ class JGitUtilSpec extends AnyFunSuite {
test("isEmpty") { test("isEmpty") {
withTestRepository { git => withTestRepository { git =>
assert(JGitUtil.isEmpty(git) == true) assert(JGitUtil.isEmpty(git))
createFile(git, Constants.HEAD, "README.md", "body1", message = "commit1") createFile(git, Constants.HEAD, "README.md", "body1", message = "commit1")
assert(JGitUtil.isEmpty(git) == false) assert(!JGitUtil.isEmpty(git))
} }
} }
@@ -31,13 +31,13 @@ class JGitUtilSpec extends AnyFunSuite {
createFile(git, Constants.HEAD, "README.md", "body1\nbody2", message = "commit1") createFile(git, Constants.HEAD, "README.md", "body1\nbody2", message = "commit1")
// latest commit // latest commit
val diff1 = JGitUtil.getDiffs(git, None, "main", false, true) val diff1 = JGitUtil.getDiffs(git, None, "main", fetchContent = false, makePatch = true)
assert(diff1.size == 1) assert(diff1.size == 1)
assert(diff1(0).changeType == ChangeType.MODIFY) assert(diff1(0).changeType == ChangeType.MODIFY)
assert(diff1(0).oldPath == "README.md") assert(diff1(0).oldPath == "README.md")
assert(diff1(0).newPath == "README.md") assert(diff1(0).newPath == "README.md")
assert(diff1(0).tooLarge == false) assert(!diff1(0).tooLarge)
assert(diff1(0).patch == Some("""@@ -1 +1,2 @@ assert(diff1(0).patch.contains("""@@ -1 +1,2 @@
|-body1 |-body1
|\ No newline at end of file |\ No newline at end of file
|+body1 |+body1
@@ -45,13 +45,13 @@ class JGitUtilSpec extends AnyFunSuite {
|\ No newline at end of file""".stripMargin)) |\ No newline at end of file""".stripMargin))
// from specified commit // from specified commit
val diff2 = JGitUtil.getDiffs(git, Some(commit.getName), "main", false, true) val diff2 = JGitUtil.getDiffs(git, Some(commit.getName), "main", fetchContent = false, makePatch = true)
assert(diff2.size == 2) assert(diff2.size == 2)
assert(diff2(0).changeType == ChangeType.ADD) assert(diff2(0).changeType == ChangeType.ADD)
assert(diff2(0).oldPath == "/dev/null") assert(diff2(0).oldPath == "/dev/null")
assert(diff2(0).newPath == "LICENSE") assert(diff2(0).newPath == "LICENSE")
assert(diff2(0).tooLarge == false) assert(!diff2(0).tooLarge)
assert(diff2(0).patch == Some("""+++ b/LICENSE assert(diff2(0).patch.contains("""+++ b/LICENSE
|@@ -0,0 +1 @@ |@@ -0,0 +1 @@
|+Apache License |+Apache License
|\ No newline at end of file""".stripMargin)) |\ No newline at end of file""".stripMargin))
@@ -59,8 +59,8 @@ class JGitUtilSpec extends AnyFunSuite {
assert(diff2(1).changeType == ChangeType.MODIFY) assert(diff2(1).changeType == ChangeType.MODIFY)
assert(diff2(1).oldPath == "README.md") assert(diff2(1).oldPath == "README.md")
assert(diff2(1).newPath == "README.md") assert(diff2(1).newPath == "README.md")
assert(diff2(1).tooLarge == false) assert(!diff2(1).tooLarge)
assert(diff2(1).patch == Some("""@@ -1 +1,2 @@ assert(diff2(1).patch.contains("""@@ -1 +1,2 @@
|-body1 |-body1
|\ No newline at end of file |\ No newline at end of file
|+body1 |+body1
@@ -210,7 +210,7 @@ class JGitUtilSpec extends AnyFunSuite {
JGitUtil.createBranch(git, "main", "test2") JGitUtil.createBranch(git, "main", "test2")
// getBranches // getBranches
val branches = JGitUtil.getBranches(git, "main", true) val branches = JGitUtil.getBranches(git, "main", origin = true)
assert(branches.size == 3) assert(branches.size == 3)
assert(branches(0).name == "main") assert(branches(0).name == "main")
@@ -239,8 +239,8 @@ class JGitUtilSpec extends AnyFunSuite {
JGitUtil.createBranch(git, "main", "test2") JGitUtil.createBranch(git, "main", "test2")
// getBranches // getBranches
val branchesNMI = JGitUtil.getBranchesNoMergeInfo(git, "main") val branchesNMI = JGitUtil.getBranchesNoMergeInfo(git)
val branches = JGitUtil.getBranches(git, "main", true) val branches = JGitUtil.getBranches(git, "main", origin = true)
assert( assert(
branches.map(bi => branches.map(bi =>
@@ -313,14 +313,14 @@ class JGitUtilSpec extends AnyFunSuite {
val objectId = git.getRepository.resolve("main") val objectId = git.getRepository.resolve("main")
val commit = JGitUtil.getRevCommitFromId(git, objectId) val commit = JGitUtil.getRevCommitFromId(git, objectId)
val content1 = JGitUtil.getContentFromPath(git, commit.getTree, "README.md", true) val content1 = JGitUtil.getContentFromPath(git, commit.getTree, "README.md", fetchLargeFile = true)
assert(content1.map(x => new String(x, "UTF-8")) == Some("body1")) assert(content1.map(x => new String(x, "UTF-8")).contains("body1"))
val content2 = JGitUtil.getContentFromPath(git, commit.getTree, "LARGE_FILE", false) val content2 = JGitUtil.getContentFromPath(git, commit.getTree, "LARGE_FILE", fetchLargeFile = false)
assert(content2.isEmpty) assert(content2.isEmpty)
val content3 = JGitUtil.getContentFromPath(git, commit.getTree, "LARGE_FILE", true) val content3 = JGitUtil.getContentFromPath(git, commit.getTree, "LARGE_FILE", fetchLargeFile = true)
assert(content3.map(x => new String(x, "UTF-8")) == Some("body1" * 1000000)) assert(content3.map(x => new String(x, "UTF-8")).contains("body1" * 1000000))
} }
} }