mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-06 05:25:50 +01:00
Improve Git repository creation.
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
package app
|
package app
|
||||||
|
|
||||||
import util.Directory._
|
import util.Directory._
|
||||||
import util.UsersAuthenticator
|
import util.{JGitUtil, UsersAuthenticator}
|
||||||
import service._
|
import service._
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import org.eclipse.jgit.api.Git
|
import org.eclipse.jgit.api.Git
|
||||||
@@ -56,13 +56,7 @@ trait CreateRepositoryControllerBase extends ControllerBase {
|
|||||||
|
|
||||||
// Create the actual repository
|
// Create the actual repository
|
||||||
val gitdir = getRepositoryDir(loginUserName, form.name)
|
val gitdir = getRepositoryDir(loginUserName, form.name)
|
||||||
val repository = new RepositoryBuilder().setGitDir(gitdir).setBare.build
|
JGitUtil.initRepository(gitdir)
|
||||||
|
|
||||||
repository.create
|
|
||||||
|
|
||||||
val config = repository.getConfig
|
|
||||||
config.setBoolean("http", null, "receivepack", true)
|
|
||||||
config.save
|
|
||||||
|
|
||||||
if(form.createReadme){
|
if(form.createReadme){
|
||||||
val tmpdir = getInitRepositoryDir(loginUserName, form.name)
|
val tmpdir = getInitRepositoryDir(loginUserName, form.name)
|
||||||
@@ -73,9 +67,13 @@ trait CreateRepositoryControllerBase extends ControllerBase {
|
|||||||
// Create README.md
|
// Create README.md
|
||||||
FileUtils.writeStringToFile(new File(tmpdir, "README.md"),
|
FileUtils.writeStringToFile(new File(tmpdir, "README.md"),
|
||||||
if(form.description.nonEmpty){
|
if(form.description.nonEmpty){
|
||||||
form.name + "\n===============\n\n" + form.description.get
|
form.name + "\n" +
|
||||||
|
"===============\n" +
|
||||||
|
"\n" +
|
||||||
|
form.description.get
|
||||||
} else {
|
} else {
|
||||||
form.name + "\n===============\n"
|
form.name + "\n" +
|
||||||
|
"===============\n"
|
||||||
}, "UTF-8")
|
}, "UTF-8")
|
||||||
|
|
||||||
val git = Git.open(tmpdir)
|
val git = Git.open(tmpdir)
|
||||||
@@ -95,7 +93,7 @@ trait CreateRepositoryControllerBase extends ControllerBase {
|
|||||||
recordCreateRepositoryActivity(loginUserName, form.name, loginUserName)
|
recordCreateRepositoryActivity(loginUserName, form.name, loginUserName)
|
||||||
|
|
||||||
// redirect to the repository
|
// redirect to the repository
|
||||||
redirect("/%s/%s".format(loginUserName, form.name))
|
redirect(s"/${loginUserName}/${form.name}")
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -68,12 +68,10 @@ trait WikiService {
|
|||||||
lock(owner.userName, repository){
|
lock(owner.userName, repository){
|
||||||
val dir = Directory.getWikiRepositoryDir(owner.userName, repository)
|
val dir = Directory.getWikiRepositoryDir(owner.userName, repository)
|
||||||
if(!dir.exists){
|
if(!dir.exists){
|
||||||
val repo = new RepositoryBuilder().setGitDir(dir).setBare.build
|
|
||||||
try {
|
try {
|
||||||
repo.create
|
JGitUtil.initRepository(dir)
|
||||||
saveWikiPage(owner.userName, repository, "Home", "Home", "Welcome to the %s wiki!!".format(repository), owner, "Initial Commit")
|
saveWikiPage(owner.userName, repository, "Home", "Home", s"Welcome to the ${repository} wiki!!", owner, "Initial Commit")
|
||||||
} finally {
|
} finally {
|
||||||
repo.close
|
|
||||||
// once delete cloned repository because initial cloned repository does not have 'branch.master.merge'
|
// once delete cloned repository because initial cloned repository does not have 'branch.master.merge'
|
||||||
FileUtils.deleteDirectory(Directory.getWikiWorkDir(owner.userName, repository))
|
FileUtils.deleteDirectory(Directory.getWikiWorkDir(owner.userName, repository))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -502,4 +502,20 @@ object JGitUtil {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def initRepository(dir: java.io.File): Unit = {
|
||||||
|
val repository = new RepositoryBuilder().setGitDir(dir).setBare.build
|
||||||
|
try {
|
||||||
|
repository.create
|
||||||
|
setReceivePack(repository)
|
||||||
|
} finally {
|
||||||
|
repository.close
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private def setReceivePack(repository: org.eclipse.jgit.lib.Repository): Unit = {
|
||||||
|
val config = repository.getConfig
|
||||||
|
config.setBoolean("http", null, "receivepack", true)
|
||||||
|
config.save
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user