GitLabgitlab-org
cli
main
1package infer
3import (
4 "bytes"
5 "context"
6 "errors"
7 "fmt"
8 "strings"
10 "github.com/MakeNowJust/heredoc/v2"
12 "gitlab.com/gitlab-org/cli/internal/cmdutils"
13 "gitlab.com/gitlab-org/cli/internal/commands/stack/stackutils"
14 "gitlab.com/gitlab-org/cli/internal/git"
15)
17// parseCommitSelection removes comments and trims space for all non-comment lines
18func parseCommitSelection(input string) ([]string, error) {
19 result := []string{} // Initialize as empty slice, not nil
21 for line := range strings.SplitSeq(input, "\n") {
22 // Trim whitespace from the line first
23 line = strings.TrimSpace(line)
25 if strings.HasPrefix(line, "#") {
26 continue
27 }
29 if line == "" {
30 continue
31 }
33 commitLine := strings.Fields(line)
35 if (len(commitLine) == 1) || stackutils.HasComment(commitLine) {
36 result = append(result, commitLine[0])
37 } else {
38 return []string{},
39 fmt.Errorf("improperly formatted reorder file: unexpected content after commit hash on line %q", line)
40 }
41 }
42 return result, nil
43}
45func promptForCommits(ctx context.Context, f cmdutils.Factory, gr git.GitRunner, args []string, allCommits bool) ([]string, error) {
46 if len(args) == 0 {
47 return nil, errors.New("no revision arguments provided")
48 }
50 // Join all args to pass to RevList, similar to how git rev-list works
51 revArgs := args
52 commitData, err := gr.Git(append([]string{"log", "--format=%s%x00%h%x00%an", "--reverse"}, revArgs...)...)
53 if err != nil {
54 return nil, fmt.Errorf("could not get commit list: %w", err)
55 }
57 var buffer bytes.Buffer
58 allHashes := []string{}
60 buffer.WriteString(heredoc.Doc(`
61 # Choose which commits you'd like to include in your stack.
62 # Lines starting with '#' will be ignored.
63 # Each line should contain only the commit hash you want to include.
64 # Remove or comment out commits you don't want in the stack.
65 #
66 # Commits are listed oldest to newest (stack order):
67 #
68 `))
70 // Parse the commit data format: "subject\x00hash\x00author"
71 for line := range strings.SplitSeq(strings.TrimSpace(commitData), "\n") {
72 line = strings.TrimSpace(line)
73 if line == "" {
74 continue
75 }
77 parts := strings.Split(line, "\x00")
78 if len(parts) < 2 {
79 continue
80 }
82 subject := parts[0]
83 hash := parts[1]
84 author := ""
85 if len(parts) >= 3 {
86 author = parts[2]
87 }
89 allHashes = append(allHashes, hash)
91 // Format: hash # subject (author)
92 if author != "" {
93 buffer.WriteString(fmt.Sprintf("%s # %s (%s)\n", hash, subject, author))
94 } else {
95 buffer.WriteString(fmt.Sprintf("%s # %s\n", hash, subject))
96 }
97 }
99 if allCommits {
100 return allHashes, nil
101 }
103 editor, err := cmdutils.GetEditor(f.Config)
104 if err != nil {
105 return nil, err
106 }
108 var promptResponse string
109 err = f.IO().DirectEditor(ctx, &promptResponse, buffer.String(), editor)
110 if err != nil {
111 return nil, err
112 }
114 return parseCommitSelection(promptResponse)
115}
Diagnostics8 git calls · 218 ms
CallStatusSizeTime0218 ms
discover200185 B4 ms
git.upload-pack discover http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=2 git.response.bytes=185 git.server.agent=git/2.56.g1891de4-Linux git.server.object_format=sha1 git.server.caps=agent ls-refs fetch server-option object-format git.server.fetch=shallow wait-for-done filter git.protocol.version=2 git.pkt.frames=9 git.pkt.data=7 git.pkt.flush=2 git.pkt.delim=0 git.pkt.bytes=185 git.pkt.payload.max=35
ls-refs20058 KiB3 ms
git.upload-pack ls-refs http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=ls-refs git.upstream.dur_ms=3 git.response.bytes=59849 git.response.cache=UPDATING git.response.duration_ms=3 git.protocol.version=2 git.pkt.frames=731 git.pkt.data=730 git.pkt.flush=1 git.pkt.delim=0 git.pkt.bytes=59849 git.pkt.payload.max=143 git.ls_refs.count=730 git.ls_refs.head=refs/heads/main
fetchcombine:blob:none+tree:2 · deepen 12004.2 KiB · hit2 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=2 git.response.bytes=4273 git.response.cache=HIT git.response.duration_ms=2 git.fetch.filter=combine:blob:none+tree:2 git.fetch.wants=0dd7574dce9e385c5c30540e6c15657adc6bdce9 git.fetch.haves.count=0 git.fetch.deepen=1 git.fetch.thin_pack=false git.fetch.ofs_delta=true git.protocol.version=2 git.pkt.frames=7 git.pkt.data=5 git.pkt.flush=1 git.pkt.delim=1 git.pkt.bytes=4273 git.pkt.payload.max=4173 git.sideband.band1.bytes=4173 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0 git.pack.objects=11 git.pack.bytes=4173 git.fetch.wide.objects=11 git.fetch.wide.extra_bytes=3930 git.fetch.wide.blobs=0
fetchtree:0 · deepen 1020032 KiB · hit2 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=2 git.response.bytes=32926 git.response.cache=HIT git.response.duration_ms=2 git.fetch.filter=tree:0 git.fetch.wants=0dd7574dce9e385c5c30540e6c15657adc6bdce9 git.fetch.haves.count=0 git.fetch.deepen=10 git.fetch.thin_pack=false git.fetch.ofs_delta=true git.protocol.version=2 git.pkt.frames=22 git.pkt.data=20 git.pkt.flush=1 git.pkt.delim=1 git.pkt.bytes=32926 git.pkt.payload.max=32046 git.sideband.band1.bytes=32046 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0 git.pack.objects=80 git.pack.bytes=32046 git.pack.ofs_delta=36 git.pack.ref_delta=0 git.pack.chain.max=2 git.pack.trailer=cb0bad5d7ffc514895d8b21c4dd470327f90bc91 git.pack.full=44Open pack map
fetchtree:02001.8 KiB · hit2 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=3 git.response.bytes=1857 git.response.cache=HIT git.response.duration_ms=2 git.fetch.filter=tree:0 git.fetch.wants=dce174ff8c632a19d17eea99c8a9b7c37fb2b592 git.fetch.haves.count=0 git.fetch.deepen=0 git.fetch.thin_pack=false git.fetch.ofs_delta=true git.protocol.version=2 git.pkt.frames=4 git.pkt.data=3 git.pkt.flush=1 git.pkt.delim=0 git.pkt.bytes=1857 git.pkt.payload.max=1830 git.sideband.band1.bytes=1830 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0 git.pack.objects=1 git.pack.bytes=1830 git.pack.trailer=fb03183b7909876778f740d196d7516811003517Open pack map
fetchtree:0200432 B · hit3 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=2 git.response.bytes=432 git.response.cache=HIT git.response.duration_ms=3 git.fetch.filter=tree:0 git.fetch.wants=ff2d1e7abc74964e5679ebdb51f1ac0d0dc3aff0 git.fetch.haves.count=0 git.fetch.deepen=0 git.fetch.thin_pack=false git.fetch.ofs_delta=true git.protocol.version=2 git.pkt.frames=4 git.pkt.data=3 git.pkt.flush=1 git.pkt.delim=0 git.pkt.bytes=432 git.pkt.payload.max=405 git.sideband.band1.bytes=405 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0 git.pack.objects=1 git.pack.bytes=405 git.pack.trailer=8f3029a269217d94d12d0671e0490fe3d5506303Open pack map
fetchtree:0200199 B · hit2 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=205 git.response.bytes=199 git.response.cache=HIT git.response.duration_ms=2 git.fetch.filter=tree:0 git.fetch.wants=8109696a12928135171f031112e487158b02c470 git.fetch.haves.count=0 git.fetch.deepen=0 git.fetch.thin_pack=false git.fetch.ofs_delta=true git.protocol.version=2 git.pkt.frames=4 git.pkt.data=3 git.pkt.flush=1 git.pkt.delim=0 git.pkt.bytes=199 git.pkt.payload.max=172 git.sideband.band1.bytes=172 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0 git.pack.objects=1 git.pack.bytes=172 git.pack.trailer=7619d11a8f208890971c50dea8f51b0e072e21b9Open pack map
fetch2001.3 KiB205 ms
git.upload-pack fetch http.response.status_code=200 git.response.bytes=1294 git.response.cache=MISS git.response.duration_ms=205 git.fetch.wants=88c0a14df084c7b674790290622358e648ae1826 git.fetch.haves.count=0 git.fetch.deepen=0 git.fetch.thin_pack=false git.fetch.ofs_delta=true git.protocol.version=2 git.pkt.frames=4 git.pkt.data=3 git.pkt.flush=1 git.pkt.delim=0 git.pkt.bytes=1294 git.pkt.payload.max=1267 git.sideband.band1.bytes=1267 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0
Each row is one HTTP round trip ply made to the git server for this page, on one timeline. discover asks what the server speaks, ls-refs lists branch tips, fetch brings objects by id. A hit was served by Workers Cache. Tap a row for its wire details.
- Remote
- https://gitlab.com/gitlab-org/cli
- Ref
- refs/heads/main
- Commit
- 0dd7574dce9e385c5c30540e6c15657adc6bdce9
- cf-ray
- a5e29fae3a0c1293
- Request
- 0043bbfb…
- Protocol
- v2 · sha1
- Agent
- git/2.56.g1891de4-Linux
- Filter
- advertised
- Fetch
- shallow wait-for-done filter
- Capabilities
- agent ls-refs fetch server-option object-format