Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-05 13:05: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

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

@@ -158,27 +158,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
JGitUtil.withGit(getRepositoryDir(owner, repository)){ git =>
val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
import scala.collection.JavaConverters._
import org.eclipse.jgit.lib.Constants
val walk = new org.eclipse.jgit.revwalk.RevWalk(git.getRepository)
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))
repo.html.commit(id, new JGitUtil.CommitInfo(revCommit),
JGitUtil.getBranchesOfCommit(git, revCommit.getName),
JGitUtil.getTagsOfCommit(git, revCommit.getName),
getRepository(owner, repository, baseUrl).get, JGitUtil.getDiffs(git, id))
}
})