-
Notifications
You must be signed in to change notification settings - Fork 4
Add worktree subcommand
#32
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,190 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "errors" | ||
| "fmt" | ||
| "os" | ||
| "path/filepath" | ||
|
|
||
| "github.com/go-git/go-billy/v6/memfs" | ||
| "github.com/go-git/go-billy/v6/osfs" | ||
| "github.com/go-git/go-git/v6" | ||
| "github.com/go-git/go-git/v6/plumbing" | ||
| "github.com/go-git/go-git/v6/x/plumbing/worktree" | ||
| xstorage "github.com/go-git/go-git/v6/x/storage" | ||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| var ( | ||
| worktreeAddCommit string | ||
| worktreeAddDetach bool | ||
| ) | ||
|
|
||
| func init() { | ||
| worktreeAddCmd.Flags().StringVarP(&worktreeAddCommit, "commit", "c", "", "Commit hash to checkout in the new worktree") | ||
| worktreeAddCmd.Flags().BoolVarP(&worktreeAddDetach, "detach", "d", false, "Create a detached HEAD worktree") | ||
| worktreeCmd.AddCommand(worktreeAddCmd) | ||
| worktreeCmd.AddCommand(worktreeListCmd) | ||
| worktreeCmd.AddCommand(worktreeRemoveCmd) | ||
| rootCmd.AddCommand(worktreeCmd) | ||
| } | ||
|
|
||
| var worktreeCmd = &cobra.Command{ | ||
| Use: "worktree <command>", | ||
| Short: "Manage repository worktrees", | ||
| RunE: func(cmd *cobra.Command, _ []string) error { | ||
| return cmd.Usage() | ||
| }, | ||
| DisableFlagsInUseLine: true, | ||
| } | ||
|
|
||
| var worktreeAddCmd = &cobra.Command{ | ||
| Use: "add <path>", | ||
| Short: "Add a new linked worktree", | ||
| Args: cobra.ExactArgs(1), | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| path := args[0] | ||
| name := filepath.Base(path) | ||
|
|
||
| r, err := git.PlainOpen(".") | ||
| if err != nil { | ||
| return fmt.Errorf("failed to open repository: %w", err) | ||
| } | ||
|
|
||
| w, err := worktree.New(r.Storer) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to create worktree manager: %w", err) | ||
| } | ||
|
|
||
| wt := osfs.New(path) | ||
|
|
||
| var opts []worktree.Option | ||
| if worktreeAddDetach { | ||
| opts = append(opts, worktree.WithDetachedHead()) | ||
| } | ||
| if worktreeAddCommit != "" { | ||
| hash := plumbing.NewHash(worktreeAddCommit) | ||
| if !hash.IsZero() { | ||
| opts = append(opts, worktree.WithCommit(hash)) | ||
| } | ||
| } | ||
|
|
||
| err = w.Add(wt, name, opts...) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to add worktree: %w", err) | ||
| } | ||
|
|
||
| fmt.Fprintf(cmd.OutOrStdout(), "Worktree '%s' created at '%s'\n", name, path) | ||
|
|
||
| return nil | ||
| }, | ||
| DisableFlagsInUseLine: true, | ||
| } | ||
|
|
||
| var worktreeListCmd = &cobra.Command{ | ||
| Use: "list", | ||
| Short: "List all linked worktrees", | ||
| Args: cobra.NoArgs, | ||
| RunE: func(cmd *cobra.Command, _ []string) error { | ||
| r, err := git.PlainOpen(".") | ||
| if err != nil { | ||
| return fmt.Errorf("failed to open repository: %w", err) | ||
| } | ||
|
|
||
| w, err := worktree.New(r.Storer) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to create worktree manager: %w", err) | ||
| } | ||
|
|
||
| cwd, err := os.Getwd() | ||
| if err != nil { | ||
| return fmt.Errorf("failed to get current directory: %w", err) | ||
| } | ||
|
|
||
| ref, err := r.Head() | ||
| if err != nil { | ||
| return fmt.Errorf("failed to get HEAD: %w", err) | ||
| } | ||
|
|
||
| fmt.Fprintf(cmd.OutOrStdout(), "%-30s %s %s\n", cwd, ref.Hash().String()[:7], refName(ref)) | ||
|
|
||
| worktrees, err := w.List() | ||
| if err != nil { | ||
| return fmt.Errorf("failed to list worktrees: %w", err) | ||
| } | ||
|
|
||
| wts, ok := r.Storer.(xstorage.WorktreeStorer) | ||
| if !ok { | ||
| return errors.New("storer does not implement WorktreeStorer") | ||
| } | ||
|
|
||
| commonDir := wts.Filesystem() | ||
| for _, name := range worktrees { | ||
| gitdirPath := filepath.Join(commonDir.Root(), "worktrees", name, "gitdir") | ||
| gitdirData, err := os.ReadFile(gitdirPath) | ||
| if err != nil || len(gitdirData) == 0 { | ||
| continue | ||
| } | ||
|
|
||
| wtPath := filepath.Dir(string(gitdirData[:len(gitdirData)-1])) | ||
pjbgf marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| wt := memfs.New() | ||
| err = w.Init(wt, name) | ||
| if err != nil { | ||
| continue | ||
| } | ||
|
|
||
| wtRepo, err := w.Open(wt) | ||
| if err != nil { | ||
| continue | ||
| } | ||
|
|
||
| wtRef, err := wtRepo.Head() | ||
| if err != nil { | ||
| return fmt.Errorf("failed to get HEAD: %w", err) | ||
pjbgf marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| fmt.Fprintf(cmd.OutOrStdout(), "%-30s %s %s\n", wtPath, wtRef.Hash().String()[:7], refName(wtRef)) | ||
| } | ||
|
|
||
| return nil | ||
| }, | ||
| DisableFlagsInUseLine: true, | ||
| } | ||
|
|
||
| func refName(ref *plumbing.Reference) string { | ||
| name := ref.Name() | ||
| if name.IsBranch() { | ||
| return fmt.Sprintf("[%s]", name.Short()) | ||
| } | ||
|
|
||
| return fmt.Sprintf("(detached %s)", string(ref.Name())) | ||
| } | ||
|
|
||
| var worktreeRemoveCmd = &cobra.Command{ | ||
| Use: "remove <name>", | ||
| Short: "Remove a linked worktree", | ||
| Args: cobra.ExactArgs(1), | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| name := args[0] | ||
|
|
||
| r, err := git.PlainOpen(".") | ||
| if err != nil { | ||
| return fmt.Errorf("failed to open repository: %w", err) | ||
| } | ||
|
|
||
| wt, err := worktree.New(r.Storer) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to create worktree manager: %w", err) | ||
| } | ||
|
|
||
| err = wt.Remove(name) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to remove worktree: %w", err) | ||
| } | ||
|
|
||
| fmt.Fprintf(cmd.OutOrStdout(), "Worktree '%s' removed\n", name) | ||
|
|
||
| return nil | ||
| }, | ||
| DisableFlagsInUseLine: true, | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.