allow create new file on empty repository

Author: lunny

modules/context/repo.go

@@ -74,7 +74,7 @@ type Repository struct {
 
 // CanEnableEditor returns true if repository is editable and user has proper access level.
 func (r *Repository) CanEnableEditor() bool {
-	return r.Permission.CanWrite(unit_model.TypeCode) && r.Repository.CanEnableEditor() && r.IsViewBranch && !r.Repository.IsArchived
+	return r.Permission.CanWrite(unit_model.TypeCode) && r.Repository.CanEnableEditor() && (r.IsViewBranch || r.Repository.IsEmpty) && !r.Repository.IsArchived
 }
 
 // CanCreateBranch returns true if repository is editable and user has proper access level.
@@ -753,6 +753,10 @@ func RepoRefByType(refType RepoRefType, ignoreNotExistErr ...bool) func(*Context
 	return func(ctx *Context) (cancel context.CancelFunc) {
 		// Empty repository does not have reference information.
 		if ctx.Repo.Repository.IsEmpty {
+			ctx.Repo.BranchName = ctx.Repo.Repository.DefaultBranch
+			ctx.Repo.TreePath = ""
+			ctx.Data["TreePath"] = ctx.Repo.TreePath
+			ctx.Repo.IsViewBranch = true
 			return
 		}
 

modules/repofiles/update.go

@@ -131,9 +131,11 @@ func CreateOrUpdateRepoFile(repo *models.Repository, doer *models.User, opts *Up
 		opts.NewBranch = opts.OldBranch
 	}
 
-	// oldBranch must exist for this operation
-	if _, err := repo_module.GetBranch(repo, opts.OldBranch); err != nil {
-		return nil, err
+	if !repo.IsEmpty {
+		// oldBranch must exist for this operation
+		if _, err := repo_module.GetBranch(repo, opts.OldBranch); err != nil {
+			return nil, err
+		}
 	}
 
 	// A NewBranch can be specified for the file to be created/updated in a new branch.
@@ -153,6 +155,8 @@ 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
@@ -204,7 +208,6 @@ func CreateOrUpdateRepoFile(repo *models.Repository, doer *models.User, opts *Up
 			return nil, fmt.Errorf("DeleteRepoFile: Invalid last commit ID: %v", err)
 		}
 		opts.LastCommitID = lastCommitID.String()
-
 	}
 
 	encoding := "UTF-8"

options/locale/locale_en-US.ini

@@ -942,7 +942,7 @@ download_archive = Download Repository
 
 no_desc = No Description
 quick_guide = Quick Guide
-clone_this_repo = Clone this repository
+clone_this_repo = Upload files or Clone this repository
 create_new_repo_command = Creating a new repository on the command line
 push_exist_repo = Pushing an existing repository from the command line
 empty_message = This repository does not contain any content.

routers/web/repo/view.go

@@ -826,15 +826,11 @@ func renderCode(ctx *context.Context) {
 	ctx.Data["PageIsViewCode"] = true
 
 	if ctx.Repo.Repository.IsEmpty {
-<<<<<<< HEAD:routers/web/repo/view.go
-		ctx.HTML(http.StatusOK, tplRepoEMPTY)
-=======
 		if ctx.Repo.CanWrite(models.UnitTypeCode) {
 			ctx.Data["CanAddFile"] = true
 			ctx.Data["CanUploadFile"] = setting.Repository.Upload.Enabled
 		}
-		ctx.HTML(200, tplRepoEMPTY)
->>>>>>> 7d4422307 (Add buttons on empty repository page):routers/repo/view.go
+		ctx.HTML(http.StatusOK, tplRepoEMPTY)
 		return
 	}
 

routers/web/web.go

@@ -791,6 +791,16 @@ func RegisterRoutes(m *web.Route) {
 					Get(repo.UploadFile).
 					Post(bindIgnErr(forms.UploadRepoFileForm{}), repo.UploadFilePost)
 			}, context.RepoRefByType(context.RepoRefBranch), repo.MustBeEditable)
+		}, 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)