From 8f5013449f968dabb910d14e8c1164e79548a740 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 12 Nov 2019 09:24:01 -0800 Subject: [PATCH 1/3] Upgrade jackson-core to 2.10.1 Change-Id: I396450676605a8441c8140984f1d6c3b314b364a --- WORKSPACE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index b3ba0e3bf3..d6473ccbdc 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1118,8 +1118,8 @@ maven_jar( maven_jar( name = "jackson-core", - artifact = "com.fasterxml.jackson.core:jackson-core:2.10.0", - sha1 = "4e2c5fa04648ec9772c63e2101c53af6504e624e", + artifact = "com.fasterxml.jackson.core:jackson-core:2.10.1", + sha1 = "2c8b5e26ba40e5f91eb37a24075a2028b402c5f9", ) TESTCONTAINERS_VERSION = "1.12.3" From 593a5007052c340920d5715e62b4eeec617a6f54 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 12 Nov 2019 09:40:48 -0800 Subject: [PATCH 2/3] MergeValidationListener: Include the change Id in onPreMerge Bug: Issue 11905 Change-Id: Ib0a65d12991b768f169cfe7fd562dcf8defc4d74 --- .../server/git/validators/MergeValidationListener.java | 2 ++ .../gerrit/server/git/validators/MergeValidators.java | 10 ++++++++-- java/com/google/gerrit/server/submit/MergeOp.java | 2 +- plugins/hooks | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/java/com/google/gerrit/server/git/validators/MergeValidationListener.java b/java/com/google/gerrit/server/git/validators/MergeValidationListener.java index 6edd04eeff..da6284a68f 100644 --- a/java/com/google/gerrit/server/git/validators/MergeValidationListener.java +++ b/java/com/google/gerrit/server/git/validators/MergeValidationListener.java @@ -16,6 +16,7 @@ package com.google.gerrit.server.git.validators; import com.google.gerrit.extensions.annotations.ExtensionPoint; import com.google.gerrit.reviewdb.client.Branch; +import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.git.CodeReviewCommit; @@ -45,6 +46,7 @@ public interface MergeValidationListener { CodeReviewCommit commit, ProjectState destProject, Branch.NameKey destBranch, + Change.Id changeId, PatchSet.Id patchSetId, IdentifiedUser caller) throws MergeValidationException; diff --git a/java/com/google/gerrit/server/git/validators/MergeValidators.java b/java/com/google/gerrit/server/git/validators/MergeValidators.java index 0422c51f1b..abaf99967f 100644 --- a/java/com/google/gerrit/server/git/validators/MergeValidators.java +++ b/java/com/google/gerrit/server/git/validators/MergeValidators.java @@ -23,6 +23,7 @@ import com.google.gerrit.extensions.registration.Extension; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Branch; +import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.RefNames; @@ -83,6 +84,7 @@ public class MergeValidators { CodeReviewCommit commit, ProjectState destProject, Branch.NameKey destBranch, + Change.Id changeId, PatchSet.Id patchSetId, IdentifiedUser caller) throws MergeValidationException { @@ -94,7 +96,7 @@ public class MergeValidators { groupValidatorFactory.create()); for (MergeValidationListener validator : validators) { - validator.onPreMerge(repo, commit, destProject, destBranch, patchSetId, caller); + validator.onPreMerge(repo, commit, destProject, destBranch, changeId, patchSetId, caller); } } @@ -156,6 +158,7 @@ public class MergeValidators { final CodeReviewCommit commit, final ProjectState destProject, final Branch.NameKey destBranch, + final Change.Id changeId, final PatchSet.Id patchSetId, IdentifiedUser caller) throws MergeValidationException { @@ -251,11 +254,12 @@ public class MergeValidators { CodeReviewCommit commit, ProjectState destProject, Branch.NameKey destBranch, + Change.Id changeId, PatchSet.Id patchSetId, IdentifiedUser caller) throws MergeValidationException { mergeValidationListeners.runEach( - l -> l.onPreMerge(repo, commit, destProject, destBranch, patchSetId, caller), + l -> l.onPreMerge(repo, commit, destProject, destBranch, changeId, patchSetId, caller), MergeValidationException.class); } } @@ -288,6 +292,7 @@ public class MergeValidators { CodeReviewCommit commit, ProjectState destProject, Branch.NameKey destBranch, + Change.Id changeId, PatchSet.Id patchSetId, IdentifiedUser caller) throws MergeValidationException { @@ -339,6 +344,7 @@ public class MergeValidators { CodeReviewCommit commit, ProjectState destProject, Branch.NameKey destBranch, + Change.Id changeId, PatchSet.Id patchSetId, IdentifiedUser caller) throws MergeValidationException { diff --git a/java/com/google/gerrit/server/submit/MergeOp.java b/java/com/google/gerrit/server/submit/MergeOp.java index 9c841ca990..43cc5d6455 100644 --- a/java/com/google/gerrit/server/submit/MergeOp.java +++ b/java/com/google/gerrit/server/submit/MergeOp.java @@ -846,7 +846,7 @@ public class MergeOp implements AutoCloseable { MergeValidators mergeValidators = mergeValidatorsFactory.create(); try { mergeValidators.validatePreMerge( - or.repo, commit, or.project, destBranch, ps.getId(), caller); + or.repo, commit, or.project, destBranch, changeId, ps.getId(), caller); } catch (MergeValidationException mve) { commitStatus.problem(changeId, mve.getMessage()); continue; diff --git a/plugins/hooks b/plugins/hooks index d2632b5727..c0f9d23820 160000 --- a/plugins/hooks +++ b/plugins/hooks @@ -1 +1 @@ -Subproject commit d2632b5727d481ab72abdb0aa34f25baa340285d +Subproject commit c0f9d238203e24911b8172789c3e19e9d78c1fb5 From 666cf0dc8130728389abb1f001a2721ed1127683 Mon Sep 17 00:00:00 2001 From: Tao Zhou Date: Tue, 12 Nov 2019 18:29:22 +0000 Subject: [PATCH 3/3] Avoid browser caching for diff on edit patch Bug: Issue 8282 Change-Id: I73f57fd493190a07527e817a5841d02577e7d0ff --- .../gr-rest-api-interface/gr-rest-api-interface.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js index 3861a84891..dd4f04f642 100644 --- a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js +++ b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js @@ -2272,15 +2272,23 @@ params.base = basePatchNum; } const endpoint = `/files/${encodeURIComponent(path)}/diff`; - - return this._getChangeURLAndFetch({ + const req = { changeNum, endpoint, patchNum, errFn: opt_errFn, params, anonymizedEndpoint: '/files/*/diff', - }); + }; + + // Invalidate the cache if its edit patch to make sure we always get latest. + if (patchNum === this.EDIT_NAME) { + if (!req.fetchOptions) req.fetchOptions = {}; + if (!req.fetchOptions.headers) req.fetchOptions.headers = new Headers(); + req.fetchOptions.headers.append('Cache-Control', 'no-cache'); + } + + return this._getChangeURLAndFetch(req); }, /**