issue, mr: Allow filtering lists by milestone

It's useful to list all issues/merge requests associated with a
milestone (for example for release planning), so add a corresponding
filter option.

cmd/issue_list.go

@@ -12,11 +12,12 @@ import (
 )
 
 var (
-	issueLabels []string
-	issueState  string
-	issueSearch string
-	issueNumRet int
-	issueAll    bool
+	issueLabels    []string
+	issueMilestone string
+	issueState     string
+	issueSearch    string
+	issueNumRet    int
+	issueAll       bool
 )
 
 var issueListCmd = &cobra.Command{
@@ -51,13 +52,22 @@ func issueList(args []string) ([]*gitlab.Issue, error) {
 		return nil, err
 	}
 
+	if issueMilestone != "" {
+		milestone, err := lab.MilestoneGet(rn, issueMilestone)
+		if err != nil {
+			return nil, err
+		}
+		issueMilestone = milestone.Title
+	}
+
 	opts := gitlab.ListProjectIssuesOptions{
 		ListOptions: gitlab.ListOptions{
 			PerPage: issueNumRet,
 		},
-		Labels:  labels,
-		State:   &issueState,
-		OrderBy: gitlab.String("updated_at"),
+		Labels:    labels,
+		Milestone: &issueMilestone,
+		State:     &issueState,
+		OrderBy:   gitlab.String("updated_at"),
 	}
 
 	if issueSearch != "" {
@@ -84,6 +94,9 @@ func init() {
 	issueListCmd.Flags().BoolVarP(
 		&issueAll, "all", "a", false,
 		"list all issues on the project")
+	issueListCmd.Flags().StringVar(
+		&issueMilestone, "milestone", "",
+		"filter issues by milestone")
 
 	issueCmd.AddCommand(issueListCmd)
 	carapace.Gen(issueListCmd).FlagCompletion(carapace.ActionMap{

cmd/issue_list_test.go

@@ -56,6 +56,22 @@ func Test_issueListStateClosed(t *testing.T) {
 	require.Contains(t, issues, "#4 test closed issue")
 }
 
+func Test_issueListFlagMilestone(t *testing.T) {
+	t.Parallel()
+	repo := copyTestRepo(t)
+	cmd := exec.Command(labBinaryPath, "issue", "list", "--milestone", "1.0")
+	cmd.Dir = repo
+
+	b, err := cmd.CombinedOutput()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	issues := strings.Split(string(b), "\n")
+	t.Log(issues)
+	require.Contains(t, issues, "#1 test issue for lab list")
+}
+
 func Test_issueListSearch(t *testing.T) {
 	t.Parallel()
 	repo := copyTestRepo(t)

cmd/mr_list.go

@@ -16,6 +16,7 @@ var (
 	mrLabels       []string
 	mrState        string
 	mrTargetBranch string
+	mrMilestone    string
 	mrNumRet       int
 	mrAll          bool
 	mrMine         bool
@@ -77,6 +78,14 @@ func mrList(args []string) ([]*gitlab.MergeRequest, error) {
 		assigneeID = &_assigneeID
 	}
 
+	if mrMilestone != "" {
+		milestone, err := lab.MilestoneGet(rn, mrMilestone)
+		if err != nil {
+			log.Fatal(err)
+		}
+		mrMilestone = milestone.Title
+	}
+
 	orderBy := gitlab.String(order)
 
 	sort := gitlab.String(sortedBy)
@@ -88,6 +97,7 @@ func mrList(args []string) ([]*gitlab.MergeRequest, error) {
 		Labels:       labels,
 		State:        &mrState,
 		TargetBranch: &mrTargetBranch,
+		Milestone:    &mrMilestone,
 		OrderBy:      orderBy,
 		Sort:         sort,
 		AssigneeID:   assigneeID,
@@ -114,6 +124,8 @@ func init() {
 	listCmd.Flags().StringVarP(
 		&mrTargetBranch, "target-branch", "t", "",
 		"filter merge requests by target branch")
+	listCmd.Flags().StringVar(
+		&mrMilestone, "milestone", "", "list only MRs for the given milestone")
 	listCmd.Flags().BoolVarP(&mrAll, "all", "a", false, "list all MRs on the project")
 	listCmd.Flags().BoolVarP(&mrMine, "mine", "m", false, "list only MRs assigned to me")
 	listCmd.Flags().StringVar(

cmd/mr_test.go

@@ -344,6 +344,88 @@ func Test_mrCmd_Draft(t *testing.T) {
 	})
 }
 
+func Test_mrCmd_Milestone(t *testing.T) {
+	repo := copyTestRepo(t)
+	var mrID string
+	t.Run("prepare", func(t *testing.T) {
+		cmd := exec.Command("sh", "-c", labBinaryPath+` mr list origin | grep -m1 'Test draft' | cut -c2- | awk '{print $1}' | xargs `+labBinaryPath+` mr origin -d`)
+		cmd.Dir = repo
+
+		b, err := cmd.CombinedOutput()
+		if err != nil {
+			t.Log(string(b))
+			//t.Fatal(err)
+		}
+	})
+	t.Run("create", func(t *testing.T) {
+		git := exec.Command("git", "checkout", "mrtest")
+		git.Dir = repo
+		b, err := git.CombinedOutput()
+		if err != nil {
+			t.Log(string(b))
+			t.Fatal(err)
+		}
+
+		cmd := exec.Command(labBinaryPath, "mr", "create", "--milestone", "1.0", "origin", "master",
+			"-m", "MR for 1.0",
+		)
+		cmd.Dir = repo
+
+		b, _ = cmd.CombinedOutput()
+		out := string(b)
+		t.Log(out)
+		require.Contains(t, out, "https://gitlab.com/zaquestion/test/-/merge_requests")
+
+		i := strings.Index(out, "/diffs\n")
+		mrID = strings.TrimPrefix(out[:i], "https://gitlab.com/zaquestion/test/-/merge_requests/")
+		t.Log(mrID)
+	})
+	t.Run("list", func(t *testing.T) {
+		if mrID == "" {
+			t.Skip("mrID is empty, create likely failed")
+		}
+		cmd := exec.Command(labBinaryPath, "mr", "list", "--milestone", "1.0", "origin")
+		cmd.Dir = repo
+
+		b, _ := cmd.CombinedOutput()
+		out := string(b)
+		t.Log(out)
+		require.Contains(t, out, "MR for 1.0")
+	})
+	t.Run("modify", func(t *testing.T) {
+		if mrID == "" {
+			t.Skip("mrID is empty, create likely failed")
+		}
+		cmd := exec.Command(labBinaryPath, "mr", "edit", "--milestone", "", "origin")
+		cmd.Dir = repo
+
+		b, _ := cmd.CombinedOutput()
+		t.Log(string(b))
+
+		cmd = exec.Command(labBinaryPath, "mr", "list", "--milestone", "1.0", "origin")
+		cmd.Dir = repo
+
+		b, _ = cmd.CombinedOutput()
+		out := string(b)
+		t.Log(out)
+		require.NotContains(t, out, "MR for 1.0")
+	})
+	t.Run("delete", func(t *testing.T) {
+		if mrID == "" {
+			t.Skip("mrID is empty, create likely failed")
+		}
+		cmd := exec.Command(labBinaryPath, "mr", "close", "origin", mrID)
+		cmd.Dir = repo
+
+		b, err := cmd.CombinedOutput()
+		if err != nil {
+			t.Log(string(b))
+			t.Fatal(err)
+		}
+		require.Contains(t, string(b), fmt.Sprintf("Merge Request !%s closed", mrID))
+	})
+}
+
 func Test_mrCmd_ByBranch(t *testing.T) {
 	repo := copyTestRepo(t)
 	var mrID string