Added changes suggested from automated tests

Author: Guillermo Prandi

models/repo_watch.go

@@ -87,10 +87,8 @@ func watchRepoMode(e Engine, watch Watch, mode RepoWatchMode) (err error) {
 		if _, err := e.ID(watch.ID).AllCols().Update(watch); err != nil {
 			return err
 		}
-	} else {
-		if _, err = e.Delete(Watch{ID: watch.ID}); err != nil {
-			return err
-		}
+	} else if _, err = e.Delete(Watch{ID: watch.ID}); err != nil {
+		return err
 	}
 	if repodiff != 0 {
 		_, err = e.Exec("UPDATE `repository` SET num_watches = num_watches + ? WHERE id = ?", repodiff, watch.RepoID)

routers/repo/http.go

@@ -460,7 +460,10 @@ func serviceRPC(h serviceHandler, service string) {
 		return
 	}
 
-	models.WatchIfAuto(userID, repoID, service == "receive-pack")
+	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) {