From 0299e25fee7c13728959c19b6b1c13fb96035b3c Mon Sep 17 00:00:00 2001 From: Sven Selberg Date: Tue, 5 May 2020 16:16:41 +0200 Subject: [PATCH 1/6] gerrit-config.txt: cache-automerge is for "merge" commmits Change-Id: I952978259cf0507a200d5aa5246f1d3b1eb52bfd --- Documentation/config-gerrit.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt index cd15de70cc..5052386b19 100644 --- a/Documentation/config-gerrit.txt +++ b/Documentation/config-gerrit.txt @@ -1200,7 +1200,7 @@ Default is false. [[change.cacheAutomerge]]change.cacheAutomerge:: + -When reviewing diff commits, the left-hand side shows the output of the +When reviewing merge commits, the left-hand side shows the output of the result of JGit's automatic merge algorithm. This option controls whether this output is cached in the change repository, or if only the diff is cached in the persistent `diff` cache. From 3b8bbf7ead553a00d1de6adf0bdea69cb15b4402 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Wed, 6 May 2020 14:28:10 +0200 Subject: [PATCH 2/6] Update git submodules * Update plugins/hooks from branch 'stable-2.16' to e7769bd52c2b709d7712a386aa6cb96aec2c11a9 - HookExecutor: Add missing licence header Signed-off-by: Edwin Kempin Change-Id: I036a6b1f246efbf42d0cd0a8555ef582e8a78293 --- plugins/hooks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hooks b/plugins/hooks index 57c8e62610..e7769bd52c 160000 --- a/plugins/hooks +++ b/plugins/hooks @@ -1 +1 @@ -Subproject commit 57c8e6261016e1cc233ea41f19fa5bdf187df8a7 +Subproject commit e7769bd52c2b709d7712a386aa6cb96aec2c11a9 From e16ecb1b6745c0a3232a53baf36d0a80cded523f Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Wed, 6 May 2020 14:30:23 +0200 Subject: [PATCH 3/6] ListTestPlugin: Add missing license header Change-Id: I68e1e335e1c762bc6dd4bc25c2e98de18bc438af Signed-off-by: Edwin Kempin --- .../gerrit/acceptance/rest/ListTestPlugin.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/java/com/google/gerrit/acceptance/rest/ListTestPlugin.java b/java/com/google/gerrit/acceptance/rest/ListTestPlugin.java index 00e7d32f99..00e071ccb5 100644 --- a/java/com/google/gerrit/acceptance/rest/ListTestPlugin.java +++ b/java/com/google/gerrit/acceptance/rest/ListTestPlugin.java @@ -1,3 +1,17 @@ +// Copyright (C) 2019 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + package com.google.gerrit.acceptance.rest; import com.google.common.collect.ImmutableList; From 3b3401e14d578377c08e1979d53935268d6706bc Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 7 May 2020 09:58:16 +0900 Subject: [PATCH 4/6] Update git submodules * Update plugins/replication from branch 'stable-2.16' to 0ee047a7d73cb10010ff4923764851982cb38e98 - ReplicationQueue: Revert back from Flogger to slf4j logging Slf4j's Mapped Diagnostic Context (MDC) is used to add the replication Id into the logs and this was not adapted in the migration to Flogger, resulting in the replication Id being omitted from the logs. Flogger does not support MDC in the same way as slf4j, but provides a log context which could be used. This would however change the format of the log output. An alternative would be to manually update all the log statements to include the replication Id. The downside of this approach is that we need to remember to manually add it in any new logs that get added. Instead of attempting either of those, just revert back to using slf4j. This reverts commit 425f4f20218986615593da1a9319466743ee12eb. Note that this is not a pure revert of 425f4f2; following that commit several new logs were added. This reverts the commit and adapts the new logs to also use slf4j. Bug: Issue 12678 Change-Id: I3002afdac7c31786de5b611b32fa3f4c1a80e657 --- plugins/replication | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/replication b/plugins/replication index 3cf0561317..0ee047a7d7 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit 3cf056131792a031e80476efda35f4b43315d546 +Subproject commit 0ee047a7d73cb10010ff4923764851982cb38e98 From 19275196a75ac80398b012fc80a2f1d15fa221d1 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 7 May 2020 10:39:40 +0900 Subject: [PATCH 5/6] Fix documentation of owned-by option in groups REST API Bug: Issue 12698 Change-Id: Ia3b75b11cab70100f927d3237f4792a8807f7be9 --- Documentation/rest-api-groups.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/rest-api-groups.txt b/Documentation/rest-api-groups.txt index 00fd81f62a..85f73295aa 100644 --- a/Documentation/rest-api-groups.txt +++ b/Documentation/rest-api-groups.txt @@ -126,13 +126,13 @@ client so they are generally disabled by default. Optional fields are: ==== Find groups that are owned by another group -By setting `ownedBy` and specifying the link:#group-id[\{group-id\}] of another +By setting `owned-by` and specifying the link:#group-id[\{group-id\}] of another group, it is possible to find all the groups for which the owning group is the given group. .Request ---- - GET /groups/?ownedBy=7ca042f4d5847936fcb90ca91057673157fd06fc HTTP/1.0 + GET /groups/?owned-by=7ca042f4d5847936fcb90ca91057673157fd06fc HTTP/1.0 ---- .Response From b274a824690839d39a40a8bc170cdd0dba8bee36 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 7 May 2020 10:47:33 +0900 Subject: [PATCH 6/6] ListGroups: Accept --ownedby as an alias of --owned-by In the release notes of 2.16 and documentation, the --owned-by option was incorrectly documented as --ownedBy which resulted in an error if it was used: "--ownedby" is not a valid option The documentation has been fixed, but --ownedBy will still result in an error for anyone who refers to the outdated documentation. Add --ownedby as an alias of --owned-by so that it will work if either is given. Bug: Issue 12698 Change-Id: I6229b191b59d8c0bc65105ae5817104c3b40863c --- java/com/google/gerrit/server/restapi/group/ListGroups.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java/com/google/gerrit/server/restapi/group/ListGroups.java b/java/com/google/gerrit/server/restapi/group/ListGroups.java index 2567f6ab8c..7fe9e90106 100644 --- a/java/com/google/gerrit/server/restapi/group/ListGroups.java +++ b/java/com/google/gerrit/server/restapi/group/ListGroups.java @@ -205,7 +205,10 @@ public class ListGroups implements RestReadView { options.addAll(ListGroupsOption.fromBits(Integer.parseInt(hex, 16))); } - @Option(name = "--owned-by", usage = "list groups owned by the given group uuid") + @Option( + name = "--owned-by", + aliases = {"--ownedby"}, + usage = "list groups owned by the given group uuid") public void setOwnedBy(String ownedBy) { this.ownedBy = ownedBy; }