From 31f404fd9c1bf7e3cfb0430b6d48f18ff258d498 Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Tue, 8 Nov 2022 10:22:34 +0100 Subject: [PATCH 1/6] [gitlab.atd]: [merge_request.approvals_before_merge] is integral --- CHANGES.md | 1 + lib/gitlab.atd | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 8335f1e..f1d51f7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,7 @@ * `gitlab.atd`: add `scheduler_failure` to `failure_reason` * `gitlab.atd`: add `data_integrity_failure` to `failure_reason` + * `gitlab.atd`: make `merge_request.approvals_before_merge` integral # 0.1.7 - 2023-02-02 diff --git a/lib/gitlab.atd b/lib/gitlab.atd index dce0ef2..5cfdbff 100644 --- a/lib/gitlab.atd +++ b/lib/gitlab.atd @@ -369,7 +369,7 @@ type merge_request = { downvotes: int; author: user_short; assignee: user_short nullable; - approvals_before_merge: string nullable; + approvals_before_merge: int nullable; ?allow_collaboration: bool nullable; ?allow_maintainer_to_push: bool nullable; blocking_discussions_resolved: bool; From 1b4499e3fbfdf6ae35b1f3802d72d647641afd0c Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Tue, 8 Nov 2022 10:22:50 +0100 Subject: [PATCH 2/6] [gitlab.atd]: [merge_request.sha] is nullable I think this happens when the source branch is removed. Here is an example: https://gitlab.com/tezos/tezos/-/merge_requests/6456 --- CHANGES.md | 1 + lib/gitlab.atd | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index f1d51f7..5c8d551 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,6 +5,7 @@ * `gitlab.atd`: add `scheduler_failure` to `failure_reason` * `gitlab.atd`: add `data_integrity_failure` to `failure_reason` * `gitlab.atd`: make `merge_request.approvals_before_merge` integral + * `gitlab.atd`: make `merge_request.sha` nullable # 0.1.7 - 2023-02-02 diff --git a/lib/gitlab.atd b/lib/gitlab.atd index 5cfdbff..9d7123e 100644 --- a/lib/gitlab.atd +++ b/lib/gitlab.atd @@ -384,7 +384,7 @@ type merge_request = { milestone: milestone nullable; merge_when_pipeline_succeeds: bool; merge_status: merge_status; - sha: string; + sha: string nullable; merge_commit_sha: string nullable; squash_commit_sha: string nullable; user_notes_count: int; From 7c9e29bc72857ddf2c4dcded665c9a061d9fcd8e Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Tue, 8 Nov 2022 10:27:02 +0100 Subject: [PATCH 3/6] [Project.merge_requests]: add param [target_branch] --- CHANGES.md | 4 ++++ lib/gitlab_core.ml | 8 +++++++- lib/gitlab_s.mli | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 5c8d551..697beb8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,9 @@ # Unreleased +## Added + + * `Project.merge_requests`: add parameter `target_branch` + ## Bug fixes * `gitlab.atd`: add `scheduler_failure` to `failure_reason` diff --git a/lib/gitlab_core.ml b/lib/gitlab_core.ml index cc18f44..46a7cf9 100644 --- a/lib/gitlab_core.ml +++ b/lib/gitlab_core.ml @@ -1314,6 +1314,11 @@ struct | None -> uri | Some scope -> Uri.add_query_param' uri ("scope", scope) + let target_branch_param target_branch uri = + match target_branch with + | None -> uri + | Some target_branch -> Uri.add_query_param' uri ("target_branch", target_branch) + module Event = struct open Lwt @@ -1487,7 +1492,7 @@ struct let merge_requests ?token ?state ?milestone ?labels ?author ?author_username ?my_reaction ?scope ?created_after ?created_before ?updated_after - ?updated_before ?sort ?order_by ~id () = + ?updated_before ?sort ?order_by ?target_branch ~id () = let order_by_param order uri = let show = function | `Created_at -> "created_at" @@ -1510,6 +1515,7 @@ struct |> updated_after_param updated_after |> updated_before_param updated_before |> order_by_param order_by |> sort_param sort + |> target_branch_param target_branch in API.get_stream ?token ~uri (fun body -> return (Gitlab_j.merge_requests_of_string body)) diff --git a/lib/gitlab_s.mli b/lib/gitlab_s.mli index 86ea46e..8b2e171 100644 --- a/lib/gitlab_s.mli +++ b/lib/gitlab_s.mli @@ -693,6 +693,7 @@ module type Gitlab = sig ?updated_before:string -> ?sort:Gitlab_t.sort -> ?order_by:[ `Created_at | `Title | `Updated_at ] -> + ?target_branch:string -> id:int -> unit -> Gitlab_t.merge_request Stream.t From 13ebd9d69844261408034eff3cd96f9425981c8e Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Mon, 14 Nov 2022 18:57:24 +0100 Subject: [PATCH 4/6] [Project.merge_requests]: add param [wip] --- CHANGES.md | 1 + lib/gitlab_core.ml | 10 +++++++++- lib/gitlab_s.mli | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 697beb8..5b6542e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,7 @@ ## Added + * `Project.merge_requests`: add parameter `wip` * `Project.merge_requests`: add parameter `target_branch` ## Bug fixes diff --git a/lib/gitlab_core.ml b/lib/gitlab_core.ml index 46a7cf9..ef26660 100644 --- a/lib/gitlab_core.ml +++ b/lib/gitlab_core.ml @@ -1309,6 +1309,13 @@ struct | None -> uri | Some sort -> Uri.add_query_param' uri ("sort", show sort) + let wip_param wip uri = + match wip with + | None -> uri + | Some wip -> + let wip = if wip then "yes" else "no" in + Uri.add_query_param' uri ("wip", wip) + let event_scope_param scope uri = match scope with | None -> uri @@ -1492,7 +1499,7 @@ struct let merge_requests ?token ?state ?milestone ?labels ?author ?author_username ?my_reaction ?scope ?created_after ?created_before ?updated_after - ?updated_before ?sort ?order_by ?target_branch ~id () = + ?updated_before ?sort ?order_by ?target_branch ?wip ~id () = let order_by_param order uri = let show = function | `Created_at -> "created_at" @@ -1516,6 +1523,7 @@ struct |> updated_before_param updated_before |> order_by_param order_by |> sort_param sort |> target_branch_param target_branch + |> wip_param wip in API.get_stream ?token ~uri (fun body -> return (Gitlab_j.merge_requests_of_string body)) diff --git a/lib/gitlab_s.mli b/lib/gitlab_s.mli index 8b2e171..53fa760 100644 --- a/lib/gitlab_s.mli +++ b/lib/gitlab_s.mli @@ -694,6 +694,7 @@ module type Gitlab = sig ?sort:Gitlab_t.sort -> ?order_by:[ `Created_at | `Title | `Updated_at ] -> ?target_branch:string -> + ?wip:bool -> id:int -> unit -> Gitlab_t.merge_request Stream.t From 7d7cf9f7539d15454d14045ef4280d4136b6d57e Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Thu, 15 Jun 2023 10:10:45 +0200 Subject: [PATCH 5/6] [Project.merge_requests]: add param [per_page] --- CHANGES.md | 1 + lib/gitlab_core.ml | 3 ++- lib/gitlab_s.mli | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 5b6542e..0856a63 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,7 @@ * `Project.merge_requests`: add parameter `wip` * `Project.merge_requests`: add parameter `target_branch` + * `Project.merge_requests`: add parameter `per_page` ## Bug fixes diff --git a/lib/gitlab_core.ml b/lib/gitlab_core.ml index ef26660..af95022 100644 --- a/lib/gitlab_core.ml +++ b/lib/gitlab_core.ml @@ -1499,7 +1499,7 @@ struct let merge_requests ?token ?state ?milestone ?labels ?author ?author_username ?my_reaction ?scope ?created_after ?created_before ?updated_after - ?updated_before ?sort ?order_by ?target_branch ?wip ~id () = + ?updated_before ?sort ?order_by ?target_branch ?wip ?per_page ~id () = let order_by_param order uri = let show = function | `Created_at -> "created_at" @@ -1524,6 +1524,7 @@ struct |> order_by_param order_by |> sort_param sort |> target_branch_param target_branch |> wip_param wip + |> per_page_param per_page in API.get_stream ?token ~uri (fun body -> return (Gitlab_j.merge_requests_of_string body)) diff --git a/lib/gitlab_s.mli b/lib/gitlab_s.mli index 53fa760..b6aed19 100644 --- a/lib/gitlab_s.mli +++ b/lib/gitlab_s.mli @@ -695,6 +695,7 @@ module type Gitlab = sig ?order_by:[ `Created_at | `Title | `Updated_at ] -> ?target_branch:string -> ?wip:bool -> + ?per_page:int -> id:int -> unit -> Gitlab_t.merge_request Stream.t From ca4e204fd3f4d54c2b6f201fd507fa1c34f5f4fd Mon Sep 17 00:00:00 2001 From: Tim McGilchrist Date: Sat, 26 Aug 2023 13:19:01 +1000 Subject: [PATCH 6/6] ocamlformat code --- lib/gitlab_core.ml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/gitlab_core.ml b/lib/gitlab_core.ml index af95022..9d1813d 100644 --- a/lib/gitlab_core.ml +++ b/lib/gitlab_core.ml @@ -1313,8 +1313,8 @@ struct match wip with | None -> uri | Some wip -> - let wip = if wip then "yes" else "no" in - Uri.add_query_param' uri ("wip", wip) + let wip = if wip then "yes" else "no" in + Uri.add_query_param' uri ("wip", wip) let event_scope_param scope uri = match scope with @@ -1324,7 +1324,8 @@ struct let target_branch_param target_branch uri = match target_branch with | None -> uri - | Some target_branch -> Uri.add_query_param' uri ("target_branch", target_branch) + | Some target_branch -> + Uri.add_query_param' uri ("target_branch", target_branch) module Event = struct open Lwt @@ -1523,8 +1524,7 @@ struct |> updated_before_param updated_before |> order_by_param order_by |> sort_param sort |> target_branch_param target_branch - |> wip_param wip - |> per_page_param per_page + |> wip_param wip |> per_page_param per_page in API.get_stream ?token ~uri (fun body -> return (Gitlab_j.merge_requests_of_string body))