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)Remove Directory#getWikiWorkDir()

Browse Source
This commit is contained in:
takezoe
2013-10-30 11:39:55 +09:00
parent e79ded934f
commit a1dc19fa26
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,13 +48,8 @@ trait WikiService {
LockUtil.lock(s"${owner}/${repository}/wiki"){
defining(Directory.getWikiRepositoryDir(owner, repository)){ dir =>
if(!dir.exists){
try {
JGitUtil.initRepository(dir)
saveWikiPage(owner, repository, "Home", "Home", s"Welcome to the ${repository} wiki!!", loginAccount, "Initial Commit", None)
} finally {
// once delete cloned repository because initial cloned repository does not have 'branch.master.merge'
FileUtils.deleteDirectory(Directory.getWikiWorkDir(owner, repository))
}
JGitUtil.initRepository(dir)
saveWikiPage(owner, repository, "Home", "Home", s"Welcome to the ${repository} wiki!!", loginAccount, "Initial Commit", None)
}
}
}

6
src/main/scala/util/Directory.scala
View File

@@ -70,11 +70,5 @@ object Directory {
*/
def getWikiRepositoryDir(owner: String, repository: String): File =
new File(s"${RepositoryHome}/${owner}/${repository}.wiki.git")
/**
* Wiki working directory which is cloned from the wiki repository.
*/
def getWikiWorkDir(owner: String, repository: String): File =
new File(getTemporaryDir(owner, repository), "wiki")
}