diff --git a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala index 52f675b..671d9f1 100644 --- a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala +++ b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala @@ -12,8 +12,6 @@ import gitbucket.core.util.Directory._ import gitbucket.core.util.Implicits._ import gitbucket.core.util._ -import gitbucket.core.view -import gitbucket.core.view.helpers import io.github.gitbucket.scalatra.forms._ import org.eclipse.jgit.api.Git import org.eclipse.jgit.lib.PersonIdent @@ -497,26 +495,6 @@ (defaultOwner, value) } -// private def getRequestCompareInfo(userName: String, repositoryName: String, branch: String, -// requestUserName: String, requestRepositoryName: String, requestCommitId: String): (Seq[Seq[CommitInfo]], Seq[DiffInfo]) = -// using( -// Git.open(getRepositoryDir(userName, repositoryName)), -// Git.open(getRepositoryDir(requestUserName, requestRepositoryName)) -// ){ (oldGit, newGit) => -// val oldId = oldGit.getRepository.resolve(branch) -// val newId = newGit.getRepository.resolve(requestCommitId) -// -// val commits = newGit.log.addRange(oldId, newId).call.iterator.asScala.map { revCommit => -// new CommitInfo(revCommit) -// }.toList.splitWith { (commit1, commit2) => -// helpers.date(commit1.commitTime) == view.helpers.date(commit2.commitTime) -// } -// -// val diffs = JGitUtil.getDiffs(newGit, oldId.getName, newId.getName, true) -// -// (commits, diffs) -// } - private def searchPullRequests(userName: Option[String], repository: RepositoryService.RepositoryInfo) = defining(repository.owner, repository.name){ case (owner, repoName) => val page = IssueSearchCondition.page(request) diff --git a/src/main/scala/gitbucket/core/service/PullRequestService.scala b/src/main/scala/gitbucket/core/service/PullRequestService.scala index 6f94ab3..6f3ab42 100644 --- a/src/main/scala/gitbucket/core/service/PullRequestService.scala +++ b/src/main/scala/gitbucket/core/service/PullRequestService.scala @@ -128,7 +128,6 @@ // Update comments position val comments = getCommitComments(pullreq.userName, pullreq.repositoryName, pullreq.commitIdTo, true) - println(comments) comments.foreach { comment => comment match { case CommitComment(_, _, _, commitId, _, _, Some(fileName), _, Some(newLine), _, _, _) => {