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

Move getBranchesOfCommit and getTagsOfCommit to JGitUtil.

Browse Source
This commit is contained in:
takezoe
2013-06-21 11:34:26 +09:00
parent 457954d812
commit 16ee0e0fd6
2 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/scala/app/RepositoryViewerController.scala
View File

@@ -158,26 +158,9 @@ trait RepositoryViewerControllerBase extends ControllerBase {
JGitUtil.withGit(getRepositoryDir(owner, repository)){ git => JGitUtil.withGit(getRepositoryDir(owner, repository)){ git =>
val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id)) val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
import scala.collection.JavaConverters._ repo.html.commit(id, new JGitUtil.CommitInfo(revCommit),
import org.eclipse.jgit.lib.Constants JGitUtil.getBranchesOfCommit(git, revCommit.getName),
val walk = new org.eclipse.jgit.revwalk.RevWalk(git.getRepository) JGitUtil.getTagsOfCommit(git, revCommit.getName),
val commit = walk.parseCommit(git.getRepository.resolve(revCommit.getName + "^0"))
// TODO move to JGitUtil
val branchs = git.getRepository.getAllRefs.entrySet.asScala.filter { e =>
(e.getKey.startsWith(Constants.R_HEADS) && walk.isMergedInto(commit, walk.parseCommit(e.getValue.getObjectId)))
}.map { e =>
e.getValue.getName.substring(org.eclipse.jgit.lib.Constants.R_HEADS.length)
}.toList.sorted
// TODO move to JGitUtil
val tags = git.getRepository.getAllRefs.entrySet.asScala.filter { e =>
(e.getKey.startsWith(Constants.R_TAGS) && walk.isMergedInto(commit, walk.parseCommit(e.getValue.getObjectId)))
}.map { e =>
e.getValue.getName.substring(org.eclipse.jgit.lib.Constants.R_TAGS.length)
}.toList.sorted.reverse
repo.html.commit(id, new JGitUtil.CommitInfo(revCommit), branchs, tags,
getRepository(owner, repository, baseUrl).get, JGitUtil.getDiffs(git, id)) getRepository(owner, repository, baseUrl).get, JGitUtil.getDiffs(git, id))
} }
}) })

38
src/main/scala/util/JGitUtil.scala
View File

@@ -431,4 +431,42 @@ object JGitUtil {
} }
} }
/**
* Returns the list of branch names of the specified commit.
*/
def getBranchesOfCommit(git: Git, commitId: String): List[String] = {
val walk = new org.eclipse.jgit.revwalk.RevWalk(git.getRepository)
try {
val commit = walk.parseCommit(git.getRepository.resolve(commitId + "^0"))
git.getRepository.getAllRefs.entrySet.asScala.filter { e =>
(e.getKey.startsWith(Constants.R_HEADS) && walk.isMergedInto(commit, walk.parseCommit(e.getValue.getObjectId)))
}.map { e =>
e.getValue.getName.substring(org.eclipse.jgit.lib.Constants.R_HEADS.length)
}.toList.sorted
} finally {
walk.release
}
}
/**
* Returns the list of tags of the specified commit.
*/
def getTagsOfCommit(git: Git, commitId: String): List[String] = {
val walk = new org.eclipse.jgit.revwalk.RevWalk(git.getRepository)
try {
val commit = walk.parseCommit(git.getRepository.resolve(commitId + "^0"))
git.getRepository.getAllRefs.entrySet.asScala.filter { e =>
(e.getKey.startsWith(Constants.R_TAGS) && walk.isMergedInto(commit, walk.parseCommit(e.getValue.getObjectId)))
}.map { e =>
e.getValue.getName.substring(org.eclipse.jgit.lib.Constants.R_TAGS.length)
}.toList.sorted.reverse
} finally {
walk.release
}
}
} }