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

Added compare revisions for Wiki changes.

Browse Source
This commit is contained in:
takezoe
2013-05-04 02:09:14 +09:00
parent fc8bd7d3a6
commit 66db3a898b
8 changed files with 223 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/scala/app/WikiController.scala
View File

@@ -45,6 +45,32 @@ class WikiController extends ControllerBase {
JGitUtil.getRepositoryInfo(owner, repository, servletContext))
}
get("/:owner/:repository/wiki/:page/_compare/:commitId"){
val owner = params("owner")
val repository = params("repository")
val page = params("page")
val commitId = params("commitId").split("\\.\\.\\.")
println(commitId(0))
println(commitId(1))
html.wikicompare(Some(page),
WikiUtil.getDiffs(Git.open(WikiUtil.getWikiRepositoryDir(owner, repository)), commitId(0), commitId(1)),
JGitUtil.getRepositoryInfo(owner, repository, servletContext))
}
get("/:owner/:repository/wiki/_compare/:commitId"){
val owner = params("owner")
val repository = params("repository")
val commitId = params("commitId").split("\\.\\.\\.")
println(commitId(0))
println(commitId(1))
html.wikicompare(None,
WikiUtil.getDiffs(Git.open(WikiUtil.getWikiRepositoryDir(owner, repository)), commitId(0), commitId(1)),
JGitUtil.getRepositoryInfo(owner, repository, servletContext))
}
get("/:owner/:repository/wiki/:page/_edit"){
val owner = params("owner")