Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-01-07 16:12:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed deprecation warning, part 2/2

Browse Source
This commit is contained in:
Uli Heller
2018-09-21 20:03:58 +02:00
parent 318cdafcb1
commit fd0bc80284
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -740,15 +740,17 @@ object JGitUtil {
def getBranchesOfCommit(git: Git, commitId: String): List[String] =
using(new RevWalk(git.getRepository)) { revWalk =>
defining(revWalk.parseCommit(git.getRepository.resolve(commitId + "^0"))) { commit =>
git.getRepository.getAllRefs.entrySet.asScala
git.getRepository.getRefDatabase
.getRefsByPrefix(Constants.R_HEADS)
.asScala
.filter { e =>
(e.getKey.startsWith(Constants.R_HEADS) && revWalk.isMergedInto(
(revWalk.isMergedInto(
commit,
revWalk.parseCommit(e.getValue.getObjectId)
revWalk.parseCommit(e.getObjectId)
))
}
.map { e =>
e.getValue.getName.substring(org.eclipse.jgit.lib.Constants.R_HEADS.length)
e.getName.substring(Constants.R_HEADS.length)
}
.toList
.sorted
@@ -781,15 +783,17 @@ object JGitUtil {
def getTagsOfCommit(git: Git, commitId: String): List[String] =
using(new RevWalk(git.getRepository)) { revWalk =>
defining(revWalk.parseCommit(git.getRepository.resolve(commitId + "^0"))) { commit =>
git.getRepository.getAllRefs.entrySet.asScala
git.getRepository.getRefDatabase
.getRefsByPrefix(Constants.R_TAGS)
.asScala
.filter { e =>
(e.getKey.startsWith(Constants.R_TAGS) && revWalk.isMergedInto(
(revWalk.isMergedInto(
commit,
revWalk.parseCommit(e.getValue.getObjectId)
revWalk.parseCommit(e.getObjectId)
))
}
.map { e =>
e.getValue.getName.substring(org.eclipse.jgit.lib.Constants.R_TAGS.length)
e.getName.substring(Constants.R_TAGS.length)
}
.toList
.sorted