diff options
Diffstat (limited to 'update.go')
| -rw-r--r-- | update.go | 102 |
1 files changed, 88 insertions, 14 deletions
@@ -4,9 +4,20 @@ package main -import "github.com/codegangsta/cli" +import ( +"os" +"os/exec" +"strings" +"strconv" +"container/list" +"github.com/codegangsta/cli" //"github.com/gogits/gogs/modules/log" +"github.com/gogits/gogs/models" +"github.com/gogits/gogs/modules/base" +"github.com/qiniu/log" +"github.com/gogits/git" +) var CmdUpdate = cli.Command{ Name: "update", @@ -18,16 +29,39 @@ gogs serv provide access auth for repositories`, } // for command: ./gogs update -func runUpdate(*cli.Context) { - /*w, _ := os.Create("update.log") +func runUpdate(c *cli.Context) { + base.NewConfigContext() + models.LoadModelsConfig() + models.NewEngine() + + w, _ := os.Create("update.log") + defer w.Close() + log.SetOutput(w) + args := c.Args() + if len(args) != 3 { + log.Error("received less 3 parameters") + return + } + + refName := args[0] + oldCommitId := args[1] + newCommitId := args[2] + userName := os.Getenv("userName") userId := os.Getenv("userId") - repoId := os.Getenv("repoId") + //repoId := os.Getenv("repoId") repoName := os.Getenv("repoName") + log.Info("username", userName) + log.Info("repoName", repoName) f := models.RepoPath(userName, repoName) + log.Info("f", f) + + gitUpdate := exec.Command("git", "update-server-info") + gitUpdate.Dir = f + gitUpdate.Run() repo, err := git.OpenRepository(f) if err != nil { @@ -35,13 +69,45 @@ func runUpdate(*cli.Context) { return } - ref, err := repo.LookupReference("HEAD") + ref, err := repo.LookupReference(refName) + if err != nil { + log.Error("runUpdate.Ref repoId: %v", err) + return + } + + oldOid, err := git.NewOidFromString(oldCommitId) + if err != nil { + log.Error("runUpdate.Ref repoId: %v", err) + return + } + + oldCommit, err := repo.LookupCommit(oldOid) + if err != nil { + log.Error("runUpdate.Ref repoId: %v", err) + return + } + + newOid, err := git.NewOidFromString(newCommitId) + if err != nil { + log.Error("runUpdate.Ref repoId: %v", err) + return + } + + newCommit, err := repo.LookupCommit(newOid) if err != nil { log.Error("runUpdate.Ref repoId: %v", err) return } - lastCommit, err := repo.LookupCommit(ref.Oid) + var l *list.List + // if a new branch + if strings.HasPrefix(oldCommitId, "0000000") { + l, err = ref.AllCommits() + + } else { + l = ref.CommitsBetween(newCommit, oldCommit) + } + if err != nil { log.Error("runUpdate.Commit repoId: %v", err) return @@ -52,18 +118,26 @@ func runUpdate(*cli.Context) { log.Error("runUpdate.Parse userId: %v", err) return } - sRepoId, err := strconv.Atoi(repoId) + + repos, err := models.GetRepositoryByName(int64(sUserId), repoName) if err != nil { - log.Error("runUpdate.Parse repoId: %v", err) + log.Error("runUpdate.GetRepositoryByName userId: %v", err) return } + commits := make([][]string, 0) - commits = append(commits, []string{lastCommit.Id().String(), lastCommit.Message()}) + var maxCommits = 3 + for e := l.Front(); e != nil; e = e.Next() { + commit := e.Value.(*git.Commit) + commits = append(commits, []string{commit.Id().String(), commit.Message()}) + if len(commits) >= maxCommits { + break + } + } + + //commits = append(commits, []string{lastCommit.Id().String(), lastCommit.Message()}) if err = models.CommitRepoAction(int64(sUserId), userName, - int64(sRepoId), repoName, commits); err != nil { + repos.Id, repoName, git.BranchName(refName), &base.PushCommits{l.Len(), commits}); err != nil { log.Error("runUpdate.models.CommitRepoAction: %v", err) - } else { - l := exec.Command("exec", "git", "update-server-info") - l.Run() - }*/ + } } |