GitLabgitlab-org
cli
main
1//go:build !integration
3package mrutils
5import (
6 "context"
7 "errors"
8 "fmt"
9 "strconv"
10 "sync/atomic"
11 "testing"
12 "time"
14 "git.sr.ht/~timofurrer/ugh"
15 "github.com/stretchr/testify/assert"
16 "github.com/stretchr/testify/require"
17 "go.uber.org/mock/gomock"
19 gitlab "gitlab.com/gitlab-org/api/client-go/v3"
20 gitlabtesting "gitlab.com/gitlab-org/api/client-go/v3/testing"
22 "gitlab.com/gitlab-org/cli/internal/api"
23 "gitlab.com/gitlab-org/cli/internal/git"
24 "gitlab.com/gitlab-org/cli/internal/glrepo"
25 "gitlab.com/gitlab-org/cli/internal/iostreams"
26 "gitlab.com/gitlab-org/cli/internal/testing/cmdtest"
27)
29func Test_DisplayMR(t *testing.T) {
30 testCases := []struct {
31 name string
32 mr *gitlab.BasicMergeRequest
33 output string
34 outputToTTY bool
35 }{
36 {
37 name: "opened",
38 mr: &gitlab.BasicMergeRequest{
39 IID: 1,
40 State: "opened",
41 Title: "This is open",
42 SourceBranch: "main",
43 WebURL: "https://gitlab.com/gitlab-org/cli/-/merge_requests/1",
44 },
45 output: "!1 This is open (main)\n https://gitlab.com/gitlab-org/cli/-/merge_requests/1\n",
46 outputToTTY: true,
47 },
48 {
49 name: "merged",
50 mr: &gitlab.BasicMergeRequest{
51 IID: 2,
52 State: "merged",
53 Title: "This is merged",
54 SourceBranch: "main",
55 WebURL: "https://gitlab.com/gitlab-org/cli/-/merge_requests/2",
56 },
57 output: "!2 This is merged (main)\n https://gitlab.com/gitlab-org/cli/-/merge_requests/2\n",
58 outputToTTY: true,
59 },
60 {
61 name: "closed",
62 mr: &gitlab.BasicMergeRequest{
63 IID: 3,
64 State: "closed",
65 Title: "This is closed",
66 SourceBranch: "main",
67 WebURL: "https://gitlab.com/gitlab-org/cli/-/merge_requests/3",
68 },
69 output: "!3 This is closed (main)\n https://gitlab.com/gitlab-org/cli/-/merge_requests/3\n",
70 outputToTTY: true,
71 },
72 {
73 name: "non-tty terse output",
74 mr: &gitlab.BasicMergeRequest{
75 IID: 4,
76 State: "open",
77 Title: "This shouldn't be visible",
78 SourceBranch: "main",
79 WebURL: "https://gitlab.com/gitlab-org/cli/-/merge_requests/4",
80 },
81 output: "https://gitlab.com/gitlab-org/cli/-/merge_requests/4",
82 outputToTTY: false,
83 },
84 }
85 streams, _, _, _ := cmdtest.TestIOStreams()
86 for _, tC := range testCases {
87 t.Run(tC.name, func(t *testing.T) {
88 got := DisplayMR(streams.Color(), tC.mr, tC.outputToTTY)
89 assert.Equal(t, tC.output, got)
90 })
91 }
92}
94func TestGenerateMRTitleAndBody(t *testing.T) {
95 tests := []struct {
96 name string
97 commits []*git.Commit
98 fallbackBranch string
99 fillCommitBody bool
100 expectedTitle string
101 expectedDesc string
102 wantErr bool
103 }{
104 {
105 name: "No commits - use branch name",
106 commits: []*git.Commit{},
107 fallbackBranch: "feature-branch",
108 fillCommitBody: false,
109 expectedTitle: "feature branch",
110 expectedDesc: "",
111 wantErr: false,
112 },
113 {
114 name: "Single commit - use commit title",
115 commits: []*git.Commit{
116 {Title: "Fix login bug", Sha: "abc123"},
117 },
118 fallbackBranch: "fix-login",
119 fillCommitBody: false,
120 expectedTitle: "Fix login bug",
121 expectedDesc: "Fix login bug", // Falls back to title when fillCommitBody is false
122 wantErr: false,
123 },
124 {
125 name: "Multiple commits without body - list format",
126 commits: []*git.Commit{
127 {Title: "Add feature A", Sha: "abc123"},
128 {Title: "Fix bug B", Sha: "def456"},
129 },
130 fallbackBranch: "feature-branch",
131 fillCommitBody: false,
132 expectedTitle: "feature branch",
133 expectedDesc: "- Fix bug B \n- Add feature A \n",
134 wantErr: false,
135 },
136 {
137 name: "Multiple commits with body - list format",
138 commits: []*git.Commit{
139 {Title: "Add feature A", Sha: "abc123"},
140 {Title: "Fix bug B", Sha: "def456"},
141 },
142 fallbackBranch: "feature-branch",
143 fillCommitBody: true,
144 expectedTitle: "feature branch",
145 // When git.CommitBody fails, we just get the titles
146 expectedDesc: "",
147 wantErr: true, // This will error when trying to get commit bodies
148 },
149 }
151 for _, tt := range tests {
152 t.Run(tt.name, func(t *testing.T) {
153 title, desc, err := GenerateMRTitleAndBody(tt.commits, tt.fallbackBranch, tt.fillCommitBody)
155 if tt.wantErr {
156 require.Error(t, err)
157 return
158 }
160 require.NoError(t, err)
161 assert.Equal(t, tt.expectedTitle, title)
162 assert.Equal(t, tt.expectedDesc, desc)
163 })
164 }
165}
167func TestGenerateMRCommitListBody(t *testing.T) {
168 tests := []struct {
169 name string
170 commits []*git.Commit
171 fillCommitBody bool
172 expectedOutput string
173 wantErr bool
174 }{
175 {
176 name: "Empty commits list",
177 commits: []*git.Commit{},
178 fillCommitBody: false,
179 expectedOutput: "",
180 wantErr: false,
181 },
182 {
183 name: "Single commit without body",
184 commits: []*git.Commit{
185 {Title: "Fix login issue", Sha: "abc123"},
186 },
187 fillCommitBody: false,
188 expectedOutput: "- Fix login issue \n",
189 wantErr: false,
190 },
191 {
192 name: "Multiple commits without body",
193 commits: []*git.Commit{
194 {Title: "First commit", Sha: "abc123"},
195 {Title: "Second commit", Sha: "def456"},
196 {Title: "Third commit", Sha: "ghi789"},
197 },
198 fillCommitBody: false,
199 expectedOutput: "- Third commit \n- Second commit \n- First commit \n",
200 wantErr: false,
201 },
202 {
203 name: "Multiple commits with body enabled but git fails",
204 commits: []*git.Commit{
205 {Title: "First commit", Sha: "abc123"},
206 {Title: "Second commit", Sha: "def456"},
207 },
208 fillCommitBody: true,
209 // When git.CommitBody fails with fake SHAs, expect error
210 expectedOutput: "",
211 wantErr: true,
212 },
213 }
215 for _, tt := range tests {
216 t.Run(tt.name, func(t *testing.T) {
217 output, err := GenerateMRCommitListBody(tt.commits, tt.fillCommitBody)
219 if tt.wantErr {
220 assert.Error(t, err)
221 return
222 }
224 require.NoError(t, err)
225 assert.Equal(t, tt.expectedOutput, output)
226 })
227 }
228}
230func Test_MRCheckErrors(t *testing.T) {
231 testCases := []struct {
232 name string
233 mr *gitlab.MergeRequest
234 errOpts MRCheckErrOptions
235 output string
236 }{
237 {
238 name: "draft",
239 mr: &gitlab.MergeRequest{
240 BasicMergeRequest: gitlab.BasicMergeRequest{
241 IID: 1,
242 Draft: true,
243 },
244 },
245 errOpts: MRCheckErrOptions{
246 Draft: true,
247 },
248 output: "this merge request is still a draft; run `glab mr update 1 --ready` to mark it as ready for review",
249 },
250 {
251 name: "pipeline",
252 mr: &gitlab.MergeRequest{
253 BasicMergeRequest: gitlab.BasicMergeRequest{
254 IID: 1,
255 MergeWhenPipelineSucceeds: true,
256 },
257 Pipeline: &gitlab.PipelineInfo{
258 Status: "failure",
259 },
260 },
261 errOpts: MRCheckErrOptions{
262 PipelineStatus: true,
263 },
264 output: "the pipeline for this merge request has failed; it must succeed before merging",
265 },
266 {
267 name: "merged",
268 mr: &gitlab.MergeRequest{
269 BasicMergeRequest: gitlab.BasicMergeRequest{
270 IID: 1,
271 State: "merged",
272 },
273 },
274 errOpts: MRCheckErrOptions{
275 Merged: true,
276 },
277 output: "this merge request has already been merged",
278 },
279 {
280 name: "closed",
281 mr: &gitlab.MergeRequest{
282 BasicMergeRequest: gitlab.BasicMergeRequest{
283 IID: 1,
284 State: "closed",
285 },
286 },
287 errOpts: MRCheckErrOptions{
288 Closed: true,
289 },
290 output: "this merge request has been closed",
291 },
292 {
293 name: "opened",
294 mr: &gitlab.MergeRequest{
295 BasicMergeRequest: gitlab.BasicMergeRequest{
296 IID: 1,
297 State: "opened",
298 },
299 },
300 errOpts: MRCheckErrOptions{
301 Opened: true,
302 },
303 output: "this merge request is already open",
304 },
305 {
306 name: "subscribed",
307 mr: &gitlab.MergeRequest{
308 BasicMergeRequest: gitlab.BasicMergeRequest{
309 IID: 1,
310 },
311 Subscribed: true,
312 },
313 errOpts: MRCheckErrOptions{
314 Subscribed: true,
315 },
316 output: "you are already subscribed to this merge request",
317 },
318 {
319 name: "unsubscribed",
320 mr: &gitlab.MergeRequest{
321 BasicMergeRequest: gitlab.BasicMergeRequest{
322 IID: 1,
323 },
324 Subscribed: false,
325 },
326 errOpts: MRCheckErrOptions{
327 Unsubscribed: true,
328 },
329 output: "you are not subscribed to this merge request",
330 },
331 {
332 name: "merge-privilege",
333 mr: &gitlab.MergeRequest{
334 BasicMergeRequest: gitlab.BasicMergeRequest{
335 IID: 1,
336 },
337 User: struct {
338 CanMerge bool "json:\"can_merge\""
339 }{CanMerge: false},
340 },
341 errOpts: MRCheckErrOptions{
342 MergePrivilege: true,
343 },
344 output: "you do not have permission to merge this merge request",
345 },
346 {
347 name: "conflicts",
348 mr: &gitlab.MergeRequest{
349 BasicMergeRequest: gitlab.BasicMergeRequest{
350 IID: 1,
351 HasConflicts: true,
352 },
353 },
354 errOpts: MRCheckErrOptions{
355 Conflict: true,
356 },
357 output: "merge conflicts exist; resolve the conflicts and try again, or merge locally",
358 },
359 {
360 name: "ci_must_pass with PipelineStatus",
361 mr: &gitlab.MergeRequest{
362 BasicMergeRequest: gitlab.BasicMergeRequest{
363 IID: 1,
364 DetailedMergeStatus: "ci_must_pass",
365 },
366 },
367 errOpts: MRCheckErrOptions{
368 PipelineStatus: true,
369 },
370 output: "this merge request requires a passing pipeline before merging",
371 },
372 }
374 for _, tC := range testCases {
375 t.Run(tC.name, func(t *testing.T) {
376 err := MRCheckErrors(tC.mr, tC.errOpts)
377 assert.EqualError(t, err, tC.output)
378 })
379 }
381 t.Run("ci_must_pass without PipelineStatus does not error", func(t *testing.T) {
382 err := MRCheckErrors(&gitlab.MergeRequest{
383 BasicMergeRequest: gitlab.BasicMergeRequest{
384 IID: 1,
385 DetailedMergeStatus: "ci_must_pass",
386 },
387 }, MRCheckErrOptions{
388 PipelineStatus: false,
389 })
390 assert.NoError(t, err)
391 })
393 t.Run("nil", func(t *testing.T) {
394 err := MRCheckErrors(&gitlab.MergeRequest{}, MRCheckErrOptions{})
395 assert.NoError(t, err)
396 })
397}
399func Test_getMRForBranchFails(t *testing.T) {
400 baseRepo := glrepo.NewWithHost("foo", "bar", "gitlab.com")
402 t.Run("API-call-failed", func(t *testing.T) {
403 api.ListMRs = func(client *gitlab.Client, projectID any, opts *gitlab.ListProjectMergeRequestsOptions, listOpts ...api.CliListMROption) ([]*gitlab.BasicMergeRequest, error) {
404 return nil, errors.New("API call failed")
405 }
407 got, err := GetMRForBranch(t.Context(), nil, &gitlab.Client{}, MrOptions{baseRepo, "foo", "opened", true})
408 assert.Nil(t, got)
409 assert.EqualError(t, err, `failed to get open merge request for "foo": API call failed`)
410 })
412 t.Run("no-return", func(t *testing.T) {
413 api.ListMRs = func(client *gitlab.Client, projectID any, opts *gitlab.ListProjectMergeRequestsOptions, listOpts ...api.CliListMROption) ([]*gitlab.BasicMergeRequest, error) {
414 return []*gitlab.BasicMergeRequest{}, nil
415 }
417 got, err := GetMRForBranch(t.Context(), nil, &gitlab.Client{}, MrOptions{baseRepo, "foo", "opened", true})
418 assert.Nil(t, got)
419 assert.EqualError(t, err, `no open merge request available for "foo"`)
420 })
422 t.Run("owner-no-match", func(t *testing.T) {
423 api.ListMRs = func(client *gitlab.Client, projectID any, opts *gitlab.ListProjectMergeRequestsOptions, listOpts ...api.CliListMROption) ([]*gitlab.BasicMergeRequest, error) {
424 return []*gitlab.BasicMergeRequest{
425 {
426 IID: 1,
427 Author: &gitlab.BasicUser{
428 Username: "profclems",
429 },
430 },
431 {
432 IID: 2,
433 Author: &gitlab.BasicUser{
434 Username: "maxice8",
435 },
436 },
437 }, nil
438 }
440 got, err := GetMRForBranch(t.Context(), nil, &gitlab.Client{}, MrOptions{baseRepo, "zemzale:foo", "opened", true})
441 assert.Nil(t, got)
442 assert.EqualError(t, err, `no open merge request available for "foo" owned by @zemzale`)
443 })
444}
446func Test_getMRForBranch(t *testing.T) {
447 baseRepo := glrepo.NewWithHost("foo", "bar", "gitlab.com")
449 testCases := []struct {
450 name string
451 input string
452 mrs []*gitlab.BasicMergeRequest
453 expect *gitlab.MergeRequest
454 }{
455 {
456 name: "one-match",
457 mrs: []*gitlab.BasicMergeRequest{
458 {
459 IID: 1,
460 Author: &gitlab.BasicUser{
461 Username: "profclems",
462 },
463 },
464 },
465 expect: &gitlab.MergeRequest{
466 BasicMergeRequest: gitlab.BasicMergeRequest{
467 IID: 1,
468 Author: &gitlab.BasicUser{
469 Username: "profclems",
470 },
471 },
472 },
473 },
474 {
475 name: "owner-match",
476 input: "maxice8:foo",
477 mrs: []*gitlab.BasicMergeRequest{
478 {
479 IID: 1,
480 Author: &gitlab.BasicUser{
481 Username: "profclems",
482 },
483 },
484 {
485 IID: 2,
486 Author: &gitlab.BasicUser{
487 Username: "maxice8",
488 },
489 },
490 },
491 expect: &gitlab.MergeRequest{
492 BasicMergeRequest: gitlab.BasicMergeRequest{
493 IID: 2,
494 Author: &gitlab.BasicUser{
495 Username: "maxice8",
496 },
497 },
498 },
499 },
500 }
501 for _, tC := range testCases {
502 t.Run(tC.name, func(t *testing.T) {
503 api.ListMRs = func(_ *gitlab.Client, _ any, _ *gitlab.ListProjectMergeRequestsOptions, listOpts ...api.CliListMROption) ([]*gitlab.BasicMergeRequest, error) {
504 return tC.mrs, nil
505 }
507 got, err := GetMRForBranch(t.Context(), nil, &gitlab.Client{}, MrOptions{baseRepo, tC.input, "opened", true})
508 require.NoError(t, err)
510 assert.Equal(t, tC.expect.IID, got.IID)
511 assert.Equal(t, tC.expect.Author.Username, got.Author.Username)
512 })
513 }
514}
516func Test_getMRForBranchPrompt(t *testing.T) {
517 baseRepo := glrepo.NewWithHost("foo", "bar", "gitlab.com")
519 api.ListMRs = func(client *gitlab.Client, projectID any, opts *gitlab.ListProjectMergeRequestsOptions, listOpts ...api.CliListMROption) ([]*gitlab.BasicMergeRequest, error) {
520 return []*gitlab.BasicMergeRequest{
521 {
522 IID: 1,
523 Author: &gitlab.BasicUser{
524 Username: "profclems",
525 },
526 },
527 {
528 IID: 2,
529 Author: &gitlab.BasicUser{
530 Username: "maxice8",
531 },
532 },
533 }, nil
534 }
536 c := ugh.New(t)
537 c.Expect(ugh.Select(multipleMRSelectQuestion)).
538 Do(ugh.SelectIndex(0))
540 ios, cleanup := cmdtest.TestIOStreamsWithConsole(t, c)
541 t.Cleanup(cleanup)
543 got, err := GetMRForBranch(t.Context(), ios, &gitlab.Client{}, MrOptions{baseRepo, "foo", "opened", true})
544 require.NoError(t, err)
546 assert.Equal(t, int64(1), got.IID)
547 assert.Equal(t, "profclems", got.Author.Username)
548}
550func Test_MRFromArgsWithOpts(t *testing.T) {
551 ios, _, _, _ := cmdtest.TestIOStreams()
552 ios.SetPrompt("false")
554 // Create base factory for tests
555 baseFactory := cmdtest.NewTestFactory(ios,
556 cmdtest.WithBaseRepo("foo", "bar", ""),
557 cmdtest.WithBranch("main"),
558 )
560 t.Run("success", func(t *testing.T) {
561 t.Run("via-ID", func(t *testing.T) {
562 api.GetMR = func(client *gitlab.Client, projectID any, mrID int64, opts *gitlab.GetMergeRequestsOptions) (*gitlab.MergeRequest, error) {
563 return &gitlab.MergeRequest{
564 BasicMergeRequest: gitlab.BasicMergeRequest{
565 IID: 2,
566 Title: "test mr",
567 SourceBranch: "main",
568 },
569 }, nil
570 }
572 expectedRepo, err := baseFactory.BaseRepo()
573 if err != nil {
574 t.Skipf("failed to get base repo: %s", err)
575 }
577 gotMR, gotRepo, err := MRFromArgs(t.Context(), baseFactory, []string{"2"}, "")
578 require.NoError(t, err)
580 assert.Equal(t, expectedRepo.FullName(), gotRepo.FullName())
582 assert.Equal(t, int64(2), gotMR.IID)
583 assert.Equal(t, "test mr", gotMR.Title)
584 assert.Equal(t, "main", gotMR.SourceBranch)
585 })
586 t.Run("via-name", func(t *testing.T) {
587 GetMRForBranch = func(_ context.Context, _ *iostreams.IOStreams, apiClient *gitlab.Client, mrOpts MrOptions) (*gitlab.BasicMergeRequest, error) {
588 return &gitlab.BasicMergeRequest{
589 IID: 2,
590 Title: "test mr",
591 SourceBranch: "main",
592 }, nil
593 }
595 api.GetMR = func(client *gitlab.Client, projectID any, mrID int64, opts *gitlab.GetMergeRequestsOptions) (*gitlab.MergeRequest, error) {
596 return &gitlab.MergeRequest{
597 BasicMergeRequest: gitlab.BasicMergeRequest{
598 IID: 2,
599 Title: "test mr",
600 SourceBranch: "main",
601 },
602 }, nil
603 }
605 expectedRepo, err := baseFactory.BaseRepo()
606 if err != nil {
607 t.Skipf("failed to get base repo: %s", err)
608 }
610 gotMR, gotRepo, err := MRFromArgs(t.Context(), baseFactory, []string{"foo"}, "")
611 require.NoError(t, err)
613 assert.Equal(t, expectedRepo.FullName(), gotRepo.FullName())
615 assert.Equal(t, int64(2), gotMR.IID)
616 assert.Equal(t, "test mr", gotMR.Title)
617 assert.Equal(t, "main", gotMR.SourceBranch)
618 })
619 t.Run("via-URL", func(t *testing.T) {
620 api.GetMR = func(client *gitlab.Client, projectID any, mrID int64, opts *gitlab.GetMergeRequestsOptions) (*gitlab.MergeRequest, error) {
621 // Verify the correct MR ID from the URL is being used
622 assert.Equal(t, int64(1234), mrID)
623 return &gitlab.MergeRequest{
624 BasicMergeRequest: gitlab.BasicMergeRequest{
625 IID: 1234,
626 Title: "test mr from URL",
627 SourceBranch: "feature-branch",
628 },
629 }, nil
630 }
632 gotMR, gotRepo, err := MRFromArgs(t.Context(), baseFactory, []string{"https://gitlab.com/gitlab-org/cli/-/merge_requests/1234"}, "")
633 require.NoError(t, err)
635 // The repository should be extracted from the URL
636 assert.Equal(t, "gitlab-org/cli", gotRepo.FullName())
638 assert.Equal(t, int64(1234), gotMR.IID)
639 assert.Equal(t, "test mr from URL", gotMR.Title)
640 assert.Equal(t, "feature-branch", gotMR.SourceBranch)
641 })
642 t.Run("via-URL-self-managed", func(t *testing.T) {
643 api.GetMR = func(client *gitlab.Client, projectID any, mrID int64, opts *gitlab.GetMergeRequestsOptions) (*gitlab.MergeRequest, error) {
644 // Verify the correct MR ID from the URL is being used
645 assert.Equal(t, int64(42), mrID)
646 return &gitlab.MergeRequest{
647 BasicMergeRequest: gitlab.BasicMergeRequest{
648 IID: 42,
649 Title: "test mr from self-managed",
650 SourceBranch: "feature-branch",
651 },
652 }, nil
653 }
655 // Need to create a factory that can handle different hosts
656 f := cmdtest.NewTestFactory(ios,
657 cmdtest.WithBaseRepo("kde", "krita", "invent.kde.org"),
658 cmdtest.WithBranch("main"),
659 )
661 gotMR, gotRepo, err := MRFromArgs(t.Context(), f, []string{"https://invent.kde.org/kde/krita/-/merge_requests/42"}, "")
662 require.NoError(t, err)
664 // The repository should be extracted from the URL
665 assert.Equal(t, "kde/krita", gotRepo.FullName())
666 assert.Equal(t, "invent.kde.org", gotRepo.RepoHost())
668 assert.Equal(t, int64(42), gotMR.IID)
669 assert.Equal(t, "test mr from self-managed", gotMR.Title)
670 assert.Equal(t, "feature-branch", gotMR.SourceBranch)
671 })
672 t.Run("via-URL-cross-instance", func(t *testing.T) {
673 api.GetMR = func(client *gitlab.Client, projectID any, mrID int64, opts *gitlab.GetMergeRequestsOptions) (*gitlab.MergeRequest, error) {
674 // Verify the correct MR ID from the URL is being used
675 assert.Equal(t, int64(42), mrID)
676 return &gitlab.MergeRequest{
677 BasicMergeRequest: gitlab.BasicMergeRequest{
678 IID: 42,
679 Title: "test mr from cross instance",
680 SourceBranch: "feature-branch",
681 },
682 }, nil
683 }
685 // Create a factory with gitlab.com as base, but test with invent.kde.org URL
686 // This tests the cross-instance hostname comparison logic
687 f := cmdtest.NewTestFactory(ios,
688 cmdtest.WithBaseRepo("gitlab-org", "cli", "gitlab.com"),
689 cmdtest.WithBranch("main"),
690 )
692 gotMR, gotRepo, err := MRFromArgs(t.Context(), f, []string{"https://invent.kde.org/kde/krita/-/merge_requests/42"}, "")
693 require.NoError(t, err)
695 // The repository should be extracted from the URL (different from base repo)
696 assert.Equal(t, "kde/krita", gotRepo.FullName())
697 assert.Equal(t, "invent.kde.org", gotRepo.RepoHost())
699 assert.Equal(t, int64(42), gotMR.IID)
700 assert.Equal(t, "test mr from cross instance", gotMR.Title)
701 assert.Equal(t, "feature-branch", gotMR.SourceBranch)
702 })
703 t.Run("via-URL-cross-instance-api-client", func(t *testing.T) {
704 api.GetMR = func(client *gitlab.Client, projectID any, mrID int64, opts *gitlab.GetMergeRequestsOptions) (*gitlab.MergeRequest, error) {
705 return &gitlab.MergeRequest{
706 BasicMergeRequest: gitlab.BasicMergeRequest{
707 IID: 42,
708 Title: "test mr api client",
709 SourceBranch: "feature-branch",
710 },
711 }, nil
712 }
714 // Track which hostname was used for ApiClient call
715 var capturedHostname string
717 f := cmdtest.NewTestFactory(ios,
718 cmdtest.WithBaseRepo("gitlab-org", "cli", "gitlab.com"),
719 cmdtest.WithBranch("main"),
720 )
722 // Override ApiClient to capture the hostname parameter
723 originalApiClient := f.ApiClientStub
724 f.ApiClientStub = func(repoHost string) (*api.Client, error) {
725 capturedHostname = repoHost
726 return originalApiClient(repoHost) // Call original implementation
727 }
729 gotMR, gotRepo, err := MRFromArgs(t.Context(), f, []string{"https://custom.gitlab.com/user/repo/-/merge_requests/42"}, "")
730 require.NoError(t, err)
732 // Verify that ApiClient was called with the correct hostname from URL
733 assert.Equal(t, "custom.gitlab.com", capturedHostname)
734 assert.Equal(t, "user/repo", gotRepo.FullName())
735 assert.Equal(t, "custom.gitlab.com", gotRepo.RepoHost())
736 assert.Equal(t, int64(42), gotMR.IID)
737 })
738 })
740 t.Run("fail", func(t *testing.T) {
741 t.Run("HttpClient", func(t *testing.T) {
742 f := cmdtest.NewTestFactory(ios,
743 cmdtest.WithGitLabClientError(errors.New("failed to create HttpClient")),
744 cmdtest.WithBaseRepo("foo", "bar", ""),
745 cmdtest.WithBranch("main"),
746 )
748 gotMR, gotRepo, err := MRFromArgs(t.Context(), f, []string{}, "")
749 assert.Nil(t, gotMR)
750 assert.Nil(t, gotRepo)
751 assert.EqualError(t, err, "failed to create HttpClient")
752 })
753 t.Run("BaseRepo", func(t *testing.T) {
754 f := cmdtest.NewTestFactory(ios,
755 cmdtest.WithBaseRepoError(errors.New("failed to create glrepo.Interface")),
756 cmdtest.WithBranch("main"),
757 )
759 gotMR, gotRepo, err := MRFromArgs(t.Context(), f, []string{}, "")
760 assert.Nil(t, gotMR)
761 assert.Nil(t, gotRepo)
762 assert.EqualError(t, err, "failed to create glrepo.Interface")
763 })
764 t.Run("Branch", func(t *testing.T) {
765 f := cmdtest.NewTestFactory(ios,
766 cmdtest.WithBaseRepo("foo", "bar", ""),
767 cmdtest.WithBranchError(errors.New("failed to get branch")),
768 )
770 gotMR, gotRepo, err := MRFromArgs(t.Context(), f, []string{}, "")
771 assert.Nil(t, gotMR)
772 assert.Nil(t, gotRepo)
773 assert.EqualError(t, err, "failed to get branch")
774 })
775 t.Run("Invalid-MR-ID", func(t *testing.T) {
776 gotMR, gotRepo, err := MRFromArgs(t.Context(), baseFactory, []string{"0"}, "")
777 assert.Nil(t, gotMR)
778 assert.Nil(t, gotRepo)
779 assert.EqualError(t, err, "invalid merge request ID provided")
780 })
781 t.Run("invalid-name", func(t *testing.T) {
782 GetMRForBranch = func(_ context.Context, _ *iostreams.IOStreams, _ *gitlab.Client, mrOpts MrOptions) (*gitlab.BasicMergeRequest, error) {
783 return nil, fmt.Errorf("no merge requests from branch %q", mrOpts.Branch)
784 }
786 gotMR, gotRepo, err := MRFromArgs(t.Context(), baseFactory, []string{"foo"}, "")
787 assert.Nil(t, gotMR)
788 assert.Nil(t, gotRepo)
789 assert.EqualError(t, err, `no merge requests from branch "foo"`)
790 })
791 t.Run("api.GetMR", func(t *testing.T) {
792 api.GetMR = func(client *gitlab.Client, projectID any, mrID int64, opts *gitlab.GetMergeRequestsOptions) (*gitlab.MergeRequest, error) {
793 return nil, errors.New("API call failed")
794 }
796 gotMR, gotRepo, err := MRFromArgs(t.Context(), baseFactory, []string{"2"}, "")
797 assert.Nil(t, gotMR)
798 assert.Nil(t, gotRepo)
799 assert.EqualError(t, err, "failed to get merge request 2: API call failed")
800 })
801 t.Run("URL-with-API-failure", func(t *testing.T) {
802 api.GetMR = func(client *gitlab.Client, projectID any, mrID int64, opts *gitlab.GetMergeRequestsOptions) (*gitlab.MergeRequest, error) {
803 // This should be called with the ID from the URL (1234)
804 assert.Equal(t, int64(1234), mrID)
805 return nil, errors.New("API call failed for URL MR")
806 }
808 gotMR, gotRepo, err := MRFromArgs(t.Context(), baseFactory, []string{"https://gitlab.com/gitlab-org/cli/-/merge_requests/1234"}, "")
809 assert.Nil(t, gotMR)
810 assert.Nil(t, gotRepo)
811 assert.EqualError(t, err, "failed to get merge request 1234: API call failed for URL MR")
812 })
813 t.Run("URL-without-scheme", func(t *testing.T) {
814 // Test that a URL without a scheme (http/https) fails to parse and falls back to branch lookup
815 GetMRForBranch = func(_ context.Context, _ *iostreams.IOStreams, _ *gitlab.Client, mrOpts MrOptions) (*gitlab.BasicMergeRequest, error) {
816 return nil, fmt.Errorf("no merge requests from branch %q", mrOpts.Branch)
817 }
819 gotMR, gotRepo, err := MRFromArgs(t.Context(), baseFactory, []string{"gitlab.com/gitlab-org/cli/-/merge_requests/1234"}, "")
820 assert.Nil(t, gotMR)
821 assert.Nil(t, gotRepo)
822 assert.EqualError(t, err, `no merge requests from branch "gitlab.com/gitlab-org/cli/-/merge_requests/1234"`)
823 })
824 })
825}
827func Test_DisplayAllMRs(t *testing.T) {
828 streams, _, _, _ := cmdtest.TestIOStreams()
829 mrs := []*gitlab.BasicMergeRequest{
830 {
831 IID: 1,
832 State: "opened",
833 Title: "add tests",
834 TargetBranch: "main",
835 SourceBranch: "new-tests",
836 References: &gitlab.IssueReferences{
837 Full: "OWNER/REPO/merge_requests/1",
838 Relative: "#1",
839 Short: "#1",
840 },
841 },
842 {
843 IID: 2,
844 State: "merged",
845 Title: "fix bug",
846 TargetBranch: "main",
847 SourceBranch: "new-feature",
848 References: &gitlab.IssueReferences{
849 Full: "OWNER/REPO/merge_requests/2",
850 Relative: "#2",
851 Short: "#2",
852 },
853 },
854 {
855 IID: 1,
856 State: "closed",
857 Title: "add new feature",
858 TargetBranch: "main",
859 SourceBranch: "new-tests",
860 References: &gitlab.IssueReferences{
861 Full: "OWNER/REPO/merge_requests/3",
862 Relative: "#3",
863 Short: "#3",
864 },
865 },
866 }
868 expected := `!1 OWNER/REPO/merge_requests/1 add tests (main) ← (new-tests)
869!2 OWNER/REPO/merge_requests/2 fix bug (main) ← (new-feature)
870!1 OWNER/REPO/merge_requests/3 add new feature (main) ← (new-tests)
871`
873 got := DisplayAllMRs(streams, mrs)
874 assert.Equal(t, expected, got)
875}
877func Test_DisplayAllMRs_nilReferences(t *testing.T) {
878 streams, _, _, _ := cmdtest.TestIOStreams()
879 mrs := []*gitlab.BasicMergeRequest{
880 {
881 IID: 1,
882 State: "opened",
883 Title: "add tests",
884 TargetBranch: "main",
885 SourceBranch: "new-tests",
886 References: nil,
887 },
888 }
890 expected := "!1\t\tadd tests\t(main) ← (new-tests)\n"
892 got := DisplayAllMRs(streams, mrs)
893 assert.Equal(t, expected, got)
894}
896func Test_PrintMRApprovalState(t *testing.T) {
897 scenarios := []struct {
898 name string
899 approvalState *gitlab.MergeRequestApprovalState
900 expected string
901 }{
902 {
903 name: "approved, min approvers met",
904 approvalState: &gitlab.MergeRequestApprovalState{
905 Rules: []*gitlab.MergeRequestApprovalRule{
906 {
907 ID: 1,
908 Name: "rule 1",
909 ApprovalsRequired: 2,
910 ApprovedBy: []*gitlab.BasicUser{
911 {
912 ID: 1,
913 Username: "user1",
914 Name: "User One",
915 },
916 {
917 ID: 2,
918 Username: "user2",
919 Name: "User Two",
920 },
921 },
922 Approved: true,
923 },
924 },
925 },
926 expected: `Rule "rule 1" sufficient approvals (2/2 required):
927Name Username Approved
928User One user1 👍
929User Two user2 👍
931`,
932 },
933 {
934 name: "not-approved, min approvers not met",
935 approvalState: &gitlab.MergeRequestApprovalState{
936 Rules: []*gitlab.MergeRequestApprovalRule{
937 {
938 ID: 1,
939 Name: "rule 1",
940 ApprovalsRequired: 2,
941 ApprovedBy: []*gitlab.BasicUser{
942 {
943 ID: 1,
944 Username: "user1",
945 Name: "User One",
946 },
947 },
948 Approved: false,
949 },
950 },
951 },
952 expected: `Rule "rule 1" insufficient approvals (1/2 required):
953Name Username Approved
954User One user1 👍
956`,
957 },
958 {
959 name: "approved, eligible approvers",
960 approvalState: &gitlab.MergeRequestApprovalState{
961 Rules: []*gitlab.MergeRequestApprovalRule{
962 {
963 ID: 1,
964 Name: "rule 1",
965 ApprovalsRequired: 2,
966 EligibleApprovers: []*gitlab.BasicUser{
967 {
968 ID: 1,
969 Username: "user1",
970 Name: "User One",
971 },
972 {
973 ID: 2,
974 Username: "user2",
975 Name: "User Two",
976 },
977 },
978 ApprovedBy: []*gitlab.BasicUser{
979 {
980 ID: 1,
981 Username: "user1",
982 Name: "User One",
983 },
984 {
985 ID: 2,
986 Username: "user2",
987 Name: "User Two",
988 },
989 },
990 Approved: true,
991 },
992 },
993 },
994 expected: `Rule "rule 1" sufficient approvals (2/2 required):
995Name Username Approved
996User One user1 👍
997User Two user2 👍
999`,
1000 },
1001 {
1002 name: "not approved, missing eligible approver",
1003 approvalState: &gitlab.MergeRequestApprovalState{
1004 Rules: []*gitlab.MergeRequestApprovalRule{
1005 {
1006 ID: 1,
1007 Name: "rule 1",
1008 ApprovalsRequired: 2,
1009 EligibleApprovers: []*gitlab.BasicUser{
1010 {
1011 ID: 1,
1012 Username: "user1",
1013 Name: "User One",
1014 },
1015 {
1016 ID: 2,
1017 Username: "user2",
1018 Name: "User Two",
1019 },
1020 },
1021 ApprovedBy: []*gitlab.BasicUser{
1022 {
1023 ID: 1,
1024 Username: "user1",
1025 Name: "User One",
1026 },
1027 },
1028 Approved: false,
1029 },
1030 },
1031 },
1032 expected: `Rule "rule 1" insufficient approvals (1/2 required):
1033Name Username Approved
1034User One user1 👍
1035User Two user2 -
1037`,
1038 },
1039 {
1040 name: "deterministic output without eligible approvers",
1041 approvalState: &gitlab.MergeRequestApprovalState{
1042 Rules: []*gitlab.MergeRequestApprovalRule{
1043 {
1044 ID: 1,
1045 Name: "rule 1",
1046 ApprovalsRequired: 2,
1047 ApprovedBy: []*gitlab.BasicUser{
1048 {
1049 ID: 1,
1050 Username: "aaa",
1051 Name: "User One",
1052 },
1053 {
1054 ID: 2,
1055 Username: "zzz",
1056 Name: "User Two",
1057 },
1058 {
1059 ID: 3,
1060 Username: "000",
1061 Name: "User Three",
1062 },
1063 {
1064 ID: 4,
1065 Username: "xyz",
1066 Name: "User Four",
1067 },
1068 },
1069 Approved: true,
1070 },
1071 },
1072 },
1073 expected: `Rule "rule 1" sufficient approvals (4/2 required):
1074Name Username Approved
1075User Three 000 👍
1076User One aaa 👍
1077User Four xyz 👍
1078User Two zzz 👍
1080`,
1081 },
1082 {
1083 name: "deterministic output with all eligible approvers",
1084 approvalState: &gitlab.MergeRequestApprovalState{
1085 Rules: []*gitlab.MergeRequestApprovalRule{
1086 {
1087 ID: 1,
1088 Name: "rule 1",
1089 ApprovalsRequired: 2,
1090 ApprovedBy: []*gitlab.BasicUser{
1091 {
1092 ID: 4,
1093 Username: "xyz",
1094 Name: "User Four",
1095 },
1096 {
1097 ID: 1,
1098 Username: "aaa",
1099 Name: "User One",
1100 },
1101 {
1102 ID: 2,
1103 Username: "zzz",
1104 Name: "User Two",
1105 },
1106 {
1107 ID: 3,
1108 Username: "000",
1109 Name: "User Three",
1110 },
1111 },
1112 EligibleApprovers: []*gitlab.BasicUser{
1113 {
1114 ID: 4,
1115 Username: "xyz",
1116 Name: "User Four",
1117 },
1118 {
1119 ID: 2,
1120 Username: "zzz",
1121 Name: "User Two",
1122 },
1123 },
1124 Approved: true,
1125 },
1126 },
1127 },
1128 expected: `Rule "rule 1" sufficient approvals (4/2 required):
1129Name Username Approved
1130User Four xyz 👍
1131User Two zzz 👍
1132User Three 000 👍
1133User One aaa 👍
1135`,
1136 },
1137 {
1138 name: "deterministic output with no eligible approvers",
1139 approvalState: &gitlab.MergeRequestApprovalState{
1140 Rules: []*gitlab.MergeRequestApprovalRule{
1141 {
1142 ID: 1,
1143 Name: "rule 1",
1144 ApprovalsRequired: 2,
1145 ApprovedBy: []*gitlab.BasicUser{
1146 {
1147 ID: 1,
1148 Username: "aaa",
1149 Name: "User One",
1150 },
1151 {
1152 ID: 3,
1153 Username: "000",
1154 Name: "User Three",
1155 },
1156 },
1157 EligibleApprovers: []*gitlab.BasicUser{
1158 {
1159 ID: 4,
1160 Username: "xyz",
1161 Name: "User Four",
1162 },
1163 {
1164 ID: 2,
1165 Username: "zzz",
1166 Name: "User Two",
1167 },
1168 },
1169 Approved: true,
1170 },
1171 },
1172 },
1173 expected: `Rule "rule 1" sufficient approvals (2/2 required):
1174Name Username Approved
1175User Four xyz -
1176User Two zzz -
1177User Three 000 👍
1178User One aaa 👍
1180`,
1181 },
1182 }
1184 for _, scenario := range scenarios {
1185 t.Run(scenario.name, func(t *testing.T) {
1186 streams, _, stdout, _ := cmdtest.TestIOStreams()
1188 PrintMRApprovalState(streams, scenario.approvalState)
1189 assert.Equal(t, scenario.expected, stdout.String())
1190 })
1191 }
1192}
1194func Test_RebaseMR(t *testing.T) {
1195 type status struct {
1196 inProgress bool
1197 sha string
1198 diverged int64
1199 mergeError string
1200 }
1202 testCases := []struct {
1203 name string
1204 before *gitlab.MergeRequest
1205 statuses []status
1206 attempts int
1207 trustAfter int
1208 wantErr string
1209 wantPolls int
1210 wantSleeps int
1211 }{
1212 {
1213 name: "ignores the stale status read before the rebase job starts",
1214 statuses: []status{{false, "old", 2, ""}, {true, "old", 2, ""}, {true, "old", 2, ""}, {false, "new", 0, ""}},
1215 wantPolls: 4,
1216 wantSleeps: 3,
1217 },
1218 {
1219 name: "completes when the head SHA changed between polls",
1220 statuses: []status{{false, "new", 2, ""}},
1221 wantPolls: 1,
1222 },
1223 {
1224 name: "completes when the branch no longer diverges",
1225 statuses: []status{{false, "old", 0, ""}},
1226 wantPolls: 1,
1227 },
1228 {
1229 name: "returns the merge error of a failed rebase",
1230 statuses: []status{{true, "old", 2, ""}, {false, "old", 2, "Rebase failed"}},
1231 wantErr: "Rebase failed",
1232 wantPolls: 2,
1233 wantSleeps: 1,
1234 },
1235 {
1236 name: "returns a repeated merge error once the rebase was seen in progress",
1237 before: &gitlab.MergeRequest{
1238 BasicMergeRequest: gitlab.BasicMergeRequest{IID: 123, SHA: "old"},
1239 MergeError: "Rebase failed",
1240 },
1241 statuses: []status{{true, "old", 2, "Rebase failed"}, {false, "old", 2, "Rebase failed"}},
1242 wantErr: "Rebase failed",
1243 wantPolls: 2,
1244 wantSleeps: 1,
1245 },
1246 {
1247 name: "returns a repeated merge error once it outlasts the grace polls",
1248 before: &gitlab.MergeRequest{
1249 BasicMergeRequest: gitlab.BasicMergeRequest{IID: 123, SHA: "old"},
1250 MergeError: "Rebase failed",
1251 },
1252 statuses: []status{{false, "old", 2, "Rebase failed"}, {false, "old", 2, "Rebase failed"}, {false, "old", 2, "Rebase failed"}},
1253 trustAfter: 2,
1254 wantErr: "Rebase failed",
1255 wantPolls: 3,
1256 wantSleeps: 2,
1257 },
1258 {
1259 name: "ignores a merge error left over from an earlier attempt",
1260 before: &gitlab.MergeRequest{
1261 BasicMergeRequest: gitlab.BasicMergeRequest{IID: 123, SHA: "old"},
1262 MergeError: "old error",
1263 },
1264 statuses: []status{{false, "old", 2, "old error"}, {false, "new", 0, "old error"}},
1265 wantPolls: 2,
1266 wantSleeps: 1,
1267 },
1268 {
1269 name: "times out when the rebase never happens",
1270 statuses: []status{{false, "old", 2, ""}, {false, "old", 2, ""}, {false, "old", 2, ""}},
1271 attempts: 3,
1272 wantErr: "timed out waiting for the rebase of merge request !123",
1273 wantPolls: 3,
1274 wantSleeps: 2,
1275 },
1276 }
1278 for _, tc := range testCases {
1279 t.Run(tc.name, func(t *testing.T) {
1280 sleeps := 0
1281 poll := rebasePolling{interval: time.Second, attempts: 300, wait: func(context.Context, time.Duration) error {
1282 sleeps++
1283 return nil
1284 }}
1285 if tc.attempts > 0 {
1286 poll.attempts = tc.attempts
1287 }
1288 poll.trustMergeErrorAfter = poll.attempts
1289 if tc.trustAfter > 0 {
1290 poll.trustMergeErrorAfter = tc.trustAfter
1291 }
1293 polls := 0
1294 testClient := gitlabtesting.NewTestClient(t)
1295 testClient.MockMergeRequests.EXPECT().
1296 RebaseMergeRequest("OWNER/REPO", int64(123), gomock.Any(), gomock.Any()).
1297 Return(nil, nil)
1298 testClient.MockMergeRequests.EXPECT().
1299 GetMergeRequest("OWNER/REPO", int64(123), gomock.Any(), gomock.Any()).
1300 DoAndReturn(func(_ any, _ int64, opts *gitlab.GetMergeRequestsOptions, _ ...gitlab.RequestOptionFunc) (*gitlab.MergeRequest, *gitlab.Response, error) {
1301 require.True(t, *opts.IncludeRebaseInProgress)
1302 require.True(t, *opts.IncludeDivergedCommitsCount)
1303 require.Less(t, polls, len(tc.statuses), "unexpected extra status read")
1304 s := tc.statuses[polls]
1305 polls++
1306 return &gitlab.MergeRequest{
1307 BasicMergeRequest: gitlab.BasicMergeRequest{IID: 123, SHA: s.sha},
1308 RebaseInProgress: s.inProgress,
1309 DivergedCommitsCount: s.diverged,
1310 MergeError: s.mergeError,
1311 }, nil, nil
1312 }).
1313 AnyTimes()
1315 before := tc.before
1316 if before == nil {
1317 before = &gitlab.MergeRequest{BasicMergeRequest: gitlab.BasicMergeRequest{IID: 123, SHA: "old"}}
1318 }
1319 ios, _, _, _ := cmdtest.TestIOStreams()
1321 err := rebaseMR(t.Context(), ios, testClient.Client, glrepo.New("OWNER", "REPO", "gitlab.com"), before, nil, poll)
1323 if tc.wantErr != "" {
1324 require.ErrorContains(t, err, tc.wantErr)
1325 } else {
1326 require.NoError(t, err)
1327 }
1328 assert.Equal(t, tc.wantPolls, polls)
1329 assert.Equal(t, tc.wantSleeps, sleeps)
1330 })
1331 }
1332}
1334func Test_RebaseMR_StopsWaitingWhenContextIsCancelled(t *testing.T) {
1335 ctx, cancel := context.WithCancel(t.Context())
1336 polls := 0
1337 testClient := gitlabtesting.NewTestClient(t)
1338 testClient.MockMergeRequests.EXPECT().
1339 RebaseMergeRequest("OWNER/REPO", int64(123), gomock.Any(), gomock.Any()).
1340 Return(nil, nil)
1341 testClient.MockMergeRequests.EXPECT().
1342 GetMergeRequest("OWNER/REPO", int64(123), gomock.Any(), gomock.Any()).
1343 DoAndReturn(func(_ any, _ int64, _ *gitlab.GetMergeRequestsOptions, _ ...gitlab.RequestOptionFunc) (*gitlab.MergeRequest, *gitlab.Response, error) {
1344 polls++
1345 cancel()
1346 return &gitlab.MergeRequest{
1347 BasicMergeRequest: gitlab.BasicMergeRequest{IID: 123, SHA: "old"},
1348 DivergedCommitsCount: 2,
1349 }, nil, nil
1350 })
1352 before := &gitlab.MergeRequest{BasicMergeRequest: gitlab.BasicMergeRequest{IID: 123, SHA: "old"}}
1353 ios, _, _, _ := cmdtest.TestIOStreams()
1354 // An hour-long interval: the test only finishes because the wait honours ctx.
1355 poll := rebasePolling{interval: time.Hour, attempts: 300, wait: waitOrDone}
1357 err := rebaseMR(ctx, ios, testClient.Client, glrepo.New("OWNER", "REPO", "gitlab.com"), before, nil, poll)
1359 require.ErrorIs(t, err, context.Canceled)
1360 assert.Equal(t, 1, polls)
1361}
1363func Test_MRsFromArgs_LimitsConcurrency(t *testing.T) {
1364 ios, _, _, _ := cmdtest.TestIOStreams()
1365 f := cmdtest.NewTestFactory(ios, cmdtest.WithBaseRepo("foo", "bar", ""))
1367 var inFlight, maxInFlight atomic.Int32
1368 release := make(chan struct{})
1369 origGetMR := api.GetMR
1370 t.Cleanup(func() { api.GetMR = origGetMR })
1371 api.GetMR = func(_ *gitlab.Client, _ any, mrID int64, _ *gitlab.GetMergeRequestsOptions) (*gitlab.MergeRequest, error) {
1372 n := inFlight.Add(1)
1373 defer inFlight.Add(-1)
1374 for {
1375 m := maxInFlight.Load()
1376 if n <= m || maxInFlight.CompareAndSwap(m, n) {
1377 break
1378 }
1379 }
1380 <-release
1381 return &gitlab.MergeRequest{BasicMergeRequest: gitlab.BasicMergeRequest{IID: mrID}}, nil
1382 }
1384 args := make([]string, 4*api.MaxConcurrentRequests)
1385 for i := range args {
1386 args[i] = strconv.Itoa(i + 1)
1387 }
1389 type result struct {
1390 mrs []*gitlab.MergeRequest
1391 err error
1392 }
1393 done := make(chan result)
1394 go func() {
1395 mrs, _, err := MRsFromArgs(t.Context(), f, args, "")
1396 done <- result{mrs, err}
1397 }()
1399 require.Eventually(t, func() bool {
1400 return inFlight.Load() == api.MaxConcurrentRequests
1401 }, time.Second, time.Millisecond)
1402 close(release)
1403 res := <-done
1405 require.NoError(t, res.err)
1406 require.Len(t, res.mrs, len(args))
1407 assert.Equal(t, int32(api.MaxConcurrentRequests), maxInFlight.Load())
1408}
Diagnostics8 git calls · 383 ms
CallStatusSizeTime0383 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 KiB · hit2 ms
git.upload-pack ls-refs http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=ls-refs git.upstream.dur_ms=2 git.response.bytes=59849 git.response.cache=HIT git.response.duration_ms=2 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
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
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=3 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:02001.8 KiB · hit3 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=1 git.response.bytes=1857 git.response.cache=HIT git.response.duration_ms=3 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:0200746 B · hit1 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=746 git.response.cache=HIT git.response.duration_ms=1 git.fetch.filter=tree:0 git.fetch.wants=f3d413a22af5a9c2fe9aa49709b1cb36d1351a7f 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=746 git.pkt.payload.max=719 git.sideband.band1.bytes=719 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0 git.pack.objects=1 git.pack.bytes=719 git.pack.trailer=330baf80c59a4208b55120dff7dd824b7952b790Open pack map
fetchtree:0200469 B · hit3 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=370 git.response.bytes=469 git.response.cache=HIT git.response.duration_ms=3 git.fetch.filter=tree:0 git.fetch.wants=6020159a68b7314d330ee4ac0f7529b651d7accc 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=469 git.pkt.payload.max=442 git.sideband.band1.bytes=442 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0 git.pack.objects=1 git.pack.bytes=442 git.pack.trailer=97b1fd715810f2e169ed93a75830c9ee2eff1fc0Open pack map
fetch2006.5 KiB370 ms
git.upload-pack fetch http.response.status_code=200 git.response.bytes=6616 git.response.cache=MISS git.response.duration_ms=370 git.fetch.wants=6cde2982ecef035e4d7344a6eecf2205e4efaab4 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=6616 git.pkt.payload.max=6589 git.sideband.band1.bytes=6589 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
- a5e2cabfae0d4b67
- Request
- 5ce232a4…
- 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