Merge "Allow optionally submitting a whole topic"
diff --git a/.mailmap b/.mailmap index 805ff41..332f98c 100644 --- a/.mailmap +++ b/.mailmap
@@ -37,6 +37,7 @@ Gustaf Lundh <gustaflh@axis.com> <gustaf.lundh@sonymobile.com> Han-Wen Nienhuys <hanwen@google.com> <hanwen@google.com> Hector Oswaldo Caballero <hector.caballero@ericsson.com> <hector.caballero@ericsson.com> +Hitesh Chaudhari <hitesh.chaudhari@sap.com> <hitesh.chaudhari@sap.com> Hugo Arès <hugo.ares@ericsson.com> Hugo Ares <hugo.ares@ericsson.com> Hugo Arès <hugo.ares@ericsson.com> <hugares@gmail.com> Jacek Centkowski <jcentkowski@collab.net> <gemincia.programs@gmail.com> @@ -96,6 +97,7 @@ Ulrik Sjölin <ulrik.sjolin@sonyericsson.com> Ulrik Sjölin <ulrik.sjolin@sonyericsson.com> Ulrik Sjölin <ulrik.sjolin@sonyericsson.com> Ulrik Sjolin <ulrik.sjolin@sonyericsson.com> Viktar Donich <viktard@google.com> viktard +Wendy Wang <wendy.wang10@sap.com> <wendy.wang10@sap.com> Yuxuan 'fishy' Wang <fishywang@google.com> Yuxuan Wang <fishywang@google.com> Zalán Blénessy <zalanb@axis.com> Zalan Blenessy <zalanb@axis.com> 飞 李 <lifei@7v1.net> lifei <lifei@7v1.net>
diff --git a/.nvmrc b/.nvmrc index d875019..1dda03d 100644 --- a/.nvmrc +++ b/.nvmrc
@@ -1 +1 @@ -26.11.1 +26.13.0
diff --git a/Documentation/cmd-create-project.txt b/Documentation/cmd-create-project.txt index 87f3851..25133ac 100644 --- a/Documentation/cmd-create-project.txt +++ b/Documentation/cmd-create-project.txt
@@ -13,6 +13,7 @@ [--permissions-only] [--description <DESC> | -d <DESC>] [--submit-type <TYPE> | -t <TYPE>] + [--ref-storage <FILES | REFTABLE>] [--use-contributor-agreements | --ca] [--use-signed-off-by | --so] [--use-content-merge] @@ -123,6 +124,12 @@ For more details see link:config-project-config.html#submit-type[ Submit Types]. +--ref-storage:: + Ref storage format for the new project's repository: `FILES` (loose + and packed refs) or `REFTABLE`. + If omitted, the repository manager selects the format. Local disk + storage uses JGit's init defaults, falling back to `FILES`. + --use-content-merge:: If enabled, Gerrit will try to perform a 3-way merge of text file content when a file has been modified by both the @@ -197,6 +204,12 @@ are passed through SSH as-is to the remote Gerrit server, which uses the single quotes to delimit the value. +Create a new project with reftable ref storage: + +---- +$ ssh -p 29418 review.example.com gerrit create-project --ref-storage REFTABLE tools/gerrit +---- + == REPLICATION If the replication plugin is installed, the plugin will attempt to perform remote repository creation by a Bourne shell script:
diff --git a/Documentation/cmd-stream-events.txt b/Documentation/cmd-stream-events.txt index e34ba6a..761ba07 100644 --- a/Documentation/cmd-stream-events.txt +++ b/Documentation/cmd-stream-events.txt
@@ -173,7 +173,7 @@ projectName:: The created project name -projectHead:: The created project head name +headName:: The created project head name eventCreatedOn:: Time in seconds since the UNIX epoch when this event was created.
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt index a97fd68..a72221f 100644 --- a/Documentation/config-gerrit.txt +++ b/Documentation/config-gerrit.txt
@@ -44,6 +44,20 @@ + Default is to create H2 database in the db folder of the site path. + +To configure an H2 database explicitly, use the `async:` file system: ++ +---- +[accountPatchReviewDb] + url = jdbc:h2:async:/path/to/db +---- ++ +For legacy configurations, Gerrit also accepts the previous +`jdbc:h2:file:/path/to/db` form as an alias for `jdbc:h2:async:/path/to/db`. +H2 documents the `async:` file system as a workaround for applications that +may interrupt embedded H2 operations, but not as a complete safety guarantee. +Use a client/server database for the strongest isolation from interrupted +request threads. ++ Changing this parameter requires to migrate database using the link:pgm-MigrateAccountPatchReviewDb.html[MigrateAccountPatchReviewDb] program. Migration cannot be done while the server is running. @@ -4522,6 +4536,9 @@ the in-memory buffer fills, but only committed and guaranteed to be synced to disk when the process finishes. + +Ignored by the offline link:pgm-reindex.html[reindex] program, which always +behaves as if `commitWithin` is negative. ++ Defaults to 5 minutes.
diff --git a/Documentation/pg-plugin-endpoints.txt b/Documentation/pg-plugin-endpoints.txt index 54c189b..70b4cc0 100644 --- a/Documentation/pg-plugin-endpoints.txt +++ b/Documentation/pg-plugin-endpoints.txt
@@ -84,8 +84,8 @@ === chat-panel The `chat-panel` extension point wraps the `<chat-panel>` component in the -change view's right-hand sidebar. Plugins can decorate or replace the default -chat panel. +change view's and diff view's right-hand sidebar. Plugins can decorate or +replace the default chat panel. * `change` +
diff --git a/Documentation/rest-api-projects.txt b/Documentation/rest-api-projects.txt index dff3399..ccbac1c 100644 --- a/Documentation/rest-api-projects.txt +++ b/Documentation/rest-api-projects.txt
@@ -1061,9 +1061,16 @@ Conversion is supported in both directions, but only for a local repository that is not already in the requested format. A request is rejected with `409 Conflict` when it cannot be satisfied: the repository is already in the -requested format, or is not a local repository. A missing or unrecognized -`ref_storage` is rejected with `400 Bad Request`, and `404 Not Found` is -returned if the repository cannot be opened. +requested format, is not a local repository, or a backup from a previous +conversion is still present and must be removed before converting again. A +missing or unrecognized `ref_storage` is rejected with `400 Bad Request`, and +`404 Not Found` is returned if the repository cannot be opened. + +When `backup` is kept, the previous ref storage is retained on the server and +is not removed automatically: converting from `FILES` renames the old files +(`refs.old`, `packed-refs.old`, `logs.old`), while converting from `REFTABLE` +leaves the old `reftable` directory in place. A leftover backup blocks a later +conversion back until it is removed. Caller must be a member of a group that is granted the link:access-control.html#capability_administrateServer[Administrate Server]
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index cca46a3..8608435 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock
@@ -811,46 +811,46 @@ } }, "@@rules_nodejs+//nodejs:extensions.bzl%node": { - "26.11.1": { - "26.11.1-darwin_amd64": [ - "node-v26.11.1-darwin-x64.tar.gz", - "node-v26.11.1-darwin-x64", - "9a8129bd9ab08039793dd1143a7aedee6b5d60ac06592ad938d8bddf36142f3a" + "26.13.0": { + "26.13.0-darwin_amd64": [ + "node-v26.13.0-darwin-x64.tar.gz", + "node-v26.13.0-darwin-x64", + "525c9b29bb0263d687de60a4cec0e2a6db876a8eb032369e5795eca71e7c358e" ], - "26.11.1-darwin_arm64": [ - "node-v26.11.1-darwin-arm64.tar.gz", - "node-v26.11.1-darwin-arm64", - "d916511b55965e91be7a88e17f88d895b6793ceaba3e6c9b194aefe51c2c65ac" + "26.13.0-darwin_arm64": [ + "node-v26.13.0-darwin-arm64.tar.gz", + "node-v26.13.0-darwin-arm64", + "d38bd5e5a2ddce6bbb5ce45e46e208337da4d51fffe611e567fd32073d6439f6" ], - "26.11.1-linux_amd64": [ - "node-v26.11.1-linux-x64.tar.xz", - "node-v26.11.1-linux-x64", - "3883bfc73f9a680ca4eab04b196068aaaab1373ffa77d8fc1a4408222495b651" + "26.13.0-linux_amd64": [ + "node-v26.13.0-linux-x64.tar.xz", + "node-v26.13.0-linux-x64", + "d28a96af6c38596f6d9d97c0ee531c13d238d757742387d1928de822d959e997" ], - "26.11.1-linux_arm64": [ - "node-v26.11.1-linux-arm64.tar.xz", - "node-v26.11.1-linux-arm64", - "0945e2cde6aa0f54d980f03874dfe5cf3a549ce714c7fb9019e591ce0accf282" + "26.13.0-linux_arm64": [ + "node-v26.13.0-linux-arm64.tar.xz", + "node-v26.13.0-linux-arm64", + "406fe3fbde1c054adff8b297c16fdb5af6659db327c1ac8acd46b56ef1af9a92" ], - "26.11.1-linux_ppc64le": [ - "node-v26.11.1-linux-ppc64le.tar.xz", - "node-v26.11.1-linux-ppc64le", - "96ee3114c4215fd986ac4e935dc6edb19990865f9f2dc4333b30d14050f96d22" + "26.13.0-linux_ppc64le": [ + "node-v26.13.0-linux-ppc64le.tar.xz", + "node-v26.13.0-linux-ppc64le", + "1cf7c718f58471d14f699c9c39cf05d97f43c2e0a2f28e660fa6e36557f8ed6c" ], - "26.11.1-linux_s390x": [ - "node-v26.11.1-linux-s390x.tar.xz", - "node-v26.11.1-linux-s390x", - "cabaa5fd10e805809f2a19661fb35a7055de444d584b346142412aa89ee55a51" + "26.13.0-linux_s390x": [ + "node-v26.13.0-linux-s390x.tar.xz", + "node-v26.13.0-linux-s390x", + "1412eac54e27a6a888de8850cec5d238ed862baff82ec377601a0c3849cd6251" ], - "26.11.1-windows_amd64": [ - "node-v26.11.1-win-x64.zip", - "node-v26.11.1-win-x64", - "97f36a8a9684ff0d3e35758b4610fef5b628a5880e96f2ccc11240e5daf9934e" + "26.13.0-windows_amd64": [ + "node-v26.13.0-win-x64.zip", + "node-v26.13.0-win-x64", + "dcc60d59a0746999f99064a01c020445d54d84228c691cdbf25b49ac3b59150a" ], - "26.11.1-windows_arm64": [ - "node-v26.11.1-win-arm64.zip", - "node-v26.11.1-win-arm64", - "8dd03add3ed431eb436306f9abe946434bce928d2bf967b04117dc3755051208" + "26.13.0-windows_arm64": [ + "node-v26.13.0-win-arm64.zip", + "node-v26.13.0-win-arm64", + "a9427139595156ef484e1fb08957676e09d4232368dd1743a2a9f93f3d241b14" ] } },
diff --git a/java/com/google/gerrit/extensions/api/projects/ProjectApi.java b/java/com/google/gerrit/extensions/api/projects/ProjectApi.java index a8407d1..7a059e2 100644 --- a/java/com/google/gerrit/extensions/api/projects/ProjectApi.java +++ b/java/com/google/gerrit/extensions/api/projects/ProjectApi.java
@@ -19,6 +19,7 @@ import com.google.gerrit.extensions.api.access.ProjectAccessInput; import com.google.gerrit.extensions.api.config.AccessCheckInfo; import com.google.gerrit.extensions.api.config.AccessCheckInput; +import com.google.gerrit.extensions.client.RefStorage; import com.google.gerrit.extensions.common.BatchLabelInput; import com.google.gerrit.extensions.common.BatchSubmitRequirementInput; import com.google.gerrit.extensions.common.ChangeInfo; @@ -279,6 +280,18 @@ /** Reindexes all changes of the project. */ void indexChanges() throws RestApiException; + /** + * Converts the ref storage of the project's repository. + * + * <p>Requires the caller to be a server administrator. The conversion does not lock the + * repository, so concurrent writes during the conversion can leave the ref storage in an + * inconsistent state. + * + * @param input the target format and backup preference + * @return the resulting ref storage format + */ + RefStorage convertRefStorage(RefStorageInput input) throws RestApiException; + ListLabelsRequest labels() throws RestApiException; abstract class ListLabelsRequest {
diff --git a/java/com/google/gerrit/extensions/api/projects/RefStorageInput.java b/java/com/google/gerrit/extensions/api/projects/RefStorageInput.java index c05d280..ed5e93b 100644 --- a/java/com/google/gerrit/extensions/api/projects/RefStorageInput.java +++ b/java/com/google/gerrit/extensions/api/projects/RefStorageInput.java
@@ -28,8 +28,9 @@ /** * Whether to keep the previous ref storage as a backup. Defaults to {@code true}. When {@code - * false}, the superseded ref storage is deleted instead of being renamed with a {@code .old} - * suffix. + * true}, the superseded ref storage is retained (converting from files renames it with a {@code + * .old} suffix; converting from reftable leaves the {@code reftable} directory in place). When + * {@code false}, it is deleted. */ public Boolean backup; }
diff --git a/java/com/google/gerrit/pgm/Reindex.java b/java/com/google/gerrit/pgm/Reindex.java index 243626a..f58c3b6 100644 --- a/java/com/google/gerrit/pgm/Reindex.java +++ b/java/com/google/gerrit/pgm/Reindex.java
@@ -270,8 +270,10 @@ private void overrideConfig() { // Disable auto-commit for speed; committing will happen at the end of the process. if (IndexModule.getIndexType(dbInjector).isLucene()) { - globalConfig.setLong("index", "changes_open", "commitWithin", -1); - globalConfig.setLong("index", "changes_closed", "commitWithin", -1); + for (String index : + ImmutableSet.of("changes_open", "changes_closed", "accounts", "groups", "projects")) { + globalConfig.setLong("index", index, "commitWithin", -1); + } } // Disable change cache.
diff --git a/java/com/google/gerrit/server/api/projects/ProjectApiImpl.java b/java/com/google/gerrit/server/api/projects/ProjectApiImpl.java index 44f82d8..676cc86 100644 --- a/java/com/google/gerrit/server/api/projects/ProjectApiImpl.java +++ b/java/com/google/gerrit/server/api/projects/ProjectApiImpl.java
@@ -46,9 +46,11 @@ import com.google.gerrit.extensions.api.projects.ParentInput; import com.google.gerrit.extensions.api.projects.ProjectApi; import com.google.gerrit.extensions.api.projects.ProjectInput; +import com.google.gerrit.extensions.api.projects.RefStorageInput; import com.google.gerrit.extensions.api.projects.SubmitRequirementApi; import com.google.gerrit.extensions.api.projects.TagApi; import com.google.gerrit.extensions.api.projects.TagInfo; +import com.google.gerrit.extensions.client.RefStorage; import com.google.gerrit.extensions.common.BatchLabelInput; import com.google.gerrit.extensions.common.BatchSubmitRequirementInput; import com.google.gerrit.extensions.common.ChangeInfo; @@ -75,6 +77,7 @@ import com.google.gerrit.server.restapi.project.ChildProjectsCollection; import com.google.gerrit.server.restapi.project.CommitsCollection; import com.google.gerrit.server.restapi.project.CommitsIncludedInRefs; +import com.google.gerrit.server.restapi.project.ConvertRefStorage; import com.google.gerrit.server.restapi.project.CreateAccessChange; import com.google.gerrit.server.restapi.project.CreateProject; import com.google.gerrit.server.restapi.project.DeleteBranches; @@ -169,6 +172,7 @@ private final LabelApiImpl.Factory labelApi; private final SubmitRequirementApiImpl.Factory submitRequirementApi; private final Provider<GetDiffFile> getDiffFile; + private final ConvertRefStorage convertRefStorage; @AssistedInject ProjectApiImpl( @@ -216,6 +220,7 @@ PostSubmitRequirements postSubmitRequirements, PostSubmitRequirementsReview postSubmitRequirementsReview, Provider<GetDiffFile> getDiffFile, + ConvertRefStorage convertRefStorage, @Assisted ProjectResource project) { this( permissionBackend, @@ -263,6 +268,7 @@ postSubmitRequirements, postSubmitRequirementsReview, getDiffFile, + convertRefStorage, null); } @@ -312,6 +318,7 @@ PostSubmitRequirements postSubmitRequirements, PostSubmitRequirementsReview postSubmitRequirementsReview, Provider<GetDiffFile> getDiffFile, + ConvertRefStorage convertRefStorage, @Assisted String name) { this( permissionBackend, @@ -359,6 +366,7 @@ postSubmitRequirements, postSubmitRequirementsReview, getDiffFile, + convertRefStorage, name); } @@ -408,6 +416,7 @@ PostSubmitRequirements postSubmitRequirements, PostSubmitRequirementsReview postSubmitRequirementsReview, Provider<GetDiffFile> getDiffFile, + ConvertRefStorage convertRefStorage, String name) { this.permissionBackend = permissionBackend; this.createProject = createProject; @@ -455,6 +464,7 @@ this.postSubmitRequirements = postSubmitRequirements; this.postSubmitRequirementsReview = postSubmitRequirementsReview; this.getDiffFile = getDiffFile; + this.convertRefStorage = convertRefStorage; } @Override @@ -786,6 +796,16 @@ } @Override + public RefStorage convertRefStorage(RefStorageInput input) throws RestApiException { + try { + // value() is the resulting format's enum name, so valueOf round-trips. + return RefStorage.valueOf(convertRefStorage.apply(checkExists(), input).value()); + } catch (Exception e) { + throw asRestApiException("Cannot convert ref storage", e); + } + } + + @Override public void head(String head) throws RestApiException { HeadInput input = new HeadInput(); input.ref = head;
diff --git a/java/com/google/gerrit/server/change/ChangeJson.java b/java/com/google/gerrit/server/change/ChangeJson.java index 430e3d2..5f91cfb 100644 --- a/java/com/google/gerrit/server/change/ChangeJson.java +++ b/java/com/google/gerrit/server/change/ChangeJson.java
@@ -106,6 +106,7 @@ import com.google.gerrit.server.experiments.ExperimentFeatures; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.index.change.ChangeField; +import com.google.gerrit.server.logging.LoggingContext; import com.google.gerrit.server.logging.Metadata; import com.google.gerrit.server.logging.TraceContext; import com.google.gerrit.server.logging.TraceContext.TraceTimer; @@ -138,6 +139,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -369,20 +371,24 @@ // CurrentUser is thread-safe for reading. It is not mutated during the parallel formatting. CurrentUser user = userProvider.get(); ImmutableListMultimap<Change.Id, PluginDefinedInfo> pluginInfosByChange = getPluginInfos(in); - List<ChangeInfo> out = - in.parallelStream() - .map( - cd -> { - try (ManualRequestContext ctx = new ManualRequestContext(user, requestContext)) { - return format( - cd, Optional.empty(), false, pluginInfosByChange.get(cd.getId()), user); - } - }) + List<Callable<ChangeInfo>> tasks = + in.stream() + .map(cd -> LoggingContext.copy(() -> formatChange(cd, pluginInfosByChange, user))) .collect(toList()); + List<ChangeInfo> out = tasks.parallelStream().map(ChangeJson::call).collect(toList()); accountLoader.fill(); return out; } + private ChangeInfo formatChange( + ChangeData cd, + ImmutableListMultimap<Change.Id, PluginDefinedInfo> pluginInfosByChange, + CurrentUser user) { + try (ManualRequestContext ctx = new ManualRequestContext(user, requestContext)) { + return format(cd, Optional.empty(), false, pluginInfosByChange.get(cd.getId()), user); + } + } + public ChangeInfo format(Project.NameKey project, Change.Id id) { return format(project, id, null); } @@ -530,30 +536,13 @@ TraceContext.newTimer( "Load change data for lazyLoad options", Metadata.builder().resourceCount(all.size()).build())) { - boolean isIdentifiedUser = userProvider.get().isIdentifiedUser(); - all.parallelStream() - .forEach( - cd -> { - // Mark all ChangeDatas as coming from the index, but allow backfilling data from - // NoteDb - cd.setStorageConstraint( - ChangeData.StorageConstraint.INDEX_PRIMARY_NOTEDB_SECONDARY); - - Set<ChangeData> singleCdSet = Collections.singleton(cd); - ChangeData.ensureChangeLoaded(singleCdSet); - if (has(ALL_REVISIONS)) { - ChangeData.ensureAllPatchSetsLoaded(singleCdSet); - } else if (has(CURRENT_REVISION) || has(MESSAGES)) { - ChangeData.ensureCurrentPatchSetLoaded(singleCdSet); - } - if (has(REVIEWED) && isIdentifiedUser) { - ChangeData.ensureReviewedByLoadedForOpenChanges(singleCdSet); - } - if (has(STAR) && isIdentifiedUser) { - ChangeData.ensureChangeServerId(singleCdSet); - } - ChangeData.ensureCurrentApprovalsLoaded(singleCdSet); - }); + CurrentUser user = userProvider.get(); + boolean isIdentifiedUser = user.isIdentifiedUser(); + List<Runnable> tasks = + all.stream() + .map(cd -> LoggingContext.copy(() -> loadChangeData(cd, user, isIdentifiedUser))) + .collect(toList()); + tasks.parallelStream().forEach(Runnable::run); } } else { all.parallelStream() @@ -565,6 +554,29 @@ } } + private void loadChangeData(ChangeData cd, CurrentUser user, boolean isIdentifiedUser) { + try (ManualRequestContext ctx = new ManualRequestContext(user, requestContext)) { + // Mark all ChangeDatas as coming from the index, but allow backfilling data from + // NoteDb + cd.setStorageConstraint(ChangeData.StorageConstraint.INDEX_PRIMARY_NOTEDB_SECONDARY); + + Set<ChangeData> singleCdSet = Collections.singleton(cd); + ChangeData.ensureChangeLoaded(singleCdSet); + if (has(ALL_REVISIONS)) { + ChangeData.ensureAllPatchSetsLoaded(singleCdSet); + } else if (has(CURRENT_REVISION) || has(MESSAGES)) { + ChangeData.ensureCurrentPatchSetLoaded(singleCdSet); + } + if (has(REVIEWED) && isIdentifiedUser) { + ChangeData.ensureReviewedByLoadedForOpenChanges(singleCdSet); + } + if (has(STAR) && isIdentifiedUser) { + ChangeData.ensureChangeServerId(singleCdSet); + } + ChangeData.ensureCurrentApprovalsLoaded(singleCdSet); + } + } + private boolean has(ListChangesOption option) { return options.contains(option); } @@ -575,55 +587,16 @@ ImmutableListMultimap<Change.Id, PluginDefinedInfo> pluginInfosByChange, CurrentUser user) { try (Timer0.Context _ = metrics.toChangeInfosLatency.start()) { - List<ChangeInfo> changeInfos = + List<Callable<ChangeInfo>> tasks = IntStream.range(0, changes.size()) - .parallel() .mapToObj( - i -> { - try (ManualRequestContext ctx = - new ManualRequestContext(user, requestContext)) { - ChangeData cd = changes.get(i); - // Cache/re-use only if it is not the last entity in the list. - // The last entity may have _moreChanges set later, which would - // propagate to the original cached/re-used entity, yielding - // incorrect results. This applies to both caching and reusing. - boolean isCacheable = - cacheQueryResultsByChangeNum && (i != changes.size() - 1); - if (cd.hasFailedParsingFromIndex()) { - return createFaultyChangeInfo(cd).orElse(null); - } - try { - Change.Id cdUniqueId = cd.virtualId(); - if (isCacheable) { - ChangeInfo info = cache.get(cdUniqueId); - if (info != null) { - return info; - } - } - - ChangeInfo info = - format( - cd, - Optional.empty(), - false, - pluginInfosByChange.get(cd.getId()), - user); - if (isCacheable) { - cache.put(cdUniqueId, info); - } - return info; - } catch (RuntimeException e) { - Optional<RequestCancelledException> requestCancelledException = - RequestCancelledException.getFromCausalChain(e); - if (requestCancelledException.isPresent()) { - throw e; - } - logger.atWarning().withCause(e).log( - "Omitting corrupt change %s from results", cd.getId()); - return null; - } - } - }) + i -> + LoggingContext.copy( + () -> toChangeInfo(changes, i, cache, pluginInfosByChange, user))) + .collect(toList()); + List<ChangeInfo> changeInfos = + tasks.parallelStream() + .map(ChangeJson::call) .filter(java.util.Objects::nonNull) .collect(toList()); @@ -634,6 +607,59 @@ } } + @Nullable + private ChangeInfo toChangeInfo( + List<ChangeData> changes, + int i, + Map<Change.Id, ChangeInfo> cache, + ImmutableListMultimap<Change.Id, PluginDefinedInfo> pluginInfosByChange, + CurrentUser user) { + try (ManualRequestContext ctx = new ManualRequestContext(user, requestContext)) { + ChangeData cd = changes.get(i); + // Cache/re-use only if it is not the last entity in the list. + // The last entity may have _moreChanges set later, which would + // propagate to the original cached/re-used entity, yielding + // incorrect results. This applies to both caching and reusing. + boolean isCacheable = cacheQueryResultsByChangeNum && (i != changes.size() - 1); + if (cd.hasFailedParsingFromIndex()) { + return createFaultyChangeInfo(cd).orElse(null); + } + try { + Change.Id cdUniqueId = cd.virtualId(); + if (isCacheable) { + ChangeInfo info = cache.get(cdUniqueId); + if (info != null) { + return info; + } + } + + ChangeInfo info = + format(cd, Optional.empty(), false, pluginInfosByChange.get(cd.getId()), user); + if (isCacheable) { + cache.put(cdUniqueId, info); + } + return info; + } catch (RuntimeException e) { + Optional<RequestCancelledException> requestCancelledException = + RequestCancelledException.getFromCausalChain(e); + if (requestCancelledException.isPresent()) { + throw e; + } + logger.atWarning().withCause(e).log("Omitting corrupt change %s from results", cd.getId()); + return null; + } + } + } + + private static <T> T call(Callable<T> callable) { + try { + return callable.call(); + } catch (Exception e) { + Throwables.throwIfUnchecked(e); + throw new RuntimeException(e); + } + } + private ChangeInfo checkOnly(ChangeData cd) { ChangeNotes notes; try {
diff --git a/java/com/google/gerrit/server/change/MergeabilityCacheImpl.java b/java/com/google/gerrit/server/change/MergeabilityCacheImpl.java index 8ffd40a..79618bf 100644 --- a/java/com/google/gerrit/server/change/MergeabilityCacheImpl.java +++ b/java/com/google/gerrit/server/change/MergeabilityCacheImpl.java
@@ -199,6 +199,8 @@ return true; // Assume yes on new branch. } try (CodeReviewRevWalk rw = CodeReviewCommit.newRevWalk(repo)) { + // Dry runs do not need message bodies. + rw.setRetainBody(false); return submitDryRun.run( null, key.submitType,
diff --git a/java/com/google/gerrit/server/git/CodeReviewCommit.java b/java/com/google/gerrit/server/git/CodeReviewCommit.java index 9c05763..2074863 100644 --- a/java/com/google/gerrit/server/git/CodeReviewCommit.java +++ b/java/com/google/gerrit/server/git/CodeReviewCommit.java
@@ -77,8 +77,8 @@ } @Override - protected CodeReviewCommit createCommit(AnyObjectId id) { - return new CodeReviewCommit(id); + protected CodeReviewCommit createCommit(AnyObjectId id, int graphPos) { + return new CodeReviewCommit(id, graphPos); } @Override @@ -153,6 +153,10 @@ super(id); } + private CodeReviewCommit(AnyObjectId id, int graphPosition) { + super(id, graphPosition); + } + public ChangeNotes notes() { return notes; }
diff --git a/java/com/google/gerrit/server/git/TagSet.java b/java/com/google/gerrit/server/git/TagSet.java index 24a2dec..6ffb370 100644 --- a/java/com/google/gerrit/server/git/TagSet.java +++ b/java/com/google/gerrit/server/git/TagSet.java
@@ -509,8 +509,8 @@ } @Override - protected TagCommit createCommit(AnyObjectId id) { - return new TagCommit(id); + protected TagCommit createCommit(AnyObjectId id, int graphPos) { + return new TagCommit(id, graphPos); } } @@ -520,8 +520,8 @@ /** CachedRef.flag => isVisible, indicating if this commit is reachable from the ref. */ RoaringBitmap refFlags; - TagCommit(AnyObjectId id) { - super(id); + TagCommit(AnyObjectId id, int graphPos) { + super(id, graphPos); } /**
diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java index fb8671c..49d1c31 100644 --- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java +++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
@@ -19,6 +19,7 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableListMultimap.toImmutableListMultimap; +import static com.google.common.collect.ImmutableSet.toImmutableSet; import static com.google.common.flogger.LazyArgs.lazy; import static com.google.gerrit.entities.RefNames.REFS_CHANGES; import static com.google.gerrit.entities.RefNames.isConfigRef; @@ -4008,7 +4009,7 @@ rw.markStart(newTip); rw.markUninteresting(rw.parseCommit(cmd.getOldId())); - Map<Change.Key, ChangeData> changeDataByKey = null; + Map<RevCommit, List<String>> changeIdsByCommit = new LinkedHashMap<>(); List<ReplaceRequest> replaceAndClose = new ArrayList<>(); int existingPatchSets = 0; @@ -4044,28 +4045,43 @@ } } - for (String changeId : changeUtil.getChangeIdsFromFooter(c)) { - if (changeDataByKey == null) { - changeDataByKey = - retryHelper - .changeIndexQuery( - "queryOpenChangesByKeyByBranch", - q -> openChangesByKeyByBranch(q, branch)) - .call(); - } + List<String> changeIds = changeUtil.getChangeIdsFromFooter(c); + if (!changeIds.isEmpty()) { + changeIdsByCommit.put(c, changeIds); + } + } - ChangeData onto = changeDataByKey.get(Change.key(changeId.trim())); - if (onto != null) { - newPatchSets++; - // Hold onto this until we're done with the walk, as the call to - // req.validate below calls isMergedInto which resets the walk. - ChangeNotes ontoNotes = onto.notes(); - ReplaceRequest req = - new ReplaceRequest( - globalRevWalk, ontoNotes.getChangeId(), c, cmd, false); - req.notes = ontoNotes; - replaceAndClose.add(req); - continue COMMIT; + if (!changeIdsByCommit.isEmpty()) { + ImmutableSet<Change.Key> keys = + changeIdsByCommit.values().stream() + .flatMap(List::stream) + .map(id -> Change.key(id.trim())) + .collect(toImmutableSet()); + Map<Change.Key, ChangeData> changeDataByKey = + retryHelper + .changeIndexQuery( + "queryOpenChangesByKeysByBranch", + q -> openChangesByKeysByBranch(q, branch, keys)) + .call(); + + for (Map.Entry<RevCommit, List<String>> e : + changeIdsByCommit.entrySet()) { + for (String changeId : e.getValue()) { + ChangeData onto = changeDataByKey.get(Change.key(changeId.trim())); + if (onto != null) { + newPatchSets++; + ChangeNotes ontoNotes = onto.notes(); + ReplaceRequest req = + new ReplaceRequest( + globalRevWalk, + ontoNotes.getChangeId(), + e.getKey(), + cmd, + false); + req.notes = ontoNotes; + replaceAndClose.add(req); + break; + } } } } @@ -4139,12 +4155,12 @@ } } - private Map<Change.Key, ChangeData> openChangesByKeyByBranch( - InternalChangeQuery internalChangeQuery, BranchNameKey branch) { + private Map<Change.Key, ChangeData> openChangesByKeysByBranch( + InternalChangeQuery internalChangeQuery, BranchNameKey branch, Set<Change.Key> keys) { try (TraceTimer traceTimer = - newTimer("openChangesByKeyByBranch", Metadata.builder().branchName(branch.branch()))) { + newTimer("openChangesByKeysByBranch", Metadata.builder().branchName(branch.branch()))) { Map<Change.Key, ChangeData> r = new HashMap<>(); - for (ChangeData cd : internalChangeQuery.byBranchOpen(branch)) { + for (ChangeData cd : internalChangeQuery.byBranchKeysOpen(branch, keys)) { try { // ChangeData is not materialised into a ChangeNotes for avoiding // to load a potentially large number of changes meta-data into memory
diff --git a/java/com/google/gerrit/server/notedb/ChangeNotesCommit.java b/java/com/google/gerrit/server/notedb/ChangeNotesCommit.java index df60789..a7fac73 100644 --- a/java/com/google/gerrit/server/notedb/ChangeNotesCommit.java +++ b/java/com/google/gerrit/server/notedb/ChangeNotesCommit.java
@@ -75,8 +75,8 @@ } @Override - protected ChangeNotesCommit createCommit(AnyObjectId id) { - return new ChangeNotesCommit(id); + protected ChangeNotesCommit createCommit(AnyObjectId id, int graphPos) { + return new ChangeNotesCommit(id, graphPos); } @Override @@ -117,6 +117,10 @@ super(id); } + private ChangeNotesCommit(AnyObjectId id, int graphPosition) { + super(id, graphPosition); + } + private void initFooterLines() { if (footerLines == null) { footerLines = getFooterLines();
diff --git a/java/com/google/gerrit/server/permissions/AbstractChangeControl.java b/java/com/google/gerrit/server/permissions/AbstractChangeControl.java index 5dd1d2b..3dad5b2 100644 --- a/java/com/google/gerrit/server/permissions/AbstractChangeControl.java +++ b/java/com/google/gerrit/server/permissions/AbstractChangeControl.java
@@ -20,6 +20,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.gerrit.common.Nullable; +import com.google.gerrit.common.UsedAt; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.PermissionRange; @@ -108,6 +109,7 @@ * also allow registered users when the {@code allow_ai_review_for_registered_users} experiment is * enabled, which overrides the ACL (including a {@code block}) for identified users. */ + @UsedAt(UsedAt.Project.GOOGLE) protected boolean canAiReview() { return refControl.canPerform(Permission.AI_REVIEW); }
diff --git a/java/com/google/gerrit/server/permissions/ChangeControl.java b/java/com/google/gerrit/server/permissions/ChangeControl.java index a25fe5b..525eda7 100644 --- a/java/com/google/gerrit/server/permissions/ChangeControl.java +++ b/java/com/google/gerrit/server/permissions/ChangeControl.java
@@ -16,6 +16,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.flogger.FluentLogger; +import com.google.gerrit.common.UsedAt; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Permission; import com.google.gerrit.server.CurrentUser; @@ -70,6 +71,7 @@ return new ForChangeImpl(changeData.getId()); } + @UsedAt(UsedAt.Project.GOOGLE) @Override protected boolean canAiReview() { return super.canAiReview()
diff --git a/java/com/google/gerrit/server/permissions/PermissionCollection.java b/java/com/google/gerrit/server/permissions/PermissionCollection.java index 3fd9e8f..7612023 100644 --- a/java/com/google/gerrit/server/permissions/PermissionCollection.java +++ b/java/com/google/gerrit/server/permissions/PermissionCollection.java
@@ -23,6 +23,7 @@ import com.google.auto.value.AutoValue; import com.google.common.collect.Lists; import com.google.gerrit.common.Nullable; +import com.google.gerrit.common.UsedAt; import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.Permission; @@ -182,7 +183,8 @@ } /** Returns permissions in the right order for evaluating ALLOW/DENY status. */ - List<PermissionRule> getAllowRules(String perm) { + @UsedAt(UsedAt.Project.GOOGLE) + public List<PermissionRule> getAllowRules(String perm) { List<PermissionRule> ps = rulesByPermission.get(perm); if (ps == null) { ps = calculateAllowRules(perm); @@ -191,6 +193,12 @@ return ps; } + /** Returns the access sections that apply to this reference, ordered from child to parent. */ + @UsedAt(UsedAt.Project.GOOGLE) + public List<AccessSection> getAccessSectionsUpward() { + return accessSectionsUpward; + } + /** calculates permissions for ALLOW processing. */ private List<PermissionRule> calculateAllowRules(String permName) { Set<SeenRule> seen = new HashSet<>();
diff --git a/java/com/google/gerrit/server/permissions/ProjectControl.java b/java/com/google/gerrit/server/permissions/ProjectControl.java index 9eceeb6..5fbf9f6 100644 --- a/java/com/google/gerrit/server/permissions/ProjectControl.java +++ b/java/com/google/gerrit/server/permissions/ProjectControl.java
@@ -182,7 +182,8 @@ } } - boolean match(PermissionRule rule, boolean isChangeOwner) { + @UsedAt(UsedAt.Project.GOOGLE) + protected boolean match(PermissionRule rule, boolean isChangeOwner) { return match(rule.getGroup().getUUID(), isChangeOwner); }
diff --git a/java/com/google/gerrit/server/permissions/RefControl.java b/java/com/google/gerrit/server/permissions/RefControl.java index b1b664c..55bf6bb 100644 --- a/java/com/google/gerrit/server/permissions/RefControl.java +++ b/java/com/google/gerrit/server/permissions/RefControl.java
@@ -19,6 +19,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; +import com.google.gerrit.common.UsedAt; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.PermissionRange; @@ -99,7 +100,8 @@ return projectControl; } - CurrentUser getUser() { + @UsedAt(UsedAt.Project.GOOGLE) + protected CurrentUser getUser() { return projectControl.getUser(); } @@ -107,6 +109,11 @@ return refName; } + @UsedAt(UsedAt.Project.GOOGLE) + protected PermissionCollection getRelevantPermissions() { + return relevant; + } + /** Is this user a ref owner? */ boolean isOwner() { if (owner == null) { @@ -194,7 +201,8 @@ } /** True if the user has this permission. Works only for non labels. */ - boolean canPerform(String permissionName) { + @UsedAt(UsedAt.Project.GOOGLE) + protected boolean canPerform(String permissionName) { return canPerform(permissionName, false, false); } @@ -367,7 +375,8 @@ /* max= */ Math.min(voteMax, blockAllowMax)); } - private boolean isBlocked(String permissionName, boolean isChangeOwner, boolean withForce) { + @UsedAt(UsedAt.Project.GOOGLE) + protected boolean isBlocked(String permissionName, boolean isChangeOwner, boolean withForce) { // Permissions are ordered by (more general project, more specific ref). Because Permission // does not have back pointers, we can't tell what ref-pattern or project each permission comes // from.
diff --git a/java/com/google/gerrit/server/query/change/ConflictsPredicate.java b/java/com/google/gerrit/server/query/change/ConflictsPredicate.java index 9676a03..8dda1c4 100644 --- a/java/com/google/gerrit/server/query/change/ConflictsPredicate.java +++ b/java/com/google/gerrit/server/query/change/ConflictsPredicate.java
@@ -214,6 +214,8 @@ ObjectId other = changeData.currentPatchSet().commitId(); try (Repository repo = args.repoManager.openRepository(otherChange.getProject()); CodeReviewCommit.CodeReviewRevWalk rw = CodeReviewCommit.newRevWalk(repo)) { + // Dry runs do not need message bodies. + rw.setRetainBody(false); // Only check whether the other change itself conflicts with the tested change. Whether the // other change's own dependencies are open or already merged is irrelevant for this, so // treat its parents as already accepted. Since all ancestors of already accepted commits
diff --git a/java/com/google/gerrit/server/query/change/InternalChangeQuery.java b/java/com/google/gerrit/server/query/change/InternalChangeQuery.java index ea833dc..9ed024b 100644 --- a/java/com/google/gerrit/server/query/change/InternalChangeQuery.java +++ b/java/com/google/gerrit/server/query/change/InternalChangeQuery.java
@@ -15,6 +15,7 @@ package com.google.gerrit.server.query.change; import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.gerrit.index.query.Predicate.and; import static com.google.gerrit.index.query.Predicate.not; import static com.google.gerrit.index.query.Predicate.or; @@ -184,6 +185,23 @@ return query(and(ref(branch), project(branch.project()), open())); } + public ImmutableList<ChangeData> byBranchKeysOpen( + BranchNameKey branch, Collection<Change.Key> keys) { + if (keys.isEmpty()) { + return ImmutableList.of(); + } + int batchSize = indexConfig.maxTerms() - 3; + List<Predicate<ChangeData>> queries = new ArrayList<>(); + for (List<Change.Key> part : Iterables.partition(keys, batchSize)) { + List<Predicate<ChangeData>> keyPredicates = new ArrayList<>(part.size()); + for (Change.Key key : part) { + keyPredicates.add(change(key)); + } + queries.add(and(ref(branch), project(branch.project()), open(), or(keyPredicates))); + } + return query(queries).stream().flatMap(List::stream).collect(toImmutableList()); + } + public List<ChangeData> byBranchNew(BranchNameKey branch) { return query(and(ref(branch), project(branch.project()), status(Change.Status.NEW))); }
diff --git a/java/com/google/gerrit/server/restapi/project/ConvertRefStorage.java b/java/com/google/gerrit/server/restapi/project/ConvertRefStorage.java index fc41e8c..b67782c 100644 --- a/java/com/google/gerrit/server/restapi/project/ConvertRefStorage.java +++ b/java/com/google/gerrit/server/restapi/project/ConvertRefStorage.java
@@ -33,7 +33,10 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.IOException; +import java.text.MessageFormat; import org.eclipse.jgit.errors.RepositoryNotFoundException; +import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.RefStorageFormat; /** @@ -86,7 +89,27 @@ throw new ResourceConflictException(e.getMessage(), e); } catch (RepositoryNotFoundException e) { throw new ResourceNotFoundException(rsrc.getName(), e); + } catch (IOException e) { + if (isLeftoverBackup(e)) { + throw new ResourceConflictException( + "A backup from a previous conversion already exists. Remove it before converting again", + e); + } + throw e; } return Response.ok(target.name()); } + + /** + * Whether {@code e} signals that a backend left over from a previous conversion blocks this one. + * + * <p>JGit throws a plain {@link IOException} for this precondition (a non-empty {@code reftable/} + * directory, or a stray {@code packed-refs}) with no dedicated type, so match on the message. + */ + private static boolean isLeftoverBackup(IOException e) { + String message = e.getMessage(); + return JGitText.get().reftableDirExists.equals(message) + || MessageFormat.format(JGitText.get().fileAlreadyExists, Constants.PACKED_REFS) + .equals(message); + } }
diff --git a/java/com/google/gerrit/server/schema/AllProjectsCreator.java b/java/com/google/gerrit/server/schema/AllProjectsCreator.java index 0ea2e5c..2442743 100644 --- a/java/com/google/gerrit/server/schema/AllProjectsCreator.java +++ b/java/com/google/gerrit/server/schema/AllProjectsCreator.java
@@ -169,7 +169,11 @@ initDefaultAclsForDefaultReaders( heads, config, input.defaultReadersGroup().orElse(anonymous)); initDefaultAclsForDefaultUsers( - heads, codeReviewLabel, config, input.defaultUsersGroup().orElse(registered)); + heads, + codeReviewLabel, + config, + input.defaultUsersGroup().orElse(registered), + input.initDefaultAiReviewAcl()); }); config.upsertAccessSection( @@ -215,10 +219,13 @@ AccessSection.Builder heads, LabelType codeReviewLabel, ProjectConfig config, - GroupReference defaultUsersGroup) { + GroupReference defaultUsersGroup, + boolean initDefaultAiReviewAcl) { grant(config, heads, codeReviewLabel, -1, 1, defaultUsersGroup); grant(config, heads, Permission.FORGE_AUTHOR, defaultUsersGroup); - grant(config, heads, Permission.AI_REVIEW, registered); + if (initDefaultAiReviewAcl) { + grant(config, heads, Permission.AI_REVIEW, registered); + } config.upsertAccessSection( "refs/for/*",
diff --git a/java/com/google/gerrit/server/schema/AllProjectsInput.java b/java/com/google/gerrit/server/schema/AllProjectsInput.java index 3d6031f..a897ef7 100644 --- a/java/com/google/gerrit/server/schema/AllProjectsInput.java +++ b/java/com/google/gerrit/server/schema/AllProjectsInput.java
@@ -125,6 +125,10 @@ /** Whether initializing default access sections in All-Projects. */ public abstract boolean initDefaultAcls(); + /** Whether to initialize the default AI review ACL in All-Projects. */ + @UsedAt(UsedAt.Project.GOOGLE) + public abstract boolean initDefaultAiReviewAcl(); + /** Whether default submit requirements should be initialized in All-Projects. */ public abstract boolean initDefaultSubmitRequirements(); @@ -137,6 +141,7 @@ .codeReviewSubmitRequirement(getDefaultCodeReviewSubmitRequirements()) .firstChangeIdForNoteDb(Sequences.FIRST_CHANGE_ID) .initDefaultAcls(true) + .initDefaultAiReviewAcl(true) .initDefaultSubmitRequirements(true); DEFAULT_BOOLEAN_PROJECT_CONFIGS.forEach(builder::addBooleanProjectConfig); @@ -144,7 +149,7 @@ } public static Builder builderWithNoDefault() { - return new AutoValue_AllProjectsInput.Builder(); + return new AutoValue_AllProjectsInput.Builder().initDefaultAiReviewAcl(true); } @AutoValue.Builder @@ -190,6 +195,9 @@ @UsedAt(UsedAt.Project.GOOGLE) public abstract Builder initDefaultAcls(boolean initDefaultACLs); + @UsedAt(UsedAt.Project.GOOGLE) + public abstract Builder initDefaultAiReviewAcl(boolean initDefaultAiReviewAcl); + public abstract Builder initDefaultSubmitRequirements(boolean initDefaultSubmitRequirements); public abstract AllProjectsInput build();
diff --git a/java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java b/java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java index fdef689..7bc8085 100644 --- a/java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java +++ b/java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java
@@ -151,13 +151,13 @@ this.ds = null; } + @VisibleForTesting static String getUrl(@GerritServerConfig Config cfg, SitePaths sitePaths) { String url = cfg.getString(ACCOUNT_PATCH_REVIEW_DB, null, URL); if (url == null) { return createH2Url(sitePaths.db_dir.resolve("account_patch_reviews")); } - url = normalizeH2Url(url); - return url; + return normalizeH2Url(url); } @VisibleForTesting
diff --git a/java/com/google/gerrit/sshd/commands/CreateProjectCommand.java b/java/com/google/gerrit/sshd/commands/CreateProjectCommand.java index e2d554d..f646d2a 100644 --- a/java/com/google/gerrit/sshd/commands/CreateProjectCommand.java +++ b/java/com/google/gerrit/sshd/commands/CreateProjectCommand.java
@@ -25,6 +25,7 @@ import com.google.gerrit.extensions.api.projects.ConfigValue; import com.google.gerrit.extensions.api.projects.ProjectInput; import com.google.gerrit.extensions.client.InheritableBoolean; +import com.google.gerrit.extensions.client.RefStorage; import com.google.gerrit.extensions.client.SubmitType; import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.server.permissions.PermissionBackendException; @@ -82,6 +83,9 @@ usage = "project submit type") private SubmitType submitType; + @Option(name = "--ref-storage", usage = "ref storage format for the project repository") + private RefStorage refStorage; + @Option(name = "--contributor-agreements", usage = "if contributor agreement is required") private InheritableBoolean contributorAgreements = InheritableBoolean.INHERIT; @@ -184,6 +188,7 @@ input.permissionsOnly = permissionsOnly; input.description = projectDescription; input.submitType = submitType; + input.refStorage = refStorage; input.useContributorAgreements = contributorAgreements; input.useSignedOffBy = signedOffBy; input.useContentMerge = contentMerge;
diff --git a/javatests/com/google/gerrit/acceptance/api/project/ReftableProjectIT.java b/javatests/com/google/gerrit/acceptance/api/project/ReftableProjectIT.java index b4b3eda..5343c1c 100644 --- a/javatests/com/google/gerrit/acceptance/api/project/ReftableProjectIT.java +++ b/javatests/com/google/gerrit/acceptance/api/project/ReftableProjectIT.java
@@ -20,12 +20,17 @@ import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.UseLocalDisk; import com.google.gerrit.acceptance.config.GerritConfig; +import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.projects.ProjectInput; import com.google.gerrit.extensions.api.projects.RefStorageInput; import com.google.gerrit.extensions.client.RefStorage; +import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.BadRequestException; +import com.google.gerrit.extensions.restapi.ResourceConflictException; +import com.google.gerrit.extensions.restapi.ResourceNotFoundException; +import com.google.inject.Inject; import java.io.File; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; @@ -39,6 +44,7 @@ */ @UseLocalDisk public class ReftableProjectIT extends AbstractDaemonTest { + @Inject private RequestScopeOperations requestScopeOperations; @Test public void createReftableProjectWithInitialCommit() throws Exception { @@ -134,7 +140,8 @@ RefStorageInput in = new RefStorageInput(); in.refStorage = "REFTABLE"; - adminRestSession.post("/projects/" + name.get() + "/convert-ref-storage", in).assertOK(); + assertThat(gApi.projects().name(name.get()).convertRefStorage(in)) + .isEqualTo(RefStorage.REFTABLE); try (Repository repo = repoManager.openRepository(name)) { assertReftable(repo); @@ -154,7 +161,7 @@ RefStorageInput in = new RefStorageInput(); in.refStorage = "FILES"; - adminRestSession.post("/projects/" + name.get() + "/convert-ref-storage", in).assertOK(); + assertThat(gApi.projects().name(name.get()).convertRefStorage(in)).isEqualTo(RefStorage.FILES); try (Repository repo = repoManager.openRepository(name)) { assertFiles(repo); @@ -171,7 +178,9 @@ RefStorageInput in = new RefStorageInput(); in.refStorage = "FILES"; - adminRestSession.post("/projects/" + name.get() + "/convert-ref-storage", in).assertConflict(); + assertThrows( + ResourceConflictException.class, + () -> gApi.projects().name(name.get()).convertRefStorage(in)); } @Test @@ -181,9 +190,13 @@ RefStorageInput input = new RefStorageInput(); input.refStorage = "REFTABLE"; - userRestSession - .post("/projects/" + name.get() + "/convert-ref-storage", input) - .assertForbidden(); + requestScopeOperations.setApiUser(user.id()); + try { + assertThrows( + AuthException.class, () -> gApi.projects().name(name.get()).convertRefStorage(input)); + } finally { + requestScopeOperations.setApiUser(admin.id()); + } assertThat(gApi.projects().name(name.get()).config().refStorage).isEqualTo(RefStorage.FILES); } @@ -195,7 +208,8 @@ input.refStorage = "REFTABLE"; input.backup = false; - adminRestSession.post("/projects/" + name.get() + "/convert-ref-storage", input).assertOK(); + assertThat(gApi.projects().name(name.get()).convertRefStorage(input)) + .isEqualTo(RefStorage.REFTABLE); try (Repository repo = repoManager.openRepository(name)) { assertReftable(repo); assertThat(repo.exactRef(RefNames.REFS_CONFIG)).isNotNull(); @@ -204,10 +218,41 @@ } @Test + public void conversionBlockedByLeftoverBackupIsConflict() throws Exception { + Project.NameKey name = Project.nameKey(name("leftover-backup")); + ProjectInput create = new ProjectInput(); + create.name = name.get(); + create.refStorage = RefStorage.REFTABLE; + create.createEmptyCommit = true; + gApi.projects().create(create); + + // Converting back to files while keeping a backup leaves the reftable/ dir + // on disk. + RefStorageInput toFiles = new RefStorageInput(); + toFiles.refStorage = "FILES"; + toFiles.backup = true; + assertThat(gApi.projects().name(name.get()).convertRefStorage(toFiles)) + .isEqualTo(RefStorage.FILES); + + // The next files -> reftable is blocked by that leftover and must surface + // as the leftover-backup conflict (not a bare 500, and not the + // already-in-format conflict), so assert the actionable message too. + RefStorageInput toReftable = new RefStorageInput(); + toReftable.refStorage = "REFTABLE"; + ResourceConflictException thrown = + assertThrows( + ResourceConflictException.class, + () -> gApi.projects().name(name.get()).convertRefStorage(toReftable)); + assertThat(thrown).hasMessageThat().contains("Remove it before converting"); + } + + @Test public void conversionAcceptsBareStringBody() throws Exception { Project.NameKey name = Project.nameKey(name("convert-bare-string")); gApi.projects().create(name.get()); + // Stays on REST: exercises the raw @DefaultInput string body, which the + // extension API (RefStorageInput only) cannot express. adminRestSession .post("/projects/" + name.get() + "/convert-ref-storage", "REFTABLE") .assertOK(); @@ -223,7 +268,8 @@ RefStorageInput in = new RefStorageInput(); in.refStorage = "Reftable"; - adminRestSession.post("/projects/" + name.get() + "/convert-ref-storage", in).assertOK(); + assertThat(gApi.projects().name(name.get()).convertRefStorage(in)) + .isEqualTo(RefStorage.REFTABLE); try (Repository repo = repoManager.openRepository(name)) { assertReftable(repo); } @@ -234,18 +280,30 @@ Project.NameKey name = Project.nameKey(name("convert-invalid-format")); gApi.projects().create(name.get()); + // Stays on REST: exercises the raw @DefaultInput string body. adminRestSession .post("/projects/" + name.get() + "/convert-ref-storage", "bogus") .assertBadRequest(); } @Test + public void conversionRejectsInvalidFormatViaApi() throws Exception { + Project.NameKey name = Project.nameKey(name("convert-invalid-api")); + gApi.projects().create(name.get()); + + RefStorageInput in = new RefStorageInput(); + in.refStorage = "bogus"; + assertThrows( + BadRequestException.class, () -> gApi.projects().name(name.get()).convertRefStorage(in)); + } + + @Test public void conversionFailsForNonExistentProject() throws Exception { RefStorageInput in = new RefStorageInput(); in.refStorage = "REFTABLE"; - adminRestSession - .post("/projects/" + name("does-not-exist") + "/convert-ref-storage", in) - .assertNotFound(); + assertThrows( + ResourceNotFoundException.class, + () -> gApi.projects().name(name("does-not-exist")).convertRefStorage(in)); } private static void assertReftable(Repository repo) {
diff --git a/javatests/com/google/gerrit/acceptance/rest/TraceIT.java b/javatests/com/google/gerrit/acceptance/rest/TraceIT.java index b8f805c..8b272e1 100644 --- a/javatests/com/google/gerrit/acceptance/rest/TraceIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/TraceIT.java
@@ -66,10 +66,14 @@ import com.google.gerrit.server.validators.ProjectCreationValidationListener; import com.google.gerrit.server.validators.ValidationException; import com.google.inject.Inject; +import java.time.Instant; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import org.apache.http.message.BasicHeader; import org.eclipse.jgit.junit.TestRepository; import org.junit.Rule; @@ -91,6 +95,15 @@ * </ul> */ public class TraceIT extends AbstractDaemonTest { + /** + * Enough changes that the parallel stream in ChangeJson reliably hands some of them to + * ForkJoinPool workers rather than running them all on the request thread. + */ + private static final int PARALLEL_CHANGE_COUNT = 20; + + private static final String TO_CHANGE_INFO_LATENCY = + "http/server/rest_api/change_json/to_change_info_latency"; + @Rule public final Expect expect = Expect.create(); @Inject private ExtensionRegistry extensionRegistry; @@ -427,6 +440,48 @@ } @Test + @GerritConfig(name = "tracing.performanceLogging", value = "true") + public void performanceLoggingForParallelChangeQuery() throws Exception { + for (int i = 0; i < PARALLEL_CHANGE_COUNT; i++) { + createChange(); + } + + TestPerformanceLogger testPerformanceLogger = new TestPerformanceLogger(); + try (Registration registration = + extensionRegistry.newRegistration().add(testPerformanceLogger)) { + // MESSAGES requires lazy loading, so ensureLoaded also runs its parallel stage. + RestResponse response = + adminRestSession.get( + "/changes/?q=project:" + project.get() + "&o=DETAILED_LABELS&o=MESSAGES"); + assertThat(response.getStatusCode()).isEqualTo(SC_OK); + assertThat(testPerformanceLogger.countAfterDone(TO_CHANGE_INFO_LATENCY)) + .isEqualTo(PARALLEL_CHANGE_COUNT); + } + } + + @Test + @GerritConfig(name = "tracing.performanceLogging", value = "true") + @GerritConfig(name = "change.submitWholeTopic", value = "true") + public void performanceLoggingForParallelChangeCollectionFormatting() throws Exception { + String topic = "parallel-format"; + PushOneCommit.Result last = null; + for (int i = 0; i < PARALLEL_CHANGE_COUNT; i++) { + last = createChange("refs/for/master%topic=" + topic); + } + + TestPerformanceLogger testPerformanceLogger = new TestPerformanceLogger(); + try (Registration registration = + extensionRegistry.newRegistration().add(testPerformanceLogger)) { + // SubmittedTogether formats its changes via ChangeJson#format(Collection). + RestResponse response = + adminRestSession.get("/changes/" + last.getChangeId() + "/submitted_together"); + assertThat(response.getStatusCode()).isEqualTo(SC_OK); + assertThat(testPerformanceLogger.countAfterDone(TO_CHANGE_INFO_LATENCY)) + .isEqualTo(PARALLEL_CHANGE_COUNT); + } + } + + @Test @GerritConfig(name = "tracing.issue123.projectPattern", value = "new12") public void traceProject() throws Exception { TraceValidatingProjectCreationValidationListener projectCreationListener = @@ -1222,6 +1277,29 @@ } } + private static class TestPerformanceLogger implements PerformanceLogger { + private final List<PerformanceLogEntry> logEntries = new CopyOnWriteArrayList<>(); + private final CountDownLatch doneLatch = new CountDownLatch(1); + + @Override + public void logNanos(String operation, long durationNanos, Instant endTime, Metadata metadata) { + logEntries.add(PerformanceLogEntry.create(operation, metadata)); + } + + @Override + public void done() { + doneLatch.countDown(); + } + + /** Waits until the request's performance log records were flushed and counts the matches. */ + long countAfterDone(String operation) throws InterruptedException { + assertWithMessage("performance log records flushed") + .that(doneLatch.await(5, TimeUnit.SECONDS)) + .isTrue(); + return logEntries.stream().filter(e -> operation.equals(e.operation())).count(); + } + } + @AutoValue abstract static class PerformanceLogEntry { static PerformanceLogEntry create(String operation, Metadata metadata) {
diff --git a/javatests/com/google/gerrit/acceptance/server/httpd/JettyProxyProtocolIT.java b/javatests/com/google/gerrit/acceptance/server/httpd/JettyProxyProtocolIT.java index 5ebbc32..93aaba0 100644 --- a/javatests/com/google/gerrit/acceptance/server/httpd/JettyProxyProtocolIT.java +++ b/javatests/com/google/gerrit/acceptance/server/httpd/JettyProxyProtocolIT.java
@@ -27,17 +27,29 @@ import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.List; +import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.storage.file.FileBasedConfig; +import org.eclipse.jgit.util.FS; import org.junit.Assume; import org.junit.Test; public class JettyProxyProtocolIT extends StandaloneSiteTest { private static final String SERVER_ADDRESS = "127.0.0.1"; - private static final String TRUSTED_PROXY_ADDRESS = "127.0.0.2"; - private static final String PROXY_SOURCE_ADDRESS = "127.0.0.3"; - private static final String UNTRUSTED_PEER_ADDRESS = "127.0.0.99"; + + // Carried in the PROXY header, never bound as a socket address. Kept distinct from the + // connecting peer (127.0.0.1) so the trusted tests prove trust is based on the real peer, not + // this header value. + private static final String PROXY_SOURCE_ADDRESS = "198.51.100.1"; private static final String FORWARDED_CLIENT_ADDRESS = "192.0.2.1"; - private static final int PROXY_SOURCE_PORT = 12345; + + // Trust is config-driven, not bound to source addresses. macOS assigns only 127.0.0.1 to lo0 by + // default, so binding any other 127.x fails with EADDRNOTAVAIL even though the range routes to + // lo0 (see bind(2)). Linux lets a socket bind to any 127.0.0.0/8 address. + private static final String TRUSTED_PROXY_NETWORK = SERVER_ADDRESS + "/32"; + // A different network that excludes the connecting peer (SERVER_ADDRESS). + private static final String ANOTHER_PROXY_NETWORK = "127.0.0.2/32"; + private static final int PROXY_SOURCE_PORT = 12345; // In the PROXY header, not asserted. private static final byte[] PROXY_PROTOCOL_V2_SIGNATURE = { 0x0d, 0x0a, 0x0d, 0x0a, 0x00, 0x0d, 0x0a, 0x51, 0x55, 0x49, 0x54, 0x0a }; @@ -58,8 +70,9 @@ Config cfg = new Config(); cfg.setString("auth", null, "type", "HTTP"); cfg.setString("auth", null, "httpHeader", "X-Remote-User"); - cfg.setStringList( - "auth", null, "httpTrustedProxyNetworks", List.of(TRUSTED_PROXY_ADDRESS + "/32")); + // Must stay non-empty, or every peer is trusted. The untrusted tests replace it via + // untrustConnectingPeer() with a network that excludes the connecting peer. + cfg.setStringList("auth", null, "httpTrustedProxyNetworks", List.of(TRUSTED_PROXY_NETWORK)); cfg.setBoolean("auth", null, "trustContainerAuth", true); int serverPort = HttpTestUtil.getFreePort(); cfg.setString("httpd", null, "listenUrl", "proxy-http://" + SERVER_ADDRESS + ":" + serverPort); @@ -82,22 +95,16 @@ @Test public void trustedProxyAllowsHttpHeaderAuthenticationWithProxyProtocol() throws Exception { - Assume.assumeTrue(baseConfig.getBoolean("httpd", null, "enableProxyProtocol", false)); + Assume.assumeTrue(proxyProtocolEnabled()); try (ServerContext ctx = startServer()) { ctx.getInjector().injectMembers(this); int serverPort = httpAddress.getPort(); - String request = - "GET /a/accounts/self HTTP/1.1\r\n" - + "Host: localhost\r\n" - + "X-Remote-User: " - + admin.username() - + "\r\n" - + "Connection: close\r\n\r\n"; + String request = getRequest(); for (ProxyProtocolFormat format : PROXY_FORMATS) { byte[] proxyRequest = createProxyRequest(format, serverPort, request); - HttpResponse proxyResponse = sendRequest(serverPort, proxyRequest, TRUSTED_PROXY_ADDRESS); + HttpResponse proxyResponse = sendRequest(serverPort, proxyRequest); assertThat(proxyResponse.statusCode()).isEqualTo(200); assertThat(proxyResponse.body()).contains(admin.username()); assertThat(proxyResponse.headers()) @@ -108,42 +115,32 @@ @Test public void directHttpFromUntrustedPeerCannotUseHttpHeaderAuthentication() throws Exception { - Assume.assumeTrue(baseConfig.getBoolean("httpd", null, "enableProxyProtocol", false)); + Assume.assumeTrue(proxyProtocolEnabled()); + untrustConnectingPeer(); try (ServerContext ctx = startServer()) { ctx.getInjector().injectMembers(this); int serverPort = httpAddress.getPort(); - String request = - "GET /a/accounts/self HTTP/1.1\r\n" - + "Host: localhost\r\n" - + "X-Remote-User: " - + admin.username() - + "\r\n" - + "Connection: close\r\n\r\n"; + String request = getRequest(); - HttpResponse response = sendRequest(serverPort, request, UNTRUSTED_PEER_ADDRESS); + HttpResponse response = sendRequest(serverPort, request); assertThat(response.statusCode()).isEqualTo(403); } } @Test public void untrustedProxyCannotUseProxyProtocolForHttpHeaderAuthentication() throws Exception { - Assume.assumeTrue(baseConfig.getBoolean("httpd", null, "enableProxyProtocol", false)); + Assume.assumeTrue(proxyProtocolEnabled()); + untrustConnectingPeer(); try (ServerContext ctx = startServer()) { ctx.getInjector().injectMembers(this); int serverPort = httpAddress.getPort(); - String request = - "GET /a/accounts/self HTTP/1.1\r\n" - + "Host: localhost\r\n" - + "X-Remote-User: " - + admin.username() - + "\r\n" - + "Connection: close\r\n\r\n"; + String request = getRequest(); for (ProxyProtocolFormat format : PROXY_FORMATS) { byte[] proxyRequest = createProxyRequest(format, serverPort, request); - HttpResponse response = sendRequest(serverPort, proxyRequest, UNTRUSTED_PEER_ADDRESS); + HttpResponse response = sendRequest(serverPort, proxyRequest); assertThat(response.statusCode()).isEqualTo(403); } } @@ -151,25 +148,16 @@ @Test public void xForwardedForTakesPrecedenceOverProxyProtocolAddress() throws Exception { - Assume.assumeTrue(baseConfig.getBoolean("httpd", null, "enableProxyProtocol", false)); + Assume.assumeTrue(proxyProtocolEnabled()); try (ServerContext ctx = startServer()) { ctx.getInjector().injectMembers(this); int serverPort = httpAddress.getPort(); - String request = - "GET /a/accounts/self HTTP/1.1\r\n" - + "Host: localhost\r\n" - + "X-Remote-User: " - + admin.username() - + "\r\n" - + "X-Forwarded-For: " - + FORWARDED_CLIENT_ADDRESS - + "\r\n" - + "Connection: close\r\n\r\n"; + String request = getRequest("X-Forwarded-For: " + FORWARDED_CLIENT_ADDRESS); for (ProxyProtocolFormat format : PROXY_FORMATS) { byte[] proxyRequest = createProxyRequest(format, serverPort, request); - HttpResponse response = sendRequest(serverPort, proxyRequest, TRUSTED_PROXY_ADDRESS); + HttpResponse response = sendRequest(serverPort, proxyRequest); assertThat(response.statusCode()).isEqualTo(200); assertThat(response.body()).contains(admin.username()); assertThat(response.headers()) @@ -182,64 +170,71 @@ // The receiver must ignore the address block and keep the actual socket peer address. @Test public void localCommandUsesActualPeerAddress() throws Exception { - Assume.assumeTrue(baseConfig.getBoolean("httpd", null, "enableProxyProtocol", false)); + Assume.assumeTrue(proxyProtocolEnabled()); try (ServerContext ctx = startServer()) { ctx.getInjector().injectMembers(this); int serverPort = httpAddress.getPort(); - String request = - "GET /a/accounts/self HTTP/1.1\r\n" - + "Host: localhost\r\n" - + "X-Remote-User: " - + admin.username() - + "\r\n" - + "Connection: close\r\n\r\n"; + String request = getRequest(); byte[] localRequest = createProxyRequest(ProxyProtocolFormat.V2_LOCAL, serverPort, request); - HttpResponse response = sendRequest(serverPort, localRequest, TRUSTED_PROXY_ADDRESS); + HttpResponse response = sendRequest(serverPort, localRequest); assertThat(response.statusCode()).isEqualTo(200); assertThat(response.body()).contains(admin.username()); assertThat(response.headers()) - .contains(HttpTestUtil.REMOTE_ADDRESS_HEADER + ": " + TRUSTED_PROXY_ADDRESS); + .contains(HttpTestUtil.REMOTE_ADDRESS_HEADER + ": " + SERVER_ADDRESS); assertThat(response.headers()).doesNotContain(PROXY_SOURCE_ADDRESS); } } @Test public void proxyProtocolHeaderIsRejectedWhenDisabled() throws Exception { - Assume.assumeFalse(baseConfig.getBoolean("httpd", null, "enableProxyProtocol", false)); + Assume.assumeFalse(proxyProtocolEnabled()); try (ServerContext ctx = startServer()) { ctx.getInjector().injectMembers(this); int serverPort = httpAddress.getPort(); - String request = - "GET /a/accounts/self HTTP/1.1\r\n" - + "Host: localhost\r\n" - + "X-Remote-User: " - + admin.username() - + "\r\n" - + "Connection: close\r\n\r\n"; + String request = getRequest(); for (ProxyProtocolFormat format : PROXY_FORMATS) { byte[] proxyRequest = createProxyRequest(format, serverPort, request); - HttpResponse response = sendRequest(serverPort, proxyRequest, TRUSTED_PROXY_ADDRESS); + HttpResponse response = sendRequest(serverPort, proxyRequest); assertThat(response.statusCode()).isEqualTo(400); } } } - private static HttpResponse sendRequest(int port, String request, String sourceAddress) - throws IOException { - return sendRequest(port, request.getBytes(StandardCharsets.US_ASCII), sourceAddress); + // Trust a different network so the connecting peer (SERVER_ADDRESS) is untrusted. + private void untrustConnectingPeer() throws IOException, ConfigInvalidException { + FileBasedConfig cfg = new FileBasedConfig(sitePaths.gerrit_config.toFile(), FS.DETECTED); + cfg.load(); + cfg.setStringList("auth", null, "httpTrustedProxyNetworks", List.of(ANOTHER_PROXY_NETWORK)); + cfg.save(); } - private static HttpResponse sendRequest(int port, byte[] request, String sourceAddress) - throws IOException { - try (Socket socket = new Socket()) { - if (sourceAddress != null) { - socket.bind(new InetSocketAddress(sourceAddress, 0)); - } - socket.connect(new InetSocketAddress(SERVER_ADDRESS, port)); + private boolean proxyProtocolEnabled() { + return baseConfig.getBoolean("httpd", null, "enableProxyProtocol", false); + } + + private String getRequest(String... extraHeaders) { + StringBuilder request = + new StringBuilder("GET /a/accounts/self HTTP/1.1\r\n") + .append("Host: localhost\r\n") + .append("X-Remote-User: ") + .append(admin.username()) + .append("\r\n"); + for (String header : extraHeaders) { + request.append(header).append("\r\n"); + } + return request.append("Connection: close\r\n\r\n").toString(); + } + + private static HttpResponse sendRequest(int port, String request) throws IOException { + return sendRequest(port, request.getBytes(StandardCharsets.US_ASCII)); + } + + private static HttpResponse sendRequest(int port, byte[] request) throws IOException { + try (Socket socket = new Socket(SERVER_ADDRESS, port)) { socket.getOutputStream().write(request); socket.getOutputStream().flush(); return parseResponse( @@ -249,12 +244,13 @@ private static byte[] createProxyRequest( ProxyProtocolFormat format, int targetPort, String request) throws IOException { - if (format == ProxyProtocolFormat.V1_PROXY) { - return (PROXY_PROTOCOL_HEADER_PREFIX + targetPort + "\r\n" + request) - .getBytes(StandardCharsets.US_ASCII); - } - byte command = format == ProxyProtocolFormat.V2_LOCAL ? (byte) 0x20 : (byte) 0x21; - return concat(createProxyProtocolV2Header(command, targetPort), request); + return switch (format) { + case V1_PROXY -> + (PROXY_PROTOCOL_HEADER_PREFIX + targetPort + "\r\n" + request) + .getBytes(StandardCharsets.US_ASCII); + case V2_PROXY -> concat(createProxyProtocolV2Header((byte) 0x21, targetPort), request); + case V2_LOCAL -> concat(createProxyProtocolV2Header((byte) 0x20, targetPort), request); + }; } private static byte[] createProxyProtocolV2Header(byte command, int targetPort)
diff --git a/javatests/com/google/gerrit/acceptance/ssh/CreateProjectIT.java b/javatests/com/google/gerrit/acceptance/ssh/CreateProjectIT.java index 8367e25..2fbe83e 100644 --- a/javatests/com/google/gerrit/acceptance/ssh/CreateProjectIT.java +++ b/javatests/com/google/gerrit/acceptance/ssh/CreateProjectIT.java
@@ -17,11 +17,15 @@ import static com.google.common.truth.Truth.assertThat; import com.google.gerrit.acceptance.AbstractDaemonTest; +import com.google.gerrit.acceptance.UseLocalDisk; import com.google.gerrit.acceptance.UseSsh; import com.google.gerrit.acceptance.config.GerritConfig; import com.google.gerrit.entities.Project; +import com.google.gerrit.entities.RefNames; +import com.google.gerrit.extensions.client.RefStorage; import com.google.gerrit.server.project.ProjectState; import java.util.Optional; +import org.eclipse.jgit.lib.Repository; import org.junit.Test; @UseSsh @@ -87,6 +91,7 @@ } @Test + @UseLocalDisk public void withEmptyBranches() throws Exception { String newProjectName = name("newProject"); adminSshSession.exec("gerrit create-project " + newProjectName); @@ -94,6 +99,71 @@ Optional<ProjectState> projectState = projectCache.get(Project.nameKey(newProjectName)); assertThat(projectState).isPresent(); assertHead(newProjectName, "refs/heads/master"); + assertThat(gApi.projects().name(newProjectName).config().refStorage) + .isEqualTo(RefStorage.FILES); + } + + @Test + @UseLocalDisk + public void withFilesRefStorage() throws Exception { + String newProjectName = name("files"); + adminSshSession.exec("gerrit create-project --ref-storage FILES " + newProjectName); + adminSshSession.assertSuccess(); + + assertThat(gApi.projects().name(newProjectName).config().refStorage) + .isEqualTo(RefStorage.FILES); + } + + @Test + @UseLocalDisk + public void withReftableRefStorageAndInitialCommit() throws Exception { + String newProjectName = name("reftable"); + adminSshSession.exec( + "gerrit create-project --ref-storage REFTABLE --empty-commit --branch main " + + newProjectName); + adminSshSession.assertSuccess(); + + assertThat(gApi.projects().name(newProjectName).config().refStorage) + .isEqualTo(RefStorage.REFTABLE); + assertHead(newProjectName, "refs/heads/main"); + try (Repository repo = repoManager.openRepository(Project.nameKey(newProjectName))) { + assertThat(repo.exactRef("refs/heads/main")).isNotNull(); + assertThat(repo.exactRef(RefNames.REFS_CONFIG)).isNotNull(); + } + } + + @Test + @UseLocalDisk + public void withReftableRefStorageWithoutInitialCommit() throws Exception { + String newProjectName = name("reftable"); + adminSshSession.exec( + "gerrit create-project --ref-storage REFTABLE --branch main " + newProjectName); + adminSshSession.assertSuccess(); + + assertThat(gApi.projects().name(newProjectName).config().refStorage) + .isEqualTo(RefStorage.REFTABLE); + try (Repository repo = repoManager.openRepository(Project.nameKey(newProjectName))) { + assertThat(repo.exactRef("refs/heads/main")).isNull(); + assertThat(repo.exactRef(RefNames.REFS_CONFIG)).isNotNull(); + } + } + + @Test + public void withInvalidRefStorage() throws Exception { + String newProjectName = name("invalid-ref-storage"); + adminSshSession.exec("gerrit create-project --ref-storage INVALID " + newProjectName); + adminSshSession.assertFailure(); + + assertThat(projectCache.get(Project.nameKey(newProjectName))).isEmpty(); + } + + @Test + public void helpListsRefStorage() throws Exception { + adminSshSession.exec("gerrit create-project --help"); + + assertThat(adminSshSession.getError()).contains("--ref-storage"); + assertThat(adminSshSession.getError()).contains("FILES"); + assertThat(adminSshSession.getError()).contains("REFTABLE"); } @Test
diff --git a/javatests/com/google/gerrit/server/git/CodeReviewCommitGraphTest.java b/javatests/com/google/gerrit/server/git/CodeReviewCommitGraphTest.java new file mode 100644 index 0000000..32d3e5b --- /dev/null +++ b/javatests/com/google/gerrit/server/git/CodeReviewCommitGraphTest.java
@@ -0,0 +1,119 @@ +// Copyright (C) 2026 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.server.git; + +import static com.google.common.truth.Truth.assertThat; + +import com.google.gerrit.server.git.CodeReviewCommit.CodeReviewRevWalk; +import java.io.IOException; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicInteger; +import org.eclipse.jgit.internal.storage.commitgraph.CommitGraph; +import org.eclipse.jgit.internal.storage.file.FileRepository; +import org.eclipse.jgit.internal.storage.file.GC; +import org.eclipse.jgit.junit.TestRepository; +import org.eclipse.jgit.lib.AnyObjectId; +import org.eclipse.jgit.lib.ConfigConstants; +import org.eclipse.jgit.lib.ObjectLoader; +import org.eclipse.jgit.lib.ObjectReader; +import org.eclipse.jgit.lib.StoredConfig; +import org.eclipse.jgit.revwalk.RevCommit; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; + +/** Tests that {@link CodeReviewRevWalk} parses commits from the commit-graph when it can. */ +public class CodeReviewCommitGraphTest { + @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); + + private FileRepository repo; + private TestRepository<FileRepository> tr; + private RevCommit tip; + + @Before + public void setUp() throws Exception { + repo = new FileRepository(temporaryFolder.newFolder("repo.git")); + repo.create(true); + tr = new TestRepository<>(repo); + RevCommit c1 = tr.commit().message("c1").create(); + RevCommit c2 = tr.commit().parent(c1).message("c2").create(); + tip = tr.commit().parent(c2).message("c3").create(); + tr.update("refs/heads/master", tip); + } + + @Test + public void commitsAreParsedFromCommitGraph() throws Exception { + writeCommitGraph(); + assertThat(objectsOpenedWalkingFromTip()).isEqualTo(0); + } + + @Test + public void commitsAreParsedWithoutCommitGraph() throws Exception { + assertThat(objectsOpenedWalkingFromTip()).isEqualTo(3); + } + + private int objectsOpenedWalkingFromTip() throws Exception { + CountingReader reader = new CountingReader(repo.newObjectReader()); + try (CodeReviewRevWalk rw = CodeReviewCommit.newRevWalk(reader)) { + rw.setRetainBody(false); + rw.markStart(rw.lookupCommit(tip)); + int commits = 0; + while (rw.next() != null) { + commits++; + } + assertThat(commits).isEqualTo(3); + return reader.opens.get(); + } + } + + private void writeCommitGraph() throws Exception { + StoredConfig cfg = repo.getConfig(); + cfg.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null, "commitGraph", true); + cfg.setBoolean( + ConfigConstants.CONFIG_GC_SECTION, + null, + ConfigConstants.CONFIG_KEY_WRITE_COMMIT_GRAPH, + true); + cfg.save(); + new GC(repo).gc().get(); + } + + /** Reader that counts object loads and keeps exposing the commit-graph of the wrapped reader. */ + private static class CountingReader extends ObjectReader.Filter { + final AtomicInteger opens = new AtomicInteger(); + private final ObjectReader delegate; + + CountingReader(ObjectReader delegate) { + this.delegate = delegate; + } + + @Override + protected ObjectReader delegate() { + return delegate; + } + + @Override + public ObjectLoader open(AnyObjectId objectId, int typeHint) throws IOException { + opens.incrementAndGet(); + return super.open(objectId, typeHint); + } + + @Override + public Optional<CommitGraph> getCommitGraph() throws IOException { + return delegate.getCommitGraph(); + } + } +}
diff --git a/javatests/com/google/gerrit/server/git/TagSetTest.java b/javatests/com/google/gerrit/server/git/TagSetTest.java index ed68a3f..9402b45 100644 --- a/javatests/com/google/gerrit/server/git/TagSetTest.java +++ b/javatests/com/google/gerrit/server/git/TagSetTest.java
@@ -42,22 +42,32 @@ import java.util.Comparator; import java.util.HashMap; import java.util.Map; +import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; +import org.eclipse.jgit.internal.storage.commitgraph.CommitGraph; import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription; import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository; +import org.eclipse.jgit.internal.storage.file.FileRepository; +import org.eclipse.jgit.internal.storage.file.GC; import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.lib.AnyObjectId; +import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectIdOwnerMap; import org.eclipse.jgit.lib.ObjectLoader; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.revwalk.RevCommit; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TemporaryFolder; import org.roaringbitmap.RoaringBitmap; public class TagSetTest { + @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @Test public void roundTripToProto() { HashMap<String, CachedRef> refs = new HashMap<>(); @@ -128,6 +138,61 @@ } @Test + public void buildParsesCommitsFromCommitGraph() throws Exception { + AtomicInteger reads = new AtomicInteger(); + FileRepository repo = + new FileRepository(temporaryFolder.newFolder("project.git")) { + @Override + public ObjectReader newObjectReader() { + ObjectReader delegate = super.newObjectReader(); + return new ObjectReader.Filter() { + @Override + protected ObjectReader delegate() { + return delegate; + } + + @Override + public ObjectLoader open(AnyObjectId objectId) throws IOException { + return open(objectId, OBJ_ANY); + } + + @Override + public ObjectLoader open(AnyObjectId objectId, int typeHint) throws IOException { + reads.incrementAndGet(); + return super.open(objectId, typeHint); + } + + @Override + public Optional<CommitGraph> getCommitGraph() throws IOException { + return delegate.getCommitGraph(); + } + }; + } + }; + repo.create(true); + try (TestRepository<FileRepository> tr = new TestRepository<>(repo)) { + RevCommit c1 = tr.commit().create(); + RevCommit c2 = tr.commit().parent(c1).create(); + tr.update("refs/heads/master", tr.commit().parent(c2).create()); + tr.update("refs/tags/v1", c1); + } + StoredConfig cfg = repo.getConfig(); + cfg.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null, "commitGraph", true); + cfg.setBoolean( + ConfigConstants.CONFIG_GC_SECTION, + null, + ConfigConstants.CONFIG_KEY_WRITE_COMMIT_GRAPH, + true); + cfg.save(); + new GC(repo).gc().get(); + + reads.set(0); + assertThat(new TagSet(Project.nameKey("project")).build(repo, null, null)).isTrue(); + // Only the branch and tag tips are read; the commit between them comes from the graph. + assertThat(reads.get()).isEqualTo(2); + } + + @Test public void buildStopsReadingObjectsWhenInterrupted() throws Exception { AtomicInteger interruptedReads = new AtomicInteger(); // Mimics JGit's file-based object reader, which throws InterruptedIOException for every
diff --git a/javatests/com/google/gerrit/server/restapi/project/ConvertRefStorageTest.java b/javatests/com/google/gerrit/server/restapi/project/ConvertRefStorageTest.java index b49fa91..b84be48 100644 --- a/javatests/com/google/gerrit/server/restapi/project/ConvertRefStorageTest.java +++ b/javatests/com/google/gerrit/server/restapi/project/ConvertRefStorageTest.java
@@ -33,6 +33,10 @@ import com.google.gerrit.server.permissions.GlobalPermission; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.project.ProjectResource; +import java.io.IOException; +import java.text.MessageFormat; +import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.RefStorageFormat; import org.junit.Before; import org.junit.Test; @@ -82,6 +86,39 @@ } @Test + public void leftoverReftableDirIsConflict() throws Exception { + RefStorageInput input = new RefStorageInput(); + input.refStorage = "REFTABLE"; + when(repoManager.convertRefStorage(name, RefStorageFormat.REFTABLE, true, true)) + .thenThrow(new IOException(JGitText.get().reftableDirExists)); + ResourceConflictException thrown = + assertThrows(ResourceConflictException.class, () -> view.apply(resource, input)); + assertThat(thrown).hasMessageThat().contains("Remove it before converting"); + } + + @Test + public void leftoverPackedRefsIsConflict() throws Exception { + RefStorageInput input = new RefStorageInput(); + input.refStorage = "FILES"; + when(repoManager.convertRefStorage(name, RefStorageFormat.FILES, true, true)) + .thenThrow( + new IOException( + MessageFormat.format(JGitText.get().fileAlreadyExists, Constants.PACKED_REFS))); + ResourceConflictException thrown = + assertThrows(ResourceConflictException.class, () -> view.apply(resource, input)); + assertThat(thrown).hasMessageThat().contains("Remove it before converting"); + } + + @Test + public void unrelatedIoErrorPropagates() throws Exception { + RefStorageInput input = new RefStorageInput(); + input.refStorage = "REFTABLE"; + when(repoManager.convertRefStorage(name, RefStorageFormat.REFTABLE, true, true)) + .thenThrow(new IOException("disk failure")); + assertThrows(IOException.class, () -> view.apply(resource, input)); + } + + @Test public void unsupportedManagerIsConflict() throws Exception { RefStorageInput input = new RefStorageInput(); input.refStorage = "REFTABLE";
diff --git a/javatests/com/google/gerrit/server/schema/AllProjectsCreatorTest.java b/javatests/com/google/gerrit/server/schema/AllProjectsCreatorTest.java index 9969f0f..782d30c 100644 --- a/javatests/com/google/gerrit/server/schema/AllProjectsCreatorTest.java +++ b/javatests/com/google/gerrit/server/schema/AllProjectsCreatorTest.java
@@ -168,6 +168,16 @@ } @Test + public void createAllProjectsWithoutInitializingDefaultAiReviewAcl() throws Exception { + AllProjectsInput allProjectsInput = + AllProjectsInput.builder().initDefaultAiReviewAcl(false).build(); + allProjectsCreator.create(allProjectsInput); + + Config config = readAllProjectsConfig(repoManager, allProjectsName); + assertThat(config).stringValues("access", "refs/heads/*", "aiReview").isEmpty(); + } + + @Test public void createAllProjectsWithoutInitializingDefaultSubmitRequirements() throws Exception { GroupReference adminsGroup = createGroupReference("Administrators"); GroupReference serviceUsersGroup = createGroupReference(ServiceUserClassifier.SERVICE_USERS);
diff --git a/plugins/replication b/plugins/replication index 48d5b6c..78b8b36 160000 --- a/plugins/replication +++ b/plugins/replication
@@ -1 +1 @@ -Subproject commit 48d5b6cf76e541bcfd6c37372d792d06a38984c0 +Subproject commit 78b8b36a90a36c0db91df06aea0c78114a03a1ef
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-detail-list/gr-repo-detail-list.ts b/polygerrit-ui/app/elements/admin/gr-repo-detail-list/gr-repo-detail-list.ts index 9845490..05c956a 100644 --- a/polygerrit-ui/app/elements/admin/gr-repo-detail-list/gr-repo-detail-list.ts +++ b/polygerrit-ui/app/elements/admin/gr-repo-detail-list/gr-repo-detail-list.ts
@@ -65,6 +65,8 @@ @state() isOwner = false; + @state() private canAdd = false; + @state() loggedIn = false; @state() offset = 0; @@ -159,7 +161,8 @@ if (!this.detailType) return nothing; return html` <gr-list-view - .createNew=${this.loggedIn} + .createNew=${this.loggedIn && + (this.detailType !== RepoDetailView.BRANCHES || this.canAdd)} .createNewText=${this.detailType === RepoDetailView.BRANCHES ? 'Create Branch' : ' Create Tag'} @@ -371,10 +374,12 @@ } // private but used in test - determineIfOwner(repo: RepoName) { - return this.restApiService - .getRepoAccess(repo) - .then(access => (this.isOwner = !!access?.[repo]?.is_owner)); + determineRepoAccess(repo: RepoName) { + this.canAdd = false; + return this.restApiService.getRepoAccess(repo).then(access => { + this.isOwner = !!access?.[repo]?.is_owner; + this.canAdd = !!access?.[repo]?.can_add; + }); } // private but used in test @@ -397,7 +402,7 @@ this.getLoggedIn().then(loggedIn => { this.loggedIn = loggedIn; if (loggedIn && this.repo) { - this.determineIfOwner(this.repo); + this.determineRepoAccess(this.repo); } });
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-detail-list/gr-repo-detail-list_test.ts b/polygerrit-ui/app/elements/admin/gr-repo-detail-list/gr-repo-detail-list_test.ts index 91267e1..c5ddb8e 100644 --- a/polygerrit-ui/app/elements/admin/gr-repo-detail-list/gr-repo-detail-list_test.ts +++ b/polygerrit-ui/app/elements/admin/gr-repo-detail-list/gr-repo-detail-list_test.ts
@@ -85,6 +85,74 @@ } suite('gr-repo-detail-list', () => { + suite('creation button visibility', () => { + for (const {detail, loggedIn, canAdd, visible} of [ + { + detail: RepoDetailView.BRANCHES, + loggedIn: true, + canAdd: true, + visible: true, + }, + { + detail: RepoDetailView.BRANCHES, + loggedIn: true, + canAdd: false, + visible: false, + }, + { + detail: RepoDetailView.BRANCHES, + loggedIn: true, + canAdd: undefined, + visible: false, + }, + { + detail: RepoDetailView.BRANCHES, + loggedIn: false, + canAdd: true, + visible: false, + }, + { + detail: RepoDetailView.TAGS, + loggedIn: true, + canAdd: undefined, + visible: true, + }, + { + detail: RepoDetailView.TAGS, + loggedIn: false, + canAdd: undefined, + visible: false, + }, + ] as const) { + test(`${detail}, logged in: ${loggedIn}, can_add: ${canAdd}`, async () => { + stubRestApi('getRepoAccess').resolves({ + test: { + revision: 'xxxx', + local: {}, + owner_of: [], + groups: {}, + config_web_links: [], + can_add: canAdd, + }, + }); + const element = await fixture<GrRepoDetailList>( + html`<gr-repo-detail-list></gr-repo-detail-list>` + ); + element.repo = 'test' as RepoName; + element.detailType = detail; + element.loggedIn = loggedIn; + await element.determineRepoAccess(element.repo); + await element.updateComplete; + const list = queryAndAssert<GrListView>(element, 'gr-list-view'); + await list.updateComplete; + assert.equal( + queryAndAssert<GrButton>(list, '#createNew').hidden, + !visible + ); + }); + } + }); + suite('Branches', () => { let element: GrRepoDetailList; let branches: BranchInfo[]; @@ -2025,7 +2093,7 @@ }, } as RepoAccessInfoMap) ); - await element.determineIfOwner('test' as RepoName); + await element.determineRepoAccess('test' as RepoName); assert.equal(element.isOwner, false); assert.equal( getComputedStyle( @@ -2083,7 +2151,7 @@ element, 'handleSaveRevision' ); - await element.determineIfOwner('test' as RepoName); + await element.determineRepoAccess('test' as RepoName); assert.equal(element.isOwner, true); // The revision container for non-editing enabled row is not visible. assert.equal(getComputedStyle(revisionNoEditing).display, 'none');
diff --git a/polygerrit-ui/app/elements/admin/gr-repo/gr-repo.ts b/polygerrit-ui/app/elements/admin/gr-repo/gr-repo.ts index f3e16e2..dd45e63 100644 --- a/polygerrit-ui/app/elements/admin/gr-repo/gr-repo.ts +++ b/polygerrit-ui/app/elements/admin/gr-repo/gr-repo.ts
@@ -62,6 +62,9 @@ import {formStyles} from '../../../styles/form-styles'; import '@material/web/select/outlined-select'; import '@material/web/select/select-option'; +import '@material/web/checkbox/checkbox'; +import {MdCheckbox} from '@material/web/checkbox/checkbox'; +import '../../shared/gr-icon/gr-icon'; const STATES = { active: {value: RepoState.ACTIVE, label: 'Active'}, @@ -142,6 +145,8 @@ @state() private isConverting = false; + @state() private keepBackup = false; + @query('#convertRefStorageModal') private readonly convertRefStorageModal?: HTMLDialogElement; @@ -199,6 +204,27 @@ #convertRefStorageBtn { margin-left: var(--spacing-m); } + #keepBackupOption { + align-items: center; + display: flex; + gap: var(--spacing-s); + } + #keepBackupOption label { + cursor: pointer; + } + /* Pin a stable width so toggling the backup option, which changes the + amount of body text, does not resize the dialog. */ + #convertRefStorageModal gr-dialog { + width: calc(min(36em, 90vw)); + } + .warning { + color: var(--warning-foreground); + } + .warning gr-icon { + color: var(--warning-icon-color); + vertical-align: bottom; + margin-right: var(--spacing-s); + } h2.edited:after { color: var(--deemphasized-text-color); content: ' *'; @@ -344,7 +370,13 @@ title=${configChanged ? 'Save or discard configuration edits before converting' : nothing} - @click=${() => this.convertRefStorageModal?.showModal()} + @click=${() => { + // Reset on open as well as on @close, so the dialog is always + // shown unchecked even if a prior instance was torn down while + // open (e.g. the convert affordance disappeared mid-dialog). + this.keepBackup = false; + this.convertRefStorageModal?.showModal(); + }} >Convert to ${this.convertTargetLabel}</gr-button >` )} @@ -352,7 +384,13 @@ </fieldset> ${when( this.showConvertRefStorage, - () => html`<dialog id="convertRefStorageModal" tabindex="-1"> + () => html`<dialog + id="convertRefStorageModal" + tabindex="-1" + @close=${() => { + this.keepBackup = false; + }} + > <gr-dialog confirm-label="Convert" @confirm=${this.handleConvertRefStorageConfirm} @@ -362,8 +400,23 @@ Convert to ${this.convertTargetLabel} </div> <div class="main" slot="main"> - Convert ${this.repo} to the ${this.convertTargetLabel} ref storage - backend? The previous ref storage is removed after conversion. + <p> + Convert ${this.repo} to the ${this.convertTargetLabel} ref + storage backend? + </p> + <section id="keepBackupOption"> + <md-checkbox + id="keepBackupCheckbox" + ?checked=${this.keepBackup} + @change=${(e: Event) => { + this.keepBackup = (e.target as MdCheckbox).checked; + }} + ></md-checkbox> + <label for="keepBackupCheckbox" + >Keep a backup of the previous ref storage</label + > + </section> + ${this.renderConvertBackupNote()} </div> </gr-dialog> </dialog>` @@ -1093,20 +1146,45 @@ return this.refStorageLabel(this.repoConfig?.ref_storage); } + private renderConvertBackupNote() { + if (!this.keepBackup) { + return html`<p>The previous ref storage is removed after conversion.</p>`; + } + // Only converting away from reftable is hazardous: the old reftable/ dir is + // left in place and blocks a later conversion back. The .old files from a + // files->reftable conversion are harmless. + if (this.convertTarget === RefStorage.FILES) { + return html`<div class="warning"> + <gr-icon icon="warning"></gr-icon> + The previous ${this.currentRefStorageLabel} ref storage is kept as a + backup. A later conversion back to ${this.currentRefStorageLabel} will + fail until the leftover reftable directory is removed manually. + </div>`; + } + return html`<p> + The previous ${this.currentRefStorageLabel} ref storage is kept as a + backup. Remove it manually when no longer needed. + </p>`; + } + async handleConvertRefStorageConfirm() { const repo = this.repo; const targetName = this.convertTargetLabel; + const target = this.convertTarget; + // Snapshot the backup choice before closing the dialog, since closing it + // resets keepBackup via the dialog's @close handler. + const backup = this.keepBackup; this.convertRefStorageModal?.close(); if (!repo || !this.showConvertRefStorage || this.hasConfigChanged()) return; if (this.isConverting) return; - const target = this.convertTarget; this.isConverting = true; try { // convertRepoRefStorage reports failures itself (reportServerError), // so only react to success here, like handleSaveRepoConfig. const response = await this.restApiService.convertRepoRefStorage( repo, - target + target, + backup ); if (!response?.ok) return; fireAlert(this, `Converted ${repo} to ${targetName}`);
diff --git a/polygerrit-ui/app/elements/admin/gr-repo/gr-repo_test.ts b/polygerrit-ui/app/elements/admin/gr-repo/gr-repo_test.ts index 148d982..ce1595e 100644 --- a/polygerrit-ui/app/elements/admin/gr-repo/gr-repo_test.ts +++ b/polygerrit-ui/app/elements/admin/gr-repo/gr-repo_test.ts
@@ -52,6 +52,7 @@ import {MdOutlinedTextField} from '@material/web/textfield/outlined-text-field'; import {GrAutogrowTextarea} from '../../shared/gr-autogrow-textarea/gr-autogrow-textarea'; import {MdOutlinedSelect} from '@material/web/select/outlined-select'; +import {MdCheckbox} from '@material/web/checkbox/checkbox'; suite('gr-repo tests', () => { let element: GrRepo; @@ -192,11 +193,139 @@ await element.handleConvertRefStorageConfirm(); - assert.isTrue(convert.calledWithExactly(REPO as RepoName, target)); + assert.isTrue(convert.calledWithExactly(REPO as RepoName, target, false)); assert.isTrue(reload.calledOnce); }); } + test('conversion keeps a backup when the option is checked', async () => { + await setRefStorage(RefStorage.FILES); + const convert = stubRestApi('convertRepoRefStorage').resolves( + new Response() + ); + sinon.stub(element, 'loadRepo').resolves(); + // Confirm calls dialog.close(), which resets keepBackup via @close. The + // flag is snapshotted before close, so the conversion still sees backup=true. + const dialog = queryAndAssert<HTMLDialogElement>( + element, + '#convertRefStorageModal' + ); + dialog.showModal(); + await element.updateComplete; + assert.isTrue(dialog.open); + const checkbox = queryAndAssert<MdCheckbox>(element, '#keepBackupCheckbox'); + checkbox.checked = true; + checkbox.dispatchEvent(new Event('change')); + + await element.handleConvertRefStorageConfirm(); + + assert.isTrue( + convert.calledWithExactly(REPO as RepoName, RefStorage.REFTABLE, true) + ); + }); + + test('closing the convert dialog resets the backup option', async () => { + await setRefStorage(RefStorage.FILES); + const convert = stubRestApi('convertRepoRefStorage').resolves( + new Response() + ); + sinon.stub(element, 'loadRepo').resolves(); + const dialog = queryAndAssert<HTMLDialogElement>( + element, + '#convertRefStorageModal' + ); + dialog.showModal(); + await element.updateComplete; + assert.isTrue(dialog.open); + const checkbox = queryAndAssert<MdCheckbox>(element, '#keepBackupCheckbox'); + checkbox.checked = true; + checkbox.dispatchEvent(new Event('change')); + await element.updateComplete; + + // Dismiss via dialog.close() (the Cancel/ESC path) so @close runs and clears + // the choice. A later conversion must not inherit a stale keep-backup. + const closed = new Promise<void>(resolve => + dialog.addEventListener('close', () => resolve(), {once: true}) + ); + dialog.close(); + await closed; + await element.updateComplete; + + await element.handleConvertRefStorageConfirm(); + + assert.isTrue( + convert.calledWithExactly(REPO as RepoName, RefStorage.REFTABLE, false) + ); + }); + + // textContent preserves the template's newlines/indentation; collapse them. + function normalizedText(el: Element) { + return (el.textContent ?? '').replace(/\s+/g, ' ').trim(); + } + + test('convert-to-reftable backup note keeps backup without a failure warning', async () => { + await setRefStorage(RefStorage.FILES); + const main = queryAndAssert(element, '#convertRefStorageModal .main'); + assert.include(normalizedText(main), 'removed after conversion'); + + const checkbox = queryAndAssert<MdCheckbox>(element, '#keepBackupCheckbox'); + checkbox.checked = true; + checkbox.dispatchEvent(new Event('change')); + await element.updateComplete; + + // Converting away from files leaves only harmless .old files, so no + // round-trip failure is claimed. + assert.include(normalizedText(main), 'kept as a backup'); + assert.include(normalizedText(main), 'Remove it manually'); + assert.notInclude(normalizedText(main), 'will fail'); + }); + + test('convert-to-files backup note warns about the blocked round-trip', async () => { + await setRefStorage(RefStorage.REFTABLE); + const main = queryAndAssert(element, '#convertRefStorageModal .main'); + + const checkbox = queryAndAssert<MdCheckbox>(element, '#keepBackupCheckbox'); + checkbox.checked = true; + checkbox.dispatchEvent(new Event('change')); + await element.updateComplete; + + // Converting away from reftable leaves the reftable/ dir, which blocks a + // later conversion back to reftable. + assert.include(normalizedText(main), 'kept as a backup'); + assert.include(normalizedText(main), 'will fail'); + assert.include(normalizedText(main), 'leftover reftable directory'); + }); + + test('opening the convert dialog resets the backup choice', async () => { + await setRefStorage(RefStorage.FILES); + const convert = stubRestApi('convertRepoRefStorage').resolves( + new Response() + ); + sinon.stub(element, 'loadRepo').resolves(); + const dialog = queryAndAssert<HTMLDialogElement>( + element, + '#convertRefStorageModal' + ); + const checkbox = queryAndAssert<MdCheckbox>(element, '#keepBackupCheckbox'); + checkbox.checked = true; + checkbox.dispatchEvent(new Event('change')); + await element.updateComplete; + assert.isTrue(checkbox.checked); + assert.isFalse(dialog.open); + + queryAndAssert<GrButton>(element, '#convertRefStorageBtn').click(); + await element.updateComplete; + + assert.isTrue(dialog.open); + assert.isFalse(checkbox.checked); + + await element.handleConvertRefStorageConfirm(); + + assert.isTrue( + convert.calledWithExactly(REPO as RepoName, RefStorage.REFTABLE, false) + ); + }); + test('ordinary config saves omit the read-only ref storage', () => { const config = {...repoConf, ref_storage: RefStorage.REFTABLE}; assert.notProperty(element.formatRepoConfigForSave(config), 'ref_storage'); @@ -1375,7 +1504,11 @@ ); await element.handleConvertRefStorageConfirm(); assert.isTrue( - convertStub.calledWithExactly(REPO as RepoName, RefStorage.REFTABLE) + convertStub.calledWithExactly( + REPO as RepoName, + RefStorage.REFTABLE, + false + ) ); });
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.ts b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.ts index 8972b8e..a9c8477 100644 --- a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.ts +++ b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.ts
@@ -17,7 +17,6 @@ import {navigationToken} from '../../core/gr-navigation/gr-navigation'; import {getDisplayName} from '../../../utils/display-name-util'; import {getAppContext} from '../../../services/app-context'; -import {truncatePath} from '../../../utils/path-list-util'; import {isSelf, isServiceUser} from '../../../utils/account-util'; import { AccountInfo, @@ -280,6 +279,28 @@ .spacer { height: 0; overflow: hidden; + /* The spacer sets the subject column's preferred width. Cap it so + long subjects don't take spare width away from other columns. */ + max-width: 60ch; + } + /* The repo cell uses the same container/content/spacer layout as the + subject, so it shrinks with the table instead of holding its full + width. The spacer wraps, so it doesn't set a large minimum width; + min-width keeps enough of the name visible. */ + .repo .spacer { + min-width: 8rem; + white-space: normal; + overflow-wrap: anywhere; + } + /* Elide the start of long repo names so the distinctive end of the + name stays visible. The inner span keeps the text itself LTR. */ + .repo .content { + direction: rtl; + text-align: left; + } + .repo .content > span { + direction: ltr; + unicode-bidi: isolate; } .size gr-tooltip-content { margin: -0.4rem -0.6rem; @@ -432,11 +453,9 @@ white-space: normal; overflow-wrap: anywhere; } - .repo .truncatedRepo { - display: none; - } - .repo .fullRepo { + .repo .content { display: block; + direction: ltr; } .cell.votes { display: flex; @@ -651,10 +670,17 @@ const repo = this.change?.project ?? ''; return html` <td class="cell repo"> - <a class="fullRepo" href=${this.computeRepoUrl()}> ${repo} </a> - <a class="truncatedRepo" href=${this.computeRepoUrl()} title=${repo}> - ${truncatePath(repo, 2)} - </a> + <div class="container"> + <a + class="fullRepo content" + href=${this.computeRepoUrl()} + title=${repo} + > + <span>${repo}</span> + </a> + <div class="spacer">${repo}</div> + <span> </span> + </div> </td> `; }
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_test.ts b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_test.ts index 35e7f34..17ac1cb 100644 --- a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_test.ts +++ b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_test.ts
@@ -516,16 +516,17 @@ highlightattention="" ></gr-account-label> <div></div> - <a class="fullRepo" href="/q/project:test-project+status:open"> - test-project - </a> - <a - class="truncatedRepo" - href="/q/project:test-project+status:open" - title="test-project" - > - test-project - </a> + <div class="container"> + <a + class="fullRepo content" + href="/q/project:test-project+status:open" + title="test-project" + > + <span>test-project</span> + </a> + <div class="spacer">test-project</div> + <span></span> + </div> <a href="/q/project:test-project+branch:test-branch"> test-branch </a> <gr-date-formatter withtooltip=""></gr-date-formatter> <gr-date-formatter withtooltip=""></gr-date-formatter>
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.ts b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.ts index 11e2b6d..d7d4abaa 100644 --- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.ts +++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.ts
@@ -500,12 +500,11 @@ this.onOpenDiffInChangeView(e) ); this.addEventListener('show-tab', e => this.setActiveTab(e)); - this.addEventListener( - 'close-chat-panel', - () => (this.showSidebarChat = false) + this.addEventListener('close-chat-panel', () => + this.getChatModel().setChatPanelOpen(false) ); this.addEventListener('explain-code-requested', e => { - this.showSidebarChat = true; + this.getChatModel().setChatPanelOpen(true); this.getChatModel().processChatRequest(e.detail); }); } @@ -773,6 +772,13 @@ this.revertingChange = revertingChange; } ); + subscribe( + this, + () => this.getChatModel().chatPanelOpen$, + open => { + this.showSidebarChat = open; + } + ); } override connectedCallback() { @@ -1276,7 +1282,7 @@ } private toggleChat() { - this.showSidebarChat = !this.showSidebarChat; + this.getChatModel().setChatPanelOpen(!this.showSidebarChat); } private renderSidebar() { @@ -1872,7 +1878,9 @@ } private computeChangeStatusChips() { - if (!this.change || this.mergeable === undefined) return []; + if (!this.change) { + return []; + } const options = { mergeable: this.mergeable,
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_screenshot_test.ts b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_screenshot_test.ts index 7ea54f3..af107a6 100644 --- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_screenshot_test.ts +++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_screenshot_test.ts
@@ -27,6 +27,7 @@ } from '../../../test/test-utils'; import {testResolver} from '../../../test/common-test-setup'; import {changeModelToken} from '../../../models/change/change-model'; +import {chatModelToken} from '../../../models/chat/chat-model'; import {commentsModelToken} from '../../../models/comments/comments-model'; import { ChangeChildView, @@ -369,9 +370,7 @@ test('full page 1280px with chat panel', async () => { // Set viewport to ensure media queries respond correctly await setViewport({width: 1280, height: 800}); - // Force open the chat panel - // eslint-disable-next-line @typescript-eslint/no-explicit-any - (element as any).showSidebarChat = true; + testResolver(chatModelToken).setChatPanelOpen(true); const container = document.createElement('div'); container.style.width = '1280px';
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.ts b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.ts index fd2cdc5..f9974a5 100644 --- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.ts +++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.ts
@@ -1173,6 +1173,24 @@ assert.equal(element.computeHeaderClass(), 'header editMode'); }); + test('header class computation with status and undefined mergeable', () => { + element.change = { + ...createChangeViewChange(), + status: ChangeStatus.NEW, + }; + element.mergeable = undefined; + assert.equal(element.computeHeaderClass(), 'header active'); + + element.mergeable = false; + assert.equal(element.computeHeaderClass(), 'header merge-conflict'); + + element.change = { + ...createChangeViewChange(), + status: ChangeStatus.MERGED, + }; + assert.equal(element.computeHeaderClass(), 'header merged'); + }); + test('maybeScrollToMessage', async () => { element.change = { ...createChangeViewChange(),
diff --git a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.ts b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.ts index f075d83..6d30fb8 100644 --- a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.ts +++ b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.ts
@@ -44,7 +44,11 @@ PatchRange, RevisionPatchSetNum, } from '../../../types/common'; -import {isMarkdownDiff} from '../../../utils/diff-util'; +import { + canBlameFile, + computeBlameToggleLabel, + isMarkdownDiff, +} from '../../../utils/diff-util'; import {DiffInfo, DiffPreferencesInfo} from '../../../types/diff'; import {GrDiffHost} from '../../diff/gr-diff-host/gr-diff-host'; import {GrDiffPreferencesDialog} from '../../diff/gr-diff-preferences-dialog/gr-diff-preferences-dialog'; @@ -60,6 +64,7 @@ import {checksModelToken, RunResult} from '../../../models/checks/checks-model'; import {changeModelToken} from '../../../models/change/change-model'; import {filesModelToken} from '../../../models/change/files-model'; +import {configModelToken} from '../../../models/config/config-model'; import {ShortcutController} from '../../lit/shortcut-controller'; import { css, @@ -279,6 +284,20 @@ @state() richMarkdownFiles: Set<string> = new Set(); + /** Paths of expanded files that currently show blame for the left side. */ + // Private but used in tests. + @state() + blameFiles: Set<string> = new Set(); + + /** Paths of expanded files whose diff host is loading blame. */ + @state() + private blameLoadingHosts: Map<string, GrDiffHost> = new Map(); + + // Whether the server allows to show blame information. + // Private but used in tests. + @state() + allowBlame = false; + // Private but used in tests. @state() showSizeBars = true; @@ -339,6 +358,8 @@ private readonly getViewModel = resolve(this, changeViewModelToken); + private readonly getConfigModel = resolve(this, configModelToken); + // private but used in test fileCursor = new GrCursorManager(); @@ -526,12 +547,15 @@ margin-left: var(--spacing-s); width: 1.9em; } - .richMarkdownToggle { + .richMarkdownToggle, + .blameToggle { align-items: center; display: inline-flex; margin-left: var(--spacing-xs); vertical-align: middle; white-space: nowrap; + } + .richMarkdownToggle { opacity: 0; } .row:hover .richMarkdownToggle, @@ -539,10 +563,12 @@ .row.expanded .richMarkdownToggle { opacity: 100; } - .richMarkdownToggle gr-button { + .richMarkdownToggle gr-button, + .blameToggle gr-button { --gr-button-padding: 0 var(--spacing-s); } - .richMarkdownToggle gr-icon { + .richMarkdownToggle gr-icon, + .blameToggle gr-icon { font-size: 16px; margin-right: var(--spacing-xs); } @@ -715,10 +741,12 @@ .fullFileName { display: none; } - .richMarkdownToggle .richToggleLabel { + .richMarkdownToggle .richToggleLabel, + .blameToggle .blameToggleLabel { display: none; } - .richMarkdownToggle gr-icon { + .richMarkdownToggle gr-icon, + .blameToggle gr-icon { margin-right: 0; } } @@ -968,6 +996,13 @@ () => this.getChangeModel().basePatchNum$, x => (this.basePatchNum = x) ); + subscribe( + this, + () => this.getConfigModel().serverConfig$, + serverConfig => { + this.allowBlame = serverConfig?.change.allow_blame ?? false; + } + ); } override willUpdate(changedProperties: PropertyValues): void { @@ -1272,6 +1307,11 @@ .path=${file.__path} .projectName=${this.change?.project} ?noRenderOnPrefsChange=${true} + @is-blame-loaded-changed=${(e: ValueChangedEvent<boolean>) => + this.onIsBlameLoadedChanged( + e.currentTarget as GrDiffHost, + e.detail.value + )} @diff-changed=${(e: CustomEvent<{value?: DiffInfo}>) => { if (e.detail.value) { this.diffsByPath.set(file.__path, e.detail.value); @@ -1426,7 +1466,7 @@ copyTargetName="File path" ></gr-copy-clipboard> </a> - ${this.renderRichMarkdownToggle(file)} + ${this.renderRichMarkdownToggle(file)} ${this.renderBlameToggle(file)} ${when( file.diffs_too_expensive_to_compute, () => html` @@ -1770,6 +1810,97 @@ `; } + /** Only expanded files have a diff host that can load the blame. */ + private canBlame(file: NormalizedFileInfo) { + return ( + canBlameFile( + this.allowBlame, + file.__path, + file, + this.diffsByPath.get(file.__path) + ) && + this.isFileExpanded(file.__path) && + !this.isShowingRichMarkdown(file.__path) + ); + } + + /** + * Shows or hides blame information of the given expanded file, as in the + * diff view. + */ + async toggleBlame(path: string, e?: Event) { + if (e) { + e.stopPropagation(); + e.preventDefault(); + } + if (this.blameLoadingHosts.has(path)) return; + const host = this.findDiffByPath(path, this.diffs); + if (!host) return; + if (this.blameFiles.has(path)) { + host.clearBlame(); + return; + } + this.blameLoadingHosts = new Map(this.blameLoadingHosts).set(path, host); + try { + await host.loadBlame(); + } catch { + // gr-diff-host has already shown an alert. + } finally { + // The file may have been collapsed and re-expanded meanwhile, with the + // new host loading blame on its own. + if (this.blameLoadingHosts.get(path) === host) { + const newLoading = new Map(this.blameLoadingHosts); + newLoading.delete(path); + this.blameLoadingHosts = newLoading; + } + } + } + + private onIsBlameLoadedChanged(host: GrDiffHost, loaded: boolean) { + const path = host.path; + // Ignore discarded hosts, e.g. a blame request resolving after its file + // was collapsed (and possibly re-expanded with a new host). + if (!path || this.findDiffByPath(path, this.diffs) !== host) return; + if (this.blameFiles.has(path) === loaded) return; + const newSet = new Set(this.blameFiles); + if (loaded) { + newSet.add(path); + } else { + newSet.delete(path); + } + this.blameFiles = newSet; + } + + private renderBlameToggle(file: NormalizedFileInfo) { + if (!this.canBlame(file)) return nothing; + const path = file.__path; + const isLoading = this.blameLoadingHosts.has(path); + const isLoaded = this.blameFiles.has(path); + const label = computeBlameToggleLabel(isLoading, isLoaded); + let tooltip = + 'Show blame, linking each line to the change that last modified it'; + if (isLoading) { + tooltip = label; + } else if (isLoaded) { + tooltip = 'Hide blame'; + } + return html` + <div class="blameToggle"> + <gr-tooltip-content has-tooltip title=${tooltip}> + <gr-button + link + class="toggleBlame" + ?disabled=${isLoading} + @click=${(e: MouseEvent) => this.toggleBlame(path, e)} + > + <gr-icon icon="history"></gr-icon> + <span class="blameToggleLabel">${label}</span> + </gr-button> + </gr-tooltip-content> + </div> + `; + } + private renderShowHide(file: NormalizedFileInfo) { const expanded = this.isFileExpanded(file.__path); return html` <div class="show-hide" role="gridcell"> @@ -2679,6 +2810,17 @@ newPaths.push(path); } } + // Collapsed diffs are discarded, so they don't show or load blame anymore. + const blameFiles = [...this.blameFiles].filter(p => this.isFileExpanded(p)); + if (blameFiles.length !== this.blameFiles.size) { + this.blameFiles = new Set(blameFiles); + } + const blameLoading = [...this.blameLoadingHosts].filter(([p]) => + this.isFileExpanded(p) + ); + if (blameLoading.length !== this.blameLoadingHosts.size) { + this.blameLoadingHosts = new Map(blameLoading); + } // Required so that the newly created diff view is included in this.diffs. await this.updateComplete;
diff --git a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.ts b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.ts index c23aced..449ed0e 100644 --- a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.ts +++ b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.ts
@@ -21,6 +21,7 @@ import type {GrDiffMarkdownViewer} from '../../diff/gr-diff-markdown-viewer/gr-diff-markdown-viewer'; import { BasePatchSetNum, + BlameInfo, CommitId, EDIT, FIRST_PARENT, @@ -33,6 +34,7 @@ } from '../../../types/common'; import {createCommentThreads} from '../../../utils/comment-util'; import { + createBlame, createChangeComments, createCommit, createDiff, @@ -1425,7 +1427,7 @@ const renderSpy = sinon.spy(element, 'renderInOrder'); assert.equal( - queryAndAssert<GrIcon>(element, 'gr-icon').icon, + queryAndAssert<GrIcon>(element, 'gr-icon.show-hide-icon').icon, 'expand_more' ); assert.equal(element.expandedFiles.size, 0); @@ -1435,7 +1437,7 @@ await waitEventLoop(); assert.equal( - queryAndAssert<GrIcon>(element, 'gr-icon').icon, + queryAndAssert<GrIcon>(element, 'gr-icon.show-hide-icon').icon, 'expand_less' ); @@ -1447,7 +1449,7 @@ await waitEventLoop(); assert.equal( - queryAndAssert<GrIcon>(element, 'gr-icon').icon, + queryAndAssert<GrIcon>(element, 'gr-icon.show-hide-icon').icon, 'expand_more' ); assert.equal(renderSpy.callCount, 1); @@ -2580,4 +2582,116 @@ assert.equal(getComputedStyle(label).display, 'none'); }); }); + + suite('blame', () => { + let getBlameStub: sinon.SinonStub; + + setup(async () => { + stubRestApi('getDiffComments').returns(Promise.resolve({})); + stubRestApi('getDiffDrafts').returns(Promise.resolve({})); + stubRestApi('getAccountCapabilities').returns(Promise.resolve({})); + stubElement('gr-diff-host', 'reload').callsFake(() => Promise.resolve()); + stubElement('gr-diff-host', 'prefetchDiff').callsFake(() => {}); + getBlameStub = stubRestApi('getBlame').resolves([createBlame()]); + + element = await fixture(html`<gr-file-list></gr-file-list>`); + element.allowBlame = true; + element.numFilesShown = 5; + element.changeNum = 42 as NumericChangeId; + element.basePatchNum = PARENT; + element.patchNum = 2 as RevisionPatchSetNum; + element.files = [ + normalize({}, 'modified.ts'), + normalize({status: FileInfoStatus.ADDED}, 'added.ts'), + normalize({binary: true}, 'image.png'), + ]; + await element.updateComplete; + }); + + async function expand(...paths: string[]) { + element.expandedFiles = new Set(paths); + await element.updateComplete; + await element.filesExpandedPromise; + } + + test('toggle rendered only for expanded files with a left side', async () => { + assert.isNotOk(query(element, '.toggleBlame')); + + await expand('modified.ts', 'added.ts', 'image.png'); + const rows = queryAll(element, '.file-row'); + assert.isOk(rows[0].querySelector('.toggleBlame')); + assert.isNotOk(rows[1].querySelector('.toggleBlame')); + assert.isNotOk(rows[2].querySelector('.toggleBlame')); + + element.allowBlame = false; + await element.updateComplete; + assert.isNotOk(query(element, '.toggleBlame')); + }); + + test('toggle loads and hides blame', async () => { + await expand('modified.ts'); + + await element.toggleBlame('modified.ts'); + await element.updateComplete; + + assert.isTrue(getBlameStub.calledWithExactly(42, 2, 'modified.ts', true)); + const diffHost = queryAndAssert<GrDiffHost>(element, 'gr-diff-host'); + assert.isOk(diffHost.blame); + assert.isTrue(element.blameFiles.has('modified.ts')); + const toggle = queryAndAssert<GrButton>(element, '.toggleBlame'); + assert.include(toggle.textContent, 'Hide Blame'); + + await element.toggleBlame('modified.ts'); + await element.updateComplete; + + assert.isNull(diffHost.blame); + assert.isFalse(element.blameFiles.has('modified.ts')); + assert.include(toggle.textContent, 'Show Blame'); + }); + + test('collapsing file drops blame state', async () => { + await expand('modified.ts'); + await element.toggleBlame('modified.ts'); + assert.isTrue(element.blameFiles.has('modified.ts')); + + element.collapseAllDiffs(); + await element.updateComplete; + await element.filesExpandedPromise; + + assert.isFalse(element.blameFiles.has('modified.ts')); + }); + + test('blame resolving after collapse and re-expand is ignored', async () => { + const oldBlame = mockPromise<BlameInfo[]>(); + getBlameStub.returns(oldBlame); + await expand('modified.ts'); + const oldToggled = element.toggleBlame('modified.ts'); + + await expand(); + await expand('modified.ts'); + const toggle = queryAndAssert<GrButton>(element, '.toggleBlame'); + assert.isFalse(toggle.disabled); + assert.include(toggle.textContent, 'Show Blame'); + + const newBlame = mockPromise<BlameInfo[]>(); + getBlameStub.returns(newBlame); + const newToggled = element.toggleBlame('modified.ts'); + oldBlame.resolve([createBlame()]); + await oldToggled; + await element.updateComplete; + + // The old request neither shows blame nor ends the new one's loading. + assert.isFalse(element.blameFiles.has('modified.ts')); + assert.isTrue(toggle.disabled); + assert.include(toggle.textContent, 'Loading blame'); + + newBlame.resolve([createBlame()]); + await newToggled; + await element.updateComplete; + + assert.isTrue(element.blameFiles.has('modified.ts')); + assert.isFalse(toggle.disabled); + assert.include(toggle.textContent, 'Hide Blame'); + }); + }); });
diff --git a/polygerrit-ui/app/elements/change/gr-flows/gr-create-flow.ts b/polygerrit-ui/app/elements/change/gr-flows/gr-create-flow.ts index b400a9a..208e709 100644 --- a/polygerrit-ui/app/elements/change/gr-flows/gr-create-flow.ts +++ b/polygerrit-ui/app/elements/change/gr-flows/gr-create-flow.ts
@@ -42,6 +42,7 @@ import {SuggestionProvider} from '../../core/gr-search-autocomplete/gr-search-autocomplete'; import {when} from 'lit/directives/when.js'; import {ifDefined} from 'lit/directives/if-defined.js'; +import {keyed} from 'lit/directives/keyed.js'; import {MdOutlinedTextField} from '@material/web/textfield/outlined-text-field.js'; import { computeFlowString, @@ -1099,28 +1100,34 @@ ` )} </md-outlined-select> - <md-outlined-select - class="vote-parameter-input" - label="Value" - value=${this.selectedValueForVote ?? ''} - @change=${(e: Event) => { - // TODO: Remove the reading from attribute - // For some reason in the test, the value is only read from the attribute and not from the value property - this.selectedValueForVote = - ((e.target as HTMLSelectElement).value || - (e.target as HTMLSelectElement).getAttribute('value')) ?? - ''; - this.updateCurrentParameterForVote(); - }} - > - ${labelValues.map( - val => html` - <md-select-option value=${val}> - <div slot="headline">${val}</div> - </md-select-option> - ` - )} - </md-outlined-select> + ${keyed( + this.selectedLabelForVote, + html`<md-outlined-select + class="vote-parameter-input" + label="Value" + value=${this.selectedValueForVote ?? ''} + @change=${(e: Event) => { + // TODO: Remove the reading from attribute + // For some reason in the test, the value is only read from the attribute and not from the value property + this.selectedValueForVote = + ((e.target as HTMLSelectElement).value || + (e.target as HTMLSelectElement).getAttribute('value')) ?? + ''; + this.updateCurrentParameterForVote(); + }} + > + ${labelValues.map( + val => html` + <md-select-option + ?selected=${val === this.selectedValueForVote} + value=${val} + > + <div slot="headline">${val}</div> + </md-select-option> + ` + )} + </md-outlined-select>` + )} `; }
diff --git a/polygerrit-ui/app/elements/change/gr-flows/gr-create-flow_test.ts b/polygerrit-ui/app/elements/change/gr-flows/gr-create-flow_test.ts index 7121f62..d84e09b 100644 --- a/polygerrit-ui/app/elements/change/gr-flows/gr-create-flow_test.ts +++ b/polygerrit-ui/app/elements/change/gr-flows/gr-create-flow_test.ts
@@ -888,6 +888,14 @@ '+1': 'Verified', }, }, + { + name: 'Commit-Queue', + values: { + ' 0': 'Not ready', + '+1': 'Dry run', + '+2': 'Commit', + }, + }, ]; await element.updateComplete; }); @@ -932,6 +940,54 @@ assert.equal(element['currentParameter'], 'Verified-1'); }); + test('selects correct option when switching label and picking last value', async () => { + const actionInput = queryAndAssert<MdOutlinedSelect>( + element, + 'md-outlined-select[label="Action"]' + ); + actionInput.value = 'vote'; + actionInput.dispatchEvent(new Event('change')); + await element.updateComplete; + + let voteParamInputs = queryAll<MdOutlinedSelect>( + element, + '.vote-parameter-input' + ); + const labelSelect = voteParamInputs[0]; + + labelSelect.setAttribute('value', 'Commit-Queue'); + labelSelect.value = 'Commit-Queue'; + labelSelect.dispatchEvent(new Event('input', {bubbles: true})); + labelSelect.dispatchEvent(new Event('change', {bubbles: true})); + await element.updateComplete; + + assert.equal(element['selectedLabelForVote'], 'Commit-Queue'); + assert.equal(element['selectedValueForVote'], ' 0'); + assert.equal(element['currentParameter'], 'Commit-Queue+0'); + + voteParamInputs = queryAll<MdOutlinedSelect>( + element, + '.vote-parameter-input' + ); + const valueSelect = voteParamInputs[1]; + await valueSelect.updateComplete; + assert.isTrue(valueSelect.options[0].selected); + assert.isFalse(valueSelect.options[2].selected); + + valueSelect.setAttribute('value', '+2'); + valueSelect.value = '+2'; + valueSelect.dispatchEvent( + new Event('input', {bubbles: true, composed: true}) + ); + valueSelect.dispatchEvent( + new Event('change', {bubbles: true, composed: true}) + ); + await element.updateComplete; + + assert.equal(element['selectedValueForVote'], '+2'); + assert.equal(element['currentParameter'], 'Commit-Queue+2'); + }); + test('updates parameter when value is changed', async () => { const actionInput = queryAndAssert<MdOutlinedSelect>( element,
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.ts b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.ts index 7426951..d3c4ac6 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.ts +++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.ts
@@ -5,6 +5,7 @@ */ import '../../plugins/gr-endpoint-decorator/gr-endpoint-decorator'; import '../../plugins/gr-endpoint-param/gr-endpoint-param'; +import '../../chat-panel/chat-panel'; import '../../../styles/gr-a11y-styles'; import '../../../styles/shared-styles'; import '../../shared/gr-button/gr-button'; @@ -37,6 +38,7 @@ import {CommentAnchorTapEventDetail} from '../../shared/gr-comment/gr-comment'; import {ChangeComments} from '../../diff/gr-comment-api/gr-comment-api'; import { + ActionNameToActionInfoMap, BasePatchSetNum, Comment, CommentMap, @@ -49,10 +51,11 @@ PatchSetNumber, PreferencesInfo, RepoName, + RevisionInfo, RevisionPatchSetNum, } from '../../../types/common'; import {DiffInfo, DiffPreferencesInfo, WebLinkInfo} from '../../../types/diff'; -import {ParsedChangeInfo} from '../../../types/types'; +import {EditRevisionInfo, ParsedChangeInfo} from '../../../types/types'; import { FilesWebLinks, PatchRangeChangeEvent, @@ -60,7 +63,11 @@ import {GrDiffCursor} from '../../../embed/diff/gr-diff-cursor/gr-diff-cursor'; import {CommentSide, DiffViewMode, Side} from '../../../constants/constants'; import {GrApplyFixDialog} from '../gr-apply-fix-dialog/gr-apply-fix-dialog'; -import {OpenFixPreviewEvent, ValueChangedEvent} from '../../../types/events'; +import { + ExplainCodeRequestedEvent, + OpenFixPreviewEvent, + ValueChangedEvent, +} from '../../../types/events'; import {fire, fireAlert} from '../../../utils/event-util'; import {assertIsDefined} from '../../../utils/common-util'; import {whenVisible} from '../../../utils/dom-util'; @@ -81,6 +88,7 @@ import {GrDownloadDialog} from '../../change/gr-download-dialog/gr-download-dialog'; import {commentsModelToken} from '../../../models/comments/comments-model'; import {changeModelToken} from '../../../models/change/change-model'; +import {chatModelToken} from '../../../models/chat/chat-model'; import {resolve} from '../../../models/dependency'; import {css, html, LitElement, nothing, PropertyValues} from 'lit'; import {ShortcutController} from '../../lit/shortcut-controller'; @@ -104,7 +112,12 @@ FileNameToNormalizedFileInfoMap, filesModelToken, } from '../../../models/change/files-model'; -import {isImageDiff, isMarkdownDiff} from '../../../utils/diff-util'; +import { + canBlameFile, + computeBlameToggleLabel, + isImageDiff, + isMarkdownDiff, +} from '../../../utils/diff-util'; import '../gr-diff-markdown-viewer/gr-diff-markdown-viewer'; import type {GrDiffMarkdownViewer} from '../gr-diff-markdown-viewer/gr-diff-markdown-viewer'; import {formStyles} from '../../../styles/form-styles'; @@ -124,6 +137,10 @@ // Files larger than this cannot be downloaded. const FILE_DOWNLOAD_LIMIT_BYTES = 50 * 1000 * 1000; +// Reserved sidebar key for chat-panel in shownSidebar. +// visible for testing +export const CHAT_PANEL_SIDEBAR = 'chat-panel'; + // visible for testing export interface Files { /** All file paths sorted by `specialFilePathCompare`. */ @@ -204,6 +221,23 @@ // Private but used in tests. @state() + revision?: RevisionInfo | EditRevisionInfo; + + // Private but used in tests. + @state() + revisionActions?: ActionNameToActionInfoMap; + + // Whether any plugin has registered via plugin.aiCodeReview().register(), + // matching gr-change-actions. Private but used in tests. + @state() + aiPluginsRegistered = false; + + private lastRevisionActionsKey?: string; + + private hasInitializedSidebarFromPrefs = false; + + // Private but used in tests. + @state() changeComments?: ChangeComments; // Private but used in tests. @@ -282,10 +316,14 @@ private readonly reporting = getAppContext().reportingService; + private readonly restApiService = getAppContext().restApiService; + private readonly getUserModel = resolve(this, userModelToken); private readonly getChangeModel = resolve(this, changeModelToken); + private readonly getChatModel = resolve(this, chatModelToken); + private readonly getCommentsModel = resolve(this, commentsModelToken); private readonly getFilesModel = resolve(this, filesModelToken); @@ -318,6 +356,17 @@ } }); + private readonly handleCloseChatPanel = () => { + this.getChatModel().setChatPanelOpen(false); + }; + + private readonly handleExplainCodeRequested = ( + e: ExplainCodeRequestedEvent + ) => { + this.getChatModel().setChatPanelOpen(true); + this.getChatModel().processChatRequest(e.detail); + }; + constructor() { super(); this.setupKeyboardShortcuts(); @@ -444,6 +493,29 @@ ); subscribe( this, + () => this.getChangeModel().revision$, + revision => (this.revision = revision) + ); + subscribe( + this, + () => this.getPluginLoader().pluginsModel.aiCodeReviewPlugins$, + plugins => { + this.aiPluginsRegistered = plugins.length > 0; + } + ); + subscribe( + this, + () => this.getChatModel().chatPanelOpen$, + open => { + if (open) { + this.shownSidebar = CHAT_PANEL_SIDEBAR; + } else if (this.shownSidebar === CHAT_PANEL_SIDEBAR) { + this.shownSidebar = undefined; + } + } + ); + subscribe( + this, () => this.getChangeModel().reviewedFiles$, reviewedFiles => { this.reviewedFiles = new Set(reviewedFiles) ?? new Set(); @@ -761,11 +833,32 @@ display: inline-block; margin-right: var(--spacing-m); } + .chatButton { + display: inline-flex; + align-items: center; + margin-right: var(--spacing-m); + } + .chatButton gr-icon { + color: inherit; + margin-right: var(--spacing-xs); + } + .sidebar { + height: 100%; + } .sidebarContents { background: var(--background-color-secondary); box-sizing: border-box; height: 100%; } + .sidebarContents gr-endpoint-decorator[name='chat-panel'] { + display: block; + height: 100%; + } + .sidebarContents + gr-endpoint-decorator[name='chat-panel'] + > :not(gr-endpoint-param) { + height: 100%; + } md-checkbox { --md-checkbox-container-size: 15px; --md-checkbox-icon-size: 15px; @@ -795,30 +888,97 @@ this.handleToggleFileReviewed() ); this.addEventListener('open-fix-preview', e => this.onOpenFixPreview(e)); + this.addEventListener('close-chat-panel', this.handleCloseChatPanel); + this.addEventListener( + 'explain-code-requested', + this.handleExplainCodeRequested + ); this.cursor = new GrDiffCursor(); if (this.diffHost) this.reInitCursor(); - this.getUserModel() - .preferences$.pipe( - map(p => p.diff_page_sidebar), - take(1) - ) - .toPromise() - .then(initialSidebar => { - if (initialSidebar === 'NONE' || initialSidebar === undefined) { - this.shownSidebar = undefined; - } else { - this.shownSidebar = initialSidebar.substring('plugin-'.length); - } - }); + if (!this.hasInitializedSidebarFromPrefs) { + this.hasInitializedSidebarFromPrefs = true; + this.getUserModel() + .preferences$.pipe( + map(p => p.diff_page_sidebar), + take(1) + ) + .toPromise() + .then(initialSidebar => { + if (this.shownSidebar === CHAT_PANEL_SIDEBAR) return; + if (initialSidebar === 'NONE' || initialSidebar === undefined) { + this.shownSidebar = undefined; + } else { + this.shownSidebar = initialSidebar.substring('plugin-'.length); + } + }); + } } override disconnectedCallback() { + this.removeEventListener('close-chat-panel', this.handleCloseChatPanel); + this.removeEventListener( + 'explain-code-requested', + this.handleExplainCodeRequested + ); this.cursor?.dispose(); this.headerResizeObserver.disconnect(); document.documentElement.style.setProperty('--diff-header-height', '0px'); super.disconnectedCallback(); } + private async loadRevisionActions() { + const patchNum = + this.patchNum && this.patchNum !== EDIT + ? this.patchNum + : this.latestPatchNum; + if (!this.changeNum || !patchNum) { + this.lastRevisionActionsKey = undefined; + this.revisionActions = undefined; + return; + } + const key = `${this.changeNum}:${patchNum}`; + if (this.lastRevisionActionsKey === key) { + return; + } + this.lastRevisionActionsKey = key; + this.revisionActions = undefined; + try { + const revisionActions = + await this.restApiService.getChangeRevisionActions( + this.changeNum, + patchNum + ); + if (this.lastRevisionActionsKey !== key) return; + this.revisionActions = revisionActions ?? {}; + } catch { + if (this.lastRevisionActionsKey !== key) return; + this.revisionActions = {}; + } + } + + protected override willUpdate(changedProperties: PropertyValues): void { + super.willUpdate(changedProperties); + if ( + changedProperties.has('changeNum') || + changedProperties.has('latestPatchNum') || + changedProperties.has('patchNum') + ) { + void this.loadRevisionActions(); + } + if ( + (changedProperties.has('change') || changedProperties.has('patchNum')) && + this.change && + this.patchNum + ) { + const matchingRevision = Object.values(this.change.revisions ?? {}).find( + r => r._number === this.patchNum + ); + if (matchingRevision && this.revision !== matchingRevision) { + this.revision = matchingRevision; + } + } + } + private reInitCursor() { if (!this.diffHost) return; this.cursor?.replaceDiffs([this.diffHost]); @@ -968,7 +1128,7 @@ </gr-diff-host> </gr-endpoint-decorator> </div> - <div slot="side">${this.renderSidebarContent()}</div> + <div class="sidebar" slot="side">${this.renderSidebarContent()}</div> </gr-content-with-sidebar> ${this.renderDialogs()} `; @@ -1084,7 +1244,11 @@ name="onTrigger" .value=${(pluginName: string) => { const closeSidebar = this.shownSidebar === pluginName; + const wasChatOpen = this.shownSidebar === CHAT_PANEL_SIDEBAR; this.shownSidebar = closeSidebar ? undefined : pluginName; + if (!closeSidebar && wasChatOpen) { + this.getChatModel().setChatPanelOpen(false); + } this.getUserModel().updatePreferences({ diff_page_sidebar: closeSidebar ? 'NONE' @@ -1103,6 +1267,9 @@ } private getSidebarSide(): 'left' | 'right' { + if (this.shownSidebar === CHAT_PANEL_SIDEBAR) { + return 'right'; + } if (!this.shownSidebar) { return 'left'; } @@ -1125,6 +1292,23 @@ } private renderSidebarContent() { + if (this.shownSidebar === CHAT_PANEL_SIDEBAR) { + return html` + <div class="sidebarContents"> + <gr-endpoint-decorator name="chat-panel"> + <gr-endpoint-param + name="change" + .value=${this.change} + ></gr-endpoint-param> + <gr-endpoint-param + name="revision" + .value=${this.revision} + ></gr-endpoint-param> + <chat-panel></chat-panel> + </gr-endpoint-decorator> + </div> + `; + } return html` ${when(this.shownSidebar !== undefined, () => keyed( @@ -1227,8 +1411,9 @@ <gr-endpoint-decorator name="diff-header-controls" ></gr-endpoint-decorator> - ${this.renderSidebarTriggers()} ${this.renderShowEntireFileButton()} - ${this.renderBlameButton()} ${this.renderRichMarkdownToggle()} + ${this.renderSidebarTriggers()} ${this.renderChatButton()} + ${this.renderShowEntireFileButton()} ${this.renderBlameButton()} + ${this.renderRichMarkdownToggle()} ${when( this.computeCanEdit(), () => html` @@ -1296,6 +1481,31 @@ </div>`; } + private canShowChat(): boolean { + if (!this.loggedIn) return false; + if (this.revisionActions === undefined) return false; + if (this.revisionActions.aiReview?.enabled === false) return false; + if (!this.aiPluginsRegistered) return false; + return true; + } + + private toggleChat() { + this.getChatModel().setChatPanelOpen( + this.shownSidebar !== CHAT_PANEL_SIDEBAR + ); + } + + private renderChatButton() { + if (!this.canShowChat()) return nothing; + return html`<gr-button + link="" + id="toggleChat" + class="chatButton" + @click=${this.toggleChat} + ><gr-icon icon="ai"></gr-icon>Agent Chat</gr-button + >`; + } + private renderShowEntireFileButton() { if (isImageDiff(this.diff) || isMagicPath(this.path)) return; return html`<gr-button @@ -1313,13 +1523,11 @@ } private renderBlameButton() { - if (!this.allowBlame) return; - const showBlameLoader = !isMagicPath(this.path) && !isImageDiff(this.diff); - if (!showBlameLoader) return; - let blameToggleLabel = 'Loading blame ...'; - if (!this.isBlameLoading) { - blameToggleLabel = this.isBlameLoaded ? 'Hide Blame' : 'Show Blame'; - } + if (!canBlameFile(this.allowBlame, this.path, this.file, this.diff)) return; + const blameToggleLabel = computeBlameToggleLabel( + this.isBlameLoading, + !!this.isBlameLoaded + ); return html`<span class="separator"></span ><span class="blameLoader"> <gr-button @@ -2018,7 +2226,7 @@ * Otherwise hide it. */ private toggleBlame() { - if (!this.allowBlame) return; + if (!canBlameFile(this.allowBlame, this.path, this.file, this.diff)) return; assertIsDefined(this.diffHost, 'diffHost'); if (this.isBlameLoaded) { this.diffHost.clearBlame();
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.ts b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.ts index d015b62..d2fdaf8 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.ts +++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.ts
@@ -14,6 +14,7 @@ } from '../../../constants/constants'; import { isVisible, + mockPromise, pressKey, query, queryAll, @@ -54,7 +55,7 @@ import {CursorMoveResult} from '../../../api/core'; import {Side} from '../../../api/diff'; import {PluginApi} from '../../../api/plugin'; -import {Files, GrDiffView} from './gr-diff-view'; +import {CHAT_PANEL_SIDEBAR, Files, GrDiffView} from './gr-diff-view'; import {GrContentWithSidebar} from '../../shared/gr-content-with-sidebar/gr-content-with-sidebar'; import {DropdownItem} from '../../shared/gr-dropdown-list/gr-dropdown-list'; import {SinonFakeTimers, SinonStub, SinonStubbedMember} from 'sinon'; @@ -62,6 +63,8 @@ ChangeModel, changeModelToken, } from '../../../models/change/change-model'; +import {chatModelToken} from '../../../models/chat/chat-model'; +import {GrEndpointParam} from '../../plugins/gr-endpoint-param/gr-endpoint-param'; import {assertIsDefined} from '../../../utils/common-util'; import {GrDiffModeSelector} from '../gr-diff-mode-selector/gr-diff-mode-selector'; import {assert, fixture, html} from '@open-wc/testing'; @@ -411,7 +414,7 @@ <gr-diff-host id="diffHost"> </gr-diff-host> </gr-endpoint-decorator> </div> - <div slot="side"></div> + <div class="sidebar" slot="side"></div> </gr-content-with-sidebar> <gr-apply-fix-dialog id="applyFixDialog"> </gr-apply-fix-dialog> <gr-diff-preferences-dialog id="diffPreferencesDialog"> @@ -2692,5 +2695,387 @@ assert.equal(contentWithSidebar?.side, 'right'); }); }); + + suite('chat panel', () => { + test('Agent Chat button visibility depends on login, AI plugins, and revision actions', async () => { + element.loggedIn = false; + element.aiPluginsRegistered = true; + element.revisionActions = {}; + await element.updateComplete; + assert.isUndefined(query(element, 'gr-button#toggleChat')); + + element.loggedIn = true; + element.aiPluginsRegistered = false; + await element.updateComplete; + assert.isUndefined(query(element, 'gr-button#toggleChat')); + + element.aiPluginsRegistered = true; + element.revisionActions = undefined; + await element.updateComplete; + assert.isUndefined(query(element, 'gr-button#toggleChat')); + + element.revisionActions = {aiReview: {enabled: false}}; + await element.updateComplete; + assert.isUndefined(query(element, 'gr-button#toggleChat')); + + element.revisionActions = {aiReview: {enabled: true}}; + await element.updateComplete; + const chatBtn = queryAndAssert<GrButton>( + element, + 'gr-button#toggleChat' + ); + assert.include(chatBtn.textContent, 'Agent Chat'); + const icon = queryAndAssert(chatBtn, 'gr-icon'); + assert.equal(icon.getAttribute('icon'), 'ai'); + }); + + test('loads revision actions for active patchNum rather than latestPatchNum', async () => { + const getRevisionActionsStub = stubRestApi( + 'getChangeRevisionActions' + ).resolves({aiReview: {enabled: false}}); + element.loggedIn = true; + element.aiPluginsRegistered = true; + element.latestPatchNum = 3 as PatchSetNumber; + element.patchNum = 2 as RevisionPatchSetNum; + await element.updateComplete; + await waitEventLoop(); + + assert.isTrue( + getRevisionActionsStub.calledOnceWithExactly( + TEST_NUMERIC_CHANGE_ID, + 2 as RevisionPatchSetNum + ) + ); + assert.isUndefined(query(element, 'gr-button#toggleChat')); + + getRevisionActionsStub.resolves({aiReview: {enabled: true}}); + element.patchNum = 3 as RevisionPatchSetNum; + await element.updateComplete; + await waitEventLoop(); + + assert.isTrue( + getRevisionActionsStub.calledWithExactly( + TEST_NUMERIC_CHANGE_ID, + 3 as RevisionPatchSetNum + ) + ); + assert.isDefined(query(element, 'gr-button#toggleChat')); + }); + + test('falls back to latestPatchNum for revision actions when viewing edit patchset', async () => { + const getRevisionActionsStub = stubRestApi( + 'getChangeRevisionActions' + ).resolves({aiReview: {enabled: true}}); + element.loggedIn = true; + element.aiPluginsRegistered = true; + element.patchNum = EDIT; + await element.updateComplete; + await waitEventLoop(); + + assert.isFalse(getRevisionActionsStub.called); + assert.isUndefined(query(element, 'gr-button#toggleChat')); + + element.latestPatchNum = 3 as PatchSetNumber; + await element.updateComplete; + await waitEventLoop(); + + assert.isTrue( + getRevisionActionsStub.calledOnceWithExactly( + TEST_NUMERIC_CHANGE_ID, + 3 as RevisionPatchSetNum + ) + ); + assert.isDefined(query(element, 'gr-button#toggleChat')); + }); + + test('clicking Agent Chat toggles chat panel in right sidebar', async () => { + const chatModel = testResolver(chatModelToken); + element.loggedIn = true; + element.aiPluginsRegistered = true; + element.revisionActions = {}; + await element.updateComplete; + + const contentWithSidebar = queryAndAssert<GrContentWithSidebar>( + element, + 'gr-content-with-sidebar' + ); + const diffContainer = queryAndAssert(element, '.diffContainer'); + assert.isTrue(contentWithSidebar.hideSide); + assert.isFalse(diffContainer.classList.contains('sidebarOpen')); + + const chatBtn = queryAndAssert<GrButton>( + element, + 'gr-button#toggleChat' + ); + chatBtn.click(); + await element.updateComplete; + + assert.equal(element.shownSidebar, CHAT_PANEL_SIDEBAR); + assert.isFalse(contentWithSidebar.hideSide); + assert.equal(contentWithSidebar.side, 'right'); + assert.isTrue(diffContainer.classList.contains('sidebarOpen')); + assert.isTrue(chatModel.getState().chatPanelOpen); + const decorator = queryAndAssert( + element, + 'gr-endpoint-decorator[name="chat-panel"]' + ); + queryAndAssert(decorator, 'chat-panel'); + + chatBtn.click(); + await element.updateComplete; + + assert.isUndefined(element.shownSidebar); + assert.isTrue(contentWithSidebar.hideSide); + assert.isFalse(diffContainer.classList.contains('sidebarOpen')); + assert.isFalse(chatModel.getState().chatPanelOpen); + }); + + test('close-chat-panel event closes the chat panel', async () => { + const chatModel = testResolver(chatModelToken); + chatModel.setChatPanelOpen(true); + await element.updateComplete; + + const contentWithSidebar = queryAndAssert<GrContentWithSidebar>( + element, + 'gr-content-with-sidebar' + ); + assert.isFalse(contentWithSidebar.hideSide); + + element.dispatchEvent( + new CustomEvent('close-chat-panel', { + bubbles: true, + composed: true, + }) + ); + await element.updateComplete; + + assert.isUndefined(element.shownSidebar); + assert.isTrue(contentWithSidebar.hideSide); + assert.isFalse(chatModel.getState().chatPanelOpen); + }); + + test('explain-code-requested opens chat panel and processes request', async () => { + const chatModel = testResolver(chatModelToken); + const processChatRequestStub = sinon.stub( + chatModel, + 'processChatRequest' + ); + const contentWithSidebar = queryAndAssert<GrContentWithSidebar>( + element, + 'gr-content-with-sidebar' + ); + assert.isTrue(contentWithSidebar.hideSide); + + const event = new CustomEvent('explain-code-requested', { + detail: {prompt: 'Explain this code'}, + bubbles: true, + composed: true, + }); + element.dispatchEvent(event); + await element.updateComplete; + + assert.isFalse(contentWithSidebar.hideSide); + assert.equal(contentWithSidebar.side, 'right'); + assert.isTrue( + processChatRequestStub.calledOnceWithExactly({ + prompt: 'Explain this code', + }) + ); + }); + + test('plugin sidebar takes priority over chat panel and opening chat closes plugin sidebar', async () => { + const chatModel = testResolver(chatModelToken); + chatModel.setChatPanelOpen(true); + await element.updateComplete; + assert.equal(element.shownSidebar, CHAT_PANEL_SIDEBAR); + + const triggerDecorator = queryAndAssert( + element, + 'gr-endpoint-decorator[name="sidebarTrigger"]' + ); + const openSidebarParam = queryAndAssert<GrEndpointParam>( + triggerDecorator, + 'gr-endpoint-param[name="openSidebar"]' + ); + assert.deepEqual(openSidebarParam.value, {name: CHAT_PANEL_SIDEBAR}); + + const onTriggerParam = queryAndAssert<GrEndpointParam>( + triggerDecorator, + 'gr-endpoint-param[name="onTrigger"]' + ); + const onTrigger = onTriggerParam.value as (pluginName: string) => void; + onTrigger('comments2code'); + await element.updateComplete; + + assert.equal(element.shownSidebar, 'comments2code'); + assert.deepEqual(openSidebarParam.value, {name: 'comments2code'}); + assert.isFalse(chatModel.getState().chatPanelOpen); + + chatModel.setChatPanelOpen(true); + await element.updateComplete; + + assert.equal(element.shownSidebar, CHAT_PANEL_SIDEBAR); + + // Clicking Agent Chat after switching to a plugin sidebar re-opens chat. + element.loggedIn = true; + element.aiPluginsRegistered = true; + element.revisionActions = {}; + onTrigger('comments2code'); + await element.updateComplete; + assert.equal(element.shownSidebar, 'comments2code'); + assert.isFalse(chatModel.getState().chatPanelOpen); + + queryAndAssert<GrButton>(element, 'gr-button#toggleChat').click(); + await element.updateComplete; + assert.equal(element.shownSidebar, CHAT_PANEL_SIDEBAR); + assert.isTrue(chatModel.getState().chatPanelOpen); + }); + + test('chat panel open state overrides diff_page_sidebar preference on initial load', async () => { + const chatModel = testResolver(chatModelToken); + chatModel.setChatPanelOpen(true); + userModel.setState({ + ...userModel.getState(), + preferences: { + ...createDefaultPreferences(), + diff_page_sidebar: 'plugin-comments2code', + }, + }); + + const freshDiffView = await fixture<GrDiffView>( + html`<gr-diff-view></gr-diff-view>` + ); + await freshDiffView.updateComplete; + await waitEventLoop(); + + assert.equal(freshDiffView.shownSidebar, CHAT_PANEL_SIDEBAR); + }); + + test('does not reopen plugin sidebar when cached diff view reconnects after closing chat', async () => { + const chatModel = testResolver(chatModelToken); + const updatePreferencesStub = sinon.stub( + userModel, + 'updatePreferences' + ); + userModel.setState({ + ...userModel.getState(), + preferences: { + ...createDefaultPreferences(), + diff_page_sidebar: 'plugin-ai-rationale', + }, + }); + + const cachedDiffView = await fixture<GrDiffView>( + html`<gr-diff-view></gr-diff-view>` + ); + await cachedDiffView.updateComplete; + await waitEventLoop(); + assert.equal(cachedDiffView.shownSidebar, 'ai-rationale'); + + chatModel.setChatPanelOpen(true); + await cachedDiffView.updateComplete; + assert.equal(cachedDiffView.shownSidebar, CHAT_PANEL_SIDEBAR); + + chatModel.setChatPanelOpen(false); + await cachedDiffView.updateComplete; + assert.isUndefined(cachedDiffView.shownSidebar); + + const parent = cachedDiffView.parentElement!; + parent.removeChild(cachedDiffView); + parent.appendChild(cachedDiffView); + await cachedDiffView.updateComplete; + await waitEventLoop(); + + assert.isUndefined(cachedDiffView.shownSidebar); + assert.isFalse(updatePreferencesStub.called); + assert.equal( + userModel.getState().preferences?.diff_page_sidebar, + 'plugin-ai-rationale' + ); + }); + + test('chat-panel endpoint passes change and revision and can be replaced by a plugin', async () => { + const revision = createRevision(1); + element.change = { + ...createParsedChange(), + revisions: {rev1: revision}, + }; + element.patchNum = 1 as RevisionPatchSetNum; + await element.updateComplete; + + const promise = mockPromise(); + window.Gerrit.install( + promise.resolve, + '0.1', + 'http://some/plugins/diff-chat-plugin.js' + ); + const plugin = (await promise) as PluginApi; + + class CustomDiffPluginChatPanel extends HTMLElement { + change?: unknown; + + revision?: unknown; + } + + const customChatTagName = 'custom-diff-plugin-chat-panel'; + if (!customElements.get(customChatTagName)) { + customElements.define(customChatTagName, CustomDiffPluginChatPanel); + } + + plugin.registerCustomComponent('chat-panel', customChatTagName, { + replace: true, + }); + + const chatModel = testResolver(chatModelToken); + chatModel.setChatPanelOpen(true); + await element.updateComplete; + + const decorator = queryAndAssert( + element, + 'gr-endpoint-decorator[name="chat-panel"]' + ); + await waitUntil(() => !!decorator.querySelector(customChatTagName)); + + const customChat = queryAndAssert<CustomDiffPluginChatPanel>( + decorator, + customChatTagName + ); + assert.isNull(decorator.querySelector('chat-panel')); + assert.equal(customChat.change, element.change); + assert.equal(customChat.revision, revision); + }); + + test('preserves fetched revisionActions when disconnected while in flight', async () => { + const actionsPromise = mockPromise<{aiReview: {enabled: boolean}}>(); + const getRevisionActionsStub = stubRestApi( + 'getChangeRevisionActions' + ).returns(actionsPromise); + + viewModel.updateState({ + diffView: {path: 'some/path.txt'}, + patchNum: 2 as RevisionPatchSetNum, + }); + await element.updateComplete; + assert.isTrue( + getRevisionActionsStub.calledWith(TEST_NUMERIC_CHANGE_ID, 2) + ); + + const parent = element.parentElement!; + parent.removeChild(element); + assert.isFalse(element.isConnected); + + actionsPromise.resolve({aiReview: {enabled: true}}); + await waitEventLoop(); + + parent.appendChild(element); + element.loggedIn = true; + element.aiPluginsRegistered = true; + await element.updateComplete; + + assert.deepEqual(element.revisionActions, {aiReview: {enabled: true}}); + assert.isDefined(query(element, 'gr-button#toggleChat')); + assert.isTrue(getRevisionActionsStub.calledOnce); + }); + }); }); });
diff --git a/polygerrit-ui/app/elements/plugins/gr-endpoint-decorator/gr-endpoint-decorator.ts b/polygerrit-ui/app/elements/plugins/gr-endpoint-decorator/gr-endpoint-decorator.ts index db63d33..354e67f 100644 --- a/polygerrit-ui/app/elements/plugins/gr-endpoint-decorator/gr-endpoint-decorator.ts +++ b/polygerrit-ui/app/elements/plugins/gr-endpoint-decorator/gr-endpoint-decorator.ts
@@ -57,6 +57,9 @@ override connectedCallback() { super.connectedCallback(); assertIsDefined(this.name); + for (const [el, domHook] of this.domHooks) { + domHook.handleInstanceAttached(el); + } this.getPluginLoader().pluginEndPoints.onNewEndpoint( this.name, this.initModule @@ -305,10 +308,11 @@ } this.initializedPlugins.set(name, true); initPromise.then(el => { - if (!this.isConnected) return; if (domHook) { - domHook.handleInstanceAttached(el); this.domHooks.set(el, domHook); + if (this.isConnected) { + domHook.handleInstanceAttached(el); + } } }); };
diff --git a/polygerrit-ui/app/elements/plugins/gr-endpoint-decorator/gr-endpoint-decorator_test.ts b/polygerrit-ui/app/elements/plugins/gr-endpoint-decorator/gr-endpoint-decorator_test.ts index f2c9134..0b65ce6 100644 --- a/polygerrit-ui/app/elements/plugins/gr-endpoint-decorator/gr-endpoint-decorator_test.ts +++ b/polygerrit-ui/app/elements/plugins/gr-endpoint-decorator/gr-endpoint-decorator_test.ts
@@ -491,4 +491,29 @@ 'ROOT-UNORDERED-2', ]); }); + + test('re-attaches plugin element when decorator is disconnected and reconnected', async () => { + const attachedElements: HTMLElement[] = []; + replacementHook.onAttached(el => attachedElements.push(el)); + + const module = Array.from(second.children).find( + el => el.nodeName === 'OTHER-MODULE' + ); + assert.isOk(module); + assert.equal(replacementHook.getAllAttached().length, 1); + + second.remove(); + assert.equal(replacementHook.getAllAttached().length, 0); + + container.appendChild(second); + assert.equal(replacementHook.getAllAttached().length, 1); + assert.strictEqual(replacementHook.getAllAttached()[0], module); + assert.equal(attachedElements.length, 1); + assert.strictEqual(attachedElements[0], module); + assert.equal( + Array.from(second.children).filter(el => el.nodeName === 'OTHER-MODULE') + .length, + 1 + ); + }); });
diff --git a/polygerrit-ui/app/models/chat/chat-model.ts b/polygerrit-ui/app/models/chat/chat-model.ts index 73cf285..92fab0f 100644 --- a/polygerrit-ui/app/models/chat/chat-model.ts +++ b/polygerrit-ui/app/models/chat/chat-model.ts
@@ -196,6 +196,7 @@ export declare interface ChatState extends ConversationState { readonly mode: ChatPanelMode; + readonly chatPanelOpen?: boolean; /** The list of conversations for the current CL. */ readonly conversations?: readonly Conversation[]; @@ -354,6 +355,11 @@ state => state.provider ); + readonly chatPanelOpen$: Observable<boolean> = select( + this.state$, + state => !!state.chatPanelOpen + ); + private plugin?: AiCodeReviewProvider; private change?: ChangeInfo; @@ -368,6 +374,7 @@ ) { super({ mode: ChatPanelMode.CONVERSATION, + chatPanelOpen: false, ...initialConversationState, }); @@ -420,6 +427,7 @@ this.updateState({ ...initialConversationState, + chatPanelOpen: false, // We need to explicitly clear these, because updateState does a shallow // merge, and initialConversationState does not contain these fields. models: undefined, @@ -801,6 +809,10 @@ } } + setChatPanelOpen(open: boolean) { + this.updateState({chatPanelOpen: open}); + } + listConversations() { if (!this.change) return; return this.plugin
diff --git a/polygerrit-ui/app/models/chat/chat-model_test.ts b/polygerrit-ui/app/models/chat/chat-model_test.ts index 118ea85..80768c0 100644 --- a/polygerrit-ui/app/models/chat/chat-model_test.ts +++ b/polygerrit-ui/app/models/chat/chat-model_test.ts
@@ -74,6 +74,30 @@ const state = model.getState(); assert.isObject(state); assert.isEmpty(state.turns); + assert.isFalse(state.chatPanelOpen); + }); + + test('chatPanelOpen$ tracks open state and resets on new change', () => { + const emissions: boolean[] = []; + model.chatPanelOpen$.subscribe(open => emissions.push(open)); + assert.deepEqual(emissions, [false]); + + model.setChatPanelOpen(true); + assert.deepEqual(emissions, [false, true]); + + // Updating the same change does not reset chatPanelOpen. + const change1 = createParsedChange(); + changeModel.updateStateChange(change1); + model.setChatPanelOpen(true); + changeModel.updateStateChange({...change1, subject: 'Updated subject'}); + assert.isTrue(model.getState().chatPanelOpen); + + // Navigating to a different change resets chatPanelOpen to false. + changeModel.updateStateChange({ + ...createParsedChange(), + _number: (change1._number + 1) as typeof change1._number, + }); + assert.isFalse(model.getState().chatPanelOpen); }); test('change subscription triggers API calls', () => {
diff --git a/polygerrit-ui/app/services/gr-rest-api/gr-rest-api-impl.ts b/polygerrit-ui/app/services/gr-rest-api/gr-rest-api-impl.ts index 30def22..444b111 100644 --- a/polygerrit-ui/app/services/gr-rest-api/gr-rest-api-impl.ts +++ b/polygerrit-ui/app/services/gr-rest-api/gr-rest-api-impl.ts
@@ -1761,16 +1761,18 @@ }); } - convertRepoRefStorage(repo: RepoName, refStorage: RefStorage) { + convertRepoRefStorage( + repo: RepoName, + refStorage: RefStorage, + backup: boolean + ) { // Invalidate the cached project config so the reload after a conversion // reflects the new ref storage format. this._cache.delete(`/projects/${encodeURIComponent(repo)}/config`); return this._restApiHelper.fetch({ fetchOptions: getFetchOptions({ method: HttpMethod.POST, - // No backup: delete the old ref storage, matching git refs migrate, so - // a round-trip conversion is not blocked by a leftover reftable dir. - body: {ref_storage: refStorage, backup: false}, + body: {ref_storage: refStorage, backup}, }), url: `/projects/${encodeURIComponent(repo)}/convert-ref-storage`, anonymizedUrl: '/projects/*/convert-ref-storage',
diff --git a/polygerrit-ui/app/services/gr-rest-api/gr-rest-api-impl_test.ts b/polygerrit-ui/app/services/gr-rest-api/gr-rest-api-impl_test.ts index dd2a43bf..964d162 100644 --- a/polygerrit-ui/app/services/gr-rest-api/gr-rest-api-impl_test.ts +++ b/polygerrit-ui/app/services/gr-rest-api/gr-rest-api-impl_test.ts
@@ -382,19 +382,35 @@ element._cache.set(cacheKey, { ref_storage: RefStorage.FILES, } as unknown as ParsedJSON); - element.convertRepoRefStorage('test-repo' as RepoName, RefStorage.REFTABLE); + element.convertRepoRefStorage( + 'test-repo' as RepoName, + RefStorage.REFTABLE, + false + ); assert.isTrue(fetchStub.called); assert.isFalse(element._cache.has(cacheKey)); }); - test('convertRepoRefStorage sends backup=false', () => { + test('convertRepoRefStorage forwards the backup flag', () => { const fetchStub = sinon.stub(element._restApiHelper, 'fetch'); - element.convertRepoRefStorage('test-repo' as RepoName, RefStorage.REFTABLE); - assert.isTrue(fetchStub.called); + element.convertRepoRefStorage( + 'test-repo' as RepoName, + RefStorage.REFTABLE, + false + ); assert.deepEqual( JSON.parse(fetchStub.lastCall.args[0].fetchOptions?.body as string), {ref_storage: RefStorage.REFTABLE, backup: false} ); + element.convertRepoRefStorage( + 'test-repo' as RepoName, + RefStorage.FILES, + true + ); + assert.deepEqual( + JSON.parse(fetchStub.lastCall.args[0].fetchOptions?.body as string), + {ref_storage: RefStorage.FILES, backup: true} + ); }); suite('queryAccounts', () => {
diff --git a/polygerrit-ui/app/services/gr-rest-api/gr-rest-api.ts b/polygerrit-ui/app/services/gr-rest-api/gr-rest-api.ts index e78ff35..a5a2ef6 100644 --- a/polygerrit-ui/app/services/gr-rest-api/gr-rest-api.ts +++ b/polygerrit-ui/app/services/gr-rest-api/gr-rest-api.ts
@@ -759,7 +759,8 @@ convertRepoRefStorage( repo: RepoName, - refStorage: RefStorage + refStorage: RefStorage, + backup: boolean ): Promise<Response>; deleteRepoTags(repo: RepoName, ref: GitRef): Promise<Response>; deleteRepoBranches(repo: RepoName, ref: GitRef): Promise<Response>;
diff --git a/polygerrit-ui/app/styles/gr-change-list-styles.ts b/polygerrit-ui/app/styles/gr-change-list-styles.ts index 28c95d5..4ebaf63 100644 --- a/polygerrit-ui/app/styles/gr-change-list-styles.ts +++ b/polygerrit-ui/app/styles/gr-change-list-styles.ts
@@ -123,9 +123,6 @@ text-align: center; width: 3rem; } - .truncatedRepo { - display: none; - } .hashtags { white-space: nowrap; } @@ -136,12 +133,6 @@ max-width: 18rem; text-overflow: ellipsis; } - .truncatedRepo { - display: inline-block; - } - .fullRepo { - display: none; - } } @media only screen and (max-width: 100em) { .branch,
diff --git a/polygerrit-ui/app/utils/change-util.ts b/polygerrit-ui/app/utils/change-util.ts index 446c098..e9a876e 100644 --- a/polygerrit-ui/app/utils/change-util.ts +++ b/polygerrit-ui/app/utils/change-util.ts
@@ -16,8 +16,8 @@ import {ParsedChangeInfo} from '../types/types'; import {getUserId, isServiceUser} from './account-util'; -interface ChangeStatusesOptions { - mergeable: boolean; +export interface ChangeStatusesOptions { + mergeable?: boolean; /** Is there a reverting change and if so, what status has it? */ revertingChangeStatus?: ChangeStatus; } @@ -139,7 +139,7 @@ return states; } - if (change.submittable) { + if (change.submittable && options.mergeable !== undefined) { states.push(ChangeStates.READY_TO_SUBMIT); } if (states.length === 0) {
diff --git a/polygerrit-ui/app/utils/change-util_test.ts b/polygerrit-ui/app/utils/change-util_test.ts index 45762a7..a20b3a6 100644 --- a/polygerrit-ui/app/utils/change-util_test.ts +++ b/polygerrit-ui/app/utils/change-util_test.ts
@@ -81,6 +81,14 @@ change.submittable = true; statuses = changeStatuses(change, {mergeable: false}); assert.deepEqual(statuses, [ChangeStates.MERGE_CONFLICT]); + + change.submittable = false; + statuses = changeStatuses(change, {mergeable: undefined}); + assert.deepEqual(statuses, [ChangeStates.ACTIVE]); + + change.submittable = true; + statuses = changeStatuses(change, {mergeable: undefined}); + assert.deepEqual(statuses, [ChangeStates.ACTIVE]); }); test('Git conflict', () => { @@ -141,6 +149,13 @@ }), [ChangeStates.MERGED, ChangeStates.REVERT_SUBMITTED] ); + assert.deepEqual( + changeStatuses(change, { + revertingChangeStatus: ChangeStatus.MERGED, + mergeable: undefined, + }), + [ChangeStates.MERGED, ChangeStates.REVERT_SUBMITTED] + ); }); test('Abandoned status', () => {
diff --git a/polygerrit-ui/app/utils/diff-util.ts b/polygerrit-ui/app/utils/diff-util.ts index 56313b8..2be0682 100644 --- a/polygerrit-ui/app/utils/diff-util.ts +++ b/polygerrit-ui/app/utils/diff-util.ts
@@ -3,8 +3,10 @@ * Copyright 2023 Google LLC * SPDX-License-Identifier: Apache-2.0 */ -import {Side} from '../constants/constants'; +import {FileInfoStatus, Side} from '../constants/constants'; +import {FileInfo} from '../types/common'; import {DiffInfo, SkipInfo, SkipObject} from '../types/diff'; +import {isMagicPath} from './path-list-util'; export function normalizeSkipInfo(skip: SkipInfo | undefined): SkipObject { if (!skip) return {left: 0, right: 0}; @@ -133,3 +135,29 @@ !!contentTypeB?.startsWith('text/markdown') ); } + +export function computeBlameToggleLabel(isLoading: boolean, isLoaded: boolean) { + if (isLoading) return 'Loading blame ...'; + return isLoaded ? 'Hide Blame' : 'Show Blame'; +} + +/** + * Whether the blame of the left side of a file can be shown, wherever its diff + * is displayed. Callers check their own additional conditions. + */ +export function canBlameFile( + allowBlame: boolean, + path?: string, + file?: FileInfo, + diff?: DiffInfo +): boolean { + return ( + allowBlame && + !!path && + !isMagicPath(path) && + !isImageDiff(diff) && + !file?.binary && + !file?.diffs_too_expensive_to_compute && + file?.status !== FileInfoStatus.ADDED + ); +}
diff --git a/polygerrit-ui/app/utils/diff-util_test.ts b/polygerrit-ui/app/utils/diff-util_test.ts index becae05..cd183f5 100644 --- a/polygerrit-ui/app/utils/diff-util_test.ts +++ b/polygerrit-ui/app/utils/diff-util_test.ts
@@ -7,7 +7,9 @@ import {DiffInfo, Side} from '../api/diff'; import '../test/common-test-setup'; import {createDiff} from '../test/test-data-generators'; +import {FileInfoStatus, SpecialFilePath} from '../constants/constants'; import { + canBlameFile, getContentFromDiff, isFileUnchanged, isLineUnchanged, @@ -262,4 +264,30 @@ assert.isFalse(isMarkdownDiff('code', diffOther)); }); }); + + suite('canBlameFile()', () => { + const imageDiff: DiffInfo = { + ...createDiff(), + meta_a: {name: 'a.png', content_type: 'image/png', lines: 0}, + }; + + test('allows a modified text file when the server allows blame', () => { + assert.isTrue(canBlameFile(true, 'a.txt', {}, createDiff())); + assert.isTrue(canBlameFile(true, 'a.txt')); + }); + + test('rejects files without a blameable left side', () => { + assert.isFalse(canBlameFile(false, 'a.txt')); + assert.isFalse(canBlameFile(true, undefined)); + assert.isFalse(canBlameFile(true, SpecialFilePath.COMMIT_MESSAGE)); + assert.isFalse(canBlameFile(true, 'a.png', {}, imageDiff)); + assert.isFalse(canBlameFile(true, 'a.bin', {binary: true})); + assert.isFalse( + canBlameFile(true, 'a.txt', {diffs_too_expensive_to_compute: true}) + ); + assert.isFalse( + canBlameFile(true, 'a.txt', {status: FileInfoStatus.ADDED}) + ); + }); + }); });
diff --git a/polygerrit-ui/polygerrit.MODULE.bazel b/polygerrit-ui/polygerrit.MODULE.bazel index b80d249..e04ce53 100644 --- a/polygerrit-ui/polygerrit.MODULE.bazel +++ b/polygerrit-ui/polygerrit.MODULE.bazel
@@ -78,6 +78,11 @@ use_repo(npm, "ui_npm") npm.npm_translate_lock( name = "ui_dev_npm", + # TODO(davido): Remove after upgrading to a pngjs release with correct + # archive permissions. See https://github.com/pngjs/pngjs/issues/381. + custom_postinstalls = { + "pngjs": "chmod -R a+X *", + }, data = [ "//polygerrit-ui:package.json", "//polygerrit-ui:pnpm-workspace.yaml",
diff --git a/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-1000px-dark.png b/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-1000px-dark.png index 54e0f91..77f18e8 100644 --- a/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-1000px-dark.png +++ b/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-1000px-dark.png Binary files differ
diff --git a/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-1000px.png b/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-1000px.png index 4b52372..2a6fe31 100644 --- a/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-1000px.png +++ b/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-1000px.png Binary files differ
diff --git a/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-30-labels-1000px-dark.png b/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-30-labels-1000px-dark.png index 38cfd6c..c4bf82b 100644 --- a/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-30-labels-1000px-dark.png +++ b/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-30-labels-1000px-dark.png Binary files differ
diff --git a/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-30-labels-1000px.png b/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-30-labels-1000px.png index b0ca78d..654077e 100644 --- a/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-30-labels-1000px.png +++ b/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-30-labels-1000px.png Binary files differ
diff --git a/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-801px-dark.png b/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-801px-dark.png index f6d28f9..c4de6e7 100644 --- a/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-801px-dark.png +++ b/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-801px-dark.png Binary files differ
diff --git a/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-801px.png b/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-801px.png index b9f122a..a6193c3 100644 --- a/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-801px.png +++ b/polygerrit-ui/screenshots/Chromium/baseline/gr-change-list-801px.png Binary files differ