Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-01-05 23:30:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #1623)Copy attached / LFS files when repository is forked

Browse Source
This commit is contained in:
Naoki Takezoe
2017-06-27 14:52:37 +09:00
parent 47a131c232
commit 7761946ec0
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/scala/gitbucket/core/controller/AccountController.scala
View File

@@ -2,7 +2,7 @@ package gitbucket.core.controller
import gitbucket.core.account.html
import gitbucket.core.helper
import gitbucket.core.model.{GroupMember, Role, WebHook, WebHookContentType, AccountWebHook, RepositoryWebHook, RepositoryWebHookEvent}
import gitbucket.core.model.{AccountWebHook, GroupMember, RepositoryWebHook, RepositoryWebHookEvent, Role, WebHook, WebHookContentType}
import gitbucket.core.plugin.PluginRegistry
import gitbucket.core.service._
import gitbucket.core.service.WebHookService._
@@ -13,6 +13,7 @@ import gitbucket.core.util.Implicits._
import gitbucket.core.util.StringUtil._
import gitbucket.core.util._
import io.github.gitbucket.scalatra.forms._
import org.apache.commons.io.FileUtils
import org.scalatra.i18n.Messages
import org.scalatra.BadRequest
@@ -604,6 +605,12 @@ trait AccountControllerBase extends AccountManagementControllerBase {
getWikiRepositoryDir(repository.owner, repository.name),
getWikiRepositoryDir(accountName, repository.name))
// Copy files
FileUtils.copyDirectory(
Directory.getRepositoryFilesDir(repository.owner, repository.name),
Directory.getRepositoryFilesDir(accountName, repository.name)
)
// Record activity
recordForkActivity(repository.owner, repository.name, loginUserName, accountName)

15
src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
View File

@@ -133,21 +133,12 @@ trait RepositorySettingsControllerBase extends ControllerBase {
FileUtils.moveDirectory(dir, getWikiRepositoryDir(repository.owner, form.repositoryName))
}
}
// Move lfs directory
defining(getLfsDir(repository.owner, repository.name)){ dir =>
// Move files directory
defining(getRepositoryFilesDir(repository.owner, repository.name)){ dir =>
if(dir.isDirectory) {
FileUtils.moveDirectory(dir, getLfsDir(repository.owner, form.repositoryName))
FileUtils.moveDirectory(dir, getRepositoryFilesDir(repository.owner, form.repositoryName))
}
}
// Move attached directory
defining(getAttachedDir(repository.owner, repository.name)){ dir =>
if(dir.isDirectory) {
FileUtils.moveDirectory(dir, getAttachedDir(repository.owner, form.repositoryName))
}
}
// Delete parent directory
FileUtil.deleteDirectoryIfEmpty(getRepositoryFilesDir(repository.owner, repository.name))
// Call hooks
PluginRegistry().getRepositoryHooks.foreach(_.renamed(repository.owner, repository.name, form.repositoryName))
}

4
src/main/scala/gitbucket/core/service/RepositoryService.scala
View File

@@ -59,8 +59,8 @@ trait RepositoryService { self: AccountService =>
(Repositories filter { t => t.byRepository(oldUserName, oldRepositoryName) } firstOption).map { repository =>
Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName)
val webHooks = RepositoryWebHooks .filter(_.byRepository(oldUserName, oldRepositoryName)).list
val webHookEvents = RepositoryWebHookEvents .filter(_.byRepository(oldUserName, oldRepositoryName)).list
val webHooks = RepositoryWebHooks .filter(_.byRepository(oldUserName, oldRepositoryName)).list
val webHookEvents = RepositoryWebHookEvents.filter(_.byRepository(oldUserName, oldRepositoryName)).list
val milestones = Milestones .filter(_.byRepository(oldUserName, oldRepositoryName)).list
val issueId = IssueId .filter(_.byRepository(oldUserName, oldRepositoryName)).list
val issues = Issues .filter(_.byRepository(oldUserName, oldRepositoryName)).list