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

(refs #2)Fix pull request. Basic pattern had been tested but it's still unstable.

Browse Source
This commit is contained in:
takezoe
2013-07-24 22:05:36 +09:00
parent 205119cc01
commit 88caff38f0
7 changed files with 120 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/scala/service/PullRequestService.scala
View File

@@ -18,7 +18,8 @@ trait PullRequestService { self: IssuesService =>
}
def createPullRequest(originUserName: String, originRepositoryName: String, issueId: Int,
originBranch: String, requestUserName: String, requestRepositoryName: String, requestBranch: String): Unit =
originBranch: String, requestUserName: String, requestRepositoryName: String, requestBranch: String,
commitIdFrom: String, commitIdTo: String): Unit =
PullRequests insert (PullRequest(
originUserName,
originRepositoryName,
@@ -27,15 +28,15 @@ trait PullRequestService { self: IssuesService =>
requestUserName,
requestRepositoryName,
requestBranch,
None,
None))
commitIdFrom,
commitIdTo))
def mergePullRequest(originUserName: String, originRepositoryName: String, issueId: Int,
mergeStartId: String, mergeEndId: String): Unit = {
Query(PullRequests)
.filter(_.byPrimaryKey(originUserName, originRepositoryName, issueId))
.map(t => t.mergeStartId ~ t.mergeEndId)
.update(mergeStartId, mergeEndId)
}
// def mergePullRequest(originUserName: String, originRepositoryName: String, issueId: Int,
// mergeStartId: String, mergeEndId: String): Unit = {
// Query(PullRequests)
// .filter(_.byPrimaryKey(originUserName, originRepositoryName, issueId))
// .map(t => t.mergeStartId ~ t.mergeEndId)
// .update(mergeStartId, mergeEndId)
// }
}