Remove serv code

modules/repofiles/update.go

@@ -502,5 +502,10 @@ func PushUpdate(repo *models.Repository, branch string, opts models.PushUpdateOp
 	if opts.RefFullName == git.BranchPrefix+repo.DefaultBranch {
 		models.UpdateRepoIndexer(repo)
 	}
+
+	if err = models.WatchIfAuto(opts.PusherID, repo.ID, true); err != nil {
+		log.Warn("Fail to perform auto watch on user %v for repo %v: %v", opts.PusherID, repo.ID, err)
+	}
+
 	return nil
 }

routers/private/serv.go

@@ -268,20 +268,6 @@ func ServCommand(ctx *macaron.Context) {
 			return
 		}
 	}
-
-	// Auto-subscribe to repo if not anonymous user and not wiki
-	if !results.IsWiki && user != nil {
-		if err = models.WatchIfAuto(user.ID, repo.ID, mode == models.AccessModeWrite); err != nil {
-			log.Error("Failed to check auto watch for user %-v on %-v Error: %v", user, repo, err)
-			ctx.JSON(http.StatusInternalServerError, map[string]interface{}{
-				"results": results,
-				"type":    "InternalServerError",
-				"err":     fmt.Sprintf("Failed to check auto watch for user %s on repo %s Error: %v", user.Name, repo.Name, err),
-			})
-			return
-		}
-	}
-
 	log.Debug("Serv Results:\nIsWiki: %t\nIsDeployKey: %t\nKeyID: %d\tKeyName: %s\nUserName: %s\nUserID: %d\nOwnerName: %s\nRepoName: %s\nRepoID: %d",
 		results.IsWiki,
 		results.IsDeployKey,

routers/repo/http.go

@@ -26,8 +26,6 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/timeutil"
-
-	"github.com/Unknwon/com"
 )
 
 // HTTP implmentation git smart HTTP protocol
@@ -432,38 +430,6 @@ func serviceRPC(h serviceHandler, service string) {
 		log.Error("Fail to serve RPC(%s): %v - %s", service, err, stderr.String())
 		return
 	}
-
-	// Implement automatic watch on upload/receive
-	if service != "upload-pack" && service != "receive-pack" {
-		return
-	}
-
-	var (
-		repoID int64
-		userID int64
-	)
-
-	// Restore userID and repoID values from context
-	repoReg := regexp.MustCompile("^" + models.ProtectedBranchRepoID + "=(.*)$")
-	userReg := regexp.MustCompile("^" + models.EnvPusherID + "=(.*)$")
-
-	for _, env := range h.environ {
-		if m := repoReg.FindStringSubmatch(env); m != nil {
-			repoID = com.StrTo(m[1]).MustInt64()
-		}
-		if m := userReg.FindStringSubmatch(env); m != nil {
-			userID = com.StrTo(m[1]).MustInt64()
-		}
-	}
-
-	if userID == 0 || repoID == 0 {
-		return
-	}
-
-	if err = models.WatchIfAuto(userID, repoID, service == "receive-pack"); err != nil {
-		log.Warn("Fail to perform auto watch on user %v for repo %v: %v - %v", userID, repoID, err, stderr)
-		return
-	}
 }
 
 func serviceUploadPack(h serviceHandler) {