From 53dfdacae098efab3a72714ebea6ba8d49ae6ecb Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Fri, 14 Feb 2025 19:57:14 +0100
Subject: [PATCH] ghostflow: update to skip sync merging if already merged

Also update `graphql_client` to match.

Update test expectations where necessary as well.

Fixes: #107
---
 Cargo.lock                          | 55 +++++------------------------
 Cargo.toml                          |  2 +-
 src/actions/merge_requests/merge.rs |  6 ++--
 3 files changed, 11 insertions(+), 52 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cb421bff..ea5b7816 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -823,7 +823,7 @@ dependencies = [
 [[package]]
 name = "ghostflow"
 version = "0.1.0"
-source = "git+https://gitlab.kitware.com/utils/rust-ghostflow.git#9c840994b09f0e1b2b90cda99bc29003ea2fc119"
+source = "git+https://gitlab.kitware.com/utils/rust-ghostflow.git#04ea3c090b73ac8d1c6971afaf02139da2c35404"
 dependencies = [
  "chrono",
  "derive_builder 0.11.2",
@@ -868,7 +868,7 @@ dependencies = [
  "git-checks-core",
  "git-topic-stage",
  "git-workarea",
- "graphql_client 0.11.0",
+ "graphql_client",
  "itertools 0.10.5",
  "json-job-dispatch",
  "lazy-init",
@@ -893,12 +893,12 @@ dependencies = [
 [[package]]
 name = "ghostflow-github"
 version = "0.1.0"
-source = "git+https://gitlab.kitware.com/utils/rust-ghostflow.git#9c840994b09f0e1b2b90cda99bc29003ea2fc119"
+source = "git+https://gitlab.kitware.com/utils/rust-ghostflow.git#04ea3c090b73ac8d1c6971afaf02139da2c35404"
 dependencies = [
  "chrono",
  "ghostflow",
  "git-workarea",
- "graphql_client 0.11.0",
+ "graphql_client",
  "itertools 0.10.5",
  "jsonwebtoken",
  "log",
@@ -913,7 +913,7 @@ dependencies = [
 [[package]]
 name = "ghostflow-gitlab"
 version = "0.1.0"
-source = "git+https://gitlab.kitware.com/utils/rust-ghostflow.git#9c840994b09f0e1b2b90cda99bc29003ea2fc119"
+source = "git+https://gitlab.kitware.com/utils/rust-ghostflow.git#04ea3c090b73ac8d1c6971afaf02139da2c35404"
 dependencies = [
  "chrono",
  "ghostflow",
@@ -1034,7 +1034,7 @@ dependencies = [
  "cron",
  "derive_builder 0.20.2",
  "futures-util",
- "graphql_client 0.14.0",
+ "graphql_client",
  "http 1.2.0",
  "itertools 0.12.1",
  "log",
@@ -1066,45 +1066,17 @@ dependencies = [
  "thiserror 1.0.59",
 ]
 
-[[package]]
-name = "graphql_client"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc16d75d169fddb720d8f1c7aed6413e329e1584079b9734ff07266a193f5bc"
-dependencies = [
- "graphql_query_derive 0.11.0",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "graphql_client"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a50cfdc7f34b7f01909d55c2dcb71d4c13cbcbb4a1605d6c8bd760d654c1144b"
 dependencies = [
- "graphql_query_derive 0.14.0",
+ "graphql_query_derive",
  "serde",
  "serde_json",
 ]
 
-[[package]]
-name = "graphql_client_codegen"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f290ecfa3bea3e8a157899dc8a1d96ee7dd6405c18c8ddd213fc58939d18a0e9"
-dependencies = [
- "graphql-introspection-query",
- "graphql-parser",
- "heck",
- "lazy_static",
- "proc-macro2",
- "quote",
- "serde",
- "serde_json",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "graphql_client_codegen"
 version = "0.14.0"
@@ -1122,24 +1094,13 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "graphql_query_derive"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a755cc59cda2641ea3037b4f9f7ef40471c329f55c1fa2db6fa0bb7ae6c1f7ce"
-dependencies = [
- "graphql_client_codegen 0.11.0",
- "proc-macro2",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "graphql_query_derive"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "83febfa838f898cfa73dfaa7a8eb69ff3409021ac06ee94cfb3d622f6eeb1a97"
 dependencies = [
- "graphql_client_codegen 0.14.0",
+ "graphql_client_codegen",
  "proc-macro2",
  "syn 1.0.109",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index c410fa70..77d13470 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,7 +39,7 @@ git-checks-core = "^1.2.2"
 git-checks = { version = "^4.0", features = ["config"] }
 git-topic-stage = "^4.0"
 git-workarea = "^4.2.1"
-graphql_client = "~0.11"
+graphql_client = "~0.14"
 itertools = "~0.10"
 json-job-dispatch = "^3.0.1"
 lazy-init = "~0.5"
diff --git a/src/actions/merge_requests/merge.rs b/src/actions/merge_requests/merge.rs
index d8c389b0..e35bfc96 100644
--- a/src/actions/merge_requests/merge.rs
+++ b/src/actions/merge_requests/merge.rs
@@ -1726,10 +1726,9 @@ mod tests {
         let ctx = GitContext::new(project_dir);
 
         check_ff_merge_commit(&ctx, "master", MERGE_REQUEST_FF_TOPIC);
-        check_into_merge_commit(&ctx, "next", "master");
         check_merge_commit(
             &ctx,
-            "next~",
+            "next",
             MERGE_REQUEST_FF_TOPIC,
             "Merge topic 'mr-source' into next\n\
              \n\
@@ -1792,10 +1791,9 @@ mod tests {
         let ctx = GitContext::new(project_dir);
 
         check_ff_merge_commit(&ctx, "master", MERGE_REQUEST_FF_TOPIC);
-        check_into_merge_commit(&ctx, "next", "master");
         check_merge_commit(
             &ctx,
-            "next~",
+            "next",
             MERGE_REQUEST_FF_TOPIC,
             "Merge topic 'mr-source' into next\n\
              \n\
-- 
GitLab