Add support for forking single branch

Fixes #25117

Add UI for choosing branch to fork

Change default branch on single-branch forks

Author: dsseng

options/locale/locale_en-US.ini

@@ -935,6 +935,8 @@ fork_from = Fork From
 already_forked = You've already forked %s
 fork_to_different_account = Fork to a different account
 fork_visibility_helper = The visibility of a forked repository cannot be changed.
+fork_branch = Branch to be cloned to the fork
+all_branches = All branches
 use_template = Use this template
 clone_in_vsc = Clone in VS Code
 download_zip = Download ZIP

routers/web/repo/pull.go

@@ -176,6 +176,21 @@ func getForkRepository(ctx *context.Context) *repo_model.Repository {
 		ctx.Data["ContextUser"] = orgs[0]
 	}
 
+	branches, err := git_model.FindBranchNames(ctx, git_model.FindBranchOptions{
+		RepoID: ctx.Repo.Repository.ID,
+		ListOptions: db.ListOptions{
+			ListAll: true,
+		},
+		IsDeletedBranch: util.OptionalBoolFalse,
+		// Add it as the first option
+		ExcludeBranchNames: []string{forkRepo.DefaultBranch},
+	})
+	if err != nil {
+		ctx.ServerError("FindBranchNames", err)
+		return nil
+	}
+	ctx.Data["Branches"] = append([]string{forkRepo.DefaultBranch}, branches...)
+
 	return forkRepo
 }
 
@@ -258,9 +273,10 @@ func ForkPost(ctx *context.Context) {
 	}
 
 	repo, err := repo_service.ForkRepository(ctx, ctx.Doer, ctxUser, repo_service.ForkRepoOptions{
-		BaseRepo:    forkRepo,
-		Name:        form.RepoName,
-		Description: form.Description,
+		BaseRepo:     forkRepo,
+		Name:         form.RepoName,
+		Description:  form.Description,
+		SingleBranch: form.ForkSingleBranch,
 	})
 	if err != nil {
 		ctx.Data["Err_RepoName"] = true

services/forms/repo_form.go

@@ -50,6 +50,8 @@ type CreateRepoForm struct {
 	Avatar       bool
 	Labels       bool
 	TrustModel   string
+
+	ForkSingleBranch string
 }
 
 // Validate validates the fields

services/repository/fork.go

@@ -44,9 +44,10 @@ func (err ErrForkAlreadyExist) Unwrap() error {
 
 // ForkRepoOptions contains the fork repository options
 type ForkRepoOptions struct {
-	BaseRepo    *repo_model.Repository
-	Name        string
-	Description string
+	BaseRepo     *repo_model.Repository
+	Name         string
+	Description  string
+	SingleBranch string
 }
 
 // ForkRepository forks a repository
@@ -70,14 +71,18 @@ func ForkRepository(ctx context.Context, doer, owner *user_model.User, opts Fork
 		}
 	}
 
+	defaultBranch := opts.BaseRepo.DefaultBranch
+	if opts.SingleBranch != "" {
+		defaultBranch = opts.SingleBranch
+	}
 	repo := &repo_model.Repository{
 		OwnerID:       owner.ID,
 		Owner:         owner,
 		OwnerName:     owner.Name,
 		Name:          opts.Name,
 		LowerName:     strings.ToLower(opts.Name),
 		Description:   opts.Description,
-		DefaultBranch: opts.BaseRepo.DefaultBranch,
+		DefaultBranch: defaultBranch,
 		IsPrivate:     opts.BaseRepo.IsPrivate || opts.BaseRepo.Owner.Visibility == structs.VisibleTypePrivate,
 		IsEmpty:       opts.BaseRepo.IsEmpty,
 		IsFork:        true,
@@ -134,9 +139,15 @@ func ForkRepository(ctx context.Context, doer, owner *user_model.User, opts Fork
 
 		needsRollback = true
 
+		var cloneCmd *git.Command
+		if opts.SingleBranch != "" {
+			cloneCmd = git.NewCommand(txCtx, "clone", "--bare", "--single-branch", "--branch")
+			cloneCmd = cloneCmd.AddDynamicArguments(opts.SingleBranch)
+		} else {
+			cloneCmd = git.NewCommand(txCtx, "clone", "--bare")
+		}
 		repoPath := repo_model.RepoPath(owner.Name, repo.Name)
-		if stdout, _, err := git.NewCommand(txCtx,
-			"clone", "--bare").AddDynamicArguments(oldRepoPath, repoPath).
+		if stdout, _, err := cloneCmd.AddDynamicArguments(oldRepoPath, repoPath).
 			SetDescription(fmt.Sprintf("ForkRepository(git clone): %s to %s", opts.BaseRepo.FullName(), repo.FullName())).
 			RunStdBytes(&git.RunOpts{Timeout: 10 * time.Minute}); err != nil {
 			log.Error("Fork Repository (git clone) Failed for %v (from %v):\nStdout: %s\nError: %v", repo, opts.BaseRepo, stdout, err)

templates/repo/pulls/fork.tmpl

@@ -51,6 +51,26 @@
 						</div>
 						<span class="help">{{.locale.Tr "repo.fork_visibility_helper"}}</span>
 					</div>
+					<div class="inline field">
+						<label>{{.locale.Tr "repo.fork_branch"}}</label>
+						<div class="ui selection dropdown">
+							<input type="hidden" id="fork_single_branch" name="fork_single_branch" value="" required>
+							<span class="text truncated-item-container" data-value="" title="{{.locale.Tr "repo.all_branches"}}">
+								<span class="truncated-item-name">{{.locale.Tr "repo.all_branches"}}</span>
+							</span>
+							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+							<div class="menu">
+								<div class="item truncated-item-container" data-value="" title="{{.locale.Tr "repo.all_branches"}}">
+									<span class="truncated-item-name">{{.locale.Tr "repo.all_branches"}}</span>
+								</div>
+								{{range .Branches}}
+									<div class="item truncated-item-container" data-value="{{.}}" title="{{.}}">
+										<span class="truncated-item-name">{{.}}</span>
+									</div>
+								{{end}}
+							</div>
+						</div>
+					</div>
 					<div class="inline field {{if .Err_Description}}error{{end}}">
 						<label for="description">{{.locale.Tr "repo.repo_desc"}}</label>
 						<textarea id="description" name="description">{{.description}}</textarea>