|
| 1 | +package main |
| 2 | + |
| 3 | +import ( |
| 4 | + "errors" |
| 5 | + "fmt" |
| 6 | + "os" |
| 7 | + "strings" |
| 8 | + |
| 9 | + "github.com/go-git/go-git/v6" |
| 10 | + "github.com/go-git/go-git/v6/plumbing/object" |
| 11 | + "github.com/spf13/cobra" |
| 12 | +) |
| 13 | + |
| 14 | +func init() { |
| 15 | + rootCmd.AddCommand(checkoutCmd) |
| 16 | +} |
| 17 | + |
| 18 | +var checkoutCmd = &cobra.Command{ |
| 19 | + Use: "checkout <tree-ish> -- <pathspec>...", |
| 20 | + Short: "Restore working tree files from a tree", |
| 21 | + Args: cobra.MinimumNArgs(2), |
| 22 | + RunE: func(cmd *cobra.Command, args []string) error { |
| 23 | + treeish, paths, err := splitCheckoutArgs(cmd, args) |
| 24 | + if err != nil { |
| 25 | + return err |
| 26 | + } |
| 27 | + |
| 28 | + if treeish != "HEAD" { |
| 29 | + return fmt.Errorf("only HEAD is supported as tree-ish, got %q", treeish) |
| 30 | + } |
| 31 | + |
| 32 | + r, err := git.PlainOpenWithOptions(".", &git.PlainOpenOptions{DetectDotGit: true}) |
| 33 | + if err != nil { |
| 34 | + return fmt.Errorf("failed to open repository: %w", err) |
| 35 | + } |
| 36 | + |
| 37 | + w, err := r.Worktree() |
| 38 | + if err != nil { |
| 39 | + return fmt.Errorf("failed to open worktree: %w", err) |
| 40 | + } |
| 41 | + |
| 42 | + cwd, err := os.Getwd() |
| 43 | + if err != nil { |
| 44 | + return err |
| 45 | + } |
| 46 | + |
| 47 | + root := w.Filesystem().Root() |
| 48 | + |
| 49 | + var resolved []string |
| 50 | + |
| 51 | + for _, spec := range paths { |
| 52 | + rel, rerr := resolvePathspec(root, cwd, spec) |
| 53 | + if rerr != nil { |
| 54 | + return rerr |
| 55 | + } |
| 56 | + |
| 57 | + resolved = append(resolved, rel) |
| 58 | + } |
| 59 | + |
| 60 | + expanded, err := expandDirectoryPaths(r, resolved) |
| 61 | + if err != nil { |
| 62 | + return err |
| 63 | + } |
| 64 | + |
| 65 | + if len(expanded) == 0 { |
| 66 | + return errors.New("no matching paths in HEAD") |
| 67 | + } |
| 68 | + |
| 69 | + return w.Restore(&git.RestoreOptions{ |
| 70 | + Staged: true, |
| 71 | + Worktree: true, |
| 72 | + Files: expanded, |
| 73 | + }) |
| 74 | + }, |
| 75 | + DisableFlagsInUseLine: true, |
| 76 | +} |
| 77 | + |
| 78 | +// splitCheckoutArgs splits cobra-parsed args into tree-ish and pathspecs. |
| 79 | +// Cobra strips the "--" separator but records its position via ArgsLenAtDash. |
| 80 | +func splitCheckoutArgs(cmd *cobra.Command, args []string) (string, []string, error) { |
| 81 | + dashAt := cmd.ArgsLenAtDash() |
| 82 | + if dashAt < 0 { |
| 83 | + return "", nil, errors.New("missing -- separator between tree-ish and pathspecs") |
| 84 | + } |
| 85 | + |
| 86 | + if dashAt == 0 { |
| 87 | + return "", nil, errors.New("missing tree-ish before --") |
| 88 | + } |
| 89 | + |
| 90 | + if dashAt == len(args) { |
| 91 | + return "", nil, errors.New("missing pathspec after --") |
| 92 | + } |
| 93 | + |
| 94 | + return args[0], args[dashAt:], nil |
| 95 | +} |
| 96 | + |
| 97 | +// expandDirectoryPaths replaces directory entries in paths with all file |
| 98 | +// paths from HEAD's tree that live under them. File entries are kept as-is. |
| 99 | +func expandDirectoryPaths(r *git.Repository, paths []string) ([]string, error) { |
| 100 | + ref, err := r.Head() |
| 101 | + if err != nil { |
| 102 | + return nil, fmt.Errorf("resolving HEAD: %w", err) |
| 103 | + } |
| 104 | + |
| 105 | + commit, err := r.CommitObject(ref.Hash()) |
| 106 | + if err != nil { |
| 107 | + return nil, err |
| 108 | + } |
| 109 | + |
| 110 | + tree, err := commit.Tree() |
| 111 | + if err != nil { |
| 112 | + return nil, err |
| 113 | + } |
| 114 | + |
| 115 | + var out []string |
| 116 | + |
| 117 | + for _, p := range paths { |
| 118 | + if _, err := tree.File(p); err == nil { |
| 119 | + out = append(out, p) |
| 120 | + |
| 121 | + continue |
| 122 | + } |
| 123 | + |
| 124 | + // Treat as directory: collect every tree entry whose path starts with p+"/". |
| 125 | + prefix := p + "/" |
| 126 | + if p == "." || p == "" { |
| 127 | + prefix = "" |
| 128 | + } |
| 129 | + |
| 130 | + walker := object.NewTreeWalker(tree, true, nil) |
| 131 | + |
| 132 | + for { |
| 133 | + name, entry, werr := walker.Next() |
| 134 | + if werr != nil { |
| 135 | + break |
| 136 | + } |
| 137 | + |
| 138 | + if !entry.Mode.IsFile() { |
| 139 | + continue |
| 140 | + } |
| 141 | + |
| 142 | + if prefix == "" || strings.HasPrefix(name, prefix) { |
| 143 | + out = append(out, name) |
| 144 | + } |
| 145 | + } |
| 146 | + |
| 147 | + walker.Close() |
| 148 | + } |
| 149 | + |
| 150 | + return out, nil |
| 151 | +} |
0 commit comments