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

Format code

Browse Source
This commit is contained in:
Naoki Takezoe
2016-12-12 22:54:43 +09:00
parent f44d44cb4a
commit 7af271e14a
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -213,7 +213,7 @@ object JGitUtil {
def getFileList(git: Git, revision: String, path: String = "."): List[FileInfo] = { def getFileList(git: Git, revision: String, path: String = "."): List[FileInfo] = {
using(new RevWalk(git.getRepository)){ revWalk => using(new RevWalk(git.getRepository)){ revWalk =>
val objectId = git.getRepository.resolve(revision) val objectId = git.getRepository.resolve(revision)
if(objectId==null) return Nil if(objectId == null) return Nil
val revCommit = revWalk.parseCommit(objectId) val revCommit = revWalk.parseCommit(objectId)
def useTreeWalk(rev:RevCommit)(f:TreeWalk => Any): Unit = if (path == ".") { def useTreeWalk(rev:RevCommit)(f:TreeWalk => Any): Unit = if (path == ".") {
@@ -255,14 +255,14 @@ object JGitUtil {
revIterator:java.util.Iterator[RevCommit]): List[(ObjectId, FileMode, String, Option[String], RevCommit)] ={ revIterator:java.util.Iterator[RevCommit]): List[(ObjectId, FileMode, String, Option[String], RevCommit)] ={
if(restList.isEmpty){ if(restList.isEmpty){
result result
}else if(!revIterator.hasNext){ // maybe, revCommit has only 1 log. other case, restList be empty } else if(!revIterator.hasNext){ // maybe, revCommit has only 1 log. other case, restList be empty
result ++ restList.map{ case (tuple, map) => tupleAdd(tuple, map.values.headOption.getOrElse(revCommit)) } result ++ restList.map { case (tuple, map) => tupleAdd(tuple, map.values.headOption.getOrElse(revCommit)) }
}else{ } else {
val newCommit = revIterator.next val newCommit = revIterator.next
val (thisTimeChecks,skips) = restList.partition{ case (tuple, parentsMap) => parentsMap.contains(newCommit) } val (thisTimeChecks,skips) = restList.partition { case (tuple, parentsMap) => parentsMap.contains(newCommit) }
if(thisTimeChecks.isEmpty){ if(thisTimeChecks.isEmpty){
findLastCommits(result, restList, revIterator) findLastCommits(result, restList, revIterator)
}else{ } else {
var nextRest = skips var nextRest = skips
var nextResult = result var nextResult = result
// Map[(name, oid), (tuple, parentsMap)] // Map[(name, oid), (tuple, parentsMap)]
@@ -270,20 +270,20 @@ object JGitUtil {
lazy val newParentsMap = newCommit.getParents.map(_ -> newCommit).toMap lazy val newParentsMap = newCommit.getParents.map(_ -> newCommit).toMap
useTreeWalk(newCommit){ walk => useTreeWalk(newCommit){ walk =>
while(walk.next){ while(walk.next){
rest.remove(walk.getNameString -> walk.getObjectId(0)).map{ case (tuple, _) => rest.remove(walk.getNameString -> walk.getObjectId(0)).map { case (tuple, _) =>
if(newParentsMap.isEmpty){ if(newParentsMap.isEmpty){
nextResult +:= tupleAdd(tuple, newCommit) nextResult +:= tupleAdd(tuple, newCommit)
}else{ } else {
nextRest +:= tuple -> newParentsMap nextRest +:= tuple -> newParentsMap
} }
} }
} }
} }
rest.values.map{ case (tuple, parentsMap) => rest.values.map { case (tuple, parentsMap) =>
val restParentsMap = parentsMap - newCommit val restParentsMap = parentsMap - newCommit
if(restParentsMap.isEmpty){ if(restParentsMap.isEmpty){
nextResult +:= tupleAdd(tuple, parentsMap(newCommit)) nextResult +:= tupleAdd(tuple, parentsMap(newCommit))
}else{ } else {
nextRest +:= tuple -> restParentsMap nextRest +:= tuple -> restParentsMap
} }
} }
@@ -295,7 +295,7 @@ object JGitUtil {
var fileList: List[(ObjectId, FileMode, String, Option[String])] = Nil var fileList: List[(ObjectId, FileMode, String, Option[String])] = Nil
useTreeWalk(revCommit){ treeWalk => useTreeWalk(revCommit){ treeWalk =>
while (treeWalk.next()) { while (treeWalk.next()) {
val linkUrl =if (treeWalk.getFileMode(0) == FileMode.GITLINK) { val linkUrl = if (treeWalk.getFileMode(0) == FileMode.GITLINK) {
getSubmodules(git, revCommit.getTree).find(_.path == treeWalk.getPathString).map(_.url) getSubmodules(git, revCommit.getTree).find(_.path == treeWalk.getPathString).map(_.url)
} else None } else None
fileList +:= (treeWalk.getObjectId(0), treeWalk.getFileMode(0), treeWalk.getNameString, linkUrl) fileList +:= (treeWalk.getObjectId(0), treeWalk.getFileMode(0), treeWalk.getNameString, linkUrl)
@@ -345,7 +345,7 @@ object JGitUtil {
def getTreeId(git: Git, revision: String): Option[String] = { def getTreeId(git: Git, revision: String): Option[String] = {
using(new RevWalk(git.getRepository)){ revWalk => using(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) return None
val revCommit = revWalk.parseCommit(objectId) val revCommit = revWalk.parseCommit(objectId)
Some(revCommit.getTree.name) Some(revCommit.getTree.name)
} }
@@ -357,7 +357,7 @@ object JGitUtil {
def getAllFileListByTreeId(git: Git, treeId: String): List[String] = { def getAllFileListByTreeId(git: Git, treeId: String): List[String] = {
using(new RevWalk(git.getRepository)){ revWalk => using(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(new TreeWalk(git.getRepository)){ treeWalk => using(new TreeWalk(git.getRepository)){ treeWalk =>
treeWalk.addTree(objectId) treeWalk.addTree(objectId)
treeWalk.setRecursive(true) treeWalk.setRecursive(true)