From 3f071d6f42c1b1bd0f391b5f8542f981d76e15eb Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Thu, 7 Dec 2023 15:14:44 -0700 Subject: Stop considering WIP changes "unmergeable" While work-in-progress changes are unsubmittable, they can be mergeable. This is important if a site has set change.mergeabilityComputationBehavior to a value other than NEVER. Without this change, WIP changes always show as having a merge conflict when viewed as search/query results. A new test is added for that behavior and it fails prior to this change. Bug: Issue 40014889 Change-Id: I8ae13f6563fd7a527b1af92ba1533433949b61f9 Release-Notes: Fixed WIP changes always showing Merge Conflict in searches (cherry picked from commit e48a495f9d4da5fcd49f10ce756538c19e0deeec) --- java/com/google/gerrit/server/query/change/ChangeData.java | 2 -- javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/com/google/gerrit/server/query/change/ChangeData.java b/java/com/google/gerrit/server/query/change/ChangeData.java index a69d837c6d..82f85e924e 100644 --- a/java/com/google/gerrit/server/query/change/ChangeData.java +++ b/java/com/google/gerrit/server/query/change/ChangeData.java @@ -1229,8 +1229,6 @@ public class ChangeData { mergeable = true; } else if (c.isAbandoned()) { return null; - } else if (c.isWorkInProgress()) { - return null; } else { if (!lazyload()) { return null; diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java index c9c5c2c1c8..ceceaacbca 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java @@ -4791,6 +4791,8 @@ public class ChangeIT extends AbstractDaemonTest { public void changeQueryReturnsMergeableWhenGerritIndexMergeable() throws Exception { String changeId = createChange().getChangeId(); assertThat(gApi.changes().query(changeId).get().get(0).mergeable).isTrue(); + gApi.changes().id(changeId).setWorkInProgress(); + assertThat(gApi.changes().query(changeId).get().get(0).mergeable).isTrue(); } @Test -- cgit v1.2.3