aboutsummaryrefslogtreecommitdiff
path: root/internal/db/wiki.go
diff options
context:
space:
mode:
authorᴜɴᴋɴᴡᴏɴ <u@gogs.io>2020-03-08 19:09:31 +0800
committerGitHub <noreply@github.com>2020-03-08 19:09:31 +0800
commit6437d0180b97a26319b50c2e22927dac7c94fcdd (patch)
tree3d0d097e7f498e4b970065096e7500876d365a8b /internal/db/wiki.go
parentc65b5b9f84dee21dc362311b299694e8e00f6ac6 (diff)
git: migrate to github.com/gogs/git-module@v1.0.0 (#5958)
* WIP * Finish `internal/db/git_diff.go` * FInish internal/db/mirror.go * Finish internal/db/pull.go * Finish internal/db/release.go * Finish internal/db/repo.go * Finish internal/db/repo_branch.go * Finish internal/db/repo_editor.go * Finish internal/db/update.go * Save my work * Add license header * Compile! * Merge master * Finish internal/cmd/hook.go * Finish internal/conf/static.go * Finish internal/context/repo.go * Finish internal/db/action.go * Finish internal/db/git_diff.go * Fix submodule URL inferring * Finish internal/db/mirror.go * Updat to beta.4 * css: update fonts * Finish internal/db/pull.go * Finish internal/db/release.go * Finish internal/db/repo_branch.go * Finish internal/db/wiki.go * gitutil: enhance infer submodule UR * Finish internal/route/api/v1/repo/commits.go * mirror: only collect branch commits after sync * mirror: fix tag support * Finish internal/db/repo.go * Finish internal/db/repo_editor.go * Finish internal/db/update.go * Finish internal/gitutil/pull_request.go * Make it compile * Finish internal/route/repo/setting.go * Finish internal/route/repo/branch.go * Finish internal/route/api/v1/repo/file.go * Finish internal/route/repo/download.go * Finish internal/route/repo/editor.go * Use helper * Finish internal/route/repo/issue.go * Finish internal/route/repo/pull.go * Finish internal/route/repo/release.go * Finish internal/route/repo/repo.go * Finish internal/route/repo/wiki.go * Finish internal/route/repo/commit.go * Finish internal/route/repo/view.go * Finish internal/gitutil/tag.go * go.sum
Diffstat (limited to 'internal/db/wiki.go')
-rw-r--r--internal/db/wiki.go34
1 files changed, 14 insertions, 20 deletions
diff --git a/internal/db/wiki.go b/internal/db/wiki.go
index 85005e7b..5fbb9fb6 100644
--- a/internal/db/wiki.go
+++ b/internal/db/wiki.go
@@ -62,8 +62,8 @@ func (repo *Repository) InitWiki() error {
return nil
}
- if err := git.InitRepository(repo.WikiPath(), true); err != nil {
- return fmt.Errorf("InitRepository: %v", err)
+ if err := git.Init(repo.WikiPath(), git.InitOptions{Bare: true}); err != nil {
+ return fmt.Errorf("init repository: %v", err)
} else if err = createDelegateHooks(repo.WikiPath()); err != nil {
return fmt.Errorf("createDelegateHooks: %v", err)
}
@@ -125,15 +125,12 @@ func (repo *Repository) updateWikiPage(doer *User, oldTitle, title, content, mes
if len(message) == 0 {
message = "Update page '" + title + "'"
}
- if err = git.AddChanges(localPath, true); err != nil {
- return fmt.Errorf("AddChanges: %v", err)
- } else if err = git.CommitChanges(localPath, git.CommitChangesOptions{
- Committer: doer.NewGitSig(),
- Message: message,
- }); err != nil {
- return fmt.Errorf("CommitChanges: %v", err)
- } else if err = git.Push(localPath, "origin", "master"); err != nil {
- return fmt.Errorf("Push: %v", err)
+ if err = git.RepoAdd(localPath, git.AddOptions{All: true}); err != nil {
+ return fmt.Errorf("add all changes: %v", err)
+ } else if err = git.RepoCommit(localPath, doer.NewGitSig(), message); err != nil {
+ return fmt.Errorf("commit changes: %v", err)
+ } else if err = git.RepoPush(localPath, "origin", "master"); err != nil {
+ return fmt.Errorf("push: %v", err)
}
return nil
@@ -164,15 +161,12 @@ func (repo *Repository) DeleteWikiPage(doer *User, title string) (err error) {
message := "Delete page '" + title + "'"
- if err = git.AddChanges(localPath, true); err != nil {
- return fmt.Errorf("AddChanges: %v", err)
- } else if err = git.CommitChanges(localPath, git.CommitChangesOptions{
- Committer: doer.NewGitSig(),
- Message: message,
- }); err != nil {
- return fmt.Errorf("CommitChanges: %v", err)
- } else if err = git.Push(localPath, "origin", "master"); err != nil {
- return fmt.Errorf("Push: %v", err)
+ if err = git.RepoAdd(localPath, git.AddOptions{All: true}); err != nil {
+ return fmt.Errorf("add all changes: %v", err)
+ } else if err = git.RepoCommit(localPath, doer.NewGitSig(), message); err != nil {
+ return fmt.Errorf("commit changes: %v", err)
+ } else if err = git.RepoPush(localPath, "origin", "master"); err != nil {
+ return fmt.Errorf("push: %v", err)
}
return nil