Update

Author: lunny

modules/repofiles/update.go

@@ -155,8 +155,6 @@ func CreateOrUpdateRepoFile(repo *models.Repository, doer *models.User, opts *Up
 		return nil, err
 	}
 
-	fmt.Println("2-------")
-
 	// If FromTreePath is not set, set it to the opts.TreePath
 	if opts.TreePath != "" && opts.FromTreePath == "" {
 		opts.FromTreePath = opts.TreePath
@@ -181,6 +179,19 @@ func CreateOrUpdateRepoFile(repo *models.Repository, doer *models.User, opts *Up
 
 	author, committer := GetAuthorAndCommitterUsers(opts.Author, opts.Committer, doer)
 
+	if repo.IsEmpty {
+		err := repo_module.CheckInitRepository(repo.OwnerName, repo.Name)
+		if err != nil && !models.IsErrRepoFilesAlreadyExist(err) {
+			return nil, err
+		}
+
+		repo.IsEmpty = false
+		repo.DefaultBranch = opts.OldBranch
+		if err := models.UpdateRepository(repo, false); err != nil {
+			return nil, err
+		}
+	}
+
 	t, err := NewTemporaryUploadRepository(repo)
 	if err != nil {
 		log.Error("%v", err)

modules/repository/generate.go

@@ -271,7 +271,7 @@ func GenerateRepository(ctx context.Context, doer, owner *models.User, templateR
 		}
 	}
 
-	if err = checkInitRepository(owner.Name, generateRepo.Name); err != nil {
+	if err = CheckInitRepository(owner.Name, generateRepo.Name); err != nil {
 		return generateRepo, err
 	}
 

modules/repository/init.go

@@ -172,7 +172,8 @@ func initRepoCommit(tmpPath string, repo *models.Repository, u *models.User, def
 	return nil
 }
 
-func checkInitRepository(owner, name string) (err error) {
+// CheckInitRepository check and init git repository
+func CheckInitRepository(owner, name string) (err error) {
 	// Somehow the directory could exist.
 	repoPath := models.RepoPath(owner, name)
 	isExist, err := util.IsExist(repoPath)
@@ -198,7 +199,7 @@ func checkInitRepository(owner, name string) (err error) {
 
 // InitRepository initializes README and .gitignore if needed.
 func initRepository(ctx context.Context, repoPath string, u *models.User, repo *models.Repository, opts models.CreateRepoOptions) (err error) {
-	if err = checkInitRepository(repo.OwnerName, repo.Name); err != nil {
+	if err = CheckInitRepository(repo.OwnerName, repo.Name); err != nil {
 		return err
 	}
 

routers/web/repo/view.go

@@ -826,7 +826,7 @@ func renderCode(ctx *context.Context) {
 	ctx.Data["PageIsViewCode"] = true
 
 	if ctx.Repo.Repository.IsEmpty {
-		if ctx.Repo.CanWrite(models.UnitTypeCode) {
+		if ctx.Repo.CanWrite(unit_model.TypeCode) {
 			ctx.Data["CanAddFile"] = true
 			ctx.Data["CanUploadFile"] = setting.Repository.Upload.Enabled
 		}

routers/web/web.go

@@ -794,13 +794,6 @@ func RegisterRoutes(m *web.Route) {
 		}, context.RepoMustNotBeArchived(), reqRepoCodeWriter)
 
 		m.Group("", func() {
-			m.Group("", func() {
-				m.Combo("/_edit/*").Get(repo.EditFile).
-					Post(bindIgnErr(auth.EditRepoFileForm{}), repo.EditFilePost)
-				m.Post("/_preview/*", bindIgnErr(auth.EditPreviewDiffForm{}), repo.DiffPreviewPost)
-				m.Combo("/_delete/*").Get(repo.DeleteFile).
-					Post(bindIgnErr(auth.DeleteRepoFileForm{}), repo.DeleteFilePost)
-			}, context.RepoRefByType(context.RepoRefBranch), repo.MustBeEditable)
 			m.Group("", func() {
 				m.Post("/upload-file", repo.UploadFileToServer)
 				m.Post("/upload-remove", bindIgnErr(forms.RemoveUploadFileForm{}), repo.RemoveUploadFileFromServer)