Browse Source

push tag support

Unknown 11 years ago
parent
commit
190b83e05e
3 changed files with 11 additions and 8 deletions
  1. 8 5
      models/action.go
  2. 1 1
      models/update.go
  3. 2 2
      templates/release/list.tmpl

+ 8 - 5
models/action.go

@@ -6,9 +6,10 @@ package models
 
 import (
 	"encoding/json"
+	"strings"
 	"time"
 
-	// "github.com/gogits/git"
+	"github.com/gogits/git"
 
 	"github.com/gogits/gogs/modules/base"
 	"github.com/gogits/gogs/modules/log"
@@ -74,10 +75,12 @@ func CommitRepoAction(userId int64, userName, actEmail string,
 
 	opType := OP_COMMIT_REPO
 	// Check it's tag push or branch.
-	// if git.IsTagExist(RepoPath(userName, repoName), refName) {
-	// 	opType = OP_PUSH_TAG
-	// 	commit = &base.PushCommits{}
-	// }
+	if strings.HasPrefix(refName, "refs/tags/") {
+		opType = OP_PUSH_TAG
+		commit = &base.PushCommits{}
+	}
+
+	refName = git.RefEndName(refName)
 
 	bs, err := json.Marshal(commit)
 	if err != nil {

+ 1 - 1
models/update.go

@@ -78,7 +78,7 @@ func Update(refName, oldCommitId, newCommitId, userName, repoName string, userId
 
 	//commits = append(commits, []string{lastCommit.Id().String(), lastCommit.Message()})
 	if err = CommitRepoAction(userId, userName, actEmail,
-		repos.Id, repoName, git.RefEndName(refName), &base.PushCommits{l.Len(), commits}); err != nil {
+		repos.Id, repoName, refName, &base.PushCommits{l.Len(), commits}); err != nil {
 		qlog.Fatalf("runUpdate.models.CommitRepoAction: %v", err)
 	}
 }

+ 2 - 2
templates/release/list.tmpl

@@ -5,8 +5,8 @@
 <div id="body" class="container">
     <div id="release">
         <h4 id="release-head">
-            <span class="release"><strong>Release</strong></span> /
-            <a class="tag" href="/{tag_link}">Tags</a>
+            <span class="release"><strong>Releases</strong></span><!--  /
+            <a class="tag" href="/{tag_link}">Tags</a> -->
             <!-- comment : if in tag page, show a.release and span.tag please -->
         </h4>
         <ul id="release-list" class="list-unstyled">