From a1dc19fa2605e4ce92d6a0f2959065c0ae768d1e Mon Sep 17 00:00:00 2001 From: takezoe Date: Wed, 30 Oct 2013 11:39:55 +0900 Subject: [PATCH] (refs #180)Remove Directory#getWikiWorkDir() --- src/main/scala/service/WikiService.scala | 9 ++------- src/main/scala/util/Directory.scala | 6 ------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/main/scala/service/WikiService.scala b/src/main/scala/service/WikiService.scala index eb77e4bb2..2a3cd6ec1 100644 --- a/src/main/scala/service/WikiService.scala +++ b/src/main/scala/service/WikiService.scala @@ -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) } } } diff --git a/src/main/scala/util/Directory.scala b/src/main/scala/util/Directory.scala index 540996257..f7f064a58 100644 --- a/src/main/scala/util/Directory.scala +++ b/src/main/scala/util/Directory.scala @@ -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") } \ No newline at end of file