Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 13:35:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #180)Fix compilation error.

Browse Source
This commit is contained in:
takezoe
2013-10-30 13:22:54 +09:00
parent f160952817
commit 35c8f02f90
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/service/WikiService.scala
View File

@@ -137,13 +137,13 @@ trait WikiService {
fh.getChangeType match { fh.getChangeType match {
case DiffEntry.ChangeType.MODIFY => { case DiffEntry.ChangeType.MODIFY => {
val source = getWikiPage(owner, repository, fh.getNewPath.replaceFirst("\\.md$", "")).map(_.content).getOrElse("") val source = getWikiPage(owner, repository, fh.getNewPath.replaceFirst("\\.md$", "")).map(_.content).getOrElse("")
val applied = PatchUtil.apply(source, fh) val applied = PatchUtil.apply(source, patch, fh)
if(applied != null){ if(applied != null){
Seq(RevertInfo("ADD", fh.getNewPath, applied)) Seq(RevertInfo("ADD", fh.getNewPath, applied))
} else Nil } else Nil
} }
case DiffEntry.ChangeType.ADD => { case DiffEntry.ChangeType.ADD => {
val applied = PatchUtil.apply("", fh) val applied = PatchUtil.apply("", patch, fh)
if(applied != null){ if(applied != null){
Seq(RevertInfo("ADD", fh.getNewPath, applied)) Seq(RevertInfo("ADD", fh.getNewPath, applied))
} else Nil } else Nil
@@ -152,7 +152,7 @@ trait WikiService {
Seq(RevertInfo("DELETE", fh.getNewPath, "")) Seq(RevertInfo("DELETE", fh.getNewPath, ""))
} }
case DiffEntry.ChangeType.RENAME => { case DiffEntry.ChangeType.RENAME => {
val applied = PatchUtil.apply("", fh) val applied = PatchUtil.apply("", patch, fh)
if(applied != null){ if(applied != null){
Seq(RevertInfo("DELETE", fh.getOldPath, ""), RevertInfo("ADD", fh.getNewPath, applied)) Seq(RevertInfo("DELETE", fh.getOldPath, ""), RevertInfo("ADD", fh.getNewPath, applied))
} else { } else {