Merge "Revert "Remove "revert_submission" action from the list of actions""
diff --git a/.bazelrc b/.bazelrc
index 4d30086..6ccd56a 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,4 +1,4 @@
-build --workspace_status_command="python ./tools/workspace_status.py"
+build --workspace_status_command="python3 ./tools/workspace_status.py"
build --repository_cache=~/.gerritcodereview/bazel-cache/repository
build --action_env=PATH
build --disk_cache=~/.gerritcodereview/bazel-cache/cas
diff --git a/Documentation/cmd-convert-ref-storage.txt b/Documentation/cmd-convert-ref-storage.txt
new file mode 100644
index 0000000..aae385f
--- /dev/null
+++ b/Documentation/cmd-convert-ref-storage.txt
@@ -0,0 +1,58 @@
+= gerrit convert-ref-storage
+
+== NAME
+gerrit convert-ref-storage - Convert ref storage to reftable (experimental).
+
+A reftable file is a portable binary file format customized for reference storage.
+References are sorted, enabling linear scans, binary search lookup, and range scans.
+
+See also link:https://www.git-scm.com/docs/reftable for more details[reftable,role=external,window=_blank]
+
+== SYNOPSIS
+[verse]
+--
+_ssh_ -p <port> <host> _gerrit convert-ref-storage_
+ [--format <format>]
+ [--backup | -b]
+ [--reflogs | -r]
+ [--project <PROJECT> | -p <PROJECT>]
+--
+
+== DESCRIPTION
+Convert ref storage to reftable.
+
+== ACCESS
+Administrators
+
+== OPTIONS
+--project::
+-p::
+ Required; Name of the project for which the ref format should be changed.
+
+--format::
+ Format to convert to: `reftable` or `refdir`.
+ Default: reftable.
+
+--backup::
+-b::
+ Create backup of old ref storage format.
+ Default: true.
+
+--reflogs::
+-r::
+ Write reflogs to reftable.
+ Default: true.
+
+== EXAMPLES
+
+Convert ref format for project "core" to reftable:
+----
+$ ssh -p 29418 review.example.com gerrit convert-ref-format -p core
+----
+
+GERRIT
+------
+Part of link:index.html[Gerrit Code Review]
+
+SEARCHBOX
+---------
diff --git a/Documentation/cmd-index.txt b/Documentation/cmd-index.txt
index 8a970c5..99ff0db 100644
--- a/Documentation/cmd-index.txt
+++ b/Documentation/cmd-index.txt
@@ -118,6 +118,9 @@
link:cmd-close-connection.html[gerrit close-connection]::
Close the specified SSH connection.
+link:cmd-convert-ref-storage.html[gerrit convert-ref-storage]::
+ Convert ref storage to reftable (experimental).
+
link:cmd-create-account.html[gerrit create-account]::
Create a new user account.
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index c9b2a7f..495a573 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -604,7 +604,14 @@
By default this is set to `LDAP` when link:#auth.type[`auth.type`] is `LDAP`
and `OAUTH` when link:#auth.type[`auth.type`] is `OAUTH`.
Otherwise, the default value is `HTTP`.
-
++
+When gitBasicAuthPolicy is set to `LDAP` or `HTTP_LDAP` and the user
+is authenticating with the LDAP username/password, the Git client config
+needs to have `http.cookieFile` set to a local file, otherwise every
+single call would trigger a full LDAP authentication and groups resolution
+which could introduce a noticeable latency on the overall execution
+and produce unwanted load to the LDAP server.
++
[[auth.gitOAuthProvider]]auth.gitOAuthProvider::
+
Selects the OAuth 2 provider to authenticate git over HTTP traffic with.
@@ -634,7 +641,9 @@
existing accounts this username is already in lower case. It is not
possible to convert the usernames of the existing accounts to lower
case because this would break the access to existing per-user
-branches and Gerrit provides no tool to do such a conversion.
+branches and Gerrit provides no tool to do such a conversion. Accounts
+created using the REST API or the `create-account` SSH command will
+be created with all lowercase characters, when this option is set.
+
Setting this parameter to `true` will prevent all users from login that
have a non-lower-case username.
@@ -1960,7 +1969,7 @@
scheme = http
scheme = anon_http
scheme = anon_git
- scheme = repo_download
+ scheme = repo
----
The download section configures the allowed download methods.
@@ -2017,12 +2026,13 @@
necessary to set <<gerrit.canonicalGitUrl,gerrit.canonicalGitUrl>>
variable.
+
-* `repo_download`
+* `repo`
+
Gerrit advertises patch set downloads with the `repo download`
command, assuming that all projects managed by this instance are
-generally worked on with the repo multi-repository tool. This is
-not default, as not all instances will deploy repo.
+generally worked on with the
+[repo multi-repository tool](https://gerrit.googlesource.com/git-repo).
+This is not default, as not all instances will deploy repo.
+
If `download.scheme` is not specified, SSH, HTTP and Anonymous HTTP
diff --git a/Documentation/dev-bazel.txt b/Documentation/dev-bazel.txt
index f5fcf95..61565f8 100644
--- a/Documentation/dev-bazel.txt
+++ b/Documentation/dev-bazel.txt
@@ -19,7 +19,7 @@
* A Linux or macOS system (Windows is not supported at this time)
* A JDK for Java 8|11|...
-* Python 2 or 3
+* Python 3
* link:https://github.com/nodesource/distributions/blob/master/README.md[Node.js (including npm),role=external,window=_blank]
* Bower (`npm install -g bower`)
* link:https://docs.bazel.build/versions/master/install.html[Bazel,role=external,window=_blank] -launched with
@@ -550,6 +550,10 @@
* ~/.gerritcodereview/bazel-cache/repository
* ~/.gerritcodereview/bazel-cache/cas
+The `downloaded-artifacts` cache can be relocated by setting the
+`GERRIT_CACHE_HOME` environment variable. The other two can be adjusted with
+`bazel build` options `--repository_cache` and `--disk_cache` respectively.
+
Currently none of these caches have a maximum size limit. See
link:https://github.com/bazelbuild/bazel/issues/5139[this bazel issue,role=external,window=_blank] for
details. Users should watch the cache sizes and clean them manually if
diff --git a/Documentation/dev-community.txt b/Documentation/dev-community.txt
index 70fda87..7488f74 100644
--- a/Documentation/dev-community.txt
+++ b/Documentation/dev-community.txt
@@ -43,7 +43,7 @@
** link:dev-contributing.html#mentorship[Mentorship]
* link:dev-design-docs.html[Design Docs]
* link:dev-readme.html[Developer Setup]
-* link:https://gerrit.googlesource.com/gerrit/+/master/polygerrit-ui[Polymer Frontend Developer Setup]
+* link:https://gerrit.googlesource.com/gerrit/+/master/polygerrit-ui[TypeScript Frontend Developer Setup]
* link:dev-crafting-changes.html[Crafting Changes]
* link:dev-starter-projects.html[Starter Projects]
diff --git a/Documentation/dev-plugins.txt b/Documentation/dev-plugins.txt
index f2a3e12..a66d3b5 100644
--- a/Documentation/dev-plugins.txt
+++ b/Documentation/dev-plugins.txt
@@ -1450,7 +1450,7 @@
By implementing the `com.google.gerrit.server.restapi.change.OnPostReview`
interface plugins can extend the change message that is being posted when the
-[post review](rest-api-changes.html#set-review) REST endpoint is invoked.
+link:rest-api-changes.html#set-review[post review] REST endpoint is invoked.
This is useful if certain approvals have a special meaning (e.g. custom logic
that is implemented in Prolog submit rules, signal for triggering an action
@@ -1458,6 +1458,8 @@
in the change message. This makes the effect of a given approval more
transparent to the user.
+[[ui_extension]]
+== UI Extension
[[actions]]
=== Actions
diff --git a/Documentation/images/user-review-ui-change-screen-change-info-actions.png b/Documentation/images/gwt-user-review-ui-change-screen-change-info-actions.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-change-info-actions.png
rename to Documentation/images/gwt-user-review-ui-change-screen-change-info-actions.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-change-info-cannot-merge.png b/Documentation/images/gwt-user-review-ui-change-screen-change-info-cannot-merge.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-change-info-cannot-merge.png
rename to Documentation/images/gwt-user-review-ui-change-screen-change-info-cannot-merge.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-change-info-labels.png b/Documentation/images/gwt-user-review-ui-change-screen-change-info-labels.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-change-info-labels.png
rename to Documentation/images/gwt-user-review-ui-change-screen-change-info-labels.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-change-info-last-update.png b/Documentation/images/gwt-user-review-ui-change-screen-change-info-last-update.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-change-info-last-update.png
rename to Documentation/images/gwt-user-review-ui-change-screen-change-info-last-update.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-change-info-owner.png b/Documentation/images/gwt-user-review-ui-change-screen-change-info-owner.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-change-info-owner.png
rename to Documentation/images/gwt-user-review-ui-change-screen-change-info-owner.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-change-info-project-branch-topic.png b/Documentation/images/gwt-user-review-ui-change-screen-change-info-project-branch-topic.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-change-info-project-branch-topic.png
rename to Documentation/images/gwt-user-review-ui-change-screen-change-info-project-branch-topic.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-change-info-reviewers.png b/Documentation/images/gwt-user-review-ui-change-screen-change-info-reviewers.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-change-info-reviewers.png
rename to Documentation/images/gwt-user-review-ui-change-screen-change-info-reviewers.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-change-info-submit-strategy.png b/Documentation/images/gwt-user-review-ui-change-screen-change-info-submit-strategy.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-change-info-submit-strategy.png
rename to Documentation/images/gwt-user-review-ui-change-screen-change-info-submit-strategy.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-change-info.png b/Documentation/images/gwt-user-review-ui-change-screen-change-info.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-change-info.png
rename to Documentation/images/gwt-user-review-ui-change-screen-change-info.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-change-update.png b/Documentation/images/gwt-user-review-ui-change-screen-change-update.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-change-update.png
rename to Documentation/images/gwt-user-review-ui-change-screen-change-update.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-cherry-picks.png b/Documentation/images/gwt-user-review-ui-change-screen-cherry-picks.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-cherry-picks.png
rename to Documentation/images/gwt-user-review-ui-change-screen-cherry-picks.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-commit-info-merge-commit.png b/Documentation/images/gwt-user-review-ui-change-screen-commit-info-merge-commit.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-commit-info-merge-commit.png
rename to Documentation/images/gwt-user-review-ui-change-screen-commit-info-merge-commit.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-commit-info.png b/Documentation/images/gwt-user-review-ui-change-screen-commit-info.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-commit-info.png
rename to Documentation/images/gwt-user-review-ui-change-screen-commit-info.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-commit-message.png b/Documentation/images/gwt-user-review-ui-change-screen-commit-message.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-commit-message.png
rename to Documentation/images/gwt-user-review-ui-change-screen-commit-message.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-conflicts-with.png b/Documentation/images/gwt-user-review-ui-change-screen-conflicts-with.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-conflicts-with.png
rename to Documentation/images/gwt-user-review-ui-change-screen-conflicts-with.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-download-commands-list.png b/Documentation/images/gwt-user-review-ui-change-screen-download-commands-list.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-download-commands-list.png
rename to Documentation/images/gwt-user-review-ui-change-screen-download-commands-list.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-download-commands.png b/Documentation/images/gwt-user-review-ui-change-screen-download-commands.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-download-commands.png
rename to Documentation/images/gwt-user-review-ui-change-screen-download-commands.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-file-list-comments.png b/Documentation/images/gwt-user-review-ui-change-screen-file-list-comments.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-file-list-comments.png
rename to Documentation/images/gwt-user-review-ui-change-screen-file-list-comments.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-file-list-header.png b/Documentation/images/gwt-user-review-ui-change-screen-file-list-header.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-file-list-header.png
rename to Documentation/images/gwt-user-review-ui-change-screen-file-list-header.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-file-list-mark-as-reviewed.png b/Documentation/images/gwt-user-review-ui-change-screen-file-list-mark-as-reviewed.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-file-list-mark-as-reviewed.png
rename to Documentation/images/gwt-user-review-ui-change-screen-file-list-mark-as-reviewed.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-file-list-modification-type.png b/Documentation/images/gwt-user-review-ui-change-screen-file-list-modification-type.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-file-list-modification-type.png
rename to Documentation/images/gwt-user-review-ui-change-screen-file-list-modification-type.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-file-list-rename.png b/Documentation/images/gwt-user-review-ui-change-screen-file-list-rename.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-file-list-rename.png
rename to Documentation/images/gwt-user-review-ui-change-screen-file-list-rename.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-file-list-repeating-paths.png b/Documentation/images/gwt-user-review-ui-change-screen-file-list-repeating-paths.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-file-list-repeating-paths.png
rename to Documentation/images/gwt-user-review-ui-change-screen-file-list-repeating-paths.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-file-list-size.png b/Documentation/images/gwt-user-review-ui-change-screen-file-list-size.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-file-list-size.png
rename to Documentation/images/gwt-user-review-ui-change-screen-file-list-size.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-file-list.png b/Documentation/images/gwt-user-review-ui-change-screen-file-list.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-file-list.png
rename to Documentation/images/gwt-user-review-ui-change-screen-file-list.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-history.png b/Documentation/images/gwt-user-review-ui-change-screen-history.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-history.png
rename to Documentation/images/gwt-user-review-ui-change-screen-history.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-included-in-list.png b/Documentation/images/gwt-user-review-ui-change-screen-included-in-list.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-included-in-list.png
rename to Documentation/images/gwt-user-review-ui-change-screen-included-in-list.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-included-in.png b/Documentation/images/gwt-user-review-ui-change-screen-included-in.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-included-in.png
rename to Documentation/images/gwt-user-review-ui-change-screen-included-in.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-inline-comments.png b/Documentation/images/gwt-user-review-ui-change-screen-inline-comments.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-inline-comments.png
rename to Documentation/images/gwt-user-review-ui-change-screen-inline-comments.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-not-current.png b/Documentation/images/gwt-user-review-ui-change-screen-not-current.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-not-current.png
rename to Documentation/images/gwt-user-review-ui-change-screen-not-current.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-patch-set-list.png b/Documentation/images/gwt-user-review-ui-change-screen-patch-set-list.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-patch-set-list.png
rename to Documentation/images/gwt-user-review-ui-change-screen-patch-set-list.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-patch-sets.png b/Documentation/images/gwt-user-review-ui-change-screen-patch-sets.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-patch-sets.png
rename to Documentation/images/gwt-user-review-ui-change-screen-patch-sets.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-permalink.png b/Documentation/images/gwt-user-review-ui-change-screen-permalink.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-permalink.png
rename to Documentation/images/gwt-user-review-ui-change-screen-permalink.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-plugin-extensions.png b/Documentation/images/gwt-user-review-ui-change-screen-plugin-extensions.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-plugin-extensions.png
rename to Documentation/images/gwt-user-review-ui-change-screen-plugin-extensions.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-quick-approve.png b/Documentation/images/gwt-user-review-ui-change-screen-quick-approve.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-quick-approve.png
rename to Documentation/images/gwt-user-review-ui-change-screen-quick-approve.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-related-changes-indicators.png b/Documentation/images/gwt-user-review-ui-change-screen-related-changes-indicators.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-related-changes-indicators.png
rename to Documentation/images/gwt-user-review-ui-change-screen-related-changes-indicators.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-related-changes.png b/Documentation/images/gwt-user-review-ui-change-screen-related-changes.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-related-changes.png
rename to Documentation/images/gwt-user-review-ui-change-screen-related-changes.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-reply-to-comment.png b/Documentation/images/gwt-user-review-ui-change-screen-reply-to-comment.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-reply-to-comment.png
rename to Documentation/images/gwt-user-review-ui-change-screen-reply-to-comment.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-reply.png b/Documentation/images/gwt-user-review-ui-change-screen-reply.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-reply.png
rename to Documentation/images/gwt-user-review-ui-change-screen-reply.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-replying.png b/Documentation/images/gwt-user-review-ui-change-screen-replying.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-replying.png
rename to Documentation/images/gwt-user-review-ui-change-screen-replying.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-same-topic.png b/Documentation/images/gwt-user-review-ui-change-screen-same-topic.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-same-topic.png
rename to Documentation/images/gwt-user-review-ui-change-screen-same-topic.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-star.png b/Documentation/images/gwt-user-review-ui-change-screen-star.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen-star.png
rename to Documentation/images/gwt-user-review-ui-change-screen-star.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen.png b/Documentation/images/gwt-user-review-ui-change-screen.png
similarity index 100%
rename from Documentation/images/user-review-ui-change-screen.png
rename to Documentation/images/gwt-user-review-ui-change-screen.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-column.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-column.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-column.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-column.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-comment-box.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-comment-box.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-comment-box.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-comment-box.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-comment-edit.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-comment-edit.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-comment-edit.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-comment-edit.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-comment-reply.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-comment-reply.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-comment-reply.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-comment-reply.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-comment.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-comment.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-comment.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-comment.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-commented.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-commented.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-commented.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-commented.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-dark-theme.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-dark-theme.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-dark-theme.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-dark-theme.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-expand-skipped-lines.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-expand-skipped-lines.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-expand-skipped-lines.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-expand-skipped-lines.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-file-level-comment.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-file-level-comment.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-file-level-comment.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-file-level-comment.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-file-level-commented.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-file-level-commented.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-file-level-commented.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-file-level-commented.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-inline-comments.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-inline-comments.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-inline-comments.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-inline-comments.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-keyboard-shortcuts.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-keyboard-shortcuts.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-keyboard-shortcuts.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-keyboard-shortcuts.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-navigation.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-navigation.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-navigation.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-navigation.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-no-differences.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-no-differences.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-no-differences.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-no-differences.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-patch-sets.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-patch-sets.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-patch-sets.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-patch-sets.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-preferences-popup.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-preferences-popup.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-preferences-popup.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-preferences-popup.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-preferences.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-preferences.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-preferences.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-preferences.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-project-and-file.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-project-and-file.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-project-and-file.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-project-and-file.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-red-bar.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-red-bar.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-red-bar.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-red-bar.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-rename.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-rename.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-rename.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-rename.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-replied-done.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-replied-done.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-replied-done.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-replied-done.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-reviewed.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-reviewed.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-reviewed.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-reviewed.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-scrollbar.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-scrollbar.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-scrollbar.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-scrollbar.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-search.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-search.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-search.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-search.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-syntax-coloring.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-syntax-coloring.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen-syntax-coloring.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen-syntax-coloring.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen.png b/Documentation/images/gwt-user-review-ui-side-by-side-diff-screen.png
similarity index 100%
rename from Documentation/images/user-review-ui-side-by-side-diff-screen.png
rename to Documentation/images/gwt-user-review-ui-side-by-side-diff-screen.png
Binary files differ
diff --git a/Documentation/images/inline-edit-enter-edit-mode-from-diff.png b/Documentation/images/inline-edit-enter-edit-mode-from-diff.png
deleted file mode 100644
index 46dd0ff..0000000
--- a/Documentation/images/inline-edit-enter-edit-mode-from-diff.png
+++ /dev/null
Binary files differ
diff --git a/Documentation/images/inline-edit-enter-edit-mode-from-file-list.png b/Documentation/images/inline-edit-enter-edit-mode-from-file-list.png
deleted file mode 100644
index b8c52c9..0000000
--- a/Documentation/images/inline-edit-enter-edit-mode-from-file-list.png
+++ /dev/null
Binary files differ
diff --git a/Documentation/images/inline-edit-file-list-in-edit-mode.png b/Documentation/images/inline-edit-file-list-in-edit-mode.png
deleted file mode 100644
index 8f355335..0000000
--- a/Documentation/images/inline-edit-file-list-in-edit-mode.png
+++ /dev/null
Binary files differ
diff --git a/Documentation/images/inline-edit-full-screen-editor.png b/Documentation/images/inline-edit-full-screen-editor.png
deleted file mode 100644
index 474fae5..0000000
--- a/Documentation/images/inline-edit-full-screen-editor.png
+++ /dev/null
Binary files differ
diff --git a/Documentation/images/intro-quick-hot-key-help.jpg b/Documentation/images/intro-quick-hot-key-help.jpg
deleted file mode 100644
index 41bcbe4..0000000
--- a/Documentation/images/intro-quick-hot-key-help.jpg
+++ /dev/null
Binary files differ
diff --git a/Documentation/images/user-checks-overview.png b/Documentation/images/user-checks-overview.png
new file mode 100644
index 0000000..7a9864e
--- /dev/null
+++ b/Documentation/images/user-checks-overview.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-change-screen-keyboard-shortcuts.png b/Documentation/images/user-review-ui-change-screen-keyboard-shortcuts.png
index 734ab29..9ef8f27 100644
--- a/Documentation/images/user-review-ui-change-screen-keyboard-shortcuts.png
+++ b/Documentation/images/user-review-ui-change-screen-keyboard-shortcuts.png
Binary files differ
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-intraline-difference.png b/Documentation/images/user-review-ui-side-by-side-diff-screen-intraline-difference.png
deleted file mode 100644
index 044f96f..0000000
--- a/Documentation/images/user-review-ui-side-by-side-diff-screen-intraline-difference.png
+++ /dev/null
Binary files differ
diff --git a/Documentation/intro-user.txt b/Documentation/intro-user.txt
index 0408d5d..3aeeccb 100644
--- a/Documentation/intro-user.txt
+++ b/Documentation/intro-user.txt
@@ -686,6 +686,45 @@
It is also possible to link:user-inline-edit.html#create-change[create
new changes inline].
+[[roles]]
+== Roles
+
+Making and reviewing changes usually involves multiple users that
+assume different roles:
+
+- Author:
++
+The person who wrote the code change. Recorded as author in the Git
+commit.
+
+- Committer:
++
+The person who created the Git commit, e.g. the person that executed
+the `git commit` command. Recorded as committer in the Git commit.
+
+- Uploader:
++
+The user that uploaded the commit as a patch set to Gerrit, e.g. the
+user that executed the `git push` command.
++
+The uploader of the first patch set is the change owner.
++
+The uploader of the latest patch set, the user that uploaded the
+current patch set, is relevant when [self approvals on labels are
+ignored](config-labels.html#label_ignoreSelfApproval), as in this case
+approvals from the uploader of the latest patch set are ignored.
+
+- Change Owner:
++
+The user that created the change, e.g. uploaded the first patch set.
+
+- Reviewer:
++
+A user that has reviewed the change or has been asked to review the change.
+
+Often one user assumes several of these roles, but it's possible that each role
+is assumed by a different user.
+
[[project-administration]]
== Project Administration
diff --git a/Documentation/js_licenses.txt b/Documentation/js_licenses.txt
index 4c594892..e14df57 100644
--- a/Documentation/js_licenses.txt
+++ b/Documentation/js_licenses.txt
@@ -590,6 +590,39 @@
----
+[[codemirror-minified]]
+codemirror-minified
+
+* codemirror-minified
+
+[[codemirror-minified_license]]
+----
+The MIT License (MIT)
+
+Copyright (c) 2016 Marijn Haverbeke <marijnh@gmail.com> and others
+Copyright (c) 2016 Michael Zhou <zhoumotongxue008@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+----
+
+
[[font-roboto-local-fonts-roboto]]
font-roboto-local-fonts-roboto
diff --git a/Documentation/licenses.txt b/Documentation/licenses.txt
index 45b1e66..1d96189 100644
--- a/Documentation/licenses.txt
+++ b/Documentation/licenses.txt
@@ -3549,6 +3549,39 @@
----
+[[codemirror-minified]]
+codemirror-minified
+
+* codemirror-minified
+
+[[codemirror-minified_license]]
+----
+The MIT License (MIT)
+
+Copyright (c) 2016 Marijn Haverbeke <marijnh@gmail.com> and others
+Copyright (c) 2016 Michael Zhou <zhoumotongxue008@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+----
+
+
[[font-roboto-local-fonts-roboto]]
font-roboto-local-fonts-roboto
diff --git a/Documentation/metrics.txt b/Documentation/metrics.txt
index 7a35d4d..7ac804c 100644
--- a/Documentation/metrics.txt
+++ b/Documentation/metrics.txt
@@ -106,6 +106,13 @@
* `http/server/jetty/threadpool/pool_size`: Current thread pool size
* `http/server/jetty/threadpool/queue_size`: Queued requests waiting for a thread
+==== LDAP
+
+* `ldap/login_latency`: Latency of logins.
+* `ldap/user_search_latency`: Latency for searching the user account.
+* `ldap/group_search_latency`: Latency for querying the group memberships of an account.
+* `ldap/group_expansion_latency`: Latency for expanding nested groups.
+
==== REST API
* `http/server/error_count`: Rate of REST API error responses.
diff --git a/Documentation/pg-plugin-checks-api.txt b/Documentation/pg-plugin-checks-api.txt
new file mode 100644
index 0000000..4e93da1
--- /dev/null
+++ b/Documentation/pg-plugin-checks-api.txt
@@ -0,0 +1,44 @@
+:linkattrs:
+= Gerrit Code Review - JavaScript Plugin Checks API
+
+This API is provided by link:pg-plugin-dev.html#plugin-checks[plugin.checks()].
+It allows plugins to contribute to the "Checks" tab and summary:
+
+image::images/user-checks-overview.png[width=800]
+
+Each plugin can link:#register[register] a checks provider that will be called
+when a change page is loaded. Such a call would return a list of `Runs` and each
+run can contain a list of `Results`.
+
+The details of the ChecksApi are documented in the
+link:https://gerrit.googlesource.com/gerrit/+/master/polygerrit-ui/app/api/checks.ts[source code].
+Note that this link points to the `master` branch and might thus reflect a
+newer version of the API than your Gerrit installation.
+
+If no plugins are registered with the ChecksApi, then the Checks tab will be
+hidden.
+
+You can read about the motivation, the use cases and the original plans in the
+link:https://www.gerritcodereview.com/design-docs/ci-reboot.html[design doc].
+
+Here are some examples of open source plugins that make use of the Checks API:
+
+* link:https://gerrit.googlesource.com/plugins/checks/+/master/gr-checks/plugin.js[Gerrit Checks Plugin]
+* link:https://chromium.googlesource.com/infra/gerrit-plugins/buildbucket/+/master/src/main/resources/static/buildbucket.js[Chromium Buildbucket Plugin]
+* link:https://chromium.googlesource.com/infra/gerrit-plugins/code-coverage/+/master/src/main/resources/static/chromium-coverage.js[Chromium Coverage Plugin]
+
+[[register]]
+== register
+`checksApi.register(provider, config?)`
+
+.Params
+- *provider* Must implement a `fetch()` interface that returns a
+ `Promise<FetchResponse>` with runs and results. See also documentation in the
+ link:https://gerrit.googlesource.com/gerrit/+/master/polygerrit-ui/app/api/checks.ts[source code].
+- *config* Optional configuration values for the checks provider.
+
+[[announceUpdate]]
+== announceUpdate
+`checksApi.announceUpdate()`
+
+Tells Gerrit to call `provider.fetch()`.
diff --git a/Documentation/pg-plugin-dev.txt b/Documentation/pg-plugin-dev.txt
index 9c565da..dc7986f 100644
--- a/Documentation/pg-plugin-dev.txt
+++ b/Documentation/pg-plugin-dev.txt
@@ -21,6 +21,7 @@
located in `gerrit-site/plugins` folder, where `pluginname` is an alphanumeric
plugin name.
+=== Examples
Here's a recommended starter `myplugin.js`:
``` js
@@ -29,6 +30,10 @@
});
```
+You can find more elaborate examples in the
+link:https://gerrit.googlesource.com/gerrit/+/master/polygerrit-ui/app/samples/[polygerrit-ui/app/samples/]
+directory of the source tree.
+
[[low-level-api-concepts]]
== Low-level DOM API concepts
@@ -96,9 +101,9 @@
`plugin.registerStyleModule(endpointName, moduleName)`. A style must be defined
as a standalone `<dom-module>` defined in the same .js file.
-See `samples/theme-plugin.js` for examples.
-
-Note: TODO: Insert link to the full styling API.
+See
+link:https://gerrit.googlesource.com/gerrit/+/master/polygerrit-ui/app/samples/theme-plugin.js[samples/theme-plugin.js]
+for an example.
``` js
const styleElement = document.createElement('dom-module');
@@ -141,8 +146,9 @@
binding,role=external,window=_blank] for plugins that don't use Polymer. Can be used to bind element
attribute changes to callbacks.
-See `samples/bind-parameters.js` for examples on both Polymer data bindings
-and `attibuteHelper` usage.
+See
+link:https://gerrit.googlesource.com/gerrit/+/master/polygerrit-ui/app/samples/bind-parameters.js[samples/bind-parameters.js]
+for an example.
=== hook
`plugin.hook(endpointName, opt_options)`
@@ -369,6 +375,12 @@
Returns an instance of the
link:https://gerrit.googlesource.com/gerrit/+/master/polygerrit-ui/app/api/change-reply.ts[ChangeReplyPluginApi].
+[[checks]]
+=== checks
+`plugin.checks()`
+
+Returns an instance of the link:pg-plugin-checks-api.html[ChecksApi].
+
=== getPluginName
`plugin.getPluginName()`
diff --git a/Documentation/prolog-cookbook.txt b/Documentation/prolog-cookbook.txt
index 189ccfc..c083f28 100644
--- a/Documentation/prolog-cookbook.txt
+++ b/Documentation/prolog-cookbook.txt
@@ -23,6 +23,11 @@
`rules.enable=false` in the Gerrit config file (see
link:config-gerrit.html#_a_id_rules_a_section_rules[rules section])
+[NOTE]
+Gerrit's default submit rule is skipped if a project contains prolog rules.
+The prolog submit rules are responsible for returning the necessary labels in
+this case.
+
link:https://groups.google.com/d/topic/repo-discuss/wJxTGhlHZMM/discussion[This
discussion thread,role=external,window=_blank] explains why Prolog was chosen for the purpose of writing
project specific submit rules.
diff --git a/Documentation/replace_macros.py b/Documentation/replace_macros.py
index aaa9223..f270231 100755
--- a/Documentation/replace_macros.py
+++ b/Documentation/replace_macros.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# coding=utf-8
# Copyright (C) 2013 The Android Open Source Project
#
diff --git a/Documentation/rest-api-changes.txt b/Documentation/rest-api-changes.txt
index dab8117..ff12af2 100644
--- a/Documentation/rest-api-changes.txt
+++ b/Documentation/rest-api-changes.txt
@@ -5840,6 +5840,11 @@
link:#cherrypick-input[CherryPickInput] entity. If the commit message
does not specify a Change-Id, a new one is picked for the destination change.
+When cherry-picking a change into a branch that already contains the Change-Id
+that we want to cherry-pick, the cherry-pick will create a new patch-set on the
+destination's branch's appropriate Change-Id. If the change is closed on the
+destination branch, the cherry-pick will fail.
+
.Request
----
POST /changes/myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940/revisions/674ac754f91e64a0efb8087e59a176484bd534d1/cherrypick HTTP/1.0
@@ -6682,7 +6687,12 @@
Set if the message was posted on behalf of another user.
|`date` ||
The link:rest-api.html#timestamp[timestamp] this message was posted.
-|`message` ||The text left by the user.
+|`message` ||
+The text left by the user or Gerrit system. Accounts are served as account IDs
+inlined in the text as `<GERRIT_ACCOUNT_18419>`.
+All accounts, used in message, can be found in `accountsInMessage`
+field.
+|`accountsInMessage` ||Accounts, used in `message`.
|`tag` |optional|
Value of the `tag` field from link:#review-input[ReviewInput] set
while posting the review. Votes/comments that contain `tag` with
@@ -6911,7 +6921,10 @@
The subject of the commit (header line of the commit message).
|`message` ||The commit message.
|`web_links` |optional|
-Links to the commit in external sites as a list of
+Links to the patch set in external sites as a list of
+link:#web-link-info[WebLinkInfo] entities.
+|`resolve_conflicts_web_links` |optional|
+Links to the commit in external sites for resolving conflicts as a list of
link:#web-link-info[WebLinkInfo] entities.
|===========================
@@ -7087,6 +7100,9 @@
|`web_links` |optional|
Links to the file diff in external sites as a list of
link:rest-api-changes.html#diff-web-link-info[DiffWebLinkInfo] entries.
+|`edit_web_links` |optional|
+Links to edit the file in external sites as a list of
+link:rest-api-changes.html#web-link-info[WebLinkInfo] entries.
|`binary` |not set if `false`|Whether the file is binary.
|==========================
diff --git a/Documentation/rest-api-projects.txt b/Documentation/rest-api-projects.txt
index e30ce3a..df83f1a 100644
--- a/Documentation/rest-api-projects.txt
+++ b/Documentation/rest-api-projects.txt
@@ -2621,6 +2621,11 @@
If the commit message is not set, the commit message of the source
commit will be used.
+When cherry-picking a commit into a branch that already contains the Change-Id
+that we want to cherry-pick, the cherry-pick will create a new patch-set on the
+destination's branch's appropriate Change-Id. If the change is closed on the
+destination branch, the cherry-pick will fail.
+
.Request
----
POST /projects/work%2Fmy-project/commits/a8a477efffbbf3b44169bb9a1d3a334cbbd9aa96/cherrypick HTTP/1.0
diff --git a/Documentation/user-attention-set.txt b/Documentation/user-attention-set.txt
index 5053d10..1f67fc7 100644
--- a/Documentation/user-attention-set.txt
+++ b/Documentation/user-attention-set.txt
@@ -149,7 +149,7 @@
instead.
The "Assignee" feature can be turned on/off with the
-link:config-gerrit.html#change.enableAttentionSet[enableAssignee] config option.
+link:config-gerrit.html#change.enableAssignee[enableAssignee] config option.
=== Bold Changes / Mark Reviewed
diff --git a/Documentation/user-review-ui.txt b/Documentation/user-review-ui.txt
index 06c5ab7..98ec22d 100644
--- a/Documentation/user-review-ui.txt
+++ b/Documentation/user-review-ui.txt
@@ -12,7 +12,7 @@
The change screen shows the details of a single change and provides
various actions on it.
-image::images/user-review-ui-change-screen.png[width=800, link="images/user-review-ui-change-screen.png"]
+image::images/gwt-user-review-ui-change-screen.png[width=800, link="images/gwt-user-review-ui-change-screen.png"]
[[commit-message]]
=== Commit Message Block
@@ -21,14 +21,14 @@
the most important information about a change. The numeric change ID
and the change status are displayed right above the commit message.
-image::images/user-review-ui-change-screen-commit-message.png[width=800, link="images/user-review-ui-change-screen-commit-message.png"]
+image::images/gwt-user-review-ui-change-screen-commit-message.png[width=800, link="images/gwt-user-review-ui-change-screen-commit-message.png"]
[[permalink]]
The numeric change ID is a link to the change and clicking on it
refreshes the change screen. By copying the link location you can get
the permalink of the change.
-image::images/user-review-ui-change-screen-permalink.png[width=800, link="images/user-review-ui-change-screen-permalink.png"]
+image::images/gwt-user-review-ui-change-screen-permalink.png[width=800, link="images/gwt-user-review-ui-change-screen-permalink.png"]
[[change-status]]
The change status shows the state of the change:
@@ -79,11 +79,11 @@
If a Git web browser, such as gitweb or Gitiles, is configured, there
is also a link to the commit in the Git web browser.
-image::images/user-review-ui-change-screen-commit-info.png[width=800, link="images/user-review-ui-change-screen-commit-info.png"]
+image::images/gwt-user-review-ui-change-screen-commit-info.png[width=800, link="images/gwt-user-review-ui-change-screen-commit-info.png"]
If a merge commit is viewed this is highlighted by an icon.
-image::images/user-review-ui-change-screen-commit-info-merge-commit.png[width=800, link="images/user-review-ui-change-screen-commit-info-merge-commit.png"]
+image::images/gwt-user-review-ui-change-screen-commit-info-merge-commit.png[width=800, link="images/gwt-user-review-ui-change-screen-commit-info-merge-commit.png"]
[[change-info]]
=== Change Info Block
@@ -91,14 +91,14 @@
The change info block contains detailed information about the change
and offers actions on the change.
-image::images/user-review-ui-change-screen-change-info.png[width=800, link="images/user-review-ui-change-screen-change-info.png"]
+image::images/gwt-user-review-ui-change-screen-change-info.png[width=800, link="images/gwt-user-review-ui-change-screen-change-info.png"]
- [[change-owner]]Change Owner:
+
The owner of the change is displayed as a link to a list of the owner's
changes that have the same status as the currently viewed change.
+
-image::images/user-review-ui-change-screen-change-info-owner.png[width=800, link="images/user-review-ui-change-screen-change-info-owner.png"]
+image::images/gwt-user-review-ui-change-screen-change-info-owner.png[width=800, link="images/gwt-user-review-ui-change-screen-change-info-owner.png"]
- [[reviewers]]Reviewers:
+
@@ -126,7 +126,7 @@
and Gerrit administrators may remove anyone.
+
-image::images/user-review-ui-change-screen-change-info-reviewers.png[width=800, link="images/user-review-ui-change-screen-change-info-reviewers.png"]
+image::images/gwt-user-review-ui-change-screen-change-info-reviewers.png[width=800, link="images/gwt-user-review-ui-change-screen-change-info-reviewers.png"]
- [[project-branch-topic]]Project / Branch / Topic:
+
@@ -148,7 +148,7 @@
access right. To be able to set a topic on a closed change, the
`Edit Topic Name` must be assigned with the `force` flag.
+
-image::images/user-review-ui-change-screen-change-info-project-branch-topic.png[width=800, link="images/user-review-ui-change-screen-change-info-project-branch-topic.png"]
+image::images/gwt-user-review-ui-change-screen-change-info-project-branch-topic.png[width=800, link="images/gwt-user-review-ui-change-screen-change-info-project-branch-topic.png"]
- [[submit-strategy]]Submit Strategy:
+
@@ -156,16 +156,16 @@
used to submit the change. The submit strategy is only displayed for
open changes.
+
-image::images/user-review-ui-change-screen-change-info-submit-strategy.png[width=800, link="images/user-review-ui-change-screen-change-info-submit-strategy.png"]
+image::images/gwt-user-review-ui-change-screen-change-info-submit-strategy.png[width=800, link="images/gwt-user-review-ui-change-screen-change-info-submit-strategy.png"]
+
If a change cannot be merged due to path conflicts this is highlighted
by a bold red `Cannot Merge` label.
+
-image::images/user-review-ui-change-screen-change-info-cannot-merge.png[width=800, link="images/user-review-ui-change-screen-change-info-cannot-merge.png"]
+image::images/gwt-user-review-ui-change-screen-change-info-cannot-merge.png[width=800, link="images/gwt-user-review-ui-change-screen-change-info-cannot-merge.png"]
- [[update-time]]Time of Last Update:
+
-image::images/user-review-ui-change-screen-change-info-last-update.png[width=800, link="images/user-review-ui-change-screen-change-info-last-update.png"]
+image::images/gwt-user-review-ui-change-screen-change-info-last-update.png[width=800, link="images/gwt-user-review-ui-change-screen-change-info-last-update.png"]
- [[actions]]Actions:
+
@@ -266,13 +266,13 @@
** [[plugin-actions]]Further actions may be available if plugins are installed.
+
-image::images/user-review-ui-change-screen-change-info-actions.png[width=800, link="images/user-review-ui-change-screen-change-info-actions.png"]
+image::images/gwt-user-review-ui-change-screen-change-info-actions.png[width=800, link="images/gwt-user-review-ui-change-screen-change-info-actions.png"]
- [[labels]]Labels & Votes:
+
Approving votes are colored green; veto votes are colored red.
+
-image::images/user-review-ui-change-screen-change-info-labels.png[width=800, link="images/user-review-ui-change-screen-change-info-labels.png"]
+image::images/gwt-user-review-ui-change-screen-change-info-labels.png[width=800, link="images/gwt-user-review-ui-change-screen-change-info-labels.png"]
[[files]]
=== File List
@@ -280,7 +280,7 @@
The file list shows the files that are modified in the currently viewed
patch set.
-image::images/user-review-ui-change-screen-file-list.png[width=800, link="images/user-review-ui-change-screen-file-list.png"]
+image::images/gwt-user-review-ui-change-screen-file-list.png[width=800, link="images/gwt-user-review-ui-change-screen-file-list.png"]
[[magic-files]]
In addition to the modified files the file list contains magic files
@@ -302,7 +302,7 @@
[[change-screen-mark-reviewed]]
The checkboxes in front of the file names allow files to be marked as reviewed.
-image::images/user-review-ui-change-screen-file-list-mark-as-reviewed.png[width=800, link="images/user-review-ui-change-screen-file-list-mark-as-reviewed.png"]
+image::images/gwt-user-review-ui-change-screen-file-list-mark-as-reviewed.png[width=800, link="images/gwt-user-review-ui-change-screen-file-list-mark-as-reviewed.png"]
[[modification-type]]
The type of a file modification is indicated by the character in front
@@ -335,18 +335,25 @@
comments on at least one of the sides. Otherwise unchanged files are
filtered out.
-image::images/user-review-ui-change-screen-file-list-modification-type.png[width=800, link="images/user-review-ui-change-screen-file-list-modification-type.png"]
+
+- `W` (Rewritten):
++
+The file is rewritten. The status `W` (Rewritten) is returned instead of `M`
+(Modified) if the majority of the lines have been changed so that the new file
+content has a very low similarity with the old file content.
+
+image::images/gwt-user-review-ui-change-screen-file-list-modification-type.png[width=800, link="images/gwt-user-review-ui-change-screen-file-list-modification-type.png"]
[[rename-or-copy]]
If a file is renamed or copied, the name of the original file is
displayed in gray below the file name.
-image::images/user-review-ui-change-screen-file-list-rename.png[width=800, link="images/user-review-ui-change-screen-file-list-rename.png"]
+image::images/gwt-user-review-ui-change-screen-file-list-rename.png[width=800, link="images/gwt-user-review-ui-change-screen-file-list-rename.png"]
[[repeating-path-segments]]
Repeating path segments are grayed out.
-image::images/user-review-ui-change-screen-file-list-repeating-paths.png[width=800, link="images/user-review-ui-change-screen-file-list-repeating-paths.png"]
+image::images/gwt-user-review-ui-change-screen-file-list-repeating-paths.png[width=800, link="images/gwt-user-review-ui-change-screen-file-list-repeating-paths.png"]
[[inline-comments-column]]
Inline comments on a file are shown in the `Comments` column.
@@ -357,7 +364,7 @@
New comments from other users, that were published after the current
user last reviewed this change, are highlighted in bold.
-image::images/user-review-ui-change-screen-file-list-comments.png[width=800, link="images/user-review-ui-change-screen-file-list-comments.png"]
+image::images/gwt-user-review-ui-change-screen-file-list-comments.png[width=800, link="images/gwt-user-review-ui-change-screen-file-list-comments.png"]
[[size]]
The size of the modifications in the files can be seen in the `Size` column. The
@@ -380,7 +387,7 @@
shows the total number of lines in the new file. No size is shown for binary
files and deleted files.
-image::images/user-review-ui-change-screen-file-list-size.png[width=800, link="images/user-review-ui-change-screen-file-list-size.png"]
+image::images/gwt-user-review-ui-change-screen-file-list-size.png[width=800, link="images/gwt-user-review-ui-change-screen-file-list-size.png"]
[[diff-against]]
In the header of the file list, the `Diff Against` selection can be
@@ -392,7 +399,7 @@
The file list header also provides an `Open All` button that opens the
diff views for all files in the file list.
-image::images/user-review-ui-change-screen-file-list-header.png[width=800, link="images/user-review-ui-change-screen-file-list-header.png"]
+image::images/gwt-user-review-ui-change-screen-file-list-header.png[width=800, link="images/gwt-user-review-ui-change-screen-file-list-header.png"]
[[patch-sets]]
=== Patch Sets
@@ -407,11 +414,11 @@
link:#not-current[Not Current] change state. Please note that some
operations are only available on the current patch set.
-image::images/user-review-ui-change-screen-patch-sets.png[width=800, link="images/user-review-ui-change-screen-patch-sets.png"]
+image::images/gwt-user-review-ui-change-screen-patch-sets.png[width=800, link="images/gwt-user-review-ui-change-screen-patch-sets.png"]
Another indication is a highlighted drop-down label.
-image::images/user-review-ui-change-screen-not-current.png[width=800, link="images/user-review-ui-change-screen-not-current.png"]
+image::images/gwt-user-review-ui-change-screen-not-current.png[width=800, link="images/gwt-user-review-ui-change-screen-not-current.png"]
[[patch-set-drop-down]]
The patch set drop-down list shows the list of patch sets and allows to
@@ -420,7 +427,7 @@
Draft patch sets are marked with `DRAFT`.
-image::images/user-review-ui-change-screen-patch-set-list.png[width=800, link="images/user-review-ui-change-screen-patch-set-list.png"]
+image::images/gwt-user-review-ui-change-screen-patch-set-list.png[width=800, link="images/gwt-user-review-ui-change-screen-patch-set-list.png"]
[[download]]
=== Download
@@ -428,7 +435,7 @@
The `Download` drop-down panel in the change header offers commands and
links for downloading the currently viewed patch set.
-image::images/user-review-ui-change-screen-download-commands.png[width=800, link="images/user-review-ui-change-screen-download-commands.png"]
+image::images/gwt-user-review-ui-change-screen-download-commands.png[width=800, link="images/gwt-user-review-ui-change-screen-download-commands.png"]
The available download commands depend on the installed Gerrit plugins.
The most popular plugin for download commands, the
@@ -455,7 +462,7 @@
formats (e.g. tar and tbz2); which formats are available depends on the
configuration of the server.
-image::images/user-review-ui-change-screen-download-commands-list.png[width=800, link="images/user-review-ui-change-screen-download-commands-list.png"]
+image::images/gwt-user-review-ui-change-screen-download-commands-list.png[width=800, link="images/gwt-user-review-ui-change-screen-download-commands-list.png"]
[[included-in]]
=== Included In
@@ -463,14 +470,14 @@
For merged changes the `Included In` drop-down panel is available in
the change header.
-image::images/user-review-ui-change-screen-included-in.png[width=800, link="images/user-review-ui-change-screen-included-in.png"]
+image::images/gwt-user-review-ui-change-screen-included-in.png[width=800, link="images/gwt-user-review-ui-change-screen-included-in.png"]
The `Included In` drop-down panel shows the branches and tags in which
the change is included. E.g. if a change fixes a bug, this allows to
quickly see in which released versions the bug-fix is contained
(assuming that every release is tagged).
-image::images/user-review-ui-change-screen-included-in-list.png[width=800, link="images/user-review-ui-change-screen-included-in-list.png"]
+image::images/gwt-user-review-ui-change-screen-included-in-list.png[width=800, link="images/gwt-user-review-ui-change-screen-included-in-list.png"]
[[star]]
=== Star Change
@@ -478,7 +485,7 @@
The star icon in the change header allows to mark the change as a
favorite. Clicking on the star icon again, unstars the change.
-image::images/user-review-ui-change-screen-star.png[width=800, link="images/user-review-ui-change-screen-star.png"]
+image::images/gwt-user-review-ui-change-screen-star.png[width=800, link="images/gwt-user-review-ui-change-screen-star.png"]
Starring a change turns on email notifications for this change.
@@ -513,7 +520,7 @@
For merged changes this tab is only shown if there are open
descendants.
+
-image::images/user-review-ui-change-screen-related-changes.png[width=800, link="images/user-review-ui-change-screen-related-changes.png"]
+image::images/gwt-user-review-ui-change-screen-related-changes.png[width=800, link="images/gwt-user-review-ui-change-screen-related-changes.png"]
+
Related changes may be decorated with an icon to signify dependencies
on outdated patch sets, or commits that are not associated to changes
@@ -560,7 +567,7 @@
through.
+
-image::images/user-review-ui-change-screen-related-changes-indicators.png[width=800, link="images/user-review-ui-change-screen-related-changes-indicators.png"]
+image::images/gwt-user-review-ui-change-screen-related-changes-indicators.png[width=800, link="images/gwt-user-review-ui-change-screen-related-changes-indicators.png"]
- [[conflicts-with]]`Conflicts With`:
+
@@ -572,14 +579,14 @@
conflicts and must be rebased. The rebase of the other changes with the
conflict resolution must then be done manually.
+
-image::images/user-review-ui-change-screen-conflicts-with.png[width=800, link="images/user-review-ui-change-screen-conflicts-with.png"]
+image::images/gwt-user-review-ui-change-screen-conflicts-with.png[width=800, link="images/gwt-user-review-ui-change-screen-conflicts-with.png"]
- [[same-topic]]`Same Topic`:
+
This tab page shows changes that have the same topic as the current
change. Only open changes are included in the list.
+
-image::images/user-review-ui-change-screen-same-topic.png[width=800, link="images/user-review-ui-change-screen-same-topic.png"]
+image::images/gwt-user-review-ui-change-screen-same-topic.png[width=800, link="images/gwt-user-review-ui-change-screen-same-topic.png"]
- [[submitted-together]]`Submitted Together`:
+
@@ -602,7 +609,7 @@
For each change in this list the destination branch is shown as a
prefix in front of the change subject.
+
-image::images/user-review-ui-change-screen-cherry-picks.png[width=800, link="images/user-review-ui-change-screen-cherry-picks.png"]
+image::images/gwt-user-review-ui-change-screen-cherry-picks.png[width=800, link="images/gwt-user-review-ui-change-screen-cherry-picks.png"]
If there are no related changes for a tab, the tab is not displayed.
@@ -613,7 +620,7 @@
currently viewed patch set; one can add a summary comment, publish
inline draft comments, and vote on the labels.
-image::images/user-review-ui-change-screen-reply.png[width=800, link="images/user-review-ui-change-screen-reply.png"]
+image::images/gwt-user-review-ui-change-screen-reply.png[width=800, link="images/gwt-user-review-ui-change-screen-reply.png"]
Clicking on the `Reply...` button opens a popup panel.
@@ -639,7 +646,7 @@
The `Post` button publishes the comments and the votes.
-image::images/user-review-ui-change-screen-replying.png[width=800, link="images/user-review-ui-change-screen-replying.png"]
+image::images/gwt-user-review-ui-change-screen-replying.png[width=800, link="images/gwt-user-review-ui-change-screen-replying.png"]
[[quick-approve]]
If a user can approve a label that is still required, a quick approve
@@ -658,7 +665,7 @@
comments; a summary comment is only added if the reply popup panel is
open when the quick approve button is clicked.
-image::images/user-review-ui-change-screen-quick-approve.png[width=800, link="images/user-review-ui-change-screen-quick-approve.png"]
+image::images/gwt-user-review-ui-change-screen-quick-approve.png[width=800, link="images/gwt-user-review-ui-change-screen-quick-approve.png"]
[[history]]
=== History
@@ -672,7 +679,7 @@
Messages with new comments from other users, that were published after
the current user last reviewed this change, are automatically expanded.
-image::images/user-review-ui-change-screen-history.png[width=800, link="images/user-review-ui-change-screen-history.png"]
+image::images/gwt-user-review-ui-change-screen-history.png[width=800, link="images/gwt-user-review-ui-change-screen-history.png"]
[[reply-to-message]]
It is possible to directly reply to a change message by clicking on the
@@ -683,13 +690,13 @@
Please note that for a correct rendering it is important to leave a blank
line between a quoted block and the reply to it.
-image::images/user-review-ui-change-screen-reply-to-comment.png[width=800, link="images/user-review-ui-change-screen-reply-to-comment.png"]
+image::images/gwt-user-review-ui-change-screen-reply-to-comment.png[width=800, link="images/gwt-user-review-ui-change-screen-reply-to-comment.png"]
[[inline-comments-in-history]]
Inline comments are directly displayed in the change history and there
are links to navigate to the inline comments.
-image::images/user-review-ui-change-screen-inline-comments.png[width=800, link="images/user-review-ui-change-screen-inline-comments.png"]
+image::images/gwt-user-review-ui-change-screen-inline-comments.png[width=800, link="images/gwt-user-review-ui-change-screen-inline-comments.png"]
[[expand-all]]
The `Expand All` button expands all messages; the `Collapse All` button
@@ -706,7 +713,7 @@
it is 30 seconds. Polling may also be completely disabled by the
administrator.
-image::images/user-review-ui-change-screen-change-update.png[width=800, link="images/user-review-ui-change-screen-change-update.png"]
+image::images/gwt-user-review-ui-change-screen-change-update.png[width=800, link="images/gwt-user-review-ui-change-screen-change-update.png"]
[[plugin-extensions]]
=== Plugin Extensions
@@ -715,7 +722,7 @@
additional actions to the change info block and display arbitrary UI
controls below the change info block.
-image::images/user-review-ui-change-screen-plugin-extensions.png[width=800, link="images/user-review-ui-change-screen-plugin-extensions.png"]
+image::images/gwt-user-review-ui-change-screen-plugin-extensions.png[width=800, link="images/gwt-user-review-ui-change-screen-plugin-extensions.png"]
[[side-by-side]]
== Side-by-Side Diff Screen
@@ -726,7 +733,7 @@
This screen allows to review a patch and to comment on it.
-image::images/user-review-ui-side-by-side-diff-screen.png[width=800, link="images/user-review-ui-side-by-side-diff-screen.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen.png"]
[[side-by-side-header]]
In the screen header the project name and the name of the viewed patch
@@ -736,7 +743,7 @@
the file path are displayed as links to the project and the folder in
the Git web browser.
-image::images/user-review-ui-side-by-side-diff-screen-project-and-file.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-project-and-file.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-project-and-file.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-project-and-file.png"]
[[side-by-side-mark-reviewed]]
The checkbox in front of the project name and the file name allows the
@@ -744,7 +751,7 @@
diff preference allows to control whether the files should be
automatically marked as reviewed when they are viewed.
-image::images/user-review-ui-side-by-side-diff-screen-reviewed.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-reviewed.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-reviewed.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-reviewed.png"]
[[scrollbar]]
The scrollbar shows patch diffs and inline comments as annotations.
@@ -752,7 +759,7 @@
relevant for reviewing. By clicking on an annotation one can quickly
navigate to the corresponding line in the patch.
-image::images/user-review-ui-side-by-side-diff-screen-scrollbar.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-scrollbar.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-scrollbar.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-scrollbar.png"]
[[gaps]]
A gap between lines in the file content that is caused by aligning the
@@ -760,7 +767,7 @@
vertical red bar in the line number column. This prevents a gap from
being mistaken for blank lines in the file
-image::images/user-review-ui-side-by-side-diff-screen-red-bar.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-red-bar.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-red-bar.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-red-bar.png"]
[[patch-set-selection]]
In the header, on each side, the list of patch sets is shown. Clicking
@@ -780,7 +787,7 @@
version before, may see what has changed since that version by
comparing the old patch against the current patch.
-image::images/user-review-ui-side-by-side-diff-screen-patch-sets.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-patch-sets.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-patch-sets.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-patch-sets.png"]
[[download-file]]
The download icon next to the patch set list allows to download the
@@ -791,14 +798,14 @@
If the compared patches are identical, this is highlighted by a red
`No Differences` label in the screen header.
-image::images/user-review-ui-side-by-side-diff-screen-no-differences.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-no-differences.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-no-differences.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-no-differences.png"]
[[side-by-side-rename]]
If a file was renamed, the old and new file paths are shown in the
header together with a similarity index that shows how much of the file
content is unmodified.
-image::images/user-review-ui-side-by-side-diff-screen-rename.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-rename.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-rename.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-rename.png"]
[[navigation]]
For navigating between the patches in a patch set there are navigation
@@ -807,7 +814,7 @@
the next patch. The arrow up button leads back to the change screen. In
all cases the selection for the patch set comparison is kept.
-image::images/user-review-ui-side-by-side-diff-screen-navigation.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-navigation.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-navigation.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-navigation.png"]
[[inline-comments]]
=== Inline Comments
@@ -833,7 +840,7 @@
If the diff preference link:#expand-all-comments[Expand All Comments]
is set to `Expand`, all inline comments will be automatically expanded.
-image::images/user-review-ui-side-by-side-diff-screen-inline-comments.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-inline-comments.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-inline-comments.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-inline-comments.png"]
[[comment]]
In the header of the comment box, the name of the comment author and
@@ -842,7 +849,7 @@
top left corner. Below the actual comment there are buttons to reply to
the comment.
-image::images/user-review-ui-side-by-side-diff-screen-comment-box.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-comment-box.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-comment-box.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-comment-box.png"]
[[reply-inline-comment]]
Clicking on the `Reply` button opens an editor to type the reply.
@@ -861,7 +868,7 @@
Clicking on the `Discard` button deletes the inline draft comment.
-image::images/user-review-ui-side-by-side-diff-screen-comment-reply.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-comment-reply.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-comment-reply.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-comment-reply.png"]
[[draft-inline-comment]]
Draft comments are marked by the text "Draft" in the header in the
@@ -870,14 +877,14 @@
A draft comment can be edited by clicking on the `Edit` button, or
deleted by clicking on the `Discard` button.
-image::images/user-review-ui-side-by-side-diff-screen-comment-edit.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-comment-edit.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-comment-edit.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-comment-edit.png"]
[[done]]
Clicking on the `Done` button is a quick way to reply with "Done" to a
comment. This is used to mark a comment as addressed by a follow-up
patch set.
-image::images/user-review-ui-side-by-side-diff-screen-replied-done.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-replied-done.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-replied-done.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-replied-done.png"]
[[add-inline-comment]]
To add a new inline comment there are several possibilities:
@@ -903,7 +910,7 @@
** press 'V' + arrow keys (or 'j', 'k') to select a code block line-wise
** type 'bvw' to select a word
-image::images/user-review-ui-side-by-side-diff-screen-comment.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-comment.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-comment.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-comment.png"]
For typing the new comment, a new comment box is shown under the code
that is commented.
@@ -914,7 +921,7 @@
Clicking on the `Discard` button deletes the new comment.
-image::images/user-review-ui-side-by-side-diff-screen-commented.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-commented.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-commented.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-commented.png"]
[[file-level-comments]]
=== File Level Comments
@@ -924,12 +931,12 @@
File level comments are added by clicking on the comment icon in the
header above the file.
-image::images/user-review-ui-side-by-side-diff-screen-file-level-comment.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-file-level-comment.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-file-level-comment.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-file-level-comment.png"]
Clicking on the comment icon opens a comment box for typing the file
level comment.
-image::images/user-review-ui-side-by-side-diff-screen-file-level-commented.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-file-level-commented.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-file-level-commented.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-file-level-commented.png"]
[[search]]
=== Search
@@ -951,7 +958,7 @@
Searching by `Ctrl-F` finds matches only in the visible area of the
screen unless the link:#render[Render] diff preference is set to `Slow`.
-image::images/user-review-ui-side-by-side-diff-screen-search.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-search.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-search.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-search.png"]
[[key-navigation]]
=== Key Navigation
@@ -974,7 +981,7 @@
preferences. The diff preferences can be accessed by clicking on the
settings icon in the screen header.
-image::images/user-review-ui-side-by-side-diff-screen-preferences.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-preferences.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-preferences.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-preferences.png"]
The diff preferences popup allows to change the diff preferences.
By clicking on the `Save` button changes to the diff preferences are
@@ -983,7 +990,7 @@
screen is refreshed. The `Save` button is only available if the user is
signed in.
-image::images/user-review-ui-side-by-side-diff-screen-preferences-popup.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-preferences-popup.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-preferences-popup.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-preferences-popup.png"]
The following diff preferences can be configured:
@@ -993,7 +1000,7 @@
+
E.g. users could choose to work with a dark theme.
+
-image::images/user-review-ui-side-by-side-diff-screen-dark-theme.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-dark-theme.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-dark-theme.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-dark-theme.png"]
- [[ignore-whitespace]]`Ignore Whitespace`:
+
@@ -1025,7 +1032,7 @@
is displayed so that one can easily detect lines the exceed the
preferred line length.
+
-image::images/user-review-ui-side-by-side-diff-screen-column.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-column.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-column.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-column.png"]
- [[lines-of-context]]`Lines Of Context`:
+
@@ -1042,13 +1049,7 @@
If many lines are skipped there are additional links to expand the
context by ten lines before and after the skipped block.
+
-image::images/user-review-ui-side-by-side-diff-screen-expand-skipped-lines.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-expand-skipped-lines.png"]
-
-- [[intraline-difference]]`Intraline Difference`:
-+
-Controls whether intraline differences should be highlighted.
-+
-image::images/user-review-ui-side-by-side-diff-screen-intraline-difference.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-intraline-difference.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-expand-skipped-lines.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-expand-skipped-lines.png"]
- [[syntax-highlighting]]`Syntax Highlighting`:
+
@@ -1058,7 +1059,7 @@
the file extension. The language can also be set manually by selecting
it from the `Language` drop-down list.
+
-image::images/user-review-ui-side-by-side-diff-screen-syntax-coloring.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-syntax-coloring.png"]
+image::images/gwt-user-review-ui-side-by-side-diff-screen-syntax-coloring.png[width=800, link="images/gwt-user-review-ui-side-by-side-diff-screen-syntax-coloring.png"]
- [[whitespace-errors]]`Whitespace Errors`:
+
@@ -1131,45 +1132,15 @@
Navigation within the review UI can be completely done by keys, and
most actions can be controlled by keyboard shortcuts. Typing `?` opens
-a popup that shows a list of available keyboard shortcuts:
+a popup that shows a list of available keyboard shortcuts.
-- Change Screen
-+
-image::images/user-review-ui-change-screen-keyboard-shortcuts.png[width=800, link="images/user-review-ui-change-screen-keyboard-shortcuts.png"]
-- Side-by-Side Diff Screen
-+
-image::images/user-review-ui-side-by-side-diff-screen-keyboard-shortcuts.png[width=800, link="images/user-review-ui-side-by-side-diff-screen-keyboard-shortcuts.png"]
-+
+image::images/user-review-ui-change-screen-keyboard-shortcuts.png[width=800, link="images/gwt-user-review-ui-change-screen-keyboard-shortcuts.png"]
+
+
In addition, Vim-like commands can be used to link:#key-navigation[
navigate] and link:#search[search] within a patch file.
-[[new-vs-old]]
-== New Review UI vs. Old Review UI
-
-There are some important conceptual differences between the old and
-new review UIs:
-
-- The old change screen directly shows all patch sets of the change.
- With the new change screen only a single patch set is displayed;
- users can switch between the patch sets by choosing another patch
- set from the link:#patch-sets[Patch Sets] drop down panel in the
- screen header.
-- On the old side-by-side diff screen, new comments are inserted by
- double-clicking on a line. With the new side-by-side diff screen
- double-click is used to select a word for commenting on it; there
- are link:#add-inline-comment[several ways to insert new comments],
- e.g. by selecting a code block and clicking on the popup comment
- icon.
-
-[[limitations]]
-Limitations of the new review UI:
-
-- The new side-by-side diff screen cannot render images.
-
-- The new side-by-side diff screen isn't able to highlight line
- endings.
-
GERRIT
------
Part of link:index.html[Gerrit Code Review]
diff --git a/Documentation/user-upload.txt b/Documentation/user-upload.txt
index cdaf155..0670968 100644
--- a/Documentation/user-upload.txt
+++ b/Documentation/user-upload.txt
@@ -29,6 +29,13 @@
* Both, the HTTP and the LDAP passwords (in this order) if `gitBasicAuthPolicy`
is `HTTP_LDAP`.
+When gitBasicAuthPolicy is set to `LDAP` or `HTTP_LDAP` and the user
+is authenticating with the LDAP username/password, the Git client config
+needs to have `http.cookieFile` set to a local file, otherwise every
+single call would trigger a full LDAP authentication and groups resolution
+which could introduce a noticeable latency on the overall execution
+and produce unwanted load to the LDAP server.
+
When gitBasicAuthPolicy is not `LDAP`, the user's HTTP credentials can
be regenerated by going to `Settings`, and then accessing the `HTTP
Password` tab. Revocation can effectively be done by regenerating the
diff --git a/WORKSPACE b/WORKSPACE
index 0d9b06a..6c01d03 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -976,197 +976,6 @@
yarn_lock = "//:plugins/yarn.lock",
)
-load("//tools/bzl:js.bzl", "bower_archive", "npm_binary")
-
-# NPM binaries bundled along with their dependencies.
-#
-# For full instructions on adding new binaries to the build, see
-# http://gerrit-review.googlesource.com/Documentation/dev-bazel.html#npm-binary
-npm_binary(
- name = "bower",
-)
-
-npm_binary(
- name = "polymer-bundler",
- repository = GERRIT,
-)
-
-npm_binary(
- name = "crisper",
- repository = GERRIT,
-)
-
-# bower_archive() seed components.
-bower_archive(
- name = "iron-autogrow-textarea",
- package = "polymerelements/iron-autogrow-textarea",
- sha1 = "2f04c7e2a72d462de36093ab2b4889db20f699f6",
- version = "2.2.0",
-)
-
-bower_archive(
- name = "es6-promise",
- package = "stefanpenner/es6-promise",
- sha1 = "a3a797bb22132f1ef75f9a2556173f81870c2e53",
- version = "3.3.0",
-)
-
-bower_archive(
- name = "fetch",
- package = "fetch",
- sha1 = "1b05a2bb40c73232c2909dc196de7519fe4db7a9",
- version = "1.0.0",
-)
-
-bower_archive(
- name = "iron-dropdown",
- package = "polymerelements/iron-dropdown",
- sha1 = "3902ba164552b1bfc59e6fa692efa4a1fd8dd4ea",
- version = "2.2.1",
-)
-
-bower_archive(
- name = "iron-input",
- package = "polymerelements/iron-input",
- sha1 = "f79952ff4f6f103c0a2cbd3dacf25935257ff392",
- version = "2.1.3",
-)
-
-bower_archive(
- name = "iron-overlay-behavior",
- package = "polymerelements/iron-overlay-behavior",
- sha1 = "c2d2eac1b162420d9475ade2f16d5db8959b93fc",
- version = "2.3.4",
-)
-
-bower_archive(
- name = "iron-selector",
- package = "polymerelements/iron-selector",
- sha1 = "3f3fcb55f6bd606ea493f99eab9daae21f7a6139",
- version = "2.1.0",
-)
-
-bower_archive(
- name = "paper-button",
- package = "polymerelements/paper-button",
- sha1 = "bcb783d74e1177c1d0836340e7c0280699d1438c",
- version = "2.1.3",
-)
-
-bower_archive(
- name = "paper-input",
- package = "polymerelements/paper-input",
- sha1 = "c1a81a4173d22e72e8ab609eb3715a75273396b3",
- version = "2.2.3",
-)
-
-bower_archive(
- name = "paper-tabs",
- package = "polymerelements/paper-tabs",
- sha1 = "589b8e6efa0f171c93233137c8ea013dcea0ffc7",
- version = "2.1.1",
-)
-
-bower_archive(
- name = "iron-icon",
- package = "polymerelements/iron-icon",
- sha1 = "d21e7d4f1bdc6de881390f888e28d53155eeb551",
- version = "2.1.0",
-)
-
-bower_archive(
- name = "iron-iconset-svg",
- package = "polymerelements/iron-iconset-svg",
- sha1 = "07c0ce02ce6479856758893416a3709009db7f22",
- version = "2.2.1",
-)
-
-bower_archive(
- name = "moment",
- package = "moment/moment",
- sha1 = "fc8ce2c799bab21f6ced7aff928244f4ca8880aa",
- version = "2.13.0",
-)
-
-bower_archive(
- name = "page",
- package = "visionmedia/page.js",
- sha1 = "4a31889cd75cc5e7f68a4c7f256eecaf27102eee",
- version = "1.11.4",
-)
-
-bower_archive(
- name = "paper-item",
- package = "polymerelements/paper-item",
- sha1 = "c3bad022cf182d2bf1c8a44374c7fcb1409afbfa",
- version = "2.1.1",
-)
-
-bower_archive(
- name = "paper-listbox",
- package = "polymerelements/paper-listbox",
- sha1 = "78247cc32bb776f204efef17cff3095878036a40",
- version = "2.1.1",
-)
-
-bower_archive(
- name = "paper-toggle-button",
- package = "polymerelements/paper-toggle-button",
- sha1 = "9927960afb0062726ec1b585ef3e32764c3bbac9",
- version = "2.1.1",
-)
-
-bower_archive(
- name = "polymer",
- package = "polymer/polymer",
- sha1 = "d06e17a1d8dc6187ee5aa8c5b3501da10901c82f",
- version = "2.7.2",
-)
-
-bower_archive(
- name = "polymer-resin",
- package = "polymer/polymer-resin",
- sha1 = "94c29926c20ea3a9b636f26b3e0d689ead8137e5",
- version = "2.0.1",
-)
-
-bower_archive(
- name = "resemblejs",
- package = "rsmbl/Resemble.js",
- sha1 = "49d5f022417c389b630d6f7ee667aa9540075c42",
- version = "2.10.1",
-)
-
-bower_archive(
- name = "codemirror-minified",
- package = "Dominator008/codemirror-minified",
- sha1 = "a1ddf3a6dcc6817597eacc52688cfe5083ded4cd",
- version = "5.59.1",
-)
-
-# bower test stuff
-
-bower_archive(
- name = "iron-test-helpers",
- package = "polymerelements/iron-test-helpers",
- sha1 = "882be2d4c8714b39299b5f7bf25253c4e8a40761",
- version = "2.0.1",
-)
-
-bower_archive(
- name = "test-fixture",
- package = "polymerelements/test-fixture",
- sha1 = "7d72ddfebf555a2dd1fc60a85427d9026b509723",
- version = "3.0.0",
-)
-
-bower_archive(
- name = "web-component-tester",
- package = "polymer/web-component-tester",
- sha1 = "d84f6a13bde5f8fd39ee208d43f33925410530d7",
- version = "6.5.1",
-)
-
external_plugin_deps()
# When upgrading elasticsearch-rest-client, also upgrade httpcore-nio
diff --git a/contrib/check-valid-commit.py b/contrib/check-valid-commit.py
index 763ae3e..bb018f9 100755
--- a/contrib/check-valid-commit.py
+++ b/contrib/check-valid-commit.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
from __future__ import print_function
diff --git a/contrib/git-push-review b/contrib/git-push-review
index b995fc2..5a7f664 100755
--- a/contrib/git-push-review
+++ b/contrib/git-push-review
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2014 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/contrib/populate-fixture-data.py b/contrib/populate-fixture-data.py
index 2341f6c..774a382 100755
--- a/contrib/populate-fixture-data.py
+++ b/contrib/populate-fixture-data.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2016 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
index b05050d..3e8cf3b 100644
--- a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
+++ b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
@@ -1268,6 +1268,7 @@
assertThat(diff.diffHeader).isNotNull();
assertThat(diff.intralineStatus).isNull();
assertThat(diff.webLinks).isNull();
+ assertThat(diff.editWebLinks).isNull();
assertThat(diff.metaA).isNull();
assertThat(diff.metaB).isNotNull();
diff --git a/java/com/google/gerrit/acceptance/AbstractPredicateTest.java b/java/com/google/gerrit/acceptance/AbstractPredicateTest.java
new file mode 100644
index 0000000..c8bdb63
--- /dev/null
+++ b/java/com/google/gerrit/acceptance/AbstractPredicateTest.java
@@ -0,0 +1,109 @@
+// Copyright (C) 2021 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.acceptance;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import com.google.gerrit.common.Nullable;
+import com.google.gerrit.entities.Change;
+import com.google.gerrit.extensions.annotations.Exports;
+import com.google.gerrit.extensions.common.PluginDefinedInfo;
+import com.google.gerrit.index.query.Predicate;
+import com.google.gerrit.index.query.QueryParseException;
+import com.google.gerrit.json.OutputFormat;
+import com.google.gerrit.server.DynamicOptions;
+import com.google.gerrit.server.change.ChangePluginDefinedInfoFactory;
+import com.google.gerrit.server.query.change.ChangeData;
+import com.google.gerrit.server.query.change.ChangeQueryBuilder;
+import com.google.gerrit.server.restapi.change.QueryChanges;
+import com.google.gerrit.sshd.commands.Query;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.google.inject.AbstractModule;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.kohsuke.args4j.Option;
+
+public abstract class AbstractPredicateTest extends AbstractDaemonTest {
+ public static final String PLUGIN_NAME = "my-plugin";
+ public static final Gson GSON = OutputFormat.JSON.newGson();
+
+ protected static class PluginModule extends AbstractModule {
+ @Override
+ public void configure() {
+ bind(DynamicOptions.DynamicBean.class)
+ .annotatedWith(Exports.named(Query.class))
+ .to(MyQueryOptions.class);
+ bind(DynamicOptions.DynamicBean.class)
+ .annotatedWith(Exports.named(QueryChanges.class))
+ .to(MyQueryOptions.class);
+ bind(ChangePluginDefinedInfoFactory.class)
+ .annotatedWith(Exports.named("sample"))
+ .to(AttributeFactory.class);
+ }
+ }
+
+ public static class MyQueryOptions implements DynamicOptions.DynamicBean {
+ @Option(name = "--sample")
+ public boolean sample;
+ }
+
+ protected static class AttributeFactory implements ChangePluginDefinedInfoFactory {
+ private final Provider<ChangeQueryBuilder> queryBuilderProvider;
+
+ @Inject
+ AttributeFactory(Provider<ChangeQueryBuilder> queryBuilderProvider) {
+ this.queryBuilderProvider = queryBuilderProvider;
+ }
+
+ @Override
+ public Map<Change.Id, PluginDefinedInfo> createPluginDefinedInfos(
+ Collection<ChangeData> cds, DynamicOptions.BeanProvider beanProvider, String plugin) {
+ MyQueryOptions options = (MyQueryOptions) beanProvider.getDynamicBean(plugin);
+ Map<Change.Id, PluginDefinedInfo> res = new HashMap<>();
+ if (options.sample) {
+ try {
+ Predicate<ChangeData> predicate = queryBuilderProvider.get().parse("label:Code-Review+2");
+ for (ChangeData cd : cds) {
+ PluginDefinedInfo myInfo = new PluginDefinedInfo();
+ if (predicate.isMatchable() && predicate.asMatchable().match(cd)) {
+ myInfo.message = "matched";
+ } else {
+ myInfo.message = "not matched";
+ }
+ res.put(cd.getId(), myInfo);
+ }
+ } catch (QueryParseException e) {
+ // ignored
+ }
+ }
+ return res;
+ }
+ }
+
+ protected static List<PluginDefinedInfo> decodeRawPluginsList(@Nullable Object plugins) {
+ if (plugins == null) {
+ return Collections.emptyList();
+ }
+ checkArgument(plugins instanceof List, "not a list: %s", plugins);
+ return GSON.fromJson(
+ GSON.toJson(plugins), new TypeToken<List<PluginDefinedInfo>>() {}.getType());
+ }
+}
diff --git a/java/com/google/gerrit/acceptance/ExtensionRegistry.java b/java/com/google/gerrit/acceptance/ExtensionRegistry.java
index 35f8ce6..85c4c13 100644
--- a/java/com/google/gerrit/acceptance/ExtensionRegistry.java
+++ b/java/com/google/gerrit/acceptance/ExtensionRegistry.java
@@ -32,8 +32,10 @@
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.registration.PrivateInternals_DynamicMapImpl;
import com.google.gerrit.extensions.registration.RegistrationHandle;
+import com.google.gerrit.extensions.webui.EditWebLink;
import com.google.gerrit.extensions.webui.FileHistoryWebLink;
import com.google.gerrit.extensions.webui.PatchSetWebLink;
+import com.google.gerrit.extensions.webui.ResolveConflictsWebLink;
import com.google.gerrit.server.ExceptionHook;
import com.google.gerrit.server.account.GroupBackend;
import com.google.gerrit.server.change.ChangeETagComputation;
@@ -75,6 +77,8 @@
private final DynamicSet<GitReferenceUpdatedListener> refUpdatedListeners;
private final DynamicSet<FileHistoryWebLink> fileHistoryWebLinks;
private final DynamicSet<PatchSetWebLink> patchSetWebLinks;
+ private final DynamicSet<ResolveConflictsWebLink> resolveConflictsWebLinks;
+ private final DynamicSet<EditWebLink> editWebLinks;
private final DynamicSet<RevisionCreatedListener> revisionCreatedListeners;
private final DynamicSet<GroupBackend> groupBackends;
private final DynamicSet<AccountActivationValidationListener>
@@ -109,6 +113,8 @@
DynamicSet<GitReferenceUpdatedListener> refUpdatedListeners,
DynamicSet<FileHistoryWebLink> fileHistoryWebLinks,
DynamicSet<PatchSetWebLink> patchSetWebLinks,
+ DynamicSet<ResolveConflictsWebLink> resolveConflictsWebLinks,
+ DynamicSet<EditWebLink> editWebLinks,
DynamicSet<RevisionCreatedListener> revisionCreatedListeners,
DynamicSet<GroupBackend> groupBackends,
DynamicSet<AccountActivationValidationListener> accountActivationValidationListeners,
@@ -139,6 +145,8 @@
this.refUpdatedListeners = refUpdatedListeners;
this.fileHistoryWebLinks = fileHistoryWebLinks;
this.patchSetWebLinks = patchSetWebLinks;
+ this.editWebLinks = editWebLinks;
+ this.resolveConflictsWebLinks = resolveConflictsWebLinks;
this.revisionCreatedListeners = revisionCreatedListeners;
this.groupBackends = groupBackends;
this.accountActivationValidationListeners = accountActivationValidationListeners;
@@ -240,6 +248,14 @@
return add(patchSetWebLinks, patchSetWebLink);
}
+ public Registration add(ResolveConflictsWebLink resolveConflictsWebLink) {
+ return add(resolveConflictsWebLinks, resolveConflictsWebLink);
+ }
+
+ public Registration add(EditWebLink editWebLink) {
+ return add(editWebLinks, editWebLink);
+ }
+
public Registration add(RevisionCreatedListener revisionCreatedListener) {
return add(revisionCreatedListeners, revisionCreatedListener);
}
diff --git a/java/com/google/gerrit/auth/BUILD b/java/com/google/gerrit/auth/BUILD
index 609ec8a..e844696 100644
--- a/java/com/google/gerrit/auth/BUILD
+++ b/java/com/google/gerrit/auth/BUILD
@@ -20,6 +20,7 @@
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/entities",
"//java/com/google/gerrit/extensions:api",
+ "//java/com/google/gerrit/metrics",
"//java/com/google/gerrit/proto",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/server/cache/serialize",
diff --git a/java/com/google/gerrit/auth/ldap/Helper.java b/java/com/google/gerrit/auth/ldap/Helper.java
index bf2a8c2..a939c72 100644
--- a/java/com/google/gerrit/auth/ldap/Helper.java
+++ b/java/com/google/gerrit/auth/ldap/Helper.java
@@ -20,6 +20,10 @@
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.common.data.ParameterizedString;
import com.google.gerrit.entities.AccountGroup;
+import com.google.gerrit.metrics.Description;
+import com.google.gerrit.metrics.Description.Units;
+import com.google.gerrit.metrics.MetricMaker;
+import com.google.gerrit.metrics.Timer0;
import com.google.gerrit.server.account.AccountException;
import com.google.gerrit.server.account.AuthenticationFailedException;
import com.google.gerrit.server.auth.NoSuchUserException;
@@ -81,11 +85,16 @@
private final String connectTimeoutMillis;
private final boolean useConnectionPooling;
private final boolean groupsVisibleToAll;
+ private final Timer0 loginLatencyTimer;
+ private final Timer0 userSearchLatencyTimer;
+ private final Timer0 groupSearchLatencyTimer;
+ private final Timer0 groupExpansionLatencyTimer;
@Inject
Helper(
@GerritServerConfig Config config,
- @Named(LdapModule.PARENT_GROUPS_CACHE) Cache<String, ImmutableSet<String>> parentGroups) {
+ @Named(LdapModule.PARENT_GROUPS_CACHE) Cache<String, ImmutableSet<String>> parentGroups,
+ MetricMaker metricMaker) {
this.config = config;
this.server = LdapRealm.optional(config, "server");
this.username = LdapRealm.optional(config, "username");
@@ -112,6 +121,33 @@
}
this.parentGroups = parentGroups;
this.useConnectionPooling = LdapRealm.optional(config, "useConnectionPooling", false);
+
+ this.loginLatencyTimer =
+ metricMaker.newTimer(
+ "ldap/login_latency",
+ new Description("Latency of logins").setCumulative().setUnit(Units.NANOSECONDS));
+ this.userSearchLatencyTimer =
+ metricMaker.newTimer(
+ "ldap/user_search_latency",
+ new Description("Latency for searching the user account")
+ .setCumulative()
+ .setUnit(Units.NANOSECONDS));
+ this.groupSearchLatencyTimer =
+ metricMaker.newTimer(
+ "ldap/group_search_latency",
+ new Description("Latency for querying the groups membership of an account")
+ .setCumulative()
+ .setUnit(Units.NANOSECONDS));
+ this.groupExpansionLatencyTimer =
+ metricMaker.newTimer(
+ "ldap/group_expansion_latency",
+ new Description("Latency for expanding nested groups")
+ .setCumulative()
+ .setUnit(Units.NANOSECONDS));
+ }
+
+ Timer0 getGroupSearchLatencyTimer() {
+ return groupSearchLatencyTimer;
}
private Properties createContextProperties() {
@@ -191,7 +227,9 @@
private DirContext kerberosOpen(Properties env)
throws IOException, LoginException, NamingException {
LoginContext ctx = new LoginContext("KerberosLogin");
- ctx.login();
+ try (Timer0.Context ignored = loginLatencyTimer.start()) {
+ ctx.login();
+ }
Subject subject = ctx.getSubject();
try {
return Subject.doAs(
@@ -209,7 +247,7 @@
DirContext authenticate(String dn, String password) throws AccountException {
final Properties env = createContextProperties();
- try {
+ try (Timer0.Context ignored = loginLatencyTimer.start()) {
env.put(Context.REFERRAL, referral);
if (!supportAnonymous) {
@@ -258,7 +296,7 @@
}
for (LdapQuery accountQuery : accountQueryList) {
- List<LdapQuery.Result> res = accountQuery.query(ctx, params);
+ List<LdapQuery.Result> res = accountQuery.query(ctx, params, userSearchLatencyTimer);
if (res.size() == 1) {
return res.get(0);
} else if (res.size() > 1) {
@@ -290,8 +328,10 @@
params.put(LdapRealm.USERNAME, username);
for (LdapQuery groupMemberQuery : schema.groupMemberQueryList) {
- for (LdapQuery.Result r : groupMemberQuery.query(ctx, params)) {
- recursivelyExpandGroups(groupDNs, schema, ctx, r.getDN());
+ for (LdapQuery.Result r : groupMemberQuery.query(ctx, params, groupSearchLatencyTimer)) {
+ try (Timer0.Context ignored = groupExpansionLatencyTimer.start()) {
+ recursivelyExpandGroups(groupDNs, schema, ctx, r.getDN());
+ }
}
}
}
diff --git a/java/com/google/gerrit/auth/ldap/LdapGroupBackend.java b/java/com/google/gerrit/auth/ldap/LdapGroupBackend.java
index f82523e..2947efd 100644
--- a/java/com/google/gerrit/auth/ldap/LdapGroupBackend.java
+++ b/java/com/google/gerrit/auth/ldap/LdapGroupBackend.java
@@ -205,7 +205,8 @@
Map<String, String> params = Collections.emptyMap();
for (String groupBase : schema.groupBases) {
LdapQuery query = new LdapQuery(groupBase, schema.groupScope, filter, returnAttrs);
- for (LdapQuery.Result res : query.query(ctx, params)) {
+ for (LdapQuery.Result res :
+ query.query(ctx, params, helper.getGroupSearchLatencyTimer())) {
out.add(groupReference(schema.groupName, res));
}
}
diff --git a/java/com/google/gerrit/auth/ldap/LdapQuery.java b/java/com/google/gerrit/auth/ldap/LdapQuery.java
index 2586fd4..409c9f5 100644
--- a/java/com/google/gerrit/auth/ldap/LdapQuery.java
+++ b/java/com/google/gerrit/auth/ldap/LdapQuery.java
@@ -15,6 +15,7 @@
package com.google.gerrit.auth.ldap;
import com.google.gerrit.common.data.ParameterizedString;
+import com.google.gerrit.metrics.Timer0;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -61,13 +62,16 @@
return pattern.getParameterNames();
}
- List<Result> query(DirContext ctx, Map<String, String> params) throws NamingException {
+ List<Result> query(DirContext ctx, Map<String, String> params, Timer0 queryTimer)
+ throws NamingException {
final SearchControls sc = new SearchControls();
final NamingEnumeration<SearchResult> res;
sc.setSearchScope(searchScope.scope());
sc.setReturningAttributes(returnAttributes);
- res = ctx.search(base, pattern.getRawPattern(), pattern.bind(params), sc);
+ try (Timer0.Context ignored = queryTimer.start()) {
+ res = ctx.search(base, pattern.getRawPattern(), pattern.bind(params), sc);
+ }
try {
final List<Result> r = new ArrayList<>();
try {
diff --git a/java/com/google/gerrit/common/PluginData.java b/java/com/google/gerrit/common/PluginData.java
index c440de1..289d93a 100644
--- a/java/com/google/gerrit/common/PluginData.java
+++ b/java/com/google/gerrit/common/PluginData.java
@@ -10,7 +10,7 @@
// 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.common;
+// limitations under the License.
package com.google.gerrit.common;
diff --git a/java/com/google/gerrit/entities/ChangeMessage.java b/java/com/google/gerrit/entities/ChangeMessage.java
index f34cc7d..e10d002 100644
--- a/java/com/google/gerrit/entities/ChangeMessage.java
+++ b/java/com/google/gerrit/entities/ChangeMessage.java
@@ -15,12 +15,35 @@
package com.google.gerrit.entities;
import com.google.auto.value.AutoValue;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.flogger.FluentLogger;
import com.google.gerrit.common.Nullable;
import java.sql.Timestamp;
+import java.util.HashSet;
import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
-/** A message attached to a {@link Change}. */
+/**
+ * A message attached to a {@link Change}. This message is persisted in data storage, that is why it
+ * must have template form that does not contain Gerrit user identifiable information. Hence, it
+ * requires processing to convert it to user-facing form.
+ *
+ * <p>These messages are normally auto-generated by gerrit operations, but might also incorporate
+ * user input.
+ */
public final class ChangeMessage {
+
+ private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+
+ /** Template to identify an account in {@link ChangeMessage#message}. */
+ public static final String ACCOUNT_TEMPLATE = "<GERRIT_ACCOUNT_%d>";
+
+ public static final Pattern ACCOUNT_TEMPLATE_PATTERN =
+ Pattern.compile("<GERRIT_ACCOUNT_([0-9]+)>");
+
public static Key key(Change.Id changeId, String uuid) {
return new AutoValue_ChangeMessage_Key(changeId, uuid);
}
@@ -40,9 +63,15 @@
/** When this comment was drafted. */
protected Timestamp writtenOn;
- /** The text left by the user. */
+ /**
+ * The text left by the user or Gerrit system in template form, that is free of Gerrit User
+ * Identifiable Information and can be persisted in data storage.
+ */
@Nullable protected String message;
+ /** {@link Account.Id}s that are used in {@link #message} template. */
+ protected ImmutableSet<Account.Id> accountsInMessage;
+
/** Which patchset (if any) was this message generated from? */
@Nullable protected PatchSet.Id patchset;
@@ -54,11 +83,47 @@
protected ChangeMessage() {}
- public ChangeMessage(final ChangeMessage.Key k, Account.Id a, Timestamp wo, PatchSet.Id psid) {
- key = k;
- author = a;
- writtenOn = wo;
- patchset = psid;
+ public static ChangeMessage create(
+ final ChangeMessage.Key k, @Nullable Account.Id a, Timestamp wo, @Nullable PatchSet.Id psid) {
+ return create(k, a, wo, psid, /*messageTemplate=*/ null, /*realAuthor=*/ null, /*tag=*/ null);
+ }
+
+ public static ChangeMessage create(
+ final ChangeMessage.Key k,
+ @Nullable Account.Id a,
+ Timestamp wo,
+ @Nullable PatchSet.Id psid,
+ @Nullable String messageTemplate,
+ @Nullable Account.Id realAuthor,
+ @Nullable String tag) {
+ ChangeMessage message = new ChangeMessage();
+ message.key = k;
+ message.author = a;
+ message.writtenOn = wo;
+ message.patchset = psid;
+ message.message = messageTemplate;
+ message.accountsInMessage =
+ messageTemplate == null ? ImmutableSet.of() : parseTemplates(messageTemplate);
+ // Use null for same real author, as before the column was added.
+ message.realAuthor = Objects.equals(a, realAuthor) ? null : realAuthor;
+ message.tag = tag;
+ return message;
+ }
+
+ /* Returns account ids that are used in {@code messageTemplate}. */
+ public static ImmutableSet<Account.Id> parseTemplates(String messageTemplate) {
+ Matcher matcher = ACCOUNT_TEMPLATE_PATTERN.matcher(messageTemplate);
+ Set<Account.Id> accountsInTemplate = new HashSet<>();
+ while (matcher.find()) {
+ String accountId = matcher.group(1);
+ Optional<Account.Id> parsedAccountId = Account.Id.tryParse(accountId);
+ if (parsedAccountId.isPresent()) {
+ accountsInTemplate.add(parsedAccountId.get());
+ } else {
+ logger.atFine().log("Failed to parse accountId from template %s", matcher.group());
+ }
+ }
+ return ImmutableSet.copyOf(accountsInTemplate);
}
public ChangeMessage.Key getKey() {
@@ -70,54 +135,32 @@
return author;
}
- public void setAuthor(Account.Id accountId) {
- if (author != null) {
- throw new IllegalStateException("Cannot modify author once assigned");
- }
- author = accountId;
- }
-
public Account.Id getRealAuthor() {
return realAuthor != null ? realAuthor : getAuthor();
}
- public void setRealAuthor(Account.Id id) {
- // Use null for same real author, as before the column was added.
- realAuthor = Objects.equals(getAuthor(), id) ? null : id;
- }
-
public Timestamp getWrittenOn() {
return writtenOn;
}
- public void setWrittenOn(Timestamp ts) {
- writtenOn = ts;
- }
-
+ /** Message template, as persisted in data storage. */
public String getMessage() {
return message;
}
- public void setMessage(String s) {
- message = s;
+ /** Account ids, used in {@link #message} template. */
+ public ImmutableSet<Account.Id> getAccountsInMessage() {
+ return accountsInMessage == null ? ImmutableSet.of() : accountsInMessage;
}
public String getTag() {
return tag;
}
- public void setTag(String tag) {
- this.tag = tag;
- }
-
public PatchSet.Id getPatchSetId() {
return patchset;
}
- public void setPatchSetId(PatchSet.Id id) {
- patchset = id;
- }
-
@Override
public boolean equals(Object o) {
if (!(o instanceof ChangeMessage)) {
@@ -128,6 +171,7 @@
&& Objects.equals(author, m.author)
&& Objects.equals(writtenOn, m.writtenOn)
&& Objects.equals(message, m.message)
+ && Objects.equals(accountsInMessage, m.accountsInMessage)
&& Objects.equals(patchset, m.patchset)
&& Objects.equals(tag, m.tag)
&& Objects.equals(realAuthor, m.realAuthor);
@@ -135,7 +179,8 @@
@Override
public int hashCode() {
- return Objects.hash(key, author, writtenOn, message, patchset, tag, realAuthor);
+ return Objects.hash(
+ key, author, writtenOn, message, accountsInMessage, patchset, tag, realAuthor);
}
@Override
@@ -155,6 +200,8 @@
+ tag
+ ", message=["
+ message
- + "]}";
+ + "], accountsInMessage="
+ + accountsInMessage
+ + "}";
}
}
diff --git a/java/com/google/gerrit/entities/CoreDownloadSchemes.java b/java/com/google/gerrit/entities/CoreDownloadSchemes.java
index 9bcd365..85e55a0 100644
--- a/java/com/google/gerrit/entities/CoreDownloadSchemes.java
+++ b/java/com/google/gerrit/entities/CoreDownloadSchemes.java
@@ -20,7 +20,6 @@
public static final String ANON_HTTP = "anonymous http";
public static final String HTTP = "http";
public static final String SSH = "ssh";
- public static final String REPO_DOWNLOAD = "repo";
public static final String REPO = "repo";
private CoreDownloadSchemes() {}
diff --git a/java/com/google/gerrit/entities/converter/ChangeMessageProtoConverter.java b/java/com/google/gerrit/entities/converter/ChangeMessageProtoConverter.java
index 19c121249..eb2a381 100644
--- a/java/com/google/gerrit/entities/converter/ChangeMessageProtoConverter.java
+++ b/java/com/google/gerrit/entities/converter/ChangeMessageProtoConverter.java
@@ -48,6 +48,8 @@
if (writtenOn != null) {
builder.setWrittenOn(writtenOn.getTime());
}
+ // Build proto with template representation of the message. Templates are parsed when message is
+ // extracted from cache.
String message = changeMessage.getMessage();
if (message != null) {
builder.setMessage(message);
@@ -79,16 +81,15 @@
Timestamp writtenOn = proto.hasWrittenOn() ? new Timestamp(proto.getWrittenOn()) : null;
PatchSet.Id patchSetId =
proto.hasPatchset() ? patchSetIdConverter.fromProto(proto.getPatchset()) : null;
- ChangeMessage changeMessage = new ChangeMessage(key, author, writtenOn, patchSetId);
- if (proto.hasMessage()) {
- changeMessage.setMessage(proto.getMessage());
- }
- if (proto.hasTag()) {
- changeMessage.setTag(proto.getTag());
- }
- if (proto.hasRealAuthor()) {
- changeMessage.setRealAuthor(accountIdConverter.fromProto(proto.getRealAuthor()));
- }
+ // Only template representation of the message is stored in entity. Templates should be replaced
+ // before being served to the users.
+ String messageTemplate = proto.hasMessage() ? proto.getMessage() : null;
+ String tag = proto.hasTag() ? proto.getTag() : null;
+ Account.Id realAuthor =
+ proto.hasRealAuthor() ? accountIdConverter.fromProto(proto.getRealAuthor()) : null;
+ ChangeMessage changeMessage =
+ ChangeMessage.create(key, author, writtenOn, patchSetId, messageTemplate, realAuthor, tag);
+
return changeMessage;
}
diff --git a/java/com/google/gerrit/extensions/client/ListOption.java b/java/com/google/gerrit/extensions/client/ListOption.java
index dba2eee..098966a 100644
--- a/java/com/google/gerrit/extensions/client/ListOption.java
+++ b/java/com/google/gerrit/extensions/client/ListOption.java
@@ -14,6 +14,7 @@
package com.google.gerrit.extensions.client;
+import com.google.gerrit.extensions.restapi.BadRequestException;
import java.lang.reflect.InvocationTargetException;
import java.util.EnumSet;
import java.util.Set;
@@ -22,6 +23,22 @@
public interface ListOption {
int getValue();
+ static <T extends Enum<T> & ListOption> EnumSet<T> fromHexString(Class<T> clazz, String hex)
+ throws BadRequestException {
+ int parsed;
+ try {
+ parsed = Integer.parseInt(hex, 16);
+ } catch (IllegalArgumentException e) {
+ throw new BadRequestException("not a hex-encoded 32-bit integer: " + hex, e);
+ }
+
+ try {
+ return fromBits(clazz, parsed);
+ } catch (IllegalArgumentException e) {
+ throw new BadRequestException(e.getMessage());
+ }
+ }
+
static <T extends Enum<T> & ListOption> EnumSet<T> fromBits(Class<T> clazz, int v) {
EnumSet<T> r = EnumSet.noneOf(clazz);
T[] values;
@@ -43,7 +60,7 @@
}
if (v != 0) {
throw new IllegalArgumentException(
- "unknown " + clazz.getName() + ": " + Integer.toHexString(v));
+ "unknown " + clazz.getSimpleName() + ": " + Integer.toHexString(v));
}
return r;
}
diff --git a/java/com/google/gerrit/extensions/common/ChangeMessageInfo.java b/java/com/google/gerrit/extensions/common/ChangeMessageInfo.java
index 10456ff..c1cb1627 100644
--- a/java/com/google/gerrit/extensions/common/ChangeMessageInfo.java
+++ b/java/com/google/gerrit/extensions/common/ChangeMessageInfo.java
@@ -15,8 +15,10 @@
package com.google.gerrit.extensions.common;
import java.sql.Timestamp;
+import java.util.Collection;
import java.util.Objects;
+/** Represent {@link com.google.gerrit.entities.ChangeMessage} in the REST API. */
public class ChangeMessageInfo {
public String id;
public String tag;
@@ -24,6 +26,7 @@
public AccountInfo realAuthor;
public Timestamp date;
public String message;
+ public Collection<AccountInfo> accountsInMessage;
public Integer _revisionNumber;
public ChangeMessageInfo() {}
@@ -42,6 +45,7 @@
&& Objects.equals(realAuthor, cmi.realAuthor)
&& Objects.equals(date, cmi.date)
&& Objects.equals(message, cmi.message)
+ && Objects.equals(accountsInMessage, cmi.accountsInMessage)
&& Objects.equals(_revisionNumber, cmi._revisionNumber);
}
return false;
@@ -49,7 +53,8 @@
@Override
public int hashCode() {
- return Objects.hash(id, tag, author, realAuthor, date, message, _revisionNumber);
+ return Objects.hash(
+ id, tag, author, realAuthor, date, message, accountsInMessage, _revisionNumber);
}
@Override
@@ -69,6 +74,8 @@
+ _revisionNumber
+ ", message=["
+ message
- + "]}";
+ + "], accountsForTemplate="
+ + accountsInMessage
+ + "}";
}
}
diff --git a/java/com/google/gerrit/extensions/common/CommitInfo.java b/java/com/google/gerrit/extensions/common/CommitInfo.java
index 1fd8755..202b829 100644
--- a/java/com/google/gerrit/extensions/common/CommitInfo.java
+++ b/java/com/google/gerrit/extensions/common/CommitInfo.java
@@ -29,6 +29,7 @@
public String subject;
public String message;
public List<WebLinkInfo> webLinks;
+ public List<WebLinkInfo> resolveConflictsWebLinks;
@Override
public boolean equals(Object o) {
@@ -42,12 +43,14 @@
&& Objects.equals(committer, c.committer)
&& Objects.equals(subject, c.subject)
&& Objects.equals(message, c.message)
- && Objects.equals(webLinks, c.webLinks);
+ && Objects.equals(webLinks, c.webLinks)
+ && Objects.equals(resolveConflictsWebLinks, c.resolveConflictsWebLinks);
}
@Override
public int hashCode() {
- return Objects.hash(commit, parents, author, committer, subject, message, webLinks);
+ return Objects.hash(
+ commit, parents, author, committer, subject, message, webLinks, resolveConflictsWebLinks);
}
@Override
@@ -64,6 +67,9 @@
if (webLinks != null) {
helper.add("webLinks", webLinks);
}
+ if (resolveConflictsWebLinks != null) {
+ helper.add("resolveConflictsWebLinks", resolveConflictsWebLinks);
+ }
return helper.toString();
}
}
diff --git a/java/com/google/gerrit/extensions/common/DiffInfo.java b/java/com/google/gerrit/extensions/common/DiffInfo.java
index 2511e96..5a9b82b 100644
--- a/java/com/google/gerrit/extensions/common/DiffInfo.java
+++ b/java/com/google/gerrit/extensions/common/DiffInfo.java
@@ -32,6 +32,8 @@
public List<ContentEntry> content;
// Links to the file diff in external sites
public List<DiffWebLinkInfo> webLinks;
+ // Links to edit the file in external sites
+ public List<WebLinkInfo> editWebLinks;
// Binary file
public Boolean binary;
diff --git a/java/com/google/gerrit/extensions/common/testing/CommitInfoSubject.java b/java/com/google/gerrit/extensions/common/testing/CommitInfoSubject.java
index d344e18..71fc564 100644
--- a/java/com/google/gerrit/extensions/common/testing/CommitInfoSubject.java
+++ b/java/com/google/gerrit/extensions/common/testing/CommitInfoSubject.java
@@ -20,6 +20,7 @@
import com.google.common.truth.Correspondence;
import com.google.common.truth.FailureMetadata;
+import com.google.common.truth.IterableSubject;
import com.google.common.truth.StringSubject;
import com.google.common.truth.Subject;
import com.google.gerrit.extensions.common.CommitInfo;
@@ -68,6 +69,16 @@
return check("message").that(commitInfo.message);
}
+ public IterableSubject webLinks() {
+ isNotNull();
+ return check("webLinks").that(commitInfo.webLinks);
+ }
+
+ public IterableSubject resolveConflictsWebLinks() {
+ isNotNull();
+ return check("resolveConflictsWebLinks").that(commitInfo.resolveConflictsWebLinks);
+ }
+
public static Correspondence<CommitInfo, String> hasCommit() {
return NullAwareCorrespondence.transforming(commitInfo -> commitInfo.commit, "hasCommit");
}
diff --git a/java/com/google/gerrit/extensions/common/testing/DiffInfoSubject.java b/java/com/google/gerrit/extensions/common/testing/DiffInfoSubject.java
index e258134..b800d17 100644
--- a/java/com/google/gerrit/extensions/common/testing/DiffInfoSubject.java
+++ b/java/com/google/gerrit/extensions/common/testing/DiffInfoSubject.java
@@ -74,6 +74,11 @@
return check("webLinks").that(diffInfo.webLinks);
}
+ public IterableSubject editWebLinks() {
+ isNotNull();
+ return check("editWebLinks").that(diffInfo.editWebLinks);
+ }
+
public BooleanSubject binary() {
isNotNull();
return check("binary").that(diffInfo.binary);
diff --git a/java/com/google/gerrit/extensions/webui/EditWebLink.java b/java/com/google/gerrit/extensions/webui/EditWebLink.java
new file mode 100644
index 0000000..cd70feb
--- /dev/null
+++ b/java/com/google/gerrit/extensions/webui/EditWebLink.java
@@ -0,0 +1,36 @@
+// Copyright (C) 2021 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.extensions.webui;
+
+import com.google.gerrit.extensions.annotations.ExtensionPoint;
+import com.google.gerrit.extensions.common.WebLinkInfo;
+
+@ExtensionPoint
+public interface EditWebLink extends WebLink {
+
+ /**
+ * {@link com.google.gerrit.extensions.common.WebLinkInfo} describing a link from a file to an
+ * external service for editing.
+ *
+ * <p>In order for the web link to be visible {@link WebLinkInfo#url} and {@link WebLinkInfo#name}
+ * must be set.
+ *
+ * @param projectName name of the project
+ * @param revision name of the revision (e.g. branch or commit ID)
+ * @param fileName name of the file
+ * @return WebLinkInfo that links to project in external service, null if there should be no link.
+ */
+ WebLinkInfo getEditWebLink(String projectName, String revision, String fileName);
+}
diff --git a/java/com/google/gerrit/extensions/webui/ResolveConflictsWebLink.java b/java/com/google/gerrit/extensions/webui/ResolveConflictsWebLink.java
new file mode 100644
index 0000000..19402a9
--- /dev/null
+++ b/java/com/google/gerrit/extensions/webui/ResolveConflictsWebLink.java
@@ -0,0 +1,40 @@
+// Copyright (C) 2021 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.extensions.webui;
+
+import com.google.gerrit.extensions.annotations.ExtensionPoint;
+import com.google.gerrit.extensions.common.WebLinkInfo;
+
+@ExtensionPoint
+public interface ResolveConflictsWebLink extends WebLink {
+
+ /**
+ * {@link com.google.gerrit.extensions.common.WebLinkInfo} describing a link from a patch set to
+ * an external service for the purpose of resolving merge conflicts.
+ *
+ * <p>In order for the web link to be visible {@link
+ * com.google.gerrit.extensions.common.WebLinkInfo#url} and {@link
+ * com.google.gerrit.extensions.common.WebLinkInfo#name} must be set.
+ *
+ * @param projectName name of the project
+ * @param commit commit of the patch set
+ * @param commitMessage the commit message of the change
+ * @param branchName target branch of the change
+ * @return WebLinkInfo that links to patch set in external service, {@code null} if there should
+ * be no link.
+ */
+ WebLinkInfo getResolveConflictsWebLink(
+ String projectName, String commit, String commitMessage, String branchName);
+}
diff --git a/java/com/google/gerrit/httpd/CacheBasedWebSession.java b/java/com/google/gerrit/httpd/CacheBasedWebSession.java
index a3a67e5..7212e3e 100644
--- a/java/com/google/gerrit/httpd/CacheBasedWebSession.java
+++ b/java/com/google/gerrit/httpd/CacheBasedWebSession.java
@@ -76,29 +76,27 @@
this.identified = identified;
this.byIdCache = byIdCache;
- if (request.getRequestURI() == null || !GitSmartHttpTools.isGitClient(request)) {
- String cookie = readCookie(request);
- if (cookie != null) {
- authFromCookie(cookie);
- } else {
- String token;
- try {
- token = ParameterParser.getQueryParams(request).accessToken();
- } catch (BadRequestException e) {
- token = null;
- }
- if (token != null) {
- authFromQueryParameter(token);
- }
+ String cookie = readCookie(request);
+ if (cookie != null) {
+ authFromCookie(cookie);
+ } else if (request.getRequestURI() == null || !GitSmartHttpTools.isGitClient(request)) {
+ String token;
+ try {
+ token = ParameterParser.getQueryParams(request).accessToken();
+ } catch (BadRequestException e) {
+ token = null;
}
- if (val != null && !checkAccountStatus(val.getAccountId())) {
- val = null;
- okPaths.clear();
+ if (token != null) {
+ authFromQueryParameter(token);
}
- if (val != null && val.needsCookieRefresh()) {
- // Session is more than half old; update cache entry with new expiration date.
- val = manager.createVal(key, val);
- }
+ }
+ if (val != null && !checkAccountStatus(val.getAccountId())) {
+ val = null;
+ okPaths.clear();
+ }
+ if (val != null && val.needsCookieRefresh()) {
+ // Session is more than half old; update cache entry with new expiration date.
+ val = manager.createVal(key, val);
}
}
diff --git a/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java b/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java
index 111cc34..7fcd4f8 100644
--- a/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java
+++ b/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java
@@ -22,6 +22,7 @@
import com.google.common.base.Strings;
import com.google.common.flogger.FluentLogger;
import com.google.common.io.BaseEncoding;
+import com.google.gerrit.common.Nullable;
import com.google.gerrit.entities.Account;
import com.google.gerrit.extensions.client.GitBasicAuthPolicy;
import com.google.gerrit.extensions.registration.DynamicItem;
@@ -99,7 +100,7 @@
HttpServletRequest req = (HttpServletRequest) request;
Response rsp = new Response((HttpServletResponse) response);
- if (verify(req, rsp)) {
+ if (session.get().isSignedIn() || verify(req, rsp)) {
chain.doFilter(req, rsp);
}
}
@@ -144,7 +145,7 @@
if (gitBasicAuthPolicy == GitBasicAuthPolicy.HTTP
|| gitBasicAuthPolicy == GitBasicAuthPolicy.HTTP_LDAP) {
if (PasswordVerifier.checkPassword(who.externalIds(), username, password)) {
- return succeedAuthentication(who);
+ return succeedAuthentication(who, null);
}
}
@@ -157,11 +158,11 @@
try {
AuthResult whoAuthResult = accountManager.authenticate(whoAuth);
- setUserIdentified(whoAuthResult.getAccountId());
+ setUserIdentified(whoAuthResult.getAccountId(), whoAuthResult);
return true;
} catch (NoSuchUserException e) {
if (PasswordVerifier.checkPassword(who.externalIds(), username, password)) {
- return succeedAuthentication(who);
+ return succeedAuthentication(who, null);
}
logger.atWarning().withCause(e).log(authenticationFailedMsg(username, req));
rsp.sendError(SC_UNAUTHORIZED);
@@ -183,8 +184,8 @@
}
}
- private boolean succeedAuthentication(AccountState who) {
- setUserIdentified(who.account().id());
+ private boolean succeedAuthentication(AccountState who, @Nullable AuthResult whoAuthResult) {
+ setUserIdentified(who.account().id(), whoAuthResult);
return true;
}
@@ -201,11 +202,15 @@
return String.format("Authentication from %s failed for %s", req.getRemoteAddr(), username);
}
- private void setUserIdentified(Account.Id id) {
+ private void setUserIdentified(Account.Id id, @Nullable AuthResult whoAuthResult) {
WebSession ws = session.get();
ws.setUserAccountId(id);
ws.setAccessPathOk(AccessPath.GIT, true);
ws.setAccessPathOk(AccessPath.REST_API, true);
+
+ if (whoAuthResult != null) {
+ ws.login(whoAuthResult, false);
+ }
}
private String encoding(HttpServletRequest req) {
diff --git a/java/com/google/gerrit/index/Index.java b/java/com/google/gerrit/index/Index.java
index 44f8b42..529cd78 100644
--- a/java/com/google/gerrit/index/Index.java
+++ b/java/com/google/gerrit/index/Index.java
@@ -135,4 +135,12 @@
* @param ready whether the index is ready
*/
void markReady(boolean ready);
+
+ /**
+ * Returns whether the index is enabled. {@code true} by default, but could be overridden by
+ * implementations.
+ */
+ default boolean isEnabled() {
+ return true;
+ }
}
diff --git a/java/com/google/gerrit/index/query/InternalQuery.java b/java/com/google/gerrit/index/query/InternalQuery.java
index 48e214e..5c003bc 100644
--- a/java/com/google/gerrit/index/query/InternalQuery.java
+++ b/java/com/google/gerrit/index/query/InternalQuery.java
@@ -42,7 +42,7 @@
*/
public class InternalQuery<T, Q extends InternalQuery<T, Q>> {
private final QueryProcessor<T> queryProcessor;
- private final IndexCollection<?, T, ? extends Index<?, T>> indexes;
+ protected final IndexCollection<?, T, ? extends Index<?, T>> indexes;
protected final IndexConfig indexConfig;
diff --git a/java/com/google/gerrit/pgm/util/ErrorLogJsonLayout.java b/java/com/google/gerrit/pgm/util/ErrorLogJsonLayout.java
index 2ea1f82..7d4abfc 100644
--- a/java/com/google/gerrit/pgm/util/ErrorLogJsonLayout.java
+++ b/java/com/google/gerrit/pgm/util/ErrorLogJsonLayout.java
@@ -97,7 +97,7 @@
private String getSourceHost() {
try {
- return InetAddress.getLocalHost().getHostName();
+ return InetAddress.getLocalHost().getHostAddress();
} catch (UnknownHostException e) {
return "unknown-host";
}
diff --git a/java/com/google/gerrit/server/ChangeMessagesUtil.java b/java/com/google/gerrit/server/ChangeMessagesUtil.java
index 32edadb..26424d2 100644
--- a/java/com/google/gerrit/server/ChangeMessagesUtil.java
+++ b/java/com/google/gerrit/server/ChangeMessagesUtil.java
@@ -14,24 +14,26 @@
package com.google.gerrit.server;
-import static com.google.common.base.Preconditions.checkState;
-import static java.util.Objects.requireNonNull;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.entities.Account;
import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.extensions.common.ChangeMessageInfo;
+import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.account.AccountLoader;
+import com.google.gerrit.server.account.AccountState;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.notedb.ChangeUpdate;
import com.google.gerrit.server.update.ChangeContext;
+import com.google.inject.Inject;
import com.google.inject.Singleton;
-import java.sql.Timestamp;
import java.util.List;
-import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Matcher;
-/** Utility functions to manipulate ChangeMessages. */
+/** Utility functions to manipulate {@link ChangeMessage}. */
@Singleton
public class ChangeMessagesUtil {
public static final String AUTOGENERATED_TAG_PREFIX = "autogenerated:";
@@ -68,39 +70,75 @@
public static final String TAG_UPLOADED_WIP_PATCH_SET =
AUTOGENERATED_BY_GERRIT_TAG_PREFIX + "newWipPatchSet";
- public static ChangeMessage newMessage(ChangeContext ctx, String body, @Nullable String tag) {
- return newMessage(ctx.getChange().currentPatchSetId(), ctx.getUser(), ctx.getWhen(), body, tag);
+ private final AccountCache accountCache;
+
+ @Inject
+ ChangeMessagesUtil(AccountCache accountCache) {
+ this.accountCache = accountCache;
}
- public static ChangeMessage newMessage(
- PatchSet.Id psId, CurrentUser user, Timestamp when, String body, @Nullable String tag) {
- requireNonNull(psId);
- Account.Id accountId = user.isInternalUser() ? null : user.getAccountId();
- ChangeMessage m =
- new ChangeMessage(
- ChangeMessage.key(psId.changeId(), ChangeUtil.messageUuid()), accountId, when, psId);
- m.setMessage(body);
- m.setTag(tag);
- user.updateRealAccountId(m::setRealAuthor);
- return m;
+ /**
+ * Sets {@code messageTemplate} and {@code tag}, that should be applied by the {@code update}.
+ *
+ * <p>The {@code messageTemplate} is persisted in storage and should not contain user identifiable
+ * information. See {@link ChangeMessage}.
+ *
+ * @param update update that sets {@code messageTemplate}.
+ * @param messageTemplate message in template form, that should be applied by the update.
+ * @param tag tag that should be applied by the update.
+ * @return message built from {@code messageTemplate}. Templates are replaced, so it might contain
+ * user identifiable information.
+ */
+ public String setChangeMessage(
+ ChangeUpdate update, String messageTemplate, @Nullable String tag) {
+ update.setChangeMessage(messageTemplate);
+ update.setTag(tag);
+ return replaceTemplates(messageTemplate);
+ }
+
+ /** See {@link #setChangeMessage(ChangeUpdate, String, String)}. */
+ public String setChangeMessage(ChangeContext ctx, String messageTemplate, @Nullable String tag) {
+ return setChangeMessage(
+ ctx.getUpdate(ctx.getChange().currentPatchSetId()), messageTemplate, tag);
}
public static String uploadedPatchSetTag(boolean workInProgress) {
return workInProgress ? TAG_UPLOADED_WIP_PATCH_SET : TAG_UPLOADED_PATCH_SET;
}
- public List<ChangeMessage> byChange(ChangeNotes notes) {
- return notes.load().getChangeMessages();
+ public static String getAccountTemplate(Account.Id accountId) {
+ return String.format(ChangeMessage.ACCOUNT_TEMPLATE, accountId.get());
}
- public void addChangeMessage(ChangeUpdate update, ChangeMessage changeMessage) {
- checkState(
- Objects.equals(changeMessage.getAuthor(), update.getNullableAccountId()),
- "cannot store change message by %s in update by %s",
- changeMessage.getAuthor(),
- update.getNullableAccountId());
- update.setChangeMessage(changeMessage.getMessage());
- update.setTag(changeMessage.getTag());
+ /** Builds user-readable message from {@code messageTemplate}. See {@link ChangeMessage}. */
+ public String replaceTemplates(String messageTemplate) {
+ Matcher matcher = ChangeMessage.ACCOUNT_TEMPLATE_PATTERN.matcher(messageTemplate);
+ StringBuffer out = new StringBuffer();
+ while (matcher.find()) {
+ String accountId = matcher.group(1);
+ String unrecognizedAccount = "Unrecognized Gerrit Account " + accountId;
+ Optional<Account.Id> parsedAccountId = Account.Id.tryParse(accountId);
+ if (!parsedAccountId.isPresent()) {
+ matcher.appendReplacement(out, unrecognizedAccount);
+ continue;
+ }
+ Optional<AccountState> account = accountCache.get(parsedAccountId.get());
+ if (!account.isPresent()) {
+ matcher.appendReplacement(out, unrecognizedAccount);
+ continue;
+ }
+ matcher.appendReplacement(out, account.get().account().getNameEmail(unrecognizedAccount));
+ }
+ matcher.appendTail(out);
+ return out.toString();
+ }
+
+ /**
+ * Returns {@link ChangeMessage}s from {@link ChangeNotes}, loads {@link ChangeNotes} from data
+ * storage (cache or NoteDB), if it was not loaded yet.
+ */
+ public List<ChangeMessage> byChange(ChangeNotes notes) {
+ return notes.load().getChangeMessages();
}
/**
@@ -144,6 +182,23 @@
if (realAuthor != null) {
cmi.realAuthor = accountLoader.get(realAuthor);
}
+ cmi.accountsInMessage =
+ message.getAccountsInMessage().stream().map(accountLoader::get).collect(toImmutableSet());
return cmi;
}
+
+ /**
+ * {@link ChangeMessage} is served in template form to {@link
+ * com.google.gerrit.extensions.api.changes.ChangeApi}. Serve message with replaced templates to
+ * the legacy {@link com.google.gerrit.extensions.api.changes.ChangeMessageApi} endpoints.
+ * TODO(mariasavtchouk): remove this, after {@link
+ * com.google.gerrit.extensions.api.changes.ChangeMessageApi} is deprecated (gate with
+ * experiment).
+ */
+ public ChangeMessageInfo createChangeMessageInfoWithReplacedTemplates(
+ ChangeMessage message, AccountLoader accountLoader) {
+ ChangeMessageInfo changeMessageInfo = createChangeMessageInfo(message, accountLoader);
+ changeMessageInfo.message = replaceTemplates(message.getMessage());
+ return changeMessageInfo;
+ }
}
diff --git a/java/com/google/gerrit/server/PublishCommentsOp.java b/java/com/google/gerrit/server/PublishCommentsOp.java
index a2ce6fa..84afe8c 100644
--- a/java/com/google/gerrit/server/PublishCommentsOp.java
+++ b/java/com/google/gerrit/server/PublishCommentsOp.java
@@ -14,8 +14,8 @@
package com.google.gerrit.server;
+import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.HumanComment;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.entities.Project;
@@ -49,7 +49,6 @@
public class PublishCommentsOp implements BatchUpdateOp {
private final PatchSetUtil psUtil;
private final ChangeNotes.Factory changeNotesFactory;
- private final ChangeMessagesUtil cmUtil;
private final CommentAdded commentAdded;
private final CommentsUtil commentsUtil;
private final EmailReviewComments.Factory email;
@@ -57,9 +56,10 @@
private final Project.NameKey projectNameKey;
private final PatchSet.Id psId;
private final PublishCommentUtil publishCommentUtil;
+ private final ChangeMessagesUtil changeMessagesUtil;
private List<HumanComment> comments = new ArrayList<>();
- private ChangeMessage message;
+ private String mailMessage;
private IdentifiedUser user;
public interface Factory {
@@ -69,15 +69,14 @@
@Inject
public PublishCommentsOp(
ChangeNotes.Factory changeNotesFactory,
- ChangeMessagesUtil cmUtil,
CommentAdded commentAdded,
CommentsUtil commentsUtil,
EmailReviewComments.Factory email,
PatchSetUtil psUtil,
PublishCommentUtil publishCommentUtil,
+ ChangeMessagesUtil changeMessagesUtil,
@Assisted PatchSet.Id psId,
@Assisted Project.NameKey projectNameKey) {
- this.cmUtil = cmUtil;
this.changeNotesFactory = changeNotesFactory;
this.commentAdded = commentAdded;
this.commentsUtil = commentsUtil;
@@ -86,6 +85,7 @@
this.publishCommentUtil = publishCommentUtil;
this.psUtil = psUtil;
this.projectNameKey = projectNameKey;
+ this.changeMessagesUtil = changeMessagesUtil;
}
@Override
@@ -104,12 +104,12 @@
// We do it this way so that the execution results in 2 different commits in NoteDb
ChangeUpdate changeUpdate = ctx.getDistinctUpdate(psId);
publishCommentUtil.publish(ctx, changeUpdate, comments, null);
- return insertMessage(ctx, changeUpdate);
+ return insertMessage(changeUpdate);
}
@Override
public void postUpdate(PostUpdateContext ctx) {
- if (message == null || comments.isEmpty()) {
+ if (Strings.isNullOrEmpty(mailMessage) || comments.isEmpty()) {
return;
}
ChangeNotes changeNotes = changeNotesFactory.createChecked(projectNameKey, psId.changeId());
@@ -124,20 +124,30 @@
String.format("Repository %s not found", ctx.getProject().get()), ex);
}
email
- .create(notify, changeNotes, ps, user, message, comments, null, labelDelta, repoView)
+ .create(
+ notify,
+ changeNotes,
+ ps,
+ user,
+ mailMessage,
+ ctx.getWhen(),
+ comments,
+ null,
+ labelDelta,
+ repoView)
.sendAsync();
}
commentAdded.fire(
ctx.getChangeData(changeNotes),
ps,
ctx.getAccount(),
- message.getMessage(),
+ mailMessage,
ImmutableMap.of(),
ImmutableMap.of(),
ctx.getWhen());
}
- private boolean insertMessage(ChangeContext ctx, ChangeUpdate changeUpdate) {
+ private boolean insertMessage(ChangeUpdate changeUpdate) {
StringBuilder buf = new StringBuilder();
if (comments.size() == 1) {
buf.append("\n\n(1 comment)");
@@ -147,10 +157,9 @@
if (buf.length() == 0) {
return false;
}
- message =
- ChangeMessagesUtil.newMessage(
- psId, user, ctx.getWhen(), "Patch Set " + psId.get() + ":" + buf, null);
- cmUtil.addChangeMessage(changeUpdate, message);
+ mailMessage =
+ changeMessagesUtil.setChangeMessage(
+ changeUpdate, "Patch Set " + psId.get() + ":" + buf, null);
return true;
}
}
diff --git a/java/com/google/gerrit/server/WebLinks.java b/java/com/google/gerrit/server/WebLinks.java
index e66e7f5..4acef06 100644
--- a/java/com/google/gerrit/server/WebLinks.java
+++ b/java/com/google/gerrit/server/WebLinks.java
@@ -27,11 +27,13 @@
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.webui.BranchWebLink;
import com.google.gerrit.extensions.webui.DiffWebLink;
+import com.google.gerrit.extensions.webui.EditWebLink;
import com.google.gerrit.extensions.webui.FileHistoryWebLink;
import com.google.gerrit.extensions.webui.FileWebLink;
import com.google.gerrit.extensions.webui.ParentWebLink;
import com.google.gerrit.extensions.webui.PatchSetWebLink;
import com.google.gerrit.extensions.webui.ProjectWebLink;
+import com.google.gerrit.extensions.webui.ResolveConflictsWebLink;
import com.google.gerrit.extensions.webui.TagWebLink;
import com.google.gerrit.extensions.webui.WebLink;
import com.google.inject.Inject;
@@ -55,7 +57,9 @@
};
private final DynamicSet<PatchSetWebLink> patchSetLinks;
+ private final DynamicSet<ResolveConflictsWebLink> resolveConflictsLinks;
private final DynamicSet<ParentWebLink> parentLinks;
+ private final DynamicSet<EditWebLink> editLinks;
private final DynamicSet<FileWebLink> fileLinks;
private final DynamicSet<FileHistoryWebLink> fileHistoryLinks;
private final DynamicSet<DiffWebLink> diffLinks;
@@ -66,7 +70,9 @@
@Inject
public WebLinks(
DynamicSet<PatchSetWebLink> patchSetLinks,
+ DynamicSet<ResolveConflictsWebLink> resolveConflictsLinks,
DynamicSet<ParentWebLink> parentLinks,
+ DynamicSet<EditWebLink> editLinks,
DynamicSet<FileWebLink> fileLinks,
DynamicSet<FileHistoryWebLink> fileLogLinks,
DynamicSet<DiffWebLink> diffLinks,
@@ -74,7 +80,9 @@
DynamicSet<BranchWebLink> branchLinks,
DynamicSet<TagWebLink> tagLinks) {
this.patchSetLinks = patchSetLinks;
+ this.resolveConflictsLinks = resolveConflictsLinks;
this.parentLinks = parentLinks;
+ this.editLinks = editLinks;
this.fileLinks = fileLinks;
this.fileHistoryLinks = fileLogLinks;
this.diffLinks = diffLinks;
@@ -99,6 +107,21 @@
/**
* @param project Project name.
+ * @param revision SHA1 of commit.
+ * @param commitMessage the commit message of the commit.
+ * @param branchName branch of the commit.
+ * @return Links for resolving comflicts.
+ */
+ public ImmutableList<WebLinkInfo> getResolveConflictsLinks(
+ Project.NameKey project, String commit, String commitMessage, String branchName) {
+ return filterLinks(
+ resolveConflictsLinks,
+ webLink ->
+ webLink.getResolveConflictsWebLink(project.get(), commit, commitMessage, branchName));
+ }
+
+ /**
+ * @param project Project name.
* @param revision SHA1 of the parent revision.
* @param commitMessage the commit message of the parent revision.
* @param branchName branch of the revision (and parent revision).
@@ -115,6 +138,18 @@
* @param project Project name.
* @param revision SHA1 of revision.
* @param file File name.
+ * @return Links for editing.
+ */
+ public ImmutableList<WebLinkInfo> getEditLinks(String project, String revision, String file) {
+ return Patch.isMagic(file)
+ ? ImmutableList.of()
+ : filterLinks(editLinks, webLink -> webLink.getEditWebLink(project, revision, file));
+ }
+
+ /**
+ * @param project Project name.
+ * @param revision SHA1 of revision.
+ * @param file File name.
* @return Links for files.
*/
public ImmutableList<WebLinkInfo> getFileLinks(String project, String revision, String file) {
diff --git a/java/com/google/gerrit/server/account/AccountsUpdate.java b/java/com/google/gerrit/server/account/AccountsUpdate.java
index 9d702e6..5a74047 100644
--- a/java/com/google/gerrit/server/account/AccountsUpdate.java
+++ b/java/com/google/gerrit/server/account/AccountsUpdate.java
@@ -14,13 +14,16 @@
package com.google.gerrit.server.account;
+import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toSet;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Strings;
import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.gerrit.entities.Account;
import com.google.gerrit.exceptions.DuplicateKeyException;
@@ -47,6 +50,7 @@
import com.google.inject.assistedinject.AssistedInject;
import java.io.IOException;
import java.sql.Timestamp;
+import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
@@ -64,8 +68,8 @@
* <p>This class should be used for all account updates. See {@link AccountDelta} for what can be
* updated.
*
- * <p>Updates to one account are always atomic. Batch updating several accounts within one
- * transaction is not supported.
+ * <p>Batch updates of multiple different accounts can be performed atomically, see {@link
+ * #updateBatch(List)}. Batch creation is not supported.
*
* <p>For any account update the caller must provide a commit message, the account ID and an {@link
* ConfigureDeltaFromState}. The account updater reads the current {@link AccountState} and prepares
@@ -163,6 +167,20 @@
void configure(AccountState accountState, AccountDelta.Builder delta) throws IOException;
}
+ /** Data holder for the set of arguments required to update an account. Used for batch updates. */
+ public static class UpdateArguments {
+ private final String message;
+ private final Account.Id accountId;
+ private final ConfigureDeltaFromState configureDeltaFromState;
+
+ public UpdateArguments(
+ String message, Account.Id accountId, ConfigureDeltaFromState configureDeltaFromState) {
+ this.message = message;
+ this.accountId = accountId;
+ this.configureDeltaFromState = configureDeltaFromState;
+ }
+ }
+
private final GitRepositoryManager repoManager;
private final GitReferenceUpdated gitRefUpdated;
private final Optional<IdentifiedUser> currentUser;
@@ -180,6 +198,9 @@
/** Invoked after updating the account but before committing the changes. */
private final Runnable beforeCommit;
+ /** Single instance that accumulates updates from the batch. */
+ private ExternalIdNotes externalIdNotes;
+
private static final Runnable DO_NOTHING = () -> {};
@AssistedInject
@@ -306,24 +327,28 @@
public AccountState insert(String message, Account.Id accountId, ConfigureDeltaFromState init)
throws IOException, ConfigInvalidException {
return execute(
- repo -> {
- AccountConfig accountConfig = read(repo, accountId);
- Account account =
- accountConfig.getNewAccount(new Timestamp(committerIdent.getWhen().getTime()));
- AccountState accountState = AccountState.forAccount(account);
- AccountDelta.Builder deltaBuilder = AccountDelta.builder();
- init.configure(accountState, deltaBuilder);
+ ImmutableList.of(
+ repo -> {
+ AccountConfig accountConfig = read(repo, accountId);
+ Account account =
+ accountConfig.getNewAccount(
+ new Timestamp(committerIdent.getWhen().getTime()));
+ AccountState accountState = AccountState.forAccount(account);
+ AccountDelta.Builder deltaBuilder = AccountDelta.builder();
+ init.configure(accountState, deltaBuilder);
- AccountDelta update = deltaBuilder.build();
- accountConfig.setAccountDelta(update);
- ExternalIdNotes extIdNotes =
- createExternalIdNotes(repo, accountConfig.getExternalIdsRev(), accountId, update);
- CachedPreferences defaultPreferences =
- CachedPreferences.fromConfig(VersionedDefaultPreferences.get(repo, allUsersName));
+ AccountDelta accountDelta = deltaBuilder.build();
+ accountConfig.setAccountDelta(accountDelta);
+ externalIdNotes =
+ createExternalIdNotes(
+ repo, accountConfig.getExternalIdsRev(), accountId, accountDelta);
+ CachedPreferences defaultPreferences =
+ CachedPreferences.fromConfig(
+ VersionedDefaultPreferences.get(repo, allUsersName));
- return new UpdatedAccount(
- message, accountConfig, extIdNotes, defaultPreferences, true);
- })
+ return new UpdatedAccount(message, accountConfig, defaultPreferences, true);
+ }))
+ .get(0)
.get();
}
@@ -333,7 +358,7 @@
*/
public Optional<AccountState> update(
String message, Account.Id accountId, Consumer<AccountDelta.Builder> update)
- throws LockFailureException, IOException, ConfigInvalidException {
+ throws IOException, ConfigInvalidException {
return update(message, accountId, fromConsumer(update));
}
@@ -355,30 +380,66 @@
public Optional<AccountState> update(
String message, Account.Id accountId, ConfigureDeltaFromState configureDeltaFromState)
throws LockFailureException, IOException, ConfigInvalidException {
- return execute(
- repo -> {
- AccountConfig accountConfig = read(repo, accountId);
- CachedPreferences defaultPreferences =
- CachedPreferences.fromConfig(VersionedDefaultPreferences.get(repo, allUsersName));
- Optional<AccountState> account =
- AccountState.fromAccountConfig(externalIds, accountConfig, defaultPreferences);
- if (!account.isPresent()) {
- return null;
- }
+ return updateBatch(
+ ImmutableList.of(new UpdateArguments(message, accountId, configureDeltaFromState)))
+ .get(0);
+ }
- AccountDelta.Builder deltaBuilder = AccountDelta.builder();
- configureDeltaFromState.configure(account.get(), deltaBuilder);
+ private ExecutableUpdate createExecutableUpdate(UpdateArguments updateArguments) {
+ return repo -> {
+ AccountConfig accountConfig = read(repo, updateArguments.accountId);
+ CachedPreferences defaultPreferences =
+ CachedPreferences.fromConfig(VersionedDefaultPreferences.get(repo, allUsersName));
+ Optional<AccountState> accountState =
+ AccountState.fromAccountConfig(externalIds, accountConfig, defaultPreferences);
+ if (!accountState.isPresent()) {
+ return null;
+ }
- AccountDelta delta = deltaBuilder.build();
- accountConfig.setAccountDelta(delta);
- ExternalIdNotes extIdNotes =
- createExternalIdNotes(repo, accountConfig.getExternalIdsRev(), accountId, delta);
- CachedPreferences cachedDefaultPreferences =
- CachedPreferences.fromConfig(VersionedDefaultPreferences.get(repo, allUsersName));
+ AccountDelta.Builder deltaBuilder = AccountDelta.builder();
+ updateArguments.configureDeltaFromState.configure(accountState.get(), deltaBuilder);
- return new UpdatedAccount(
- message, accountConfig, extIdNotes, cachedDefaultPreferences, false);
- });
+ AccountDelta delta = deltaBuilder.build();
+ accountConfig.setAccountDelta(delta);
+ ExternalIdNotes.checkSameAccount(
+ Iterables.concat(
+ delta.getCreatedExternalIds(),
+ delta.getUpdatedExternalIds(),
+ delta.getDeletedExternalIds()),
+ updateArguments.accountId);
+
+ if (externalIdNotes == null) {
+ externalIdNotes =
+ extIdNotesLoader.load(
+ repo, accountConfig.getExternalIdsRev().orElse(ObjectId.zeroId()));
+ }
+ externalIdNotes.replace(delta.getDeletedExternalIds(), delta.getCreatedExternalIds());
+ externalIdNotes.upsert(delta.getUpdatedExternalIds());
+
+ CachedPreferences cachedDefaultPreferences =
+ CachedPreferences.fromConfig(VersionedDefaultPreferences.get(repo, allUsersName));
+
+ return new UpdatedAccount(
+ updateArguments.message, accountConfig, cachedDefaultPreferences, false);
+ };
+ }
+
+ /**
+ * Updates multiple different accounts atomically. This will only store a single new value (aka
+ * set of all external IDs of the host) in the external ID cache, which is important for storage
+ * economy. All {@code updates} must be for different accounts.
+ *
+ * <p>NOTE on error handling: Since updates are executed in multiple stages, with some stages
+ * resulting from the union of all individual updates, we cannot point to the update that caused
+ * the error. Callers should be aware that a single "update of death" (or a set of updates that
+ * together have this property) will always prevent the entire batch from being executed.
+ */
+ public ImmutableList<Optional<AccountState>> updateBatch(List<UpdateArguments> updates)
+ throws IOException, ConfigInvalidException {
+ checkArgument(
+ updates.stream().map(u -> u.accountId.get()).distinct().count() == updates.size(),
+ "updates must all be for different accounts");
+ return execute(updates.stream().map(this::createExecutableUpdate).collect(toList()));
}
private AccountConfig read(Repository allUsersRepo, Account.Id accountId)
@@ -388,26 +449,35 @@
return accountConfig;
}
- private Optional<AccountState> execute(ExecutableUpdate executableUpdate)
+ private ImmutableList<Optional<AccountState>> execute(List<ExecutableUpdate> executableUpdates)
throws IOException, ConfigInvalidException {
- return executeWithRetry(
+ List<Optional<AccountState>> accountState = new ArrayList<>();
+ List<UpdatedAccount> updatedAccounts = new ArrayList<>();
+ executeWithRetry(
() -> {
- try (Repository allUsersRepo = repoManager.openRepository(allUsersName)) {
- UpdatedAccount updatedAccount = executableUpdate.execute(allUsersRepo);
- if (updatedAccount == null) {
- return Optional.empty();
- }
+ // Reset state for retry.
+ externalIdNotes = null;
+ accountState.clear();
+ updatedAccounts.clear();
- commit(allUsersRepo, updatedAccount);
- return Optional.of(updatedAccount.getAccountState());
+ try (Repository allUsersRepo = repoManager.openRepository(allUsersName)) {
+ for (ExecutableUpdate executableUpdate : executableUpdates) {
+ updatedAccounts.add(executableUpdate.execute(allUsersRepo));
+ }
+ commit(
+ allUsersRepo, updatedAccounts.stream().filter(Objects::nonNull).collect(toList()));
+ for (UpdatedAccount ua : updatedAccounts) {
+ accountState.add(ua == null ? Optional.empty() : ua.getAccountState());
+ }
}
+ return null;
});
+ return ImmutableList.copyOf(accountState);
}
- private Optional<AccountState> executeWithRetry(Action<Optional<AccountState>> action)
- throws IOException, ConfigInvalidException {
+ private void executeWithRetry(Action<Void> action) throws IOException, ConfigInvalidException {
try {
- return retryHelper.accountUpdate("updateAccount", action).call();
+ retryHelper.accountUpdate("updateAccount", action).call();
} catch (Exception e) {
Throwables.throwIfUnchecked(e);
Throwables.throwIfInstanceOf(e, IOException.class);
@@ -432,31 +502,40 @@
return extIdNotes;
}
- private void commit(Repository allUsersRepo, UpdatedAccount updatedAccount) throws IOException {
+ private void commit(Repository allUsersRepo, List<UpdatedAccount> updatedAccounts)
+ throws IOException {
+ if (updatedAccounts.isEmpty()) {
+ return;
+ }
+
beforeCommit.run();
BatchRefUpdate batchRefUpdate = allUsersRepo.getRefDatabase().newBatchUpdate();
- if (updatedAccount.created) {
- commitNewAccountConfig(
- updatedAccount.message, allUsersRepo, batchRefUpdate, updatedAccount.accountConfig);
- } else {
+ for (UpdatedAccount updatedAccount : updatedAccounts) {
+ // These updates are all for different refs (because batches never update the same account
+ // more than once), so there can be multiple commits in the same batch, all with the same base
+ // revision in their AccountConfig.
commitAccountConfig(
updatedAccount.message,
allUsersRepo,
batchRefUpdate,
updatedAccount.accountConfig,
- false);
- }
+ updatedAccount.created /* allowEmptyCommit */);
+ // When creating a new account we must allow empty commits so that the user branch gets
+ // created with an empty commit when no account properties are set and hence no
+ // 'account.config' file will be created.
- commitExternalIdUpdates(
- updatedAccount.message, allUsersRepo, batchRefUpdate, updatedAccount.externalIdNotes);
+ // These update the same ref, so they need to be stacked on top of one another using the same
+ // ExternalIdNotes instance.
+ commitExternalIdUpdates(updatedAccount.message, allUsersRepo, batchRefUpdate);
+ }
RefUpdateUtil.executeChecked(batchRefUpdate, allUsersRepo);
Set<Account.Id> accountsToSkipForReindex = getUpdatedAccountIds(batchRefUpdate);
extIdNotesLoader.updateExternalIdCacheAndMaybeReindexAccounts(
- updatedAccount.externalIdNotes, accountsToSkipForReindex);
+ externalIdNotes, accountsToSkipForReindex);
gitRefUpdated.fire(
allUsersName, batchRefUpdate, currentUser.map(IdentifiedUser::state).orElse(null));
@@ -469,18 +548,6 @@
.collect(toSet());
}
- private void commitNewAccountConfig(
- String message,
- Repository allUsersRepo,
- BatchRefUpdate batchRefUpdate,
- AccountConfig accountConfig)
- throws IOException {
- // When creating a new account we must allow empty commits so that the user branch gets created
- // with an empty commit when no account properties are set and hence no 'account.config' file
- // will be created.
- commitAccountConfig(message, allUsersRepo, batchRefUpdate, accountConfig, true);
- }
-
private void commitAccountConfig(
String message,
Repository allUsersRepo,
@@ -495,13 +562,9 @@
}
private void commitExternalIdUpdates(
- String message,
- Repository allUsersRepo,
- BatchRefUpdate batchRefUpdate,
- ExternalIdNotes extIdNotes)
- throws IOException {
+ String message, Repository allUsersRepo, BatchRefUpdate batchRefUpdate) throws IOException {
try (MetaDataUpdate md = createMetaDataUpdate(message, allUsersRepo, batchRefUpdate)) {
- extIdNotes.commit(md);
+ externalIdNotes.commit(md);
}
}
@@ -527,28 +590,24 @@
private class UpdatedAccount {
final String message;
final AccountConfig accountConfig;
- final ExternalIdNotes externalIdNotes;
final CachedPreferences defaultPreferences;
final boolean created;
UpdatedAccount(
String message,
AccountConfig accountConfig,
- ExternalIdNotes externalIdNotes,
CachedPreferences defaultPreferences,
boolean created) {
checkState(!Strings.isNullOrEmpty(message), "message for account update must be set");
this.message = requireNonNull(message);
this.accountConfig = requireNonNull(accountConfig);
- this.externalIdNotes = requireNonNull(externalIdNotes);
this.defaultPreferences = defaultPreferences;
this.created = created;
}
- AccountState getAccountState() throws IOException {
+ Optional<AccountState> getAccountState() throws IOException {
return AccountState.fromAccountConfig(
- externalIds, accountConfig, externalIdNotes, defaultPreferences)
- .get();
+ externalIds, accountConfig, externalIdNotes, defaultPreferences);
}
}
}
diff --git a/java/com/google/gerrit/server/account/externalids/ExternalIdNotes.java b/java/com/google/gerrit/server/account/externalids/ExternalIdNotes.java
index 5d00ca5..e403a5b 100644
--- a/java/com/google/gerrit/server/account/externalids/ExternalIdNotes.java
+++ b/java/com/google/gerrit/server/account/externalids/ExternalIdNotes.java
@@ -175,6 +175,7 @@
// Reset instance state.
externalIdNotes.cacheUpdates.clear();
+ externalIdNotes.keysToAdd.clear();
externalIdNotes.oldRev = null;
}
@@ -294,6 +295,17 @@
/** Staged cache updates that should be executed after external ID changes have been committed. */
private final List<CacheUpdate> cacheUpdates = new ArrayList<>();
+ /**
+ * When performing batch updates (cf. {@link AccountsUpdate#updateBatch(List)} we need to ensure
+ * the batch does not introduce duplicates. In addition to checking against the status quo in
+ * {@link #noteMap} (cf. {@link #checkExternalIdKeysDontExist(Collection)}), which is sufficient
+ * for single updates, we also need to check for duplicates among the batch updates. As the actual
+ * updates are computed lazily just before applying them, we unfortunately need to track keys
+ * explicitly here even though they are already implicit in the lambdas that constitute the
+ * updates.
+ */
+ private final Set<ExternalId.Key> keysToAdd = new HashSet<>();
+
private Runnable afterReadRevision;
private boolean readOnly = false;
private boolean noCacheUpdate = false;
@@ -482,6 +494,7 @@
}
});
cacheUpdates.add(cu -> cu.add(newExtIds));
+ incrementalDuplicateDetection(extIds);
}
/**
@@ -510,6 +523,7 @@
}
});
cacheUpdates.add(cu -> cu.remove(removedExtIds).add(updatedExtIds));
+ incrementalDuplicateDetection(extIds);
}
/**
@@ -624,6 +638,7 @@
}
});
cacheUpdates.add(cu -> cu.add(updatedExtIds).remove(removedExtIds));
+ incrementalDuplicateDetection(toAdd);
}
/**
@@ -656,6 +671,7 @@
}
});
cacheUpdates.add(cu -> cu.add(updatedExtIds).remove(removedExtIds));
+ incrementalDuplicateDetection(toAdd);
}
/**
@@ -788,6 +804,17 @@
return accountId;
}
+ private void incrementalDuplicateDetection(Collection<ExternalId> externalIds) {
+ externalIds.stream()
+ .map(ExternalId::key)
+ .forEach(
+ key -> {
+ if (!keysToAdd.add(key)) {
+ throw new DuplicateExternalIdKeyException(key);
+ }
+ });
+ }
+
/**
* Insert or updates an new external ID and sets it in the note map.
*
@@ -926,15 +953,15 @@
}
private static class ExternalIdCacheUpdates {
- private final Set<ExternalId> added = new HashSet<>();
- private final Set<ExternalId> removed = new HashSet<>();
+ final Set<ExternalId> added = new HashSet<>();
+ final Set<ExternalId> removed = new HashSet<>();
ExternalIdCacheUpdates add(Collection<ExternalId> extIds) {
this.added.addAll(extIds);
return this;
}
- public Set<ExternalId> getAdded() {
+ Set<ExternalId> getAdded() {
return ImmutableSet.copyOf(added);
}
@@ -943,7 +970,7 @@
return this;
}
- public Set<ExternalId> getRemoved() {
+ Set<ExternalId> getRemoved() {
return ImmutableSet.copyOf(removed);
}
}
diff --git a/java/com/google/gerrit/server/change/AbandonOp.java b/java/com/google/gerrit/server/change/AbandonOp.java
index f88e6a9..10e1f92 100644
--- a/java/com/google/gerrit/server/change/AbandonOp.java
+++ b/java/com/google/gerrit/server/change/AbandonOp.java
@@ -18,7 +18,6 @@
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.server.ChangeMessagesUtil;
@@ -50,7 +49,7 @@
private Change change;
private PatchSet patchSet;
- private ChangeMessage message;
+ private String mailMessage;
public interface Factory {
AbandonOp create(
@@ -94,20 +93,18 @@
change.setLastUpdatedOn(ctx.getWhen());
update.setStatus(change.getStatus());
- message = newMessage(ctx);
- cmUtil.addChangeMessage(update, message);
+ mailMessage = cmUtil.setChangeMessage(ctx, commentMessage(), ChangeMessagesUtil.TAG_ABANDON);
return true;
}
- private ChangeMessage newMessage(ChangeContext ctx) {
+ private String commentMessage() {
StringBuilder msg = new StringBuilder();
msg.append("Abandoned");
if (!Strings.nullToEmpty(msgTxt).trim().isEmpty()) {
msg.append("\n\n");
msg.append(msgTxt.trim());
}
-
- return ChangeMessagesUtil.newMessage(ctx, msg.toString(), ChangeMessagesUtil.TAG_ABANDON);
+ return msg.toString();
}
@Override
@@ -119,7 +116,7 @@
if (accountState != null) {
emailSender.setFrom(accountState.account().id());
}
- emailSender.setChangeMessage(message.getMessage(), ctx.getWhen());
+ emailSender.setChangeMessage(mailMessage, ctx.getWhen());
emailSender.setNotify(notify);
emailSender.setMessageId(
messageIdGenerator.fromChangeUpdate(ctx.getRepoView(), patchSet.id()));
diff --git a/java/com/google/gerrit/server/change/ChangeInserter.java b/java/com/google/gerrit/server/change/ChangeInserter.java
index 22bbd82..c067fcb 100644
--- a/java/com/google/gerrit/server/change/ChangeInserter.java
+++ b/java/com/google/gerrit/server/change/ChangeInserter.java
@@ -32,7 +32,6 @@
import com.google.gerrit.entities.Account;
import com.google.gerrit.entities.BranchNameKey;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.LabelType;
import com.google.gerrit.entities.LabelTypes;
import com.google.gerrit.entities.PatchSet;
@@ -144,7 +143,7 @@
// Fields set during the insertion process.
private ReceiveCommand cmd;
private Change change;
- private ChangeMessage changeMessage;
+ private String changeMessage;
private PatchSetInfo patchSetInfo;
private PatchSet patchSet;
private String pushCert;
@@ -362,7 +361,7 @@
return this;
}
- public ChangeMessage getChangeMessage() {
+ public String getChangeMessage() {
if (message == null) {
return null;
}
@@ -465,13 +464,8 @@
}
if (message != null) {
changeMessage =
- ChangeMessagesUtil.newMessage(
- patchSet.id(),
- ctx.getUser(),
- patchSet.createdOn(),
- message,
- ChangeMessagesUtil.uploadedPatchSetTag(workInProgress));
- cmUtil.addChangeMessage(update, changeMessage);
+ cmUtil.setChangeMessage(
+ update, message, ChangeMessagesUtil.uploadedPatchSetTag(workInProgress));
}
return true;
}
diff --git a/java/com/google/gerrit/server/change/DeleteReviewerByEmailOp.java b/java/com/google/gerrit/server/change/DeleteReviewerByEmailOp.java
index 839d7f1..b512a2d 100644
--- a/java/com/google/gerrit/server/change/DeleteReviewerByEmailOp.java
+++ b/java/com/google/gerrit/server/change/DeleteReviewerByEmailOp.java
@@ -17,11 +17,11 @@
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.entities.Address;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.PatchSet;
-import com.google.gerrit.server.ChangeUtil;
+import com.google.gerrit.server.ChangeMessagesUtil;
import com.google.gerrit.server.mail.send.DeleteReviewerSender;
import com.google.gerrit.server.mail.send.MessageIdGenerator;
+import com.google.gerrit.server.notedb.ChangeUpdate;
import com.google.gerrit.server.update.ChangeContext;
import com.google.gerrit.server.update.PostUpdateContext;
import com.google.inject.Inject;
@@ -37,19 +37,21 @@
private final DeleteReviewerSender.Factory deleteReviewerSenderFactory;
private final MessageIdGenerator messageIdGenerator;
+ private final ChangeMessagesUtil changeMessagesUtil;
private final Address reviewer;
-
- private ChangeMessage changeMessage;
+ private String mailMessage;
private Change change;
@Inject
DeleteReviewerByEmailOp(
DeleteReviewerSender.Factory deleteReviewerSenderFactory,
MessageIdGenerator messageIdGenerator,
+ ChangeMessagesUtil changeMessagesUtil,
@Assisted Address reviewer) {
this.deleteReviewerSenderFactory = deleteReviewerSenderFactory;
this.messageIdGenerator = messageIdGenerator;
+ this.changeMessagesUtil = changeMessagesUtil;
this.reviewer = reviewer;
}
@@ -57,17 +59,14 @@
public boolean updateChange(ChangeContext ctx) {
change = ctx.getChange();
PatchSet.Id psId = ctx.getChange().currentPatchSetId();
+ ChangeUpdate update = ctx.getUpdate(psId);
+ update.removeReviewerByEmail(reviewer);
+ // The reviewer is not a registered Gerrit user, thus the email address can be used in
+ // ChangeMessage without replacement (it does not classify as Gerrit user identifiable
+ // information).
String msg = "Removed reviewer " + reviewer;
- changeMessage =
- new ChangeMessage(
- ChangeMessage.key(change.getId(), ChangeUtil.messageUuid()),
- ctx.getAccountId(),
- ctx.getWhen(),
- psId);
- changeMessage.setMessage(msg);
-
- ctx.getUpdate(psId).setChangeMessage(msg);
- ctx.getUpdate(psId).removeReviewerByEmail(reviewer);
+ mailMessage =
+ changeMessagesUtil.setChangeMessage(ctx, msg, ChangeMessagesUtil.TAG_DELETE_REVIEWER);
return true;
}
@@ -84,7 +83,7 @@
deleteReviewerSenderFactory.create(ctx.getProject(), change.getId());
emailSender.setFrom(ctx.getAccountId());
emailSender.addReviewersByEmail(Collections.singleton(reviewer));
- emailSender.setChangeMessage(changeMessage.getMessage(), changeMessage.getWrittenOn());
+ emailSender.setChangeMessage(mailMessage, ctx.getWhen());
emailSender.setNotify(notify);
emailSender.setMessageId(
messageIdGenerator.fromChangeUpdate(ctx.getRepoView(), change.currentPatchSetId()));
diff --git a/java/com/google/gerrit/server/change/DeleteReviewerOp.java b/java/com/google/gerrit/server/change/DeleteReviewerOp.java
index 095a19b..64472ea 100644
--- a/java/com/google/gerrit/server/change/DeleteReviewerOp.java
+++ b/java/com/google/gerrit/server/change/DeleteReviewerOp.java
@@ -20,7 +20,6 @@
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.entities.Account;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.LabelType;
import com.google.gerrit.entities.LabelTypes;
import com.google.gerrit.entities.PatchSetApproval;
@@ -51,6 +50,7 @@
import com.google.inject.Provider;
import com.google.inject.assistedinject.Assisted;
import java.io.IOException;
+import java.sql.Timestamp;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -65,7 +65,6 @@
private final ApprovalsUtil approvalsUtil;
private final PatchSetUtil psUtil;
private final ChangeMessagesUtil cmUtil;
- private final IdentifiedUser.GenericFactory userFactory;
private final ReviewerDeleted reviewerDeleted;
private final Provider<IdentifiedUser> user;
private final DeleteReviewerSender.Factory deleteReviewerSenderFactory;
@@ -77,7 +76,7 @@
private final Account reviewer;
private final DeleteReviewerInput input;
- ChangeMessage changeMessage;
+ String mailMessage;
Change currChange;
Map<String, Short> newApprovals = new HashMap<>();
Map<String, Short> oldApprovals = new HashMap<>();
@@ -87,7 +86,6 @@
ApprovalsUtil approvalsUtil,
PatchSetUtil psUtil,
ChangeMessagesUtil cmUtil,
- IdentifiedUser.GenericFactory userFactory,
ReviewerDeleted reviewerDeleted,
Provider<IdentifiedUser> user,
DeleteReviewerSender.Factory deleteReviewerSenderFactory,
@@ -100,7 +98,6 @@
this.approvalsUtil = approvalsUtil;
this.psUtil = psUtil;
this.cmUtil = cmUtil;
- this.userFactory = userFactory;
this.reviewerDeleted = reviewerDeleted;
this.user = user;
this.deleteReviewerSenderFactory = deleteReviewerSenderFactory;
@@ -145,7 +142,9 @@
? "cc"
: "reviewer";
StringBuilder msg = new StringBuilder();
- msg.append(String.format("Removed %s %s", ccOrReviewer, reviewer.fullName()));
+ msg.append(
+ String.format(
+ "Removed %s %s", ccOrReviewer, ChangeMessagesUtil.getAccountTemplate(reviewer.id())));
StringBuilder removedVotesMsg = new StringBuilder();
removedVotesMsg.append(" with the following votes:\n\n");
boolean votesRemoved = false;
@@ -159,7 +158,7 @@
.append(a.label())
.append(formatLabelValue(a.value()))
.append(" by ")
- .append(userFactory.create(a.accountId()).getNameEmail())
+ .append(ChangeMessagesUtil.getAccountTemplate(a.accountId()))
.append("\n");
votesRemoved = true;
}
@@ -173,10 +172,8 @@
ChangeUpdate update = ctx.getUpdate(patchSet.id());
update.removeReviewer(reviewerId);
- changeMessage =
- ChangeMessagesUtil.newMessage(ctx, msg.toString(), ChangeMessagesUtil.TAG_DELETE_REVIEWER);
- cmUtil.addChangeMessage(update, changeMessage);
-
+ mailMessage =
+ cmUtil.setChangeMessage(ctx, msg.toString(), ChangeMessagesUtil.TAG_DELETE_REVIEWER);
return true;
}
@@ -196,7 +193,8 @@
}
try {
if (notify.shouldNotify()) {
- emailReviewers(ctx.getProject(), currChange, changeMessage, notify, ctx.getRepoView());
+ emailReviewers(
+ ctx.getProject(), currChange, mailMessage, ctx.getWhen(), notify, ctx.getRepoView());
}
} catch (Exception err) {
logger.atSevere().withCause(err).log(
@@ -208,7 +206,7 @@
patchSet,
accountCache.get(reviewer.id()).orElse(AccountState.forAccount(reviewer)),
ctx.getAccount(),
- changeMessage.getMessage(),
+ mailMessage,
newApprovals,
oldApprovals,
notify.handling(),
@@ -231,7 +229,8 @@
private void emailReviewers(
Project.NameKey projectName,
Change change,
- ChangeMessage changeMessage,
+ String mailMessage,
+ Timestamp timestamp,
NotifyResolver.Result notify,
RepoView repoView)
throws EmailException {
@@ -244,7 +243,7 @@
deleteReviewerSenderFactory.create(projectName, change.getId());
emailSender.setFrom(userId);
emailSender.addReviewers(Collections.singleton(reviewer.id()));
- emailSender.setChangeMessage(changeMessage.getMessage(), changeMessage.getWrittenOn());
+ emailSender.setChangeMessage(mailMessage, timestamp);
emailSender.setNotify(notify);
emailSender.setMessageId(
messageIdGenerator.fromChangeUpdate(repoView, change.currentPatchSetId()));
diff --git a/java/com/google/gerrit/server/change/EmailReviewComments.java b/java/com/google/gerrit/server/change/EmailReviewComments.java
index cacfbe7..d433c4e 100644
--- a/java/com/google/gerrit/server/change/EmailReviewComments.java
+++ b/java/com/google/gerrit/server/change/EmailReviewComments.java
@@ -18,7 +18,6 @@
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.common.Nullable;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.Comment;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.server.CurrentUser;
@@ -34,6 +33,7 @@
import com.google.gerrit.server.util.ThreadLocalRequestContext;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
+import java.sql.Timestamp;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
@@ -49,9 +49,9 @@
* @param notes change notes.
* @param patchSet patch set corresponding to the top-level op
* @param user user the email should come from.
- * @param message used by text template only: the full ChangeMessage that will go in the
- * database. The contents of this message typically include the "Patch set N" header and "(M
- * comments)".
+ * @param message used by text template only. The contents of this message typically include the
+ * "Patch set N" header and "(M comments)".
+ * @param timestamp timestamp when the comments were added.
* @param comments inline comments.
* @param patchSetComment used by HTML template only: some quasi-human-generated text. The
* contents should *not* include a "Patch set N" header or "(M comments)" footer, as these
@@ -64,9 +64,10 @@
ChangeNotes notes,
PatchSet patchSet,
IdentifiedUser user,
- ChangeMessage message,
+ @Assisted("message") String message,
+ Timestamp timestamp,
List<? extends Comment> comments,
- String patchSetComment,
+ @Assisted("patchSetComment") String patchSetComment,
List<LabelVote> labels,
RepoView repoView);
}
@@ -81,7 +82,8 @@
private final ChangeNotes notes;
private final PatchSet patchSet;
private final IdentifiedUser user;
- private final ChangeMessage message;
+ private final String message;
+ private final Timestamp timestamp;
private final List<? extends Comment> comments;
private final String patchSetComment;
private final List<LabelVote> labels;
@@ -98,9 +100,10 @@
@Assisted ChangeNotes notes,
@Assisted PatchSet patchSet,
@Assisted IdentifiedUser user,
- @Assisted ChangeMessage message,
+ @Assisted("message") String message,
+ @Assisted Timestamp timestamp,
@Assisted List<? extends Comment> comments,
- @Nullable @Assisted String patchSetComment,
+ @Nullable @Assisted("patchSetComment") String patchSetComment,
@Assisted List<LabelVote> labels,
@Assisted RepoView repoView) {
this.sendEmailsExecutor = executor;
@@ -113,6 +116,7 @@
this.patchSet = patchSet;
this.user = user;
this.message = message;
+ this.timestamp = timestamp;
this.comments = COMMENT_ORDER.sortedCopy(comments);
this.patchSetComment = patchSetComment;
this.labels = labels;
@@ -132,7 +136,7 @@
commentSenderFactory.create(notes.getProjectName(), notes.getChangeId());
emailSender.setFrom(user.getAccountId());
emailSender.setPatchSet(patchSet, patchSetInfoFactory.get(notes.getProjectName(), patchSet));
- emailSender.setChangeMessage(message.getMessage(), message.getWrittenOn());
+ emailSender.setChangeMessage(message, timestamp);
emailSender.setComments(comments);
emailSender.setPatchSetComment(patchSetComment);
emailSender.setLabels(labels);
diff --git a/java/com/google/gerrit/server/change/PatchSetInserter.java b/java/com/google/gerrit/server/change/PatchSetInserter.java
index df206bd..647fdf0 100644
--- a/java/com/google/gerrit/server/change/PatchSetInserter.java
+++ b/java/com/google/gerrit/server/change/PatchSetInserter.java
@@ -23,7 +23,6 @@
import com.google.common.collect.ImmutableListMultimap;
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.entities.PatchSetInfo;
import com.google.gerrit.extensions.api.changes.NotifyHandling;
@@ -110,7 +109,7 @@
private Change change;
private PatchSet patchSet;
private PatchSetInfo patchSetInfo;
- private ChangeMessage changeMessage;
+ private String mailMessage;
private ReviewerSet oldReviewers;
private boolean oldWorkInProgressState;
@@ -260,14 +259,9 @@
}
if (message != null) {
- changeMessage =
- ChangeMessagesUtil.newMessage(
- patchSet.id(),
- ctx.getUser(),
- ctx.getWhen(),
- message,
- ChangeMessagesUtil.uploadedPatchSetTag(change.isWorkInProgress()));
- changeMessage.setMessage(message);
+ mailMessage =
+ cmUtil.setChangeMessage(
+ update, message, ChangeMessagesUtil.uploadedPatchSetTag(change.isWorkInProgress()));
}
oldWorkInProgressState = change.isWorkInProgress();
@@ -283,9 +277,6 @@
change.setStatus(Change.Status.NEW);
}
change.setCurrentPatchSet(patchSetInfo);
- if (changeMessage != null) {
- cmUtil.addChangeMessage(update, changeMessage);
- }
if (topic != null) {
change.setTopic(topic);
try {
@@ -301,13 +292,13 @@
public void postUpdate(PostUpdateContext ctx) {
NotifyResolver.Result notify = ctx.getNotify(change.getId());
if (notify.shouldNotify() && sendEmail) {
- requireNonNull(changeMessage);
+ requireNonNull(mailMessage);
try {
ReplacePatchSetSender emailSender =
replacePatchSetFactory.create(ctx.getProject(), change.getId());
emailSender.setFrom(ctx.getAccountId());
emailSender.setPatchSet(patchSet, patchSetInfo);
- emailSender.setChangeMessage(changeMessage.getMessage(), ctx.getWhen());
+ emailSender.setChangeMessage(mailMessage, ctx.getWhen());
emailSender.addReviewers(oldReviewers.byState(REVIEWER));
emailSender.addExtraCC(oldReviewers.byState(CC));
emailSender.setNotify(notify);
diff --git a/java/com/google/gerrit/server/change/RevisionJson.java b/java/com/google/gerrit/server/change/RevisionJson.java
index b702440..33f3d4f 100644
--- a/java/com/google/gerrit/server/change/RevisionJson.java
+++ b/java/com/google/gerrit/server/change/RevisionJson.java
@@ -182,9 +182,14 @@
info.message = commit.getFullMessage();
if (addLinks) {
- ImmutableList<WebLinkInfo> links =
+ ImmutableList<WebLinkInfo> patchSetLinks =
webLinks.getPatchSetLinks(project, commit.name(), commit.getFullMessage(), branchName);
- info.webLinks = links.isEmpty() ? null : links;
+ info.webLinks = patchSetLinks.isEmpty() ? null : patchSetLinks;
+ ImmutableList<WebLinkInfo> resolveConflictsLinks =
+ webLinks.getResolveConflictsLinks(
+ project, commit.name(), commit.getFullMessage(), branchName);
+ info.resolveConflictsWebLinks =
+ resolveConflictsLinks.isEmpty() ? null : resolveConflictsLinks;
}
for (RevCommit parent : commit.getParents()) {
diff --git a/java/com/google/gerrit/server/change/SetAssigneeOp.java b/java/com/google/gerrit/server/change/SetAssigneeOp.java
index 063e7e0..3e7d0bc 100644
--- a/java/com/google/gerrit/server/change/SetAssigneeOp.java
+++ b/java/com/google/gerrit/server/change/SetAssigneeOp.java
@@ -18,7 +18,6 @@
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.server.ChangeMessagesUtil;
@@ -98,25 +97,23 @@
update.setAssignee(newAssignee.getAccountId());
// reviewdb
change.setAssignee(newAssignee.getAccountId());
- addMessage(ctx, update);
+ addMessage(ctx);
return true;
}
- private void addMessage(ChangeContext ctx, ChangeUpdate update) {
+ private void addMessage(ChangeContext ctx) {
StringBuilder msg = new StringBuilder();
msg.append("Assignee ");
if (oldAssignee == null) {
msg.append("added: ");
- msg.append(newAssignee.getNameEmail());
+ msg.append(ChangeMessagesUtil.getAccountTemplate(newAssignee.getAccountId()));
} else {
msg.append("changed from: ");
- msg.append(oldAssignee.getNameEmail());
+ msg.append(ChangeMessagesUtil.getAccountTemplate(oldAssignee.getAccountId()));
msg.append(" to: ");
- msg.append(newAssignee.getNameEmail());
+ msg.append(ChangeMessagesUtil.getAccountTemplate(newAssignee.getAccountId()));
}
- ChangeMessage cmsg =
- ChangeMessagesUtil.newMessage(ctx, msg.toString(), ChangeMessagesUtil.TAG_SET_ASSIGNEE);
- cmUtil.addChangeMessage(update, cmsg);
+ cmUtil.setChangeMessage(ctx, msg.toString(), ChangeMessagesUtil.TAG_SET_ASSIGNEE);
}
@Override
diff --git a/java/com/google/gerrit/server/change/SetHashtagsOp.java b/java/com/google/gerrit/server/change/SetHashtagsOp.java
index 3e866fa..bfc4834 100644
--- a/java/com/google/gerrit/server/change/SetHashtagsOp.java
+++ b/java/com/google/gerrit/server/change/SetHashtagsOp.java
@@ -22,7 +22,6 @@
import com.google.common.collect.Ordering;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.extensions.api.changes.HashtagsInput;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.BadRequestException;
@@ -106,7 +105,7 @@
updated.addAll(toAdd);
updated.removeAll(toRemove);
update.setHashtags(updated);
- addMessage(ctx, update);
+ addMessage(ctx);
}
updatedHashtags = ImmutableSortedSet.copyOf(updated);
@@ -116,13 +115,11 @@
}
}
- private void addMessage(ChangeContext ctx, ChangeUpdate update) {
+ private void addMessage(ChangeContext ctx) {
StringBuilder msg = new StringBuilder();
appendHashtagMessage(msg, "added", toAdd);
appendHashtagMessage(msg, "removed", toRemove);
- ChangeMessage cmsg =
- ChangeMessagesUtil.newMessage(ctx, msg.toString(), ChangeMessagesUtil.TAG_SET_HASHTAGS);
- cmUtil.addChangeMessage(update, cmsg);
+ cmUtil.setChangeMessage(ctx, msg.toString(), ChangeMessagesUtil.TAG_SET_HASHTAGS);
}
private void appendHashtagMessage(StringBuilder b, String action, Set<String> hashtags) {
diff --git a/java/com/google/gerrit/server/change/SetPrivateOp.java b/java/com/google/gerrit/server/change/SetPrivateOp.java
index 5002ee4..1274a5ed 100644
--- a/java/com/google/gerrit/server/change/SetPrivateOp.java
+++ b/java/com/google/gerrit/server/change/SetPrivateOp.java
@@ -17,7 +17,6 @@
import com.google.common.base.Strings;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.extensions.common.InputWithMessage;
import com.google.gerrit.extensions.restapi.BadRequestException;
@@ -83,7 +82,7 @@
change.setPrivate(isPrivate);
change.setLastUpdatedOn(ctx.getWhen());
update.setPrivate(isPrivate);
- addMessage(ctx, update);
+ addMessage(ctx);
return true;
}
@@ -94,7 +93,7 @@
}
}
- private void addMessage(ChangeContext ctx, ChangeUpdate update) {
+ private void addMessage(ChangeContext ctx) {
Change c = ctx.getChange();
StringBuilder buf = new StringBuilder(c.isPrivate() ? "Set private" : "Unset private");
@@ -104,13 +103,9 @@
buf.append(m);
}
- ChangeMessage cmsg =
- ChangeMessagesUtil.newMessage(
- ctx,
- buf.toString(),
- c.isPrivate()
- ? ChangeMessagesUtil.TAG_SET_PRIVATE
- : ChangeMessagesUtil.TAG_UNSET_PRIVATE);
- cmUtil.addChangeMessage(update, cmsg);
+ cmUtil.setChangeMessage(
+ ctx,
+ buf.toString(),
+ c.isPrivate() ? ChangeMessagesUtil.TAG_SET_PRIVATE : ChangeMessagesUtil.TAG_UNSET_PRIVATE);
}
}
diff --git a/java/com/google/gerrit/server/change/SetTopicOp.java b/java/com/google/gerrit/server/change/SetTopicOp.java
index b4ac203..ee35d1d 100644
--- a/java/com/google/gerrit/server/change/SetTopicOp.java
+++ b/java/com/google/gerrit/server/change/SetTopicOp.java
@@ -17,7 +17,6 @@
import com.google.common.base.Strings;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.server.ChangeMessagesUtil;
import com.google.gerrit.server.extensions.events.TopicEdited;
@@ -74,9 +73,7 @@
} catch (ValidationException ex) {
throw new BadRequestException(ex.getMessage());
}
- ChangeMessage cmsg =
- ChangeMessagesUtil.newMessage(ctx, summary, ChangeMessagesUtil.TAG_SET_TOPIC);
- cmUtil.addChangeMessage(update, cmsg);
+ cmUtil.setChangeMessage(ctx, summary, ChangeMessagesUtil.TAG_SET_TOPIC);
return true;
}
diff --git a/java/com/google/gerrit/server/change/WorkInProgressOp.java b/java/com/google/gerrit/server/change/WorkInProgressOp.java
index de81010..1409170 100644
--- a/java/com/google/gerrit/server/change/WorkInProgressOp.java
+++ b/java/com/google/gerrit/server/change/WorkInProgressOp.java
@@ -18,7 +18,6 @@
import com.google.common.collect.ImmutableList;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.extensions.api.changes.NotifyHandling;
@@ -65,7 +64,7 @@
private Change change;
private ChangeNotes notes;
private PatchSet ps;
- private ChangeMessage cmsg;
+ private String mailMessage;
@Inject
WorkInProgressOp(
@@ -99,11 +98,11 @@
}
change.setLastUpdatedOn(ctx.getWhen());
update.setWorkInProgress(workInProgress);
- addMessage(ctx, update);
+ addMessage(ctx);
return true;
}
- private void addMessage(ChangeContext ctx, ChangeUpdate update) {
+ private void addMessage(ChangeContext ctx) {
Change c = ctx.getChange();
StringBuilder buf =
new StringBuilder(c.isWorkInProgress() ? "Set Work In Progress" : "Set Ready For Review");
@@ -114,15 +113,13 @@
buf.append(m);
}
- cmsg =
- ChangeMessagesUtil.newMessage(
+ mailMessage =
+ cmUtil.setChangeMessage(
ctx,
buf.toString(),
c.isWorkInProgress()
? ChangeMessagesUtil.TAG_SET_WIP
: ChangeMessagesUtil.TAG_SET_READY);
-
- cmUtil.addChangeMessage(update, cmsg);
}
@Override
@@ -147,9 +144,10 @@
notes,
ps,
ctx.getIdentifiedUser(),
- cmsg,
+ mailMessage,
+ ctx.getWhen(),
ImmutableList.of(),
- cmsg.getMessage(),
+ mailMessage,
ImmutableList.of(),
repoView)
.sendAsync();
diff --git a/java/com/google/gerrit/server/config/DownloadConfig.java b/java/com/google/gerrit/server/config/DownloadConfig.java
index 58ce098..00df1e6 100644
--- a/java/com/google/gerrit/server/config/DownloadConfig.java
+++ b/java/com/google/gerrit/server/config/DownloadConfig.java
@@ -15,6 +15,7 @@
package com.google.gerrit.server.config;
import com.google.common.collect.ImmutableSet;
+import com.google.common.flogger.FluentLogger;
import com.google.gerrit.entities.CoreDownloadSchemes;
import com.google.gerrit.extensions.client.GeneralPreferencesInfo.DownloadCommand;
import com.google.gerrit.server.change.ArchiveFormatInternal;
@@ -35,6 +36,8 @@
*/
@Singleton
public class DownloadConfig {
+ private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+
private final ImmutableSet<String> downloadSchemes;
private final ImmutableSet<DownloadCommand> downloadCommands;
private final ImmutableSet<ArchiveFormatInternal> archiveFormats;
@@ -51,7 +54,8 @@
for (String s : allSchemes) {
String core = toCoreScheme(s);
if (core == null) {
- throw new IllegalArgumentException("not a core download scheme: " + s);
+ logger.atWarning().log("not a core download scheme: " + s);
+ continue;
}
normalized.add(core);
}
diff --git a/java/com/google/gerrit/server/config/GerritGlobalModule.java b/java/com/google/gerrit/server/config/GerritGlobalModule.java
index bb851e2..4794858 100644
--- a/java/com/google/gerrit/server/config/GerritGlobalModule.java
+++ b/java/com/google/gerrit/server/config/GerritGlobalModule.java
@@ -66,11 +66,13 @@
import com.google.gerrit.extensions.validators.CommentValidator;
import com.google.gerrit.extensions.webui.BranchWebLink;
import com.google.gerrit.extensions.webui.DiffWebLink;
+import com.google.gerrit.extensions.webui.EditWebLink;
import com.google.gerrit.extensions.webui.FileHistoryWebLink;
import com.google.gerrit.extensions.webui.FileWebLink;
import com.google.gerrit.extensions.webui.ParentWebLink;
import com.google.gerrit.extensions.webui.PatchSetWebLink;
import com.google.gerrit.extensions.webui.ProjectWebLink;
+import com.google.gerrit.extensions.webui.ResolveConflictsWebLink;
import com.google.gerrit.extensions.webui.TagWebLink;
import com.google.gerrit.extensions.webui.TopMenu;
import com.google.gerrit.extensions.webui.WebUiPlugin;
@@ -391,10 +393,12 @@
DynamicMap.mapOf(binder(), ProjectConfigEntry.class);
DynamicSet.setOf(binder(), PluginPushOption.class);
DynamicSet.setOf(binder(), PatchSetWebLink.class);
+ DynamicSet.setOf(binder(), ResolveConflictsWebLink.class);
DynamicSet.setOf(binder(), ParentWebLink.class);
DynamicSet.setOf(binder(), FileWebLink.class);
DynamicSet.setOf(binder(), FileHistoryWebLink.class);
DynamicSet.setOf(binder(), DiffWebLink.class);
+ DynamicSet.setOf(binder(), EditWebLink.class);
DynamicSet.setOf(binder(), ProjectWebLink.class);
DynamicSet.setOf(binder(), BranchWebLink.class);
DynamicSet.setOf(binder(), TagWebLink.class);
diff --git a/java/com/google/gerrit/server/config/GitwebConfig.java b/java/com/google/gerrit/server/config/GitwebConfig.java
index 8214f03..f90a72e 100644
--- a/java/com/google/gerrit/server/config/GitwebConfig.java
+++ b/java/com/google/gerrit/server/config/GitwebConfig.java
@@ -27,11 +27,13 @@
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.restapi.Url;
import com.google.gerrit.extensions.webui.BranchWebLink;
+import com.google.gerrit.extensions.webui.EditWebLink;
import com.google.gerrit.extensions.webui.FileHistoryWebLink;
import com.google.gerrit.extensions.webui.FileWebLink;
import com.google.gerrit.extensions.webui.ParentWebLink;
import com.google.gerrit.extensions.webui.PatchSetWebLink;
import com.google.gerrit.extensions.webui.ProjectWebLink;
+import com.google.gerrit.extensions.webui.ResolveConflictsWebLink;
import com.google.gerrit.extensions.webui.TagWebLink;
import com.google.inject.AbstractModule;
import com.google.inject.Inject;
@@ -71,6 +73,7 @@
}
if (!isNullOrEmpty(type.getFile()) || !isNullOrEmpty(type.getRootTree())) {
+ DynamicSet.bind(binder(), EditWebLink.class).to(GitwebLinks.class);
DynamicSet.bind(binder(), FileWebLink.class).to(GitwebLinks.class);
}
@@ -81,6 +84,7 @@
if (!isNullOrEmpty(type.getRevision())) {
DynamicSet.bind(binder(), PatchSetWebLink.class).to(GitwebLinks.class);
DynamicSet.bind(binder(), ParentWebLink.class).to(GitwebLinks.class);
+ DynamicSet.bind(binder(), ResolveConflictsWebLink.class).to(GitwebLinks.class);
}
if (!isNullOrEmpty(type.getProject())) {
@@ -253,11 +257,13 @@
@Singleton
static class GitwebLinks
implements BranchWebLink,
+ EditWebLink,
FileHistoryWebLink,
FileWebLink,
PatchSetWebLink,
ParentWebLink,
ProjectWebLink,
+ ResolveConflictsWebLink,
TagWebLink {
private final String url;
private final GitwebType type;
@@ -327,6 +333,12 @@
}
@Override
+ public WebLinkInfo getEditWebLink(String projectName, String revision, String fileName) {
+ // For Gitweb treat edit links the same as file links
+ return getFileWebLink(projectName, revision, fileName);
+ }
+
+ @Override
public WebLinkInfo getPatchSetWebLink(
String projectName, String commit, String commitMessage, String branchName) {
if (revision != null) {
@@ -341,6 +353,13 @@
}
@Override
+ public WebLinkInfo getResolveConflictsWebLink(
+ String projectName, String commit, String commitMessage, String branchName) {
+ // For Gitweb treat resolve conflicts links the same as patch set links
+ return getPatchSetWebLink(projectName, commit, commitMessage, branchName);
+ }
+
+ @Override
public WebLinkInfo getParentWebLink(
String projectName, String commit, String commitMessage, String branchName) {
// For Gitweb treat parent revision links the same as patch set links
diff --git a/java/com/google/gerrit/server/diff/DiffInfoCreator.java b/java/com/google/gerrit/server/diff/DiffInfoCreator.java
index c29ffc8..606e42b 100644
--- a/java/com/google/gerrit/server/diff/DiffInfoCreator.java
+++ b/java/com/google/gerrit/server/diff/DiffInfoCreator.java
@@ -73,6 +73,8 @@
ImmutableList<DiffWebLinkInfo> links = webLinksProvider.getDiffLinks();
result.webLinks = links.isEmpty() ? null : links;
+ ImmutableList<WebLinkInfo> editLinks = webLinksProvider.getEditWebLinks();
+ result.editWebLinks = editLinks.isEmpty() ? null : editLinks;
if (ps.isBinary()) {
result.binary = true;
@@ -156,8 +158,8 @@
FileContentUtil.resolveContentType(
state, side.fileName(), fileInfo.mode, fileInfo.mimeType);
result.lines = fileInfo.content.getSize();
- ImmutableList<WebLinkInfo> links = webLinksProvider.getFileWebLinks(side.type());
- result.webLinks = links.isEmpty() ? null : links;
+ ImmutableList<WebLinkInfo> fileLinks = webLinksProvider.getFileWebLinks(side.type());
+ result.webLinks = fileLinks.isEmpty() ? null : fileLinks;
result.commitId = fileInfo.commitId;
return Optional.of(result);
}
diff --git a/java/com/google/gerrit/server/diff/DiffWebLinksProvider.java b/java/com/google/gerrit/server/diff/DiffWebLinksProvider.java
index 0f71b17..2590ebc 100644
--- a/java/com/google/gerrit/server/diff/DiffWebLinksProvider.java
+++ b/java/com/google/gerrit/server/diff/DiffWebLinksProvider.java
@@ -24,6 +24,9 @@
/** Returns links associated with the diff view */
ImmutableList<DiffWebLinkInfo> getDiffLinks();
- /** Returns links associated with the diff side */
+ /** Returns edit links associated with the diff view */
+ ImmutableList<WebLinkInfo> getEditWebLinks();
+
+ /** Returns file links associated with the diff side */
ImmutableList<WebLinkInfo> getFileWebLinks(DiffSide.Type fileInfoType);
}
diff --git a/java/com/google/gerrit/server/events/EventFactory.java b/java/com/google/gerrit/server/events/EventFactory.java
index b648255..caf495f 100644
--- a/java/com/google/gerrit/server/events/EventFactory.java
+++ b/java/com/google/gerrit/server/events/EventFactory.java
@@ -36,6 +36,7 @@
import com.google.gerrit.extensions.registration.DynamicItem;
import com.google.gerrit.index.IndexConfig;
import com.google.gerrit.server.ApprovalsUtil;
+import com.google.gerrit.server.ChangeMessagesUtil;
import com.google.gerrit.server.GerritPersonIdent;
import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.account.AccountState;
@@ -91,6 +92,7 @@
private final ChangeKindCache changeKindCache;
private final Provider<InternalChangeQuery> queryProvider;
private final IndexConfig indexConfig;
+ private final ChangeMessagesUtil changeMessagesUtil;
@Inject
EventFactory(
@@ -103,7 +105,8 @@
ApprovalsUtil approvalsUtil,
ChangeKindCache changeKindCache,
Provider<InternalChangeQuery> queryProvider,
- IndexConfig indexConfig) {
+ IndexConfig indexConfig,
+ ChangeMessagesUtil changeMessagesUtil) {
this.accountCache = accountCache;
this.urlFormatter = urlFormatter;
this.emails = emails;
@@ -114,6 +117,7 @@
this.changeKindCache = changeKindCache;
this.queryProvider = queryProvider;
this.indexConfig = indexConfig;
+ this.changeMessagesUtil = changeMessagesUtil;
}
public ChangeAttribute asChangeAttribute(Change change) {
@@ -543,7 +547,7 @@
message.getAuthor() != null
? asAccountAttribute(message.getAuthor())
: asAccountAttribute(myIdent.get());
- a.message = message.getMessage();
+ a.message = changeMessagesUtil.replaceTemplates(message.getMessage());
return a;
}
diff --git a/java/com/google/gerrit/server/git/CommitUtil.java b/java/com/google/gerrit/server/git/CommitUtil.java
index 272ae65..2dbafd2 100644
--- a/java/com/google/gerrit/server/git/CommitUtil.java
+++ b/java/com/google/gerrit/server/git/CommitUtil.java
@@ -22,7 +22,6 @@
import com.google.gerrit.entities.Account;
import com.google.gerrit.entities.Account.Id;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.extensions.api.changes.NotifyHandling;
import com.google.gerrit.extensions.api.changes.RevertInput;
@@ -336,14 +335,10 @@
@Override
public boolean updateChange(ChangeContext ctx) {
- Change change = ctx.getChange();
- PatchSet.Id patchSetId = change.currentPatchSetId();
- ChangeMessage changeMessage =
- ChangeMessagesUtil.newMessage(
- ctx,
- "Created a revert of this change as I" + computedChangeId.name(),
- ChangeMessagesUtil.TAG_REVERT);
- cmUtil.addChangeMessage(ctx.getUpdate(patchSetId), changeMessage);
+ cmUtil.setChangeMessage(
+ ctx,
+ "Created a revert of this change as I" + computedChangeId.name(),
+ ChangeMessagesUtil.TAG_REVERT);
return true;
}
}
diff --git a/java/com/google/gerrit/server/git/DelegateRepository.java b/java/com/google/gerrit/server/git/DelegateRepository.java
index 2816429..ddfc115 100644
--- a/java/com/google/gerrit/server/git/DelegateRepository.java
+++ b/java/com/google/gerrit/server/git/DelegateRepository.java
@@ -14,6 +14,8 @@
package com.google.gerrit.server.git;
+import static com.google.common.base.Preconditions.checkState;
+
import com.google.gerrit.common.UsedAt;
import java.io.File;
import java.io.IOException;
@@ -30,6 +32,7 @@
import org.eclipse.jgit.errors.RevisionSyntaxException;
import org.eclipse.jgit.events.ListenerList;
import org.eclipse.jgit.events.RepositoryEvent;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.BaseRepositoryBuilder;
import org.eclipse.jgit.lib.ObjectDatabase;
@@ -391,4 +394,19 @@
throws IOException {
delegate.writeRebaseTodoFile(path, steps, append);
}
+
+ /**
+ * Converts between ref storage formats.
+ *
+ * @param format the format to convert to, either "reftable" or "refdir"
+ * @param writeLogs whether to write reflogs
+ * @param backup whether to make a backup of the old data
+ * @throws IOException on I/O problems.
+ */
+ public void convertRefStorage(String format, boolean writeLogs, boolean backup)
+ throws IOException {
+ checkState(
+ delegate instanceof FileRepository, "Repository is not an instance of FileRepository!");
+ ((FileRepository) delegate).convertRefStorage(format, writeLogs, backup);
+ }
}
diff --git a/java/com/google/gerrit/server/git/MergedByPushOp.java b/java/com/google/gerrit/server/git/MergedByPushOp.java
index b6cb30df..426f8db 100644
--- a/java/com/google/gerrit/server/git/MergedByPushOp.java
+++ b/java/com/google/gerrit/server/git/MergedByPushOp.java
@@ -18,7 +18,6 @@
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.entities.PatchSetInfo;
@@ -169,10 +168,7 @@
}
}
msgBuf.append(".");
- ChangeMessage msg =
- ChangeMessagesUtil.newMessage(
- psId, ctx.getUser(), ctx.getWhen(), msgBuf.toString(), ChangeMessagesUtil.TAG_MERGED);
- cmUtil.addChangeMessage(update, msg);
+ cmUtil.setChangeMessage(update, msgBuf.toString(), ChangeMessagesUtil.TAG_MERGED);
update.putApproval(LabelId.legacySubmit().get(), (short) 1);
return true;
}
diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
index 377718b..15bc603 100644
--- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
+++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
@@ -1531,6 +1531,14 @@
@Option(name = "--remove-private", usage = "remove privacy flag from updated change")
boolean removePrivate;
+ /**
+ * The skip-validation option is defined to allow parsing it using the {@link #cmdLineParser}.
+ * However we do not allow this option for pushes to magic branches. This option is used to fail
+ * with a proper error message.
+ */
+ @Option(name = "--skip-validation", usage = "skips commit validation")
+ boolean skipValidation;
+
@Option(
name = "--wip",
aliases = {"-work-in-progress"},
@@ -1814,6 +1822,14 @@
ref = null; // never happens
}
+ if (magicBranch.skipValidation) {
+ reject(
+ cmd,
+ String.format(
+ "\"--%s\" option is only supported for direct push", PUSH_OPTION_SKIP_VALIDATION));
+ return;
+ }
+
if (magicBranch.topic != null && magicBranch.topic.length() > ChangeUtil.TOPIC_MAX_LENGTH) {
reject(
cmd, String.format("topic length exceeds the limit (%d)", ChangeUtil.TOPIC_MAX_LENGTH));
diff --git a/java/com/google/gerrit/server/git/receive/ReplaceOp.java b/java/com/google/gerrit/server/git/receive/ReplaceOp.java
index 6e4f9da..cc908e4 100644
--- a/java/com/google/gerrit/server/git/receive/ReplaceOp.java
+++ b/java/com/google/gerrit/server/git/receive/ReplaceOp.java
@@ -30,7 +30,6 @@
import com.google.gerrit.common.Nullable;
import com.google.gerrit.entities.BranchNameKey;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.LabelType;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.entities.PatchSetApproval;
@@ -155,7 +154,7 @@
private ChangeNotes notes;
private PatchSet newPatchSet;
private ChangeKind changeKind;
- private ChangeMessage msg;
+ private String mailMessage;
private String rejectMessage;
private MergedByPushOp mergedByPushOp;
private RequestScopePropagator requestScopePropagator;
@@ -343,8 +342,7 @@
update.putReviewer(ctx.getAccountId(), REVIEWER);
}
- msg = createChangeMessage(ctx, reviewMessage);
- cmUtil.addChangeMessage(update, msg);
+ mailMessage = insertChangeMessage(update, ctx, reviewMessage);
if (mergedByPushOp == null) {
resetChange(ctx);
@@ -403,7 +401,7 @@
return input;
}
- private ChangeMessage createChangeMessage(ChangeContext ctx, String reviewMessage)
+ private String insertChangeMessage(ChangeUpdate update, ChangeContext ctx, String reviewMessage)
throws IOException {
String approvalMessage =
ApprovalsUtil.renderMessageWithApprovals(
@@ -422,12 +420,8 @@
if (magicBranch != null && magicBranch.workInProgress) {
workInProgress = true;
}
- return ChangeMessagesUtil.newMessage(
- patchSetId,
- ctx.getUser(),
- ctx.getWhen(),
- message.toString(),
- ChangeMessagesUtil.uploadedPatchSetTag(workInProgress));
+ return cmUtil.setChangeMessage(
+ update, message.toString(), ChangeMessagesUtil.uploadedPatchSetTag(workInProgress));
}
private String changeKindMessage(ChangeKind changeKind) {
@@ -533,7 +527,7 @@
replacePatchSetFactory.create(projectState.getNameKey(), notes.getChangeId());
emailSender.setFrom(ctx.getAccount().account().id());
emailSender.setPatchSet(newPatchSet, info);
- emailSender.setChangeMessage(msg.getMessage(), ctx.getWhen());
+ emailSender.setChangeMessage(mailMessage, ctx.getWhen());
emailSender.setNotify(ctx.getNotify(notes.getChangeId()));
emailSender.addReviewers(
Streams.concat(
diff --git a/java/com/google/gerrit/server/git/validators/MergeValidators.java b/java/com/google/gerrit/server/git/validators/MergeValidators.java
index cbaa121..6b145ca 100644
--- a/java/com/google/gerrit/server/git/validators/MergeValidators.java
+++ b/java/com/google/gerrit/server/git/validators/MergeValidators.java
@@ -51,6 +51,7 @@
import java.util.Objects;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.Config;
+import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
/**
@@ -104,7 +105,8 @@
new PluginMergeValidationListener(mergeValidationListeners),
projectConfigValidatorFactory.create(),
accountValidatorFactory.create(),
- groupValidatorFactory.create());
+ groupValidatorFactory.create(),
+ new DestBranchRefValidator());
for (MergeValidationListener validator : validators) {
validator.onPreMerge(repo, revWalk, commit, destProject, destBranch, patchSetId, caller);
@@ -198,7 +200,7 @@
throw new MergeValidationException(SET_BY_ADMIN, e);
} catch (PermissionBackendException e) {
logger.atWarning().withCause(e).log("Cannot check ADMINISTRATE_SERVER");
- throw new MergeValidationException("validation unavailable");
+ throw new MergeValidationException("validation unavailable", e);
}
} else {
try {
@@ -210,7 +212,7 @@
throw new MergeValidationException(SET_BY_OWNER, e);
} catch (PermissionBackendException e) {
logger.atWarning().withCause(e).log("Cannot check WRITE_CONFIG");
- throw new MergeValidationException("validation unavailable");
+ throw new MergeValidationException("validation unavailable", e);
}
}
if (allUsersName.equals(destProject.getNameKey())
@@ -317,7 +319,7 @@
}
} catch (StorageException e) {
logger.atSevere().withCause(e).log("Cannot validate account update");
- throw new MergeValidationException("account validation unavailable");
+ throw new MergeValidationException("account validation unavailable", e);
}
try {
@@ -329,7 +331,7 @@
}
} catch (IOException e) {
logger.atSevere().withCause(e).log("Cannot validate account update");
- throw new MergeValidationException("account validation unavailable");
+ throw new MergeValidationException("account validation unavailable", e);
}
}
}
@@ -366,4 +368,34 @@
throw new MergeValidationException("group update not allowed");
}
}
+
+ /**
+ * Validator to ensure that destBranch is not a symbolic reference (an attempt to merge into a
+ * symbolic ref branch leads to LOCK_FAILURE exception).
+ */
+ private static class DestBranchRefValidator implements MergeValidationListener {
+ @Override
+ public void onPreMerge(
+ Repository repo,
+ CodeReviewRevWalk revWalk,
+ CodeReviewCommit commit,
+ ProjectState destProject,
+ BranchNameKey destBranch,
+ PatchSet.Id patchSetId,
+ IdentifiedUser caller)
+ throws MergeValidationException {
+ try {
+ Ref ref = repo.exactRef(destBranch.branch());
+ // Usually the target branch exists, but there is an exception for some branches (see
+ // {@link com.google.gerrit.server.git.receive.ReceiveCommits} for details).
+ // Such non-existing branches should be ignored.
+ if (ref != null && ref.isSymbolic()) {
+ throw new MergeValidationException("the target branch is a symbolic ref");
+ }
+ } catch (IOException e) {
+ logger.atSevere().withCause(e).log("Cannot validate destination branch");
+ throw new MergeValidationException("symref validation unavailable", e);
+ }
+ }
+ }
}
diff --git a/java/com/google/gerrit/server/index/change/ChangeField.java b/java/com/google/gerrit/server/index/change/ChangeField.java
index 0ae4021..7e84f1d 100644
--- a/java/com/google/gerrit/server/index/change/ChangeField.java
+++ b/java/com/google/gerrit/server/index/change/ChangeField.java
@@ -679,6 +679,10 @@
cd ->
Stream.concat(
cd.publishedComments().stream().map(c -> c.message),
+ // Some endpoint allow passing user message in input, and we still want to
+ // search by that. Index on message template with placeholders for user
+ // data, so we don't
+ // persist user identifiable information data in index.
cd.messages().stream().map(ChangeMessage::getMessage))
.collect(toSet()));
diff --git a/java/com/google/gerrit/server/logging/Metadata.java b/java/com/google/gerrit/server/logging/Metadata.java
index 71ee01f..dc9af2b 100644
--- a/java/com/google/gerrit/server/logging/Metadata.java
+++ b/java/com/google/gerrit/server/logging/Metadata.java
@@ -66,6 +66,9 @@
/** The cause of an error. */
public abstract Optional<String> cause();
+ /** Side where the comment is written: <= 0 for parent, 1 for revision. */
+ public abstract Optional<Integer> commentSide();
+
/** The SHA1 of a commit. */
public abstract Optional<String> commit();
@@ -288,6 +291,8 @@
public abstract Builder cause(@Nullable String cause);
+ public abstract Builder commentSide(int side);
+
public abstract Builder commit(@Nullable String commit);
public abstract Builder eventType(@Nullable String eventType);
diff --git a/java/com/google/gerrit/server/mail/receive/MailProcessor.java b/java/com/google/gerrit/server/mail/receive/MailProcessor.java
index af7f1b0..3a35d80 100644
--- a/java/com/google/gerrit/server/mail/receive/MailProcessor.java
+++ b/java/com/google/gerrit/server/mail/receive/MailProcessor.java
@@ -23,7 +23,6 @@
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.entities.Account;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.HumanComment;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.entities.Project;
@@ -233,7 +232,14 @@
throws UpdateException, RestApiException {
try (ManualRequestContext ctx = oneOffRequestContext.openAs(sender)) {
List<ChangeData> changeDataList =
- queryProvider.get().byLegacyChangeId(Change.id(metadata.changeNumber));
+ queryProvider
+ .get()
+ .enforceVisibility(true)
+ .byLegacyChangeId(Change.id(metadata.changeNumber));
+ if (changeDataList.isEmpty()) {
+ sendRejectionEmail(message, InboundEmailRejectionSender.Error.CHANGE_NOT_FOUND);
+ return;
+ }
if (changeDataList.size() != 1) {
logger.atSevere().log(
"Message %s references unique change %s,"
@@ -313,7 +319,7 @@
private final PatchSet.Id psId;
private final List<MailComment> parsedComments;
private final String tag;
- private ChangeMessage changeMessage;
+ private String mailMessage;
private List<HumanComment> comments;
private PatchSet patchSet;
private ChangeNotes notes;
@@ -332,9 +338,8 @@
throw new StorageException("patch set not found: " + psId);
}
- changeMessage = generateChangeMessage(ctx);
- changeMessagesUtil.addChangeMessage(ctx.getUpdate(psId), changeMessage);
-
+ mailMessage =
+ changeMessagesUtil.setChangeMessage(ctx.getUpdate(psId), generateChangeMessage(), tag);
comments = new ArrayList<>();
for (MailComment c : parsedComments) {
if (c.getType() == MailComment.CommentType.CHANGE_MESSAGE) {
@@ -364,7 +369,8 @@
notes,
patchSet,
ctx.getUser().asIdentifiedUser(),
- changeMessage,
+ mailMessage,
+ ctx.getWhen(),
comments,
patchSetComment,
ImmutableList.of(),
@@ -382,13 +388,13 @@
ctx.getChangeData(notes),
patchSet,
ctx.getAccount(),
- changeMessage.getMessage(),
+ mailMessage,
approvals,
approvals,
ctx.getWhen());
}
- private ChangeMessage generateChangeMessage(ChangeContext ctx) {
+ private String generateChangeMessage() {
String changeMsg = "Patch Set " + psId.get() + ":";
if (parsedComments.get(0).getType() == MailComment.CommentType.CHANGE_MESSAGE) {
// Add a blank line after Patch Set to follow the default format
@@ -399,7 +405,7 @@
} else {
changeMsg += "\n\n" + numComments(parsedComments.size());
}
- return ChangeMessagesUtil.newMessage(ctx, changeMsg, tag);
+ return changeMsg;
}
private PatchSet targetPatchSetForComment(
diff --git a/java/com/google/gerrit/server/mail/send/InboundEmailRejectionSender.java b/java/com/google/gerrit/server/mail/send/InboundEmailRejectionSender.java
index 709bf61..acdeb5a 100644
--- a/java/com/google/gerrit/server/mail/send/InboundEmailRejectionSender.java
+++ b/java/com/google/gerrit/server/mail/send/InboundEmailRejectionSender.java
@@ -33,7 +33,8 @@
INACTIVE_ACCOUNT,
UNKNOWN_ACCOUNT,
INTERNAL_EXCEPTION,
- COMMENT_REJECTED
+ COMMENT_REJECTED,
+ CHANGE_NOT_FOUND
}
public interface Factory {
diff --git a/java/com/google/gerrit/server/notedb/ChangeNotesParser.java b/java/com/google/gerrit/server/notedb/ChangeNotesParser.java
index 97fec4c..f4d6cd3 100644
--- a/java/com/google/gerrit/server/notedb/ChangeNotesParser.java
+++ b/java/com/google/gerrit/server/notedb/ChangeNotesParser.java
@@ -732,10 +732,14 @@
}
ChangeMessage changeMessage =
- new ChangeMessage(ChangeMessage.key(psId.changeId(), commit.name()), accountId, ts, psId);
- changeMessage.setMessage(changeMsgString.get());
- changeMessage.setTag(tag);
- changeMessage.setRealAuthor(realAccountId);
+ ChangeMessage.create(
+ ChangeMessage.key(psId.changeId(), commit.name()),
+ accountId,
+ ts,
+ psId,
+ changeMsgString.get(),
+ realAccountId,
+ tag);
allChangeMessages.add(changeMessage);
}
diff --git a/java/com/google/gerrit/server/permissions/RefControl.java b/java/com/google/gerrit/server/permissions/RefControl.java
index dd00dca..f800207 100644
--- a/java/com/google/gerrit/server/permissions/RefControl.java
+++ b/java/com/google/gerrit/server/permissions/RefControl.java
@@ -523,7 +523,10 @@
+ "who also have 'Push' rights on "
+ RefNames.REFS_CONFIG);
} else {
- pde.setAdvice("To push into this reference you need 'Push' rights.");
+ pde.setAdvice(
+ "Push to refs/for/"
+ + RefNames.shortName(refName)
+ + " to create a review, or get 'Push' rights to update the branch.");
}
break;
case DELETE:
diff --git a/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java b/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java
index a7659d4..6345cdb 100644
--- a/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java
+++ b/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java
@@ -29,6 +29,7 @@
import com.google.gerrit.server.index.OnlineReindexMode;
import com.google.gerrit.server.plugincontext.PluginSetContext;
import com.google.gerrit.server.query.change.ChangeData;
+import com.google.gerrit.server.rules.DefaultSubmitRule;
import com.google.gerrit.server.rules.PrologRule;
import com.google.gerrit.server.rules.SubmitRule;
import com.google.inject.Inject;
@@ -89,13 +90,14 @@
public List<SubmitRecord> evaluate(ChangeData cd) {
try (Timer0.Context ignored = submitRuleEvaluationLatency.start()) {
Change change;
+ ProjectState projectState;
try {
change = cd.change();
if (change == null) {
throw new StorageException("Change not found");
}
- projectCache.get(cd.project()).orElseThrow(noSuchProject(cd.project()));
+ projectState = projectCache.get(cd.project()).orElseThrow(noSuchProject(cd.project()));
} catch (NoSuchProjectException e) {
throw new IllegalStateException("Unable to find project while evaluating submit rule", e);
}
@@ -117,6 +119,12 @@
// We evaluate all the plugin-defined evaluators,
// and then we collect the results in one list.
return Streams.stream(submitRules)
+ // Skip evaluating the default submit rule if the project has prolog rules.
+ // Note that in this case, the prolog submit rule will handle labels for us
+ .filter(
+ projectState.hasPrologRules()
+ ? rule -> !(rule.get() instanceof DefaultSubmitRule)
+ : rule -> true)
.map(c -> c.call(s -> s.evaluate(cd)))
.filter(Optional::isPresent)
.map(Optional::get)
diff --git a/java/com/google/gerrit/server/query/change/EqualsLabelPredicate.java b/java/com/google/gerrit/server/query/change/EqualsLabelPredicate.java
index 4b6c964..3e9209b 100644
--- a/java/com/google/gerrit/server/query/change/EqualsLabelPredicate.java
+++ b/java/com/google/gerrit/server/query/change/EqualsLabelPredicate.java
@@ -73,6 +73,7 @@
}
boolean hasVote = false;
+ object.setStorageConstraint(ChangeData.StorageConstraint.INDEX_PRIMARY_NOTEDB_SECONDARY);
for (PatchSetApproval p : object.currentApprovals()) {
if (labelType.matches(p)) {
hasVote = true;
diff --git a/java/com/google/gerrit/server/query/change/InternalChangeQuery.java b/java/com/google/gerrit/server/query/change/InternalChangeQuery.java
index 6605c23..e0f7d91 100644
--- a/java/com/google/gerrit/server/query/change/InternalChangeQuery.java
+++ b/java/com/google/gerrit/server/query/change/InternalChangeQuery.java
@@ -166,7 +166,7 @@
Iterable<ChangeData> byCommitsOnBranchNotMerged(
Repository repo, BranchNameKey branch, Collection<String> hashes, int indexLimit)
throws IOException {
- if (hashes.size() > indexLimit) {
+ if (hashes.size() > indexLimit || !indexes.getSearchIndex().isEnabled()) {
return byCommitsOnBranchNotMergedFromDatabase(repo, branch, hashes);
}
return byCommitsOnBranchNotMergedFromIndex(branch, hashes);
diff --git a/java/com/google/gerrit/server/restapi/access/ListAccess.java b/java/com/google/gerrit/server/restapi/access/ListAccess.java
index 1e1bade..dca969d 100644
--- a/java/com/google/gerrit/server/restapi/access/ListAccess.java
+++ b/java/com/google/gerrit/server/restapi/access/ListAccess.java
@@ -14,11 +14,17 @@
package com.google.gerrit.server.restapi.access;
+import com.google.common.base.Strings;
import com.google.gerrit.entities.Project;
import com.google.gerrit.extensions.api.access.ProjectAccessInfo;
+import com.google.gerrit.extensions.restapi.AuthException;
+import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.Response;
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.extensions.restapi.TopLevelResource;
+import com.google.gerrit.server.permissions.PermissionBackend;
+import com.google.gerrit.server.permissions.ProjectPermission;
+import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.restapi.project.GetAccess;
import com.google.inject.Inject;
import java.util.ArrayList;
@@ -41,10 +47,15 @@
usage = "projects for which the access rights should be returned")
private List<String> projects = new ArrayList<>();
+ private final PermissionBackend permissionBackend;
+ private final ProjectCache projectCache;
private final GetAccess getAccess;
@Inject
- public ListAccess(GetAccess getAccess) {
+ public ListAccess(
+ PermissionBackend permissionBackend, ProjectCache projectCache, GetAccess getAccess) {
+ this.permissionBackend = permissionBackend;
+ this.projectCache = projectCache;
this.getAccess = getAccess;
}
@@ -53,7 +64,23 @@
throws Exception {
Map<String, ProjectAccessInfo> access = new TreeMap<>();
for (String p : projects) {
- access.put(p, getAccess.apply(Project.nameKey(p)));
+ if (Strings.nullToEmpty(p).isEmpty()) {
+ continue;
+ }
+
+ Project.NameKey projectName = Project.nameKey(p);
+
+ if (!projectCache.get(projectName).isPresent()) {
+ throw new ResourceNotFoundException(projectName.get());
+ }
+
+ try {
+ permissionBackend.currentUser().project(projectName).check(ProjectPermission.ACCESS);
+ } catch (AuthException e) {
+ throw new ResourceNotFoundException(projectName.get(), e);
+ }
+
+ access.put(p, getAccess.apply(projectName));
}
return Response.ok(access);
}
diff --git a/java/com/google/gerrit/server/restapi/account/CreateAccount.java b/java/com/google/gerrit/server/restapi/account/CreateAccount.java
index 1cf875a..baa2951 100644
--- a/java/com/google/gerrit/server/restapi/account/CreateAccount.java
+++ b/java/com/google/gerrit/server/restapi/account/CreateAccount.java
@@ -44,6 +44,7 @@
import com.google.gerrit.server.account.VersionedAuthorizedKeys;
import com.google.gerrit.server.account.externalids.DuplicateExternalIdKeyException;
import com.google.gerrit.server.account.externalids.ExternalId;
+import com.google.gerrit.server.config.AuthConfig;
import com.google.gerrit.server.group.GroupResolver;
import com.google.gerrit.server.group.db.GroupDelta;
import com.google.gerrit.server.group.db.GroupsUpdate;
@@ -59,6 +60,7 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
+import java.util.Locale;
import java.util.Set;
import org.eclipse.jgit.errors.ConfigInvalidException;
@@ -82,6 +84,7 @@
private final PluginSetContext<AccountExternalIdCreator> externalIdCreators;
private final Provider<GroupsUpdate> groupsUpdate;
private final OutgoingEmailValidator validator;
+ private final AuthConfig authConfig;
@Inject
CreateAccount(
@@ -93,7 +96,8 @@
AccountLoader.Factory infoLoader,
PluginSetContext<AccountExternalIdCreator> externalIdCreators,
@UserInitiated Provider<GroupsUpdate> groupsUpdate,
- OutgoingEmailValidator validator) {
+ OutgoingEmailValidator validator,
+ AuthConfig authConfig) {
this.seq = seq;
this.groupResolver = groupResolver;
this.authorizedKeys = authorizedKeys;
@@ -103,6 +107,7 @@
this.externalIdCreators = externalIdCreators;
this.groupsUpdate = groupsUpdate;
this.validator = validator;
+ this.authConfig = authConfig;
}
@Override
@@ -116,14 +121,18 @@
public Response<AccountInfo> apply(IdString id, AccountInput input)
throws BadRequestException, ResourceConflictException, UnprocessableEntityException,
IOException, ConfigInvalidException, PermissionBackendException {
- String username = id.get();
- if (input.username != null && !username.equals(input.username)) {
+ String username = applyCaseOfUsername(id.get());
+ if (input.username != null && !username.equals(applyCaseOfUsername(input.username))) {
throw new BadRequestException("username must match URL");
}
if (!ExternalId.isValidUsername(username)) {
throw new BadRequestException("Invalid username '" + username + "'");
}
+ if (input.name == null) {
+ input.name = input.username;
+ }
+
Set<AccountGroup.UUID> groups = parseGroups(input.groups);
Account.Id accountId = Account.id(seq.nextAccountId());
@@ -182,6 +191,10 @@
return Response.created(info);
}
+ private String applyCaseOfUsername(String username) {
+ return authConfig.isUserNameToLowerCase() ? username.toLowerCase(Locale.US) : username;
+ }
+
private Set<AccountGroup.UUID> parseGroups(List<String> groups)
throws UnprocessableEntityException {
Set<AccountGroup.UUID> groupUuids = new HashSet<>();
diff --git a/java/com/google/gerrit/server/restapi/account/QueryAccounts.java b/java/com/google/gerrit/server/restapi/account/QueryAccounts.java
index 0d12fd4..e6b4eee 100644
--- a/java/com/google/gerrit/server/restapi/account/QueryAccounts.java
+++ b/java/com/google/gerrit/server/restapi/account/QueryAccounts.java
@@ -107,8 +107,8 @@
}
@Option(name = "-O", usage = "Output option flags, in hex")
- void setOptionFlagsHex(String hex) {
- options.addAll(ListOption.fromBits(ListAccountsOption.class, Integer.parseInt(hex, 16)));
+ void setOptionFlagsHex(String hex) throws BadRequestException {
+ options.addAll(ListOption.fromHexString(ListAccountsOption.class, hex));
}
@Option(
diff --git a/java/com/google/gerrit/server/restapi/change/CherryPickChange.java b/java/com/google/gerrit/server/restapi/change/CherryPickChange.java
index ee6484c..b43585d 100644
--- a/java/com/google/gerrit/server/restapi/change/CherryPickChange.java
+++ b/java/com/google/gerrit/server/restapi/change/CherryPickChange.java
@@ -448,6 +448,9 @@
if (workInProgress != null) {
inserter.setWorkInProgress(workInProgress);
}
+ if (shouldSetToReady(cherryPickCommit, destNotes, workInProgress)) {
+ inserter.setWorkInProgress(false);
+ }
bu.addOp(destChange.getId(), inserter);
PatchSet.Id sourcePatchSetId = sourceChange == null ? null : sourceChange.currentPatchSetId();
// If sourceChange is not provided, reset cherryPickOf to avoid stale value.
@@ -461,6 +464,20 @@
return destChange.getId();
}
+ /**
+ * We should set the change to be "ready for review" if: 1. workInProgress is not already set on
+ * this request. 2. The patch-set doesn't have any git conflict markers. 3. The change used to be
+ * work in progress (because of a previous patch-set).
+ */
+ private boolean shouldSetToReady(
+ CodeReviewCommit cherryPickCommit,
+ ChangeNotes destChangeNotes,
+ @Nullable Boolean workInProgress) {
+ return workInProgress == null
+ && cherryPickCommit.getFilesWithGitConflicts().isEmpty()
+ && destChangeNotes.getChange().isWorkInProgress();
+ }
+
private Change.Id createNewChange(
BatchUpdate bu,
CodeReviewCommit cherryPickCommit,
diff --git a/java/com/google/gerrit/server/restapi/change/CommentJson.java b/java/com/google/gerrit/server/restapi/change/CommentJson.java
index edc8fcf..81b6fb3 100644
--- a/java/com/google/gerrit/server/restapi/change/CommentJson.java
+++ b/java/com/google/gerrit/server/restapi/change/CommentJson.java
@@ -190,7 +190,7 @@
return CommentContextKey.builder()
.project(project)
.changeId(changeId)
- .id(r.id)
+ .id(Url.decode(r.id)) // We reverse the encoding done while filling comment info
.path(r.path)
.patchset(r.patchSet)
.contextPadding(contextPadding)
diff --git a/java/com/google/gerrit/server/restapi/change/CommentPorter.java b/java/com/google/gerrit/server/restapi/change/CommentPorter.java
index 34af285..d1d4544 100644
--- a/java/com/google/gerrit/server/restapi/change/CommentPorter.java
+++ b/java/com/google/gerrit/server/restapi/change/CommentPorter.java
@@ -34,6 +34,9 @@
import com.google.gerrit.metrics.Description;
import com.google.gerrit.metrics.MetricMaker;
import com.google.gerrit.server.CommentsUtil;
+import com.google.gerrit.server.logging.Metadata;
+import com.google.gerrit.server.logging.TraceContext;
+import com.google.gerrit.server.logging.TraceContext.TraceTimer;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.patch.DiffMappings;
import com.google.gerrit.server.patch.GitPositionTransformer;
@@ -142,10 +145,13 @@
PatchSet targetPatchset,
List<HumanComment> comments,
List<HumanCommentFilter> filters) {
-
- ImmutableList<HumanCommentFilter> allFilters = addDefaultFilters(filters, targetPatchset);
- ImmutableList<HumanComment> relevantComments = filter(comments, allFilters);
- return port(changeNotes, targetPatchset, relevantComments);
+ try (TraceTimer ignored =
+ TraceContext.newTimer(
+ "Porting comments", Metadata.builder().patchSetId(targetPatchset.number()).build())) {
+ ImmutableList<HumanCommentFilter> allFilters = addDefaultFilters(filters, targetPatchset);
+ ImmutableList<HumanComment> relevantComments = filter(comments, allFilters);
+ return port(changeNotes, targetPatchset, relevantComments);
+ }
}
private ImmutableList<HumanCommentFilter> addDefaultFilters(
@@ -203,20 +209,29 @@
PatchSet originalPatchset,
PatchSet targetPatchset,
ImmutableList<HumanComment> comments) {
- Map<Short, List<HumanComment>> commentsPerSide =
- comments.stream().collect(groupingBy(comment -> comment.side));
- ImmutableList.Builder<HumanComment> portedComments = ImmutableList.builder();
- for (Entry<Short, List<HumanComment>> sideAndComments : commentsPerSide.entrySet()) {
- portedComments.addAll(
- portSamePatchsetAndSide(
- project,
- change,
- originalPatchset,
- targetPatchset,
- sideAndComments.getValue(),
- sideAndComments.getKey()));
+ try (TraceTimer ignored =
+ TraceContext.newTimer(
+ "Porting comments same patchset",
+ Metadata.builder()
+ .projectName(project.get())
+ .changeId(change.getChangeId())
+ .patchSetId(originalPatchset.number())
+ .build())) {
+ Map<Short, List<HumanComment>> commentsPerSide =
+ comments.stream().collect(groupingBy(comment -> comment.side));
+ ImmutableList.Builder<HumanComment> portedComments = ImmutableList.builder();
+ for (Entry<Short, List<HumanComment>> sideAndComments : commentsPerSide.entrySet()) {
+ portedComments.addAll(
+ portSamePatchsetAndSide(
+ project,
+ change,
+ originalPatchset,
+ targetPatchset,
+ sideAndComments.getValue(),
+ sideAndComments.getKey()));
+ }
+ return portedComments.build();
}
- return portedComments.build();
}
private ImmutableList<HumanComment> portSamePatchsetAndSide(
@@ -226,30 +241,40 @@
PatchSet targetPatchset,
List<HumanComment> comments,
short side) {
- ImmutableSet<Mapping> mappings;
- try {
- mappings = loadMappings(project, change, originalPatchset, targetPatchset, side);
- } catch (Exception e) {
- logger.atWarning().withCause(e).log(
- "Could not determine some necessary diff mappings for porting comments on change %s from"
- + " patchset %s to patchset %s. Mapping %d affected comments to the fallback"
- + " destination.",
- change.getChangeId(),
- originalPatchset.id().getId(),
- targetPatchset.id().getId(),
- comments.size());
- mappings = getFallbackMappings(comments);
- }
+ try (TraceTimer ignored =
+ TraceContext.newTimer(
+ "Porting comments same patchset and side",
+ Metadata.builder()
+ .projectName(project.get())
+ .changeId(change.getChangeId())
+ .patchSetId(originalPatchset.number())
+ .commentSide(side)
+ .build())) {
+ ImmutableSet<Mapping> mappings;
+ try {
+ mappings = loadMappings(project, change, originalPatchset, targetPatchset, side);
+ } catch (Exception e) {
+ logger.atWarning().withCause(e).log(
+ "Could not determine some necessary diff mappings for porting comments on change %s from"
+ + " patchset %s to patchset %s. Mapping %d affected comments to the fallback"
+ + " destination.",
+ change.getChangeId(),
+ originalPatchset.id().getId(),
+ targetPatchset.id().getId(),
+ comments.size());
+ mappings = getFallbackMappings(comments);
+ }
- ImmutableList<PositionedEntity<HumanComment>> positionedComments =
- comments.stream().map(this::toPositionedEntity).collect(toImmutableList());
- ImmutableMap<PositionedEntity<HumanComment>, HumanComment> origToPortedMap =
- positionTransformer.transform(positionedComments, mappings).stream()
- .collect(
- ImmutableMap.toImmutableMap(
- Function.identity(), PositionedEntity::getEntityAtUpdatedPosition));
- collectMetrics(origToPortedMap);
- return ImmutableList.copyOf(origToPortedMap.values());
+ ImmutableList<PositionedEntity<HumanComment>> positionedComments =
+ comments.stream().map(this::toPositionedEntity).collect(toImmutableList());
+ ImmutableMap<PositionedEntity<HumanComment>, HumanComment> origToPortedMap =
+ positionTransformer.transform(positionedComments, mappings).stream()
+ .collect(
+ ImmutableMap.toImmutableMap(
+ Function.identity(), PositionedEntity::getEntityAtUpdatedPosition));
+ collectMetrics(origToPortedMap);
+ return ImmutableList.copyOf(origToPortedMap.values());
+ }
}
private ImmutableSet<Mapping> loadMappings(
@@ -259,9 +284,18 @@
PatchSet targetPatchset,
short side)
throws PatchListNotAvailableException {
- ObjectId originalCommit = determineCommitId(change, originalPatchset, side);
- ObjectId targetCommit = determineCommitId(change, targetPatchset, side);
- return loadCommitMappings(project, originalCommit, targetCommit);
+ try (TraceTimer ignored =
+ TraceContext.newTimer(
+ "Loading commit mappings",
+ Metadata.builder()
+ .projectName(project.get())
+ .changeId(change.getChangeId())
+ .patchSetId(originalPatchset.number())
+ .build())) {
+ ObjectId originalCommit = determineCommitId(change, originalPatchset, side);
+ ObjectId targetCommit = determineCommitId(change, targetPatchset, side);
+ return loadCommitMappings(project, originalCommit, targetCommit);
+ }
}
private ObjectId determineCommitId(Change change, PatchSet patchset, short side) {
@@ -278,11 +312,15 @@
private ImmutableSet<Mapping> loadCommitMappings(
Project.NameKey project, ObjectId originalCommit, ObjectId targetCommit)
throws PatchListNotAvailableException {
- PatchList patchList =
- patchListCache.get(
- PatchListKey.againstCommit(originalCommit, targetCommit, Whitespace.IGNORE_NONE),
- project);
- return patchList.getPatches().stream().map(DiffMappings::toMapping).collect(toImmutableSet());
+ try (TraceTimer ignored =
+ TraceContext.newTimer(
+ "Computing diffs", Metadata.builder().commit(originalCommit.name()).build())) {
+ PatchList patchList =
+ patchListCache.get(
+ PatchListKey.againstCommit(originalCommit, targetCommit, Whitespace.IGNORE_NONE),
+ project);
+ return patchList.getPatches().stream().map(DiffMappings::toMapping).collect(toImmutableSet());
+ }
}
private ImmutableSet<Mapping> getFallbackMappings(List<HumanComment> comments) {
diff --git a/java/com/google/gerrit/server/restapi/change/DeleteAssignee.java b/java/com/google/gerrit/server/restapi/change/DeleteAssignee.java
index e981695..c602214 100644
--- a/java/com/google/gerrit/server/restapi/change/DeleteAssignee.java
+++ b/java/com/google/gerrit/server/restapi/change/DeleteAssignee.java
@@ -16,7 +16,6 @@
import com.google.gerrit.entities.Account;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.extensions.common.AccountInfo;
import com.google.gerrit.extensions.common.Input;
import com.google.gerrit.extensions.restapi.Response;
@@ -94,7 +93,7 @@
IdentifiedUser deletedAssigneeUser = userFactory.create(currentAssigneeId);
deletedAssignee = deletedAssigneeUser.state();
update.removeAssignee();
- addMessage(ctx, update, deletedAssigneeUser);
+ addMessage(ctx, deletedAssigneeUser);
return true;
}
@@ -102,14 +101,12 @@
return deletedAssignee != null ? deletedAssignee.account().id() : null;
}
- private void addMessage(
- ChangeContext ctx, ChangeUpdate update, IdentifiedUser deletedAssignee) {
- ChangeMessage cmsg =
- ChangeMessagesUtil.newMessage(
- ctx,
- "Assignee deleted: " + deletedAssignee.getNameEmail(),
- ChangeMessagesUtil.TAG_DELETE_ASSIGNEE);
- cmUtil.addChangeMessage(update, cmsg);
+ private void addMessage(ChangeContext ctx, IdentifiedUser deletedAssignee) {
+ cmUtil.setChangeMessage(
+ ctx,
+ "Assignee deleted: "
+ + ChangeMessagesUtil.getAccountTemplate(deletedAssignee.getAccountId()),
+ ChangeMessagesUtil.TAG_DELETE_ASSIGNEE);
}
@Override
diff --git a/java/com/google/gerrit/server/restapi/change/DeleteChangeMessage.java b/java/com/google/gerrit/server/restapi/change/DeleteChangeMessage.java
index 5b44957..0f280db 100644
--- a/java/com/google/gerrit/server/restapi/change/DeleteChangeMessage.java
+++ b/java/com/google/gerrit/server/restapi/change/DeleteChangeMessage.java
@@ -14,12 +14,11 @@
package com.google.gerrit.server.restapi.change;
-import static com.google.gerrit.server.ChangeMessagesUtil.createChangeMessageInfo;
import static java.util.Objects.requireNonNull;
-import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Strings;
import com.google.gerrit.common.Nullable;
+import com.google.gerrit.entities.Account;
import com.google.gerrit.entities.Change;
import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.PatchSet;
@@ -85,7 +84,7 @@
permissionBackend.user(user).check(GlobalPermission.ADMINISTRATE_SERVER);
String newChangeMessage =
- createNewChangeMessage(user.asIdentifiedUser().getName(), input.reason);
+ createNewChangeMessage(user.asIdentifiedUser().getAccountId(), input.reason);
DeleteChangeMessageOp deleteChangeMessageOp =
new DeleteChangeMessageOp(resource.getChangeMessageId(), newChangeMessage);
try (BatchUpdate batchUpdate =
@@ -107,26 +106,29 @@
changeMessagesUtil.byChange(notesFactory.createChecked(project, cId));
ChangeMessage updatedChangeMessage = messages.get(targetIdx);
AccountLoader accountLoader = accountLoaderFactory.create(true);
- ChangeMessageInfo info = createChangeMessageInfo(updatedChangeMessage, accountLoader);
+ ChangeMessageInfo info =
+ changeMessagesUtil.createChangeMessageInfoWithReplacedTemplates(
+ updatedChangeMessage, accountLoader);
accountLoader.fill();
return info;
}
- @VisibleForTesting
- public static String createNewChangeMessage(String deletedBy, @Nullable String deletedReason) {
- requireNonNull(deletedBy, "user name must not be null");
+ public static String createNewChangeMessage(
+ Account.Id deletedBy, @Nullable String deletedReason) {
+ requireNonNull(deletedBy, "user must not be null");
if (Strings.isNullOrEmpty(deletedReason)) {
return createNewChangeMessage(deletedBy);
}
- return String.format("Change message removed by: %s\nReason: %s", deletedBy, deletedReason);
+ return String.format(
+ "Change message removed by: %s\nReason: %s",
+ ChangeMessagesUtil.getAccountTemplate(deletedBy), deletedReason);
}
- @VisibleForTesting
- public static String createNewChangeMessage(String deletedBy) {
- requireNonNull(deletedBy, "user name must not be null");
+ public static String createNewChangeMessage(Account.Id deletedBy) {
+ requireNonNull(deletedBy, "user must not be null");
- return "Change message removed by: " + deletedBy;
+ return "Change message removed by: " + ChangeMessagesUtil.getAccountTemplate(deletedBy);
}
private class DeleteChangeMessageOp implements BatchUpdateOp {
diff --git a/java/com/google/gerrit/server/restapi/change/DeleteVote.java b/java/com/google/gerrit/server/restapi/change/DeleteVote.java
index 433e71f..8ae902d 100644
--- a/java/com/google/gerrit/server/restapi/change/DeleteVote.java
+++ b/java/com/google/gerrit/server/restapi/change/DeleteVote.java
@@ -21,7 +21,6 @@
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.entities.Account;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.LabelTypes;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.entities.PatchSetApproval;
@@ -75,7 +74,6 @@
private final ApprovalsUtil approvalsUtil;
private final PatchSetUtil psUtil;
private final ChangeMessagesUtil cmUtil;
- private final IdentifiedUser.GenericFactory userFactory;
private final VoteDeleted voteDeleted;
private final DeleteVoteSender.Factory deleteVoteSenderFactory;
private final NotifyResolver notifyResolver;
@@ -104,7 +102,6 @@
this.approvalsUtil = approvalsUtil;
this.psUtil = psUtil;
this.cmUtil = cmUtil;
- this.userFactory = userFactory;
this.voteDeleted = voteDeleted;
this.deleteVoteSenderFactory = deleteVoteSenderFactory;
this.notifyResolver = notifyResolver;
@@ -169,7 +166,7 @@
private final String label;
private final DeleteVoteInput input;
- private ChangeMessage changeMessage;
+ private String mailMessage;
private Change change;
private PatchSet ps;
private Map<String, Short> newApprovals = new HashMap<>();
@@ -228,17 +225,15 @@
StringBuilder msg = new StringBuilder();
msg.append("Removed ");
LabelVote.appendTo(msg, label, requireNonNull(oldApprovals.get(label)));
- msg.append(" by ").append(userFactory.create(accountId).getNameEmail()).append("\n");
- changeMessage =
- ChangeMessagesUtil.newMessage(ctx, msg.toString(), ChangeMessagesUtil.TAG_DELETE_VOTE);
- cmUtil.addChangeMessage(ctx.getUpdate(psId), changeMessage);
-
+ msg.append(" by ").append(ChangeMessagesUtil.getAccountTemplate(accountId)).append("\n");
+ mailMessage =
+ cmUtil.setChangeMessage(ctx, msg.toString(), ChangeMessagesUtil.TAG_DELETE_VOTE);
return true;
}
@Override
public void postUpdate(PostUpdateContext ctx) {
- if (changeMessage == null) {
+ if (mailMessage == null) {
return;
}
@@ -249,7 +244,7 @@
ReplyToChangeSender emailSender =
deleteVoteSenderFactory.create(ctx.getProject(), change.getId());
emailSender.setFrom(user.getAccountId());
- emailSender.setChangeMessage(changeMessage.getMessage(), ctx.getWhen());
+ emailSender.setChangeMessage(mailMessage, ctx.getWhen());
emailSender.setNotify(notify);
emailSender.setMessageId(
messageIdGenerator.fromChangeUpdate(ctx.getRepoView(), change.currentPatchSetId()));
@@ -266,7 +261,7 @@
newApprovals,
oldApprovals,
input.notify,
- changeMessage.getMessage(),
+ mailMessage,
user.state(),
ctx.getWhen());
}
diff --git a/java/com/google/gerrit/server/restapi/change/GetChange.java b/java/com/google/gerrit/server/restapi/change/GetChange.java
index c51bb91..740b8cb 100644
--- a/java/com/google/gerrit/server/restapi/change/GetChange.java
+++ b/java/com/google/gerrit/server/restapi/change/GetChange.java
@@ -67,8 +67,9 @@
}
@Option(name = "-O", usage = "Output option flags, in hex")
- void setOptionFlagsHex(String hex) {
- options.addAll(ListOption.fromBits(ListChangesOption.class, Integer.parseInt(hex, 16)));
+ void setOptionFlagsHex(String hex) throws BadRequestException {
+ EnumSet<ListChangesOption> optionSet = ListOption.fromHexString(ListChangesOption.class, hex);
+ options.addAll(optionSet);
}
@Inject
diff --git a/java/com/google/gerrit/server/restapi/change/GetDetail.java b/java/com/google/gerrit/server/restapi/change/GetDetail.java
index 15362d5..c6bbf53 100644
--- a/java/com/google/gerrit/server/restapi/change/GetDetail.java
+++ b/java/com/google/gerrit/server/restapi/change/GetDetail.java
@@ -35,7 +35,7 @@
}
@Option(name = "-O", usage = "Output option flags, in hex")
- void setOptionFlagsHex(String hex) {
+ void setOptionFlagsHex(String hex) throws BadRequestException {
delegate.setOptionFlagsHex(hex);
}
diff --git a/java/com/google/gerrit/server/restapi/change/GetDiff.java b/java/com/google/gerrit/server/restapi/change/GetDiff.java
index b8902b7..2169d57 100644
--- a/java/com/google/gerrit/server/restapi/change/GetDiff.java
+++ b/java/com/google/gerrit/server/restapi/change/GetDiff.java
@@ -226,18 +226,24 @@
}
@Override
+ public ImmutableList<WebLinkInfo> getEditWebLinks() {
+ return webLinks.getEditLinks(projectName.get(), revB, sideB.fileName());
+ }
+
+ @Override
public ImmutableList<WebLinkInfo> getFileWebLinks(DiffSide.Type type) {
- String rev;
- DiffSide side;
- if (type == DiffSide.Type.SIDE_A) {
- rev = revA;
- side = sideA;
- } else {
- rev = revB;
- side = sideB;
- }
+ String rev = getSideRev(type);
+ DiffSide side = getDiffSide(type);
return webLinks.getFileLinks(projectName.get(), rev, side.fileName());
}
+
+ private String getSideRev(DiffSide.Type sideType) {
+ return DiffSide.Type.SIDE_A == sideType ? revA : revB;
+ }
+
+ private DiffSide getDiffSide(DiffSide.Type sideType) {
+ return DiffSide.Type.SIDE_A == sideType ? sideA : sideB;
+ }
}
public GetDiff setBase(String base) {
diff --git a/java/com/google/gerrit/server/restapi/change/GetFixPreview.java b/java/com/google/gerrit/server/restapi/change/GetFixPreview.java
index 6089778..99c8a0a 100644
--- a/java/com/google/gerrit/server/restapi/change/GetFixPreview.java
+++ b/java/com/google/gerrit/server/restapi/change/GetFixPreview.java
@@ -137,6 +137,11 @@
}
@Override
+ public ImmutableList<WebLinkInfo> getEditWebLinks() {
+ return ImmutableList.of();
+ }
+
+ @Override
public ImmutableList<WebLinkInfo> getFileWebLinks(Type fileInfoType) {
return ImmutableList.of();
}
diff --git a/java/com/google/gerrit/server/restapi/change/GetMetaDiff.java b/java/com/google/gerrit/server/restapi/change/GetMetaDiff.java
index af23ba7..08d51e7 100644
--- a/java/com/google/gerrit/server/restapi/change/GetMetaDiff.java
+++ b/java/com/google/gerrit/server/restapi/change/GetMetaDiff.java
@@ -62,8 +62,8 @@
}
@Option(name = "-O", usage = "Output option flags, in hex")
- void setOptionFlagsHex(String hex) {
- options.addAll(ListOption.fromBits(ListChangesOption.class, Integer.parseInt(hex, 16)));
+ void setOptionFlagsHex(String hex) throws BadRequestException {
+ options.addAll(ListOption.fromHexString(ListChangesOption.class, hex));
}
@Option(name = "--old", usage = "old NoteDb meta SHA-1")
diff --git a/java/com/google/gerrit/server/restapi/change/ListChangeMessages.java b/java/com/google/gerrit/server/restapi/change/ListChangeMessages.java
index 099d0a6..c881621 100644
--- a/java/com/google/gerrit/server/restapi/change/ListChangeMessages.java
+++ b/java/com/google/gerrit/server/restapi/change/ListChangeMessages.java
@@ -14,8 +14,6 @@
package com.google.gerrit.server.restapi.change;
-import static com.google.gerrit.server.ChangeMessagesUtil.createChangeMessageInfo;
-
import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.extensions.common.ChangeMessageInfo;
import com.google.gerrit.extensions.restapi.Response;
@@ -48,7 +46,10 @@
List<ChangeMessage> messages = changeMessagesUtil.byChange(resource.getNotes());
List<ChangeMessageInfo> messageInfos =
messages.stream()
- .map(m -> createChangeMessageInfo(m, accountLoader))
+ .map(
+ m ->
+ changeMessagesUtil.createChangeMessageInfoWithReplacedTemplates(
+ m, accountLoader))
.collect(Collectors.toList());
accountLoader.fill();
return Response.ok(messageInfos);
diff --git a/java/com/google/gerrit/server/restapi/change/Move.java b/java/com/google/gerrit/server/restapi/change/Move.java
index e8b4bc9..22fcbc7 100644
--- a/java/com/google/gerrit/server/restapi/change/Move.java
+++ b/java/com/google/gerrit/server/restapi/change/Move.java
@@ -25,7 +25,6 @@
import com.google.gerrit.common.Nullable;
import com.google.gerrit.entities.BranchNameKey;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.LabelType;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.entities.PatchSetApproval;
@@ -251,9 +250,7 @@
msgBuf.append("\n\n");
msgBuf.append(input.message);
}
- ChangeMessage cmsg =
- ChangeMessagesUtil.newMessage(ctx, msgBuf.toString(), ChangeMessagesUtil.TAG_MOVE);
- cmUtil.addChangeMessage(update, cmsg);
+ cmUtil.setChangeMessage(ctx, msgBuf.toString(), ChangeMessagesUtil.TAG_MOVE);
return true;
}
diff --git a/java/com/google/gerrit/server/restapi/change/PostReview.java b/java/com/google/gerrit/server/restapi/change/PostReview.java
index 8c1e655..4b70e04 100644
--- a/java/com/google/gerrit/server/restapi/change/PostReview.java
+++ b/java/com/google/gerrit/server/restapi/change/PostReview.java
@@ -44,7 +44,6 @@
import com.google.gerrit.entities.Account;
import com.google.gerrit.entities.Address;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.Comment;
import com.google.gerrit.entities.FixReplacement;
import com.google.gerrit.entities.FixSuggestion;
@@ -907,7 +906,7 @@
private IdentifiedUser user;
private ChangeNotes notes;
private PatchSet ps;
- private ChangeMessage message;
+ private String mailMessage;
private List<Comment> comments = new ArrayList<>();
private List<LabelVote> labelDelta = new ArrayList<>();
private Map<String, Short> approvals = new HashMap<>();
@@ -946,7 +945,7 @@
@Override
public void postUpdate(PostUpdateContext ctx) {
- if (message == null) {
+ if (mailMessage == null) {
return;
}
NotifyResolver.Result notify = ctx.getNotify(notes.getChangeId());
@@ -958,7 +957,8 @@
notes,
ps,
user,
- message,
+ mailMessage,
+ ctx.getWhen(),
comments,
in.message,
labelDelta,
@@ -969,7 +969,7 @@
String.format("Repository %s not found", ctx.getProject().get()), ex);
}
}
- String comment = message.getMessage();
+ String comment = mailMessage;
if (publishPatchSetLevelComment) {
// TODO(davido): Remove this workaround when patch set level comments are exposed in comment
// added event. For backwards compatibility, patchset level comment has a higher priority
@@ -1491,10 +1491,9 @@
return false;
}
- message =
- ChangeMessagesUtil.newMessage(
- psId, user, ctx.getWhen(), "Patch Set " + psId.get() + ":" + buf, in.tag);
- cmUtil.addChangeMessage(ctx.getUpdate(psId), message);
+ mailMessage =
+ cmUtil.setChangeMessage(
+ ctx.getUpdate(psId), "Patch Set " + psId.get() + ":" + buf, in.tag);
return true;
}
diff --git a/java/com/google/gerrit/server/restapi/change/PutDescription.java b/java/com/google/gerrit/server/restapi/change/PutDescription.java
index f442a42..7c54074 100644
--- a/java/com/google/gerrit/server/restapi/change/PutDescription.java
+++ b/java/com/google/gerrit/server/restapi/change/PutDescription.java
@@ -15,7 +15,6 @@
package com.google.gerrit.server.restapi.change;
import com.google.common.base.Strings;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.extensions.common.DescriptionInput;
import com.google.gerrit.extensions.restapi.Response;
@@ -102,10 +101,7 @@
String.format(
"Description of patch set %d changed to \"%s\"", psId.get(), newDescription);
}
- ChangeMessage cmsg =
- ChangeMessagesUtil.newMessage(
- psId, ctx.getUser(), ctx.getWhen(), summary, ChangeMessagesUtil.TAG_SET_DESCRIPTION);
- cmUtil.addChangeMessage(update, cmsg);
+ cmUtil.setChangeMessage(update, summary, ChangeMessagesUtil.TAG_SET_DESCRIPTION);
return true;
}
}
diff --git a/java/com/google/gerrit/server/restapi/change/QueryChanges.java b/java/com/google/gerrit/server/restapi/change/QueryChanges.java
index cf0d4cf..91fa2f0 100644
--- a/java/com/google/gerrit/server/restapi/change/QueryChanges.java
+++ b/java/com/google/gerrit/server/restapi/change/QueryChanges.java
@@ -82,8 +82,8 @@
}
@Option(name = "-O", usage = "Output option flags, in hex")
- void setOptionFlagsHex(String hex) {
- options.addAll(ListOption.fromBits(ListChangesOption.class, Integer.parseInt(hex, 16)));
+ void setOptionFlagsHex(String hex) throws BadRequestException {
+ options.addAll(ListOption.fromHexString(ListChangesOption.class, hex));
}
@Option(
diff --git a/java/com/google/gerrit/server/restapi/change/Restore.java b/java/com/google/gerrit/server/restapi/change/Restore.java
index 9fd6d3d..b2d1d3a 100644
--- a/java/com/google/gerrit/server/restapi/change/Restore.java
+++ b/java/com/google/gerrit/server/restapi/change/Restore.java
@@ -20,7 +20,6 @@
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.entities.Change;
import com.google.gerrit.entities.Change.Status;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.extensions.api.changes.RestoreInput;
import com.google.gerrit.extensions.common.ChangeInfo;
@@ -112,7 +111,7 @@
private Change change;
private PatchSet patchSet;
- private ChangeMessage message;
+ private String mailMessage;
private Op(RestoreInput input) {
this.input = input;
@@ -131,19 +130,18 @@
change.setLastUpdatedOn(ctx.getWhen());
update.setStatus(change.getStatus());
- message = newMessage(ctx);
- cmUtil.addChangeMessage(update, message);
+ mailMessage = cmUtil.setChangeMessage(ctx, commentMessage(), ChangeMessagesUtil.TAG_RESTORE);
return true;
}
- private ChangeMessage newMessage(ChangeContext ctx) {
+ private String commentMessage() {
StringBuilder msg = new StringBuilder();
msg.append("Restored");
if (!Strings.nullToEmpty(input.message).trim().isEmpty()) {
msg.append("\n\n");
msg.append(input.message.trim());
}
- return ChangeMessagesUtil.newMessage(ctx, msg.toString(), ChangeMessagesUtil.TAG_RESTORE);
+ return msg.toString();
}
@Override
@@ -152,7 +150,7 @@
ReplyToChangeSender emailSender =
restoredSenderFactory.create(ctx.getProject(), change.getId());
emailSender.setFrom(ctx.getAccountId());
- emailSender.setChangeMessage(message.getMessage(), ctx.getWhen());
+ emailSender.setChangeMessage(mailMessage, ctx.getWhen());
emailSender.setMessageId(
messageIdGenerator.fromChangeUpdate(ctx.getRepoView(), change.currentPatchSetId()));
emailSender.send();
diff --git a/java/com/google/gerrit/server/restapi/change/RevertSubmission.java b/java/com/google/gerrit/server/restapi/change/RevertSubmission.java
index 7414bf4..20249df 100644
--- a/java/com/google/gerrit/server/restapi/change/RevertSubmission.java
+++ b/java/com/google/gerrit/server/restapi/change/RevertSubmission.java
@@ -28,8 +28,6 @@
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.entities.BranchNameKey;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.entities.ChangeMessage;
-import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.entities.Project;
import com.google.gerrit.entities.RefNames;
import com.google.gerrit.exceptions.StorageException;
@@ -647,14 +645,10 @@
@Override
public boolean updateChange(ChangeContext ctx) throws Exception {
- Change change = ctx.getChange();
- PatchSet.Id patchSetId = change.currentPatchSetId();
- ChangeMessage changeMessage =
- ChangeMessagesUtil.newMessage(
- ctx,
- "Created a revert of this change as I" + computedChangeId.getName(),
- ChangeMessagesUtil.TAG_REVERT);
- cmUtil.addChangeMessage(ctx.getUpdate(patchSetId), changeMessage);
+ cmUtil.setChangeMessage(
+ ctx,
+ "Created a revert of this change as I" + computedChangeId.getName(),
+ ChangeMessagesUtil.TAG_REVERT);
return true;
}
}
diff --git a/java/com/google/gerrit/server/restapi/group/ListGroups.java b/java/com/google/gerrit/server/restapi/group/ListGroups.java
index 96402be..854f091 100644
--- a/java/com/google/gerrit/server/restapi/group/ListGroups.java
+++ b/java/com/google/gerrit/server/restapi/group/ListGroups.java
@@ -186,8 +186,8 @@
}
@Option(name = "-O", usage = "Output option flags, in hex")
- void setOptionFlagsHex(String hex) {
- options.addAll(ListOption.fromBits(ListGroupsOption.class, Integer.parseInt(hex, 16)));
+ void setOptionFlagsHex(String hex) throws BadRequestException {
+ options.addAll(ListOption.fromHexString(ListGroupsOption.class, hex));
}
@Option(
diff --git a/java/com/google/gerrit/server/restapi/group/QueryGroups.java b/java/com/google/gerrit/server/restapi/group/QueryGroups.java
index 26e8459..befccfe 100644
--- a/java/com/google/gerrit/server/restapi/group/QueryGroups.java
+++ b/java/com/google/gerrit/server/restapi/group/QueryGroups.java
@@ -80,8 +80,8 @@
}
@Option(name = "-O", usage = "Output option flags, in hex")
- public void setOptionFlagsHex(String hex) {
- options.addAll(ListOption.fromBits(ListGroupsOption.class, Integer.parseInt(hex, 16)));
+ public void setOptionFlagsHex(String hex) throws BadRequestException {
+ options.addAll(ListOption.fromHexString(ListGroupsOption.class, hex));
}
@Inject
diff --git a/java/com/google/gerrit/server/rules/DefaultSubmitRule.java b/java/com/google/gerrit/server/rules/DefaultSubmitRule.java
index e670dc2..f5709e4 100644
--- a/java/com/google/gerrit/server/rules/DefaultSubmitRule.java
+++ b/java/com/google/gerrit/server/rules/DefaultSubmitRule.java
@@ -16,7 +16,6 @@
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.gerrit.server.project.ProjectCache.illegalState;
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.entities.LabelFunction;
@@ -26,7 +25,6 @@
import com.google.gerrit.extensions.annotations.Exports;
import com.google.gerrit.extensions.config.FactoryModule;
import com.google.gerrit.server.project.ProjectCache;
-import com.google.gerrit.server.project.ProjectState;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -64,15 +62,6 @@
@Override
public Optional<SubmitRecord> evaluate(ChangeData cd) {
- ProjectState projectState =
- projectCache.get(cd.project()).orElseThrow(illegalState(cd.project()));
-
- // In case at least one project has a rules.pl file, we let Prolog handle it.
- // The Prolog rules engine will also handle the labels for us.
- if (projectState.hasPrologRules()) {
- return Optional.empty();
- }
-
SubmitRecord submitRecord = new SubmitRecord();
submitRecord.status = SubmitRecord.Status.OK;
diff --git a/java/com/google/gerrit/server/submit/LocalMergeSuperSetComputation.java b/java/com/google/gerrit/server/submit/LocalMergeSuperSetComputation.java
index 0b05607..547c946 100644
--- a/java/com/google/gerrit/server/submit/LocalMergeSuperSetComputation.java
+++ b/java/com/google/gerrit/server/submit/LocalMergeSuperSetComputation.java
@@ -22,20 +22,15 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.flogger.FluentLogger;
+import com.google.gerrit.common.UsedAt;
import com.google.gerrit.entities.BranchNameKey;
import com.google.gerrit.entities.Project;
import com.google.gerrit.entities.SubmitTypeRecord;
import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.extensions.client.SubmitType;
import com.google.gerrit.extensions.registration.DynamicItem;
-import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.server.CurrentUser;
-import com.google.gerrit.server.permissions.ChangePermission;
-import com.google.gerrit.server.permissions.PermissionBackend;
-import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gerrit.server.project.NoSuchProjectException;
-import com.google.gerrit.server.project.ProjectCache;
-import com.google.gerrit.server.project.ProjectState;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.query.change.ChangeIsVisibleToPredicate;
import com.google.gerrit.server.query.change.InternalChangeQuery;
@@ -84,21 +79,15 @@
abstract ImmutableSet<String> hashes();
}
- private final PermissionBackend permissionBackend;
private final Provider<InternalChangeQuery> queryProvider;
private final Map<QueryKey, ImmutableList<ChangeData>> queryCache;
private final Map<BranchNameKey, Optional<RevCommit>> heads;
- private final ProjectCache projectCache;
private final ChangeIsVisibleToPredicate.Factory changeIsVisibleToPredicateFactory;
@Inject
LocalMergeSuperSetComputation(
- PermissionBackend permissionBackend,
Provider<InternalChangeQuery> queryProvider,
- ProjectCache projectCache,
ChangeIsVisibleToPredicate.Factory changeIsVisibleToPredicateFactory) {
- this.projectCache = projectCache;
- this.permissionBackend = permissionBackend;
this.queryProvider = queryProvider;
this.queryCache = new HashMap<>();
this.heads = new HashMap<>();
@@ -107,51 +96,46 @@
@Override
public ChangeSet completeWithoutTopic(
- MergeOpRepoManager orm, ChangeSet changeSet, CurrentUser user)
- throws IOException, PermissionBackendException {
+ MergeOpRepoManager orm, ChangeSet changeSet, CurrentUser user) throws IOException {
Collection<ChangeData> visibleChanges = new ArrayList<>();
Collection<ChangeData> nonVisibleChanges = new ArrayList<>();
// For each target branch we run a separate rev walk to find open changes
// reachable from changes already in the merge super set.
- ImmutableListMultimap<BranchNameKey, ChangeData> bc =
- byBranch(Iterables.concat(changeSet.changes(), changeSet.nonVisibleChanges()));
- for (BranchNameKey b : bc.keySet()) {
- OpenRepo or = getRepo(orm, b.project());
+ ImmutableSet<BranchNameKey> branches =
+ byBranch(Iterables.concat(changeSet.changes(), changeSet.nonVisibleChanges())).keySet();
+ ImmutableListMultimap<BranchNameKey, ChangeData> visibleChangesPerBranch =
+ byBranch(changeSet.changes());
+ ImmutableListMultimap<BranchNameKey, ChangeData> nonVisibleChangesPerBranch =
+ byBranch(changeSet.nonVisibleChanges());
+
+ for (BranchNameKey branchNameKey : branches) {
+ OpenRepo or = getRepo(orm, branchNameKey.project());
List<RevCommit> visibleCommits = new ArrayList<>();
List<RevCommit> nonVisibleCommits = new ArrayList<>();
- for (ChangeData cd : bc.get(b)) {
- boolean visible = isVisible(changeSet, cd, user);
+ for (ChangeData cd : visibleChangesPerBranch.get(branchNameKey)) {
if (submitType(cd) == SubmitType.CHERRY_PICK) {
- if (visible) {
- visibleChanges.add(cd);
- } else {
- nonVisibleChanges.add(cd);
- }
-
- continue;
- }
-
- // Get the underlying git commit object
- RevCommit commit = or.rw.parseCommit(cd.currentPatchSet().commitId());
-
- // Always include the input, even if merged. This allows
- // SubmitStrategyOp to correct the situation later, assuming it gets
- // returned by byCommitsOnBranchNotMerged below.
- if (visible) {
- visibleCommits.add(commit);
+ visibleChanges.add(cd);
} else {
- nonVisibleCommits.add(commit);
+ visibleCommits.add(or.rw.parseCommit(cd.currentPatchSet().commitId()));
+ }
+ }
+ for (ChangeData cd : nonVisibleChangesPerBranch.get(branchNameKey)) {
+ if (submitType(cd) == SubmitType.CHERRY_PICK) {
+ nonVisibleChanges.add(cd);
+ } else {
+ nonVisibleCommits.add(or.rw.parseCommit(cd.currentPatchSet().commitId()));
}
}
Set<String> visibleHashes =
- walkChangesByHashes(visibleCommits, Collections.emptySet(), or, b);
- Set<String> nonVisibleHashes = walkChangesByHashes(nonVisibleCommits, visibleHashes, or, b);
+ walkChangesByHashes(visibleCommits, Collections.emptySet(), or, branchNameKey);
+ Set<String> nonVisibleHashes =
+ walkChangesByHashes(nonVisibleCommits, visibleHashes, or, branchNameKey);
ChangeSet partialSet =
- byCommitsOnBranchNotMerged(or, b, visibleHashes, nonVisibleHashes, user);
+ byCommitsOnBranchNotMerged(or, branchNameKey, visibleHashes, nonVisibleHashes, user);
Iterables.addAll(visibleChanges, partialSet.changes());
Iterables.addAll(nonVisibleChanges, partialSet.nonVisibleChanges());
}
@@ -179,26 +163,6 @@
}
}
- private boolean isVisible(ChangeSet changeSet, ChangeData cd, CurrentUser user)
- throws PermissionBackendException {
- boolean statePermitsRead =
- projectCache.get(cd.project()).map(ProjectState::statePermitsRead).orElse(false);
- boolean visible = statePermitsRead && changeSet.ids().contains(cd.getId());
- if (!visible) {
- return false;
- }
-
- try {
- permissionBackend.user(user).change(cd).check(ChangePermission.READ);
- return true;
- } catch (AuthException e) {
- // We thought the change was visible, but it isn't.
- // This can happen if the ACL changes during the
- // completeChangeSet computation, for example.
- return false;
- }
- }
-
private SubmitType submitType(ChangeData cd) {
SubmitTypeRecord str = cd.submitTypeRecord();
if (!str.isOk()) {
@@ -207,7 +171,8 @@
return str.type;
}
- private ChangeSet byCommitsOnBranchNotMerged(
+ @UsedAt(UsedAt.Project.GOOGLE)
+ public ChangeSet byCommitsOnBranchNotMerged(
OpenRepo or,
BranchNameKey branch,
Set<String> visibleHashes,
@@ -222,7 +187,9 @@
ChangeIsVisibleToPredicate changeIsVisibleToPredicate =
changeIsVisibleToPredicateFactory.forUser(user);
for (ChangeData cd : potentiallyVisibleChanges) {
- if (changeIsVisibleToPredicate.match(cd)) {
+ // short circuit permission checks for non-private changes, as we already checked all
+ // permissions (except for private changes).
+ if (!cd.change().isPrivate() || changeIsVisibleToPredicate.match(cd)) {
visibleChanges.add(cd);
} else {
invisibleChanges.add(cd);
@@ -247,7 +214,8 @@
return result;
}
- private Set<String> walkChangesByHashes(
+ @UsedAt(UsedAt.Project.GOOGLE)
+ public Set<String> walkChangesByHashes(
Collection<RevCommit> sourceCommits, Set<String> ignoreHashes, OpenRepo or, BranchNameKey b)
throws IOException {
Set<String> destHashes = new HashSet<>();
diff --git a/java/com/google/gerrit/server/submit/MergeOp.java b/java/com/google/gerrit/server/submit/MergeOp.java
index a8a8675..2b4fb3b 100644
--- a/java/com/google/gerrit/server/submit/MergeOp.java
+++ b/java/com/google/gerrit/server/submit/MergeOp.java
@@ -36,7 +36,6 @@
import com.google.gerrit.entities.BranchNameKey;
import com.google.gerrit.entities.Change;
import com.google.gerrit.entities.Change.Status;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.LegacySubmitRequirement;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.entities.Project;
@@ -963,14 +962,8 @@
change.setStatus(Change.Status.ABANDONED);
- ChangeMessage msg =
- ChangeMessagesUtil.newMessage(
- change.currentPatchSetId(),
- internalUserFactory.create(),
- change.getLastUpdatedOn(),
- "Project was deleted.",
- ChangeMessagesUtil.TAG_MERGED);
- cmUtil.addChangeMessage(ctx.getUpdate(change.currentPatchSetId()), msg);
+ cmUtil.setChangeMessage(
+ ctx, "Project was deleted.", ChangeMessagesUtil.TAG_MERGED);
return true;
}
diff --git a/java/com/google/gerrit/server/submit/SubmitStrategyOp.java b/java/com/google/gerrit/server/submit/SubmitStrategyOp.java
index a957b39..a63c7dc 100644
--- a/java/com/google/gerrit/server/submit/SubmitStrategyOp.java
+++ b/java/com/google/gerrit/server/submit/SubmitStrategyOp.java
@@ -24,7 +24,6 @@
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.entities.BranchNameKey;
import com.google.gerrit.entities.Change;
-import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.entities.PatchSetApproval;
@@ -284,7 +283,7 @@
// ChangeMergedEvent in the fixup case, but we'll just live with that.
: alreadyMergedCommit;
try {
- setMerged(ctx, message(ctx, commit, s));
+ setMerged(ctx, commit, message(ctx, commit, s));
} catch (StorageException err) {
String msg = "Error updating change status for " + id;
logger.atSevere().withCause(err).log(msg);
@@ -395,17 +394,17 @@
}
}
- private ChangeMessage message(ChangeContext ctx, CodeReviewCommit commit, CommitMergeStatus s)
+ private String message(ChangeContext ctx, CodeReviewCommit commit, CommitMergeStatus s)
throws AuthException, IOException, PermissionBackendException,
InvalidChangeOperationException {
requireNonNull(s, "CommitMergeStatus may not be null");
String txt = s.getDescription();
if (s == CommitMergeStatus.CLEAN_MERGE) {
- return message(ctx, commit.getPatchsetId(), txt);
+ return message(ctx, txt);
} else if (s == CommitMergeStatus.CLEAN_REBASE || s == CommitMergeStatus.CLEAN_PICK) {
- return message(ctx, commit.getPatchsetId(), txt + " as " + commit.name());
+ return message(ctx, txt + " as " + commit.name());
} else if (s == CommitMergeStatus.SKIPPED_IDENTICAL_TREE) {
- return message(ctx, commit.getPatchsetId(), txt);
+ return message(ctx, txt);
} else if (s == CommitMergeStatus.ALREADY_MERGED) {
// Best effort to mimic the message that would have happened had this
// succeeded the first time around.
@@ -437,19 +436,14 @@
}
}
- private ChangeMessage message(ChangeContext ctx, PatchSet.Id psId, String body)
+ private String message(ChangeContext ctx, String body)
throws AuthException, IOException, PermissionBackendException,
InvalidChangeOperationException {
stickyApprovalDiff = args.submitWithStickyApprovalDiff.apply(ctx.getNotes(), ctx.getUser());
- return ChangeMessagesUtil.newMessage(
- psId,
- ctx.getUser(),
- ctx.getWhen(),
- body + stickyApprovalDiff,
- ChangeMessagesUtil.TAG_MERGED);
+ return body + stickyApprovalDiff;
}
- private void setMerged(ChangeContext ctx, ChangeMessage msg) {
+ private void setMerged(ChangeContext ctx, CodeReviewCommit commit, String msg) {
Change c = ctx.getChange();
logger.atFine().log("Setting change %s merged", c.getId());
c.setStatus(Change.Status.MERGED);
@@ -458,7 +452,8 @@
// which is not the user from the update context. addMergedMessage was able
// to do this in the past.
if (msg != null) {
- args.cmUtil.addChangeMessage(ctx.getUpdate(msg.getPatchSetId()), msg);
+ args.cmUtil.setChangeMessage(
+ ctx.getUpdate(commit.getPatchsetId()), msg, ChangeMessagesUtil.TAG_MERGED);
}
}
diff --git a/java/com/google/gerrit/sshd/commands/ConvertRefStorage.java b/java/com/google/gerrit/sshd/commands/ConvertRefStorage.java
new file mode 100644
index 0000000..21d90ed
--- /dev/null
+++ b/java/com/google/gerrit/sshd/commands/ConvertRefStorage.java
@@ -0,0 +1,91 @@
+// Copyright (C) 2021 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.sshd.commands;
+
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.gerrit.sshd.CommandMetaData.Mode.MASTER_OR_SLAVE;
+
+import com.google.gerrit.common.data.GlobalCapability;
+import com.google.gerrit.entities.Project;
+import com.google.gerrit.extensions.annotations.RequiresCapability;
+import com.google.gerrit.server.git.DelegateRepository;
+import com.google.gerrit.server.git.GitRepositoryManager;
+import com.google.gerrit.server.project.ProjectState;
+import com.google.gerrit.sshd.CommandMetaData;
+import com.google.gerrit.sshd.SshCommand;
+import com.google.inject.Inject;
+import java.io.IOException;
+import org.eclipse.jgit.errors.RepositoryNotFoundException;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
+import org.eclipse.jgit.lib.Repository;
+import org.kohsuke.args4j.Option;
+
+@RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER)
+@CommandMetaData(
+ name = "convert-ref-storage",
+ description = "Convert ref storage to reftable (experimental)",
+ runsAt = MASTER_OR_SLAVE)
+public class ConvertRefStorage extends SshCommand {
+ @Inject private GitRepositoryManager repoManager;
+
+ private enum StorageFormatOption {
+ reftable,
+ refdir,
+ }
+
+ @Option(
+ name = "--format",
+ usage = "storage format to convert to (reftable or refdir) (default: reftable)")
+ private StorageFormatOption storageFormat = StorageFormatOption.reftable;
+
+ @Option(
+ name = "--backup",
+ aliases = {"-b"},
+ usage = "create backup of old ref storage format (default: true)")
+ private boolean backup = true;
+
+ @Option(
+ name = "--reflogs",
+ aliases = {"-r"},
+ usage = "write reflogs to reftable (default: true)")
+ private boolean writeLogs = true;
+
+ @Option(
+ name = "--project",
+ aliases = {"-p"},
+ metaVar = "PROJECT",
+ required = true,
+ usage = "project for which the storage format should be changed")
+ private ProjectState projectState;
+
+ @Override
+ public void run() throws Exception {
+ enableGracefulStop();
+ Project.NameKey projectName = projectState.getNameKey();
+ try (Repository repo = repoManager.openRepository(projectName)) {
+ if (repo instanceof DelegateRepository) {
+ ((DelegateRepository) repo).convertRefStorage(storageFormat.name(), writeLogs, backup);
+ } else {
+ checkState(
+ repo instanceof FileRepository, "Repository is not an instance of FileRepository!");
+ ((FileRepository) repo).convertRefStorage(storageFormat.name(), writeLogs, backup);
+ }
+ } catch (RepositoryNotFoundException e) {
+ throw die("'" + projectName + "': not a git archive", e);
+ } catch (IOException e) {
+ throw die("Error converting: '" + projectName + "': " + e.getMessage(), e);
+ }
+ }
+}
diff --git a/java/com/google/gerrit/sshd/commands/DefaultCommandModule.java b/java/com/google/gerrit/sshd/commands/DefaultCommandModule.java
index cfd17f4..8ee6a0d 100644
--- a/java/com/google/gerrit/sshd/commands/DefaultCommandModule.java
+++ b/java/com/google/gerrit/sshd/commands/DefaultCommandModule.java
@@ -47,6 +47,7 @@
command(gerrit, AproposCommand.class);
command(gerrit, BanCommitCommand.class);
command(gerrit, CloseConnection.class);
+ command(gerrit, ConvertRefStorage.class);
command(gerrit, FlushCaches.class);
command(gerrit, ListProjectsCommand.class);
command(gerrit, ListMembersCommand.class);
diff --git a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java
index ca412da..7130339 100644
--- a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java
@@ -131,6 +131,7 @@
import com.google.gerrit.server.account.AccountsUpdate;
import com.google.gerrit.server.account.Emails;
import com.google.gerrit.server.account.VersionedAuthorizedKeys;
+import com.google.gerrit.server.account.externalids.DuplicateExternalIdKeyException;
import com.google.gerrit.server.account.externalids.ExternalId;
import com.google.gerrit.server.account.externalids.ExternalIdNotes;
import com.google.gerrit.server.account.externalids.ExternalIds;
@@ -2625,12 +2626,14 @@
}
assertStaleAccountAndReindex(accountId);
+ extIdNotes = ExternalIdNotes.loadNoCacheUpdate(allUsers, repo);
extIdNotes.upsert(ExternalId.createWithEmail(key, accountId, "foo@example.com"));
try (MetaDataUpdate update = metaDataUpdateFactory.create(allUsers)) {
extIdNotes.commit(update);
}
assertStaleAccountAndReindex(accountId);
+ extIdNotes = ExternalIdNotes.loadNoCacheUpdate(allUsers, repo);
extIdNotes.delete(accountId, key);
try (MetaDataUpdate update = metaDataUpdateFactory.create(allUsers)) {
extIdNotes.commit(update);
@@ -2886,6 +2889,91 @@
assertThat(thrown).hasMessageThat().contains("username");
}
+ @Test
+ public void externalIdBatchUpdates() throws Exception {
+ String extId1String = "foo:bar";
+ String extId2String = "foo:baz";
+ ExternalId extId1 =
+ ExternalId.createWithEmail(ExternalId.Key.parse(extId1String), admin.id(), "1@foo.com");
+ ExternalId extId2 =
+ ExternalId.createWithEmail(ExternalId.Key.parse(extId2String), user.id(), "2@foo.com");
+
+ ObjectId revBefore;
+ try (Repository repo = repoManager.openRepository(allUsers)) {
+ revBefore = repo.exactRef(RefNames.REFS_EXTERNAL_IDS).getObjectId();
+ }
+
+ AccountsUpdate.UpdateArguments ua1 =
+ new AccountsUpdate.UpdateArguments(
+ "Add External ID", admin.id(), (a, u) -> u.addExternalId(extId1));
+ AccountsUpdate.UpdateArguments ua2 =
+ new AccountsUpdate.UpdateArguments(
+ "Add External ID", user.id(), (a, u) -> u.addExternalId(extId2));
+ ImmutableList<Optional<AccountState>> accountStates =
+ accountsUpdateProvider.get().updateBatch(ImmutableList.of(ua1, ua2));
+ assertThat(accountStates).hasSize(2);
+ assertThat(accountStates.get(0).get().externalIds()).contains(extId1);
+ assertThat(accountStates.get(1).get().externalIds()).contains(extId2);
+ assertThat(
+ gApi.accounts().id(admin.id().get()).getExternalIds().stream()
+ .map(e -> e.identity)
+ .collect(toSet()))
+ .contains(extId1String);
+ assertThat(
+ gApi.accounts().id(user.id().get()).getExternalIds().stream()
+ .map(e -> e.identity)
+ .collect(toSet()))
+ .contains(extId2String);
+
+ // Ensure that we only applied one single commit.
+ try (Repository repo = repoManager.openRepository(allUsers);
+ RevWalk rw = new RevWalk(repo)) {
+ RevCommit after = rw.parseCommit(repo.exactRef(RefNames.REFS_EXTERNAL_IDS).getObjectId());
+ assertThat(after.getParent(0).toObjectId()).isEqualTo(revBefore);
+ }
+ }
+
+ @Test
+ public void externalIdBatchUpdates_fail_sameAccount() {
+ ExternalId extId1 =
+ ExternalId.createWithEmail(ExternalId.Key.parse("foo:bar"), admin.id(), "1@foo.com");
+ ExternalId extId2 =
+ ExternalId.createWithEmail(ExternalId.Key.parse("foo:baz"), user.id(), "2@foo.com");
+
+ AccountsUpdate.UpdateArguments ua1 =
+ new AccountsUpdate.UpdateArguments(
+ "Add External ID", admin.id(), (a, u) -> u.addExternalId(extId1));
+ // Another update for the same account is not allowed.
+ AccountsUpdate.UpdateArguments ua2 =
+ new AccountsUpdate.UpdateArguments(
+ "Add External ID", admin.id(), (a, u) -> u.addExternalId(extId2));
+ IllegalArgumentException e =
+ assertThrows(
+ IllegalArgumentException.class,
+ () -> accountsUpdateProvider.get().updateBatch(ImmutableList.of(ua1, ua2)));
+ assertThat(e).hasMessageThat().contains("updates must all be for different accounts");
+ }
+
+ @Test
+ public void externalIdBatchUpdates_fail_duplicateKey() {
+ ExternalId extIdAdmin =
+ ExternalId.createWithEmail(ExternalId.Key.parse("foo:bar"), admin.id(), "1@foo.com");
+ ExternalId extIdUser =
+ ExternalId.createWithEmail(ExternalId.Key.parse("foo:bar"), user.id(), "2@foo.com");
+
+ AccountsUpdate.UpdateArguments ua1 =
+ new AccountsUpdate.UpdateArguments(
+ "Add External ID", admin.id(), (a, u) -> u.addExternalId(extIdAdmin));
+ AccountsUpdate.UpdateArguments ua2 =
+ new AccountsUpdate.UpdateArguments(
+ "Add External ID", user.id(), (a, u) -> u.addExternalId(extIdUser));
+ DuplicateExternalIdKeyException e =
+ assertThrows(
+ DuplicateExternalIdKeyException.class,
+ () -> accountsUpdateProvider.get().updateBatch(ImmutableList.of(ua1, ua2)));
+ assertThat(e).hasMessageThat().contains("foo:bar");
+ }
+
private void createDraft(PushOneCommit.Result r, String path, String message) throws Exception {
DraftInput in = new DraftInput();
in.path = path;
diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
index a8aff81..7be7114 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
@@ -202,6 +202,8 @@
import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.PersonIdent;
+import org.eclipse.jgit.lib.RefUpdate;
+import org.eclipse.jgit.lib.RefUpdate.Result;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
@@ -2432,12 +2434,14 @@
assertThat(sender.getMessages()).hasSize(1);
Message message = sender.getMessages().get(0);
- assertThat(message.body()).contains("Removed reviewer " + user.fullName() + ".");
+ assertThat(message.body()).contains("Removed reviewer " + user.getNameEmail() + ".");
assertThat(message.body()).doesNotContain("with the following votes");
// Make sure the change message for removing a reviewer is correct.
assertThat(Iterables.getLast(gApi.changes().id(changeId).messages()).message)
- .contains("Removed reviewer " + user.fullName());
+ .isEqualTo("Removed reviewer " + user.getNameEmail() + ".");
+ assertThat(Iterables.getLast(gApi.changes().id(changeId).get().messages).message)
+ .isEqualTo("Removed reviewer " + ChangeMessagesUtil.getAccountTemplate(user.id()) + ".");
// Make sure the reviewer can still be added again.
gApi.changes().id(changeId).addReviewer(user.id().toString());
@@ -2471,11 +2475,14 @@
// Make sure the email for removing a cc is correct.
assertThat(sender.getMessages()).hasSize(1);
Message message = sender.getMessages().get(0);
- assertThat(message.body()).contains("Removed cc " + user.fullName() + ".");
+ assertThat(message.body()).contains("Removed cc " + user.getNameEmail() + ".");
// Make sure the change message for removing a reviewer is correct.
assertThat(Iterables.getLast(gApi.changes().id(changeId).messages()).message)
- .contains("Removed cc " + user.fullName());
+ .isEqualTo("Removed cc " + user.getNameEmail() + ".");
+
+ assertThat(Iterables.getLast(gApi.changes().id(changeId).get().messages).message)
+ .isEqualTo("Removed cc " + ChangeMessagesUtil.getAccountTemplate(user.id()) + ".");
}
@Test
@@ -2515,8 +2522,21 @@
assertThat(sender.getMessages()).hasSize(1);
Message message = sender.getMessages().get(0);
assertThat(message.body())
- .contains("Removed reviewer " + user.fullName() + " with the following votes");
- assertThat(message.body()).contains("* Code-Review+1 by " + user.fullName());
+ .contains("Removed reviewer " + user.getNameEmail() + " with the following votes");
+ assertThat(message.body()).contains("* Code-Review+1 by " + user.getNameEmail());
+ ChangeMessageInfo changeMessageInfo =
+ Iterables.getLast(gApi.changes().id(changeId).messages());
+ assertThat(changeMessageInfo.message)
+ .contains("Removed reviewer " + user.getNameEmail() + " with the following votes");
+ assertThat(changeMessageInfo.message).contains("* Code-Review+1 by " + user.getNameEmail());
+ changeMessageInfo = Iterables.getLast(gApi.changes().id(changeId).get().messages);
+ assertThat(changeMessageInfo.message)
+ .contains(
+ "Removed reviewer "
+ + ChangeMessagesUtil.getAccountTemplate(user.id())
+ + " with the following votes");
+ assertThat(changeMessageInfo.message)
+ .contains("* Code-Review+1 by " + ChangeMessagesUtil.getAccountTemplate(user.id()));
} else {
assertThat(sender.getMessages()).isEmpty();
}
@@ -2632,7 +2652,11 @@
ChangeMessageInfo message = Iterables.getLast(c.messages);
assertThat(message.author._accountId).isEqualTo(admin.id().get());
- assertThat(message.message).isEqualTo("Removed Code-Review+1 by User <user@example.com>\n");
+ assertThat(message.message)
+ .isEqualTo(
+ "Removed Code-Review+1 by " + ChangeMessagesUtil.getAccountTemplate(user.id()) + "\n");
+ assertThat(gApi.changes().id(r.getChangeId()).message(message.id).get().message)
+ .isEqualTo("Removed Code-Review+1 by User <user@example.com>\n");
assertThat(getReviewers(c.reviewers.get(REVIEWER)))
.containsExactlyElementsIn(ImmutableSet.of(admin.id(), user.id()));
}
@@ -3054,6 +3078,24 @@
}
@Test
+ public void submitToSymref() throws Exception {
+ // Create symref in the origin repository (testRepo references to a local repository)
+ try (Repository repo = repoManager.openRepository(project)) {
+ RefUpdate u = repo.updateRef("refs/heads/master_symref");
+ assertThat(u.link("refs/heads/master")).isEqualTo(Result.NEW);
+ }
+
+ PushOneCommit.Result r = createChange("refs/for/master_symref");
+ String id = r.getChangeId();
+
+ gApi.changes().id(id).current().review(ReviewInput.approve());
+ ResourceConflictException thrown =
+ assertThrows(
+ ResourceConflictException.class, () -> gApi.changes().id(id).current().submit());
+ assertThat(thrown).hasMessageThat().contains("the target branch is a symbolic ref");
+ }
+
+ @Test
public void check() throws Exception {
PushOneCommit.Result r = createChange();
assertThat(gApi.changes().id(r.getChangeId()).get().problems).isNull();
@@ -4012,6 +4054,58 @@
submittableAfterLosingPermissions("Label");
}
+ @Test
+ @GerritConfig(name = "change.submitWholeTopic", value = "true")
+ public void cantSubmitWithInvisibleChangesWithTopic() throws Exception {
+ createBranch(BranchNameKey.create(project, "secret"));
+
+ // create two changes in the same topic.
+ String topic = "topic";
+ PushOneCommit.Result r1 = createChange();
+ PushOneCommit.Result r2 = createChange("refs/for/secret");
+ approve(r1.getChangeId());
+ approve(r2.getChangeId());
+ gApi.changes().id(r1.getChangeId()).topic(topic);
+ gApi.changes().id(r2.getChangeId()).topic(topic);
+
+ // make one of the changes invisible.
+ projectOperations
+ .project(project)
+ .forUpdate()
+ .add(block(Permission.READ).ref("refs/heads/secret").group(REGISTERED_USERS))
+ .update();
+
+ // can't submit with invisible changes.
+ requestScopeOperations.setApiUser(user.id());
+ projectOperations
+ .project(project)
+ .forUpdate()
+ .add(allow(Permission.SUBMIT).ref("refs/*").group(REGISTERED_USERS))
+ .update();
+ assertThrows(AuthException.class, () -> gApi.changes().id(r1.getChangeId()).current().submit());
+ }
+
+ @Test
+ public void cantSubmitWithInvisibleDependentChange() throws Exception {
+ // create two dependent changes.
+ PushOneCommit.Result r1 = createChange();
+ PushOneCommit.Result r2 = createChange();
+ approve(r1.getChangeId());
+ approve(r2.getChangeId());
+
+ // make the dependent change invisible.
+ gApi.changes().id(r1.getChangeId()).setPrivate(true);
+
+ // can't submit with invisible changes.
+ requestScopeOperations.setApiUser(user.id());
+ projectOperations
+ .project(project)
+ .forUpdate()
+ .add(allow(Permission.SUBMIT).ref("refs/*").group(REGISTERED_USERS))
+ .update();
+ assertThrows(AuthException.class, () -> gApi.changes().id(r2.getChangeId()).current().submit());
+ }
+
private void submittableAfterLosingPermissions(String label) throws Exception {
String codeReviewLabel = LabelId.CODE_REVIEW;
AccountGroup.UUID registered = REGISTERED_USERS;
diff --git a/javatests/com/google/gerrit/acceptance/api/change/QueryChangesIT.java b/javatests/com/google/gerrit/acceptance/api/change/QueryChangesIT.java
index 14704ad..31381dd 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/QueryChangesIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/change/QueryChangesIT.java
@@ -24,8 +24,8 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.gerrit.acceptance.AbstractDaemonTest;
-import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.PushOneCommit;
+import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.acceptance.UseClockStep;
import com.google.gerrit.acceptance.config.GerritConfig;
import com.google.gerrit.acceptance.testsuite.account.AccountOperations;
@@ -51,7 +51,6 @@
import org.eclipse.jgit.junit.TestRepository;
import org.junit.Test;
-@NoHttpd
public class QueryChangesIT extends AbstractDaemonTest {
@Inject private AccountOperations accountOperations;
@Inject private ProjectOperations projectOperations;
@@ -334,6 +333,13 @@
}
@Test
+ public void testInvalidListChangeOption() throws Exception {
+ PushOneCommit.Result r = createChange();
+ RestResponse rep = adminRestSession.get("/changes/" + r.getChange().getId() + "/?O=fffffff");
+ rep.assertBadRequest();
+ }
+
+ @Test
@SuppressWarnings("unchecked")
public void skipVisibility_privateChange() throws Exception {
TestRepository<InMemoryRepository> userRepo = cloneProject(project, user);
diff --git a/javatests/com/google/gerrit/acceptance/api/project/AccessIT.java b/javatests/com/google/gerrit/acceptance/api/project/AccessIT.java
new file mode 100644
index 0000000..32e8232
--- /dev/null
+++ b/javatests/com/google/gerrit/acceptance/api/project/AccessIT.java
@@ -0,0 +1,1015 @@
+// Copyright (C) 2016 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.acceptance.api.project;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth8.assertThat;
+import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.allow;
+import static com.google.gerrit.extensions.client.ListChangesOption.MESSAGES;
+import static com.google.gerrit.server.group.SystemGroupBackend.ANONYMOUS_USERS;
+import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
+import static com.google.gerrit.server.schema.AclUtil.grant;
+import static com.google.gerrit.testing.GerritJUnit.assertThrows;
+import static com.google.gerrit.truth.ConfigSubject.assertThat;
+import static com.google.gerrit.truth.MapSubject.assertThatMap;
+
+import com.google.gerrit.acceptance.AbstractDaemonTest;
+import com.google.gerrit.acceptance.ExtensionRegistry;
+import com.google.gerrit.acceptance.ExtensionRegistry.Registration;
+import com.google.gerrit.acceptance.GitUtil;
+import com.google.gerrit.acceptance.PushOneCommit;
+import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
+import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
+import com.google.gerrit.common.data.GlobalCapability;
+import com.google.gerrit.entities.AccessSection;
+import com.google.gerrit.entities.GroupReference;
+import com.google.gerrit.entities.LabelId;
+import com.google.gerrit.entities.Permission;
+import com.google.gerrit.entities.Project;
+import com.google.gerrit.entities.RefNames;
+import com.google.gerrit.extensions.api.access.AccessSectionInfo;
+import com.google.gerrit.extensions.api.access.PermissionInfo;
+import com.google.gerrit.extensions.api.access.PermissionRuleInfo;
+import com.google.gerrit.extensions.api.access.ProjectAccessInfo;
+import com.google.gerrit.extensions.api.access.ProjectAccessInput;
+import com.google.gerrit.extensions.api.changes.ReviewInput;
+import com.google.gerrit.extensions.api.projects.ProjectApi;
+import com.google.gerrit.extensions.client.ChangeStatus;
+import com.google.gerrit.extensions.common.ChangeInfo;
+import com.google.gerrit.extensions.common.GroupInfo;
+import com.google.gerrit.extensions.common.WebLinkInfo;
+import com.google.gerrit.extensions.config.CapabilityDefinition;
+import com.google.gerrit.extensions.config.PluginProjectPermissionDefinition;
+import com.google.gerrit.extensions.restapi.AuthException;
+import com.google.gerrit.extensions.restapi.BadRequestException;
+import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
+import com.google.gerrit.extensions.webui.FileHistoryWebLink;
+import com.google.gerrit.server.config.AllProjectsNameProvider;
+import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
+import com.google.gerrit.server.git.meta.MetaDataUpdate;
+import com.google.gerrit.server.group.SystemGroupBackend;
+import com.google.gerrit.server.project.ProjectConfig;
+import com.google.gerrit.server.schema.GrantRevertPermission;
+import com.google.inject.Inject;
+import java.util.HashMap;
+import java.util.Map;
+import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
+import org.eclipse.jgit.junit.TestRepository;
+import org.eclipse.jgit.lib.Config;
+import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.RefUpdate;
+import org.eclipse.jgit.lib.RefUpdate.Result;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.junit.Before;
+import org.junit.Test;
+
+public class AccessIT extends AbstractDaemonTest {
+
+ private static final String REFS_ALL = Constants.R_REFS + "*";
+ private static final String REFS_HEADS = Constants.R_HEADS + "*";
+ private static final String REFS_META_VERSION = "refs/meta/version";
+ private static final String REFS_DRAFTS = "refs/draft-comments/*";
+ private static final String REFS_STARRED_CHANGES = "refs/starred-changes/*";
+
+ @Inject private ProjectOperations projectOperations;
+ @Inject private RequestScopeOperations requestScopeOperations;
+ @Inject private ExtensionRegistry extensionRegistry;
+ @Inject private GrantRevertPermission grantRevertPermission;
+
+ private Project.NameKey newProjectName;
+
+ @Before
+ public void setUp() throws Exception {
+ newProjectName = projectOperations.newProject().create();
+ }
+
+ @Test
+ public void grantRevertPermission() throws Exception {
+ String ref = "refs/*";
+ String groupId = "global:Registered-Users";
+
+ grantRevertPermission.execute(newProjectName);
+
+ ProjectAccessInfo info = pApi().access();
+ assertThat(info.local.containsKey(ref)).isTrue();
+ AccessSectionInfo accessSectionInfo = info.local.get(ref);
+ assertThat(accessSectionInfo.permissions.containsKey(Permission.REVERT)).isTrue();
+ PermissionInfo permissionInfo = accessSectionInfo.permissions.get(Permission.REVERT);
+ assertThat(permissionInfo.rules.containsKey(groupId)).isTrue();
+ PermissionRuleInfo permissionRuleInfo = permissionInfo.rules.get(groupId);
+ assertThat(permissionRuleInfo.action).isEqualTo(PermissionRuleInfo.Action.ALLOW);
+ }
+
+ @Test
+ public void grantRevertPermissionByOnNewRefAndDeletingOnOldRef() throws Exception {
+ String refsHeads = "refs/heads/*";
+ String refsStar = "refs/*";
+ String groupId = "global:Registered-Users";
+ GroupReference registeredUsers = systemGroupBackend.getGroup(REGISTERED_USERS);
+
+ try (Repository repo = repoManager.openRepository(newProjectName)) {
+ MetaDataUpdate md = new MetaDataUpdate(GitReferenceUpdated.DISABLED, newProjectName, repo);
+ ProjectConfig projectConfig = projectConfigFactory.read(md);
+ projectConfig.upsertAccessSection(
+ AccessSection.HEADS,
+ heads -> {
+ grant(projectConfig, heads, Permission.REVERT, registeredUsers);
+ });
+ md.getCommitBuilder().setAuthor(admin.newIdent());
+ md.getCommitBuilder().setCommitter(admin.newIdent());
+ md.setMessage("Add revert permission for all registered users\n");
+
+ projectConfig.commit(md);
+ }
+ grantRevertPermission.execute(newProjectName);
+
+ ProjectAccessInfo info = pApi().access();
+
+ // Revert permission is removed on refs/heads/*.
+ assertThat(info.local.containsKey(refsHeads)).isTrue();
+ AccessSectionInfo accessSectionInfo = info.local.get(refsHeads);
+ assertThat(accessSectionInfo.permissions.containsKey(Permission.REVERT)).isFalse();
+
+ // new permission is added on refs/* with Registered-Users.
+ assertThat(info.local.containsKey(refsStar)).isTrue();
+ accessSectionInfo = info.local.get(refsStar);
+ assertThat(accessSectionInfo.permissions.containsKey(Permission.REVERT)).isTrue();
+ PermissionInfo permissionInfo = accessSectionInfo.permissions.get(Permission.REVERT);
+ assertThat(permissionInfo.rules.containsKey(groupId)).isTrue();
+ PermissionRuleInfo permissionRuleInfo = permissionInfo.rules.get(groupId);
+ assertThat(permissionRuleInfo.action).isEqualTo(PermissionRuleInfo.Action.ALLOW);
+ }
+
+ @Test
+ public void grantRevertPermissionDoesntDeleteAdminsPreferences() throws Exception {
+ GroupReference registeredUsers = systemGroupBackend.getGroup(REGISTERED_USERS);
+ GroupReference otherGroup = systemGroupBackend.getGroup(ANONYMOUS_USERS);
+
+ try (Repository repo = repoManager.openRepository(newProjectName)) {
+ MetaDataUpdate md = new MetaDataUpdate(GitReferenceUpdated.DISABLED, newProjectName, repo);
+ ProjectConfig projectConfig = projectConfigFactory.read(md);
+ projectConfig.upsertAccessSection(
+ AccessSection.HEADS,
+ heads -> {
+ grant(projectConfig, heads, Permission.REVERT, registeredUsers);
+ grant(projectConfig, heads, Permission.REVERT, otherGroup);
+ });
+ md.getCommitBuilder().setAuthor(admin.newIdent());
+ md.getCommitBuilder().setCommitter(admin.newIdent());
+ md.setMessage("Add revert permission for all registered users\n");
+
+ projectConfig.commit(md);
+ }
+ projectCache.evict(newProjectName);
+ ProjectAccessInfo expected = pApi().access();
+
+ grantRevertPermission.execute(newProjectName);
+ projectCache.evict(newProjectName);
+ ProjectAccessInfo actual = pApi().access();
+ // Permissions don't change
+ assertThat(expected.local).isEqualTo(actual.local);
+ }
+
+ @Test
+ public void grantRevertPermissionOnlyWorksOnce() throws Exception {
+ grantRevertPermission.execute(newProjectName);
+ grantRevertPermission.execute(newProjectName);
+
+ try (Repository repo = repoManager.openRepository(newProjectName)) {
+ MetaDataUpdate md = new MetaDataUpdate(GitReferenceUpdated.DISABLED, newProjectName, repo);
+ ProjectConfig projectConfig = projectConfigFactory.read(md);
+ AccessSection all = projectConfig.getAccessSection(AccessSection.ALL);
+
+ Permission permission = all.getPermission(Permission.REVERT);
+ assertThat(permission.getRules()).hasSize(1);
+ }
+ }
+
+ @Test
+ public void getDefaultInheritance() throws Exception {
+ String inheritedName = pApi().access().inheritsFrom.name;
+ assertThat(inheritedName).isEqualTo(AllProjectsNameProvider.DEFAULT);
+ }
+
+ private Registration newFileHistoryWebLink() {
+ FileHistoryWebLink weblink =
+ new FileHistoryWebLink() {
+ @Override
+ public WebLinkInfo getFileHistoryWebLink(
+ String projectName, String revision, String fileName) {
+ return new WebLinkInfo(
+ "name", "imageURL", "http://view/" + projectName + "/" + fileName);
+ }
+ };
+ return extensionRegistry.newRegistration().add(weblink);
+ }
+
+ @Test
+ public void webLink() throws Exception {
+ try (Registration registration = newFileHistoryWebLink()) {
+ ProjectAccessInfo info = pApi().access();
+ assertThat(info.configWebLinks).hasSize(1);
+ assertThat(info.configWebLinks.get(0).url)
+ .isEqualTo("http://view/" + newProjectName + "/project.config");
+ }
+ }
+
+ @Test
+ public void webLinkNoRefsMetaConfig() throws Exception {
+ try (Repository repo = repoManager.openRepository(newProjectName);
+ Registration registration = newFileHistoryWebLink()) {
+ RefUpdate u = repo.updateRef(RefNames.REFS_CONFIG);
+ u.setForceUpdate(true);
+ assertThat(u.delete()).isEqualTo(Result.FORCED);
+
+ // This should not crash.
+ pApi().access();
+ }
+ }
+
+ @Test
+ public void addAccessSection() throws Exception {
+ RevCommit initialHead = projectOperations.project(newProjectName).getHead(RefNames.REFS_CONFIG);
+
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
+
+ accessInput.add.put(REFS_HEADS, accessSectionInfo);
+ pApi().access(accessInput);
+
+ assertThat(pApi().access().local).isEqualTo(accessInput.add);
+
+ RevCommit updatedHead = projectOperations.project(newProjectName).getHead(RefNames.REFS_CONFIG);
+ eventRecorder.assertRefUpdatedEvents(
+ newProjectName.get(), RefNames.REFS_CONFIG, null, initialHead, initialHead, updatedHead);
+ }
+
+ @Test
+ public void addAccessSectionForPluginPermission() throws Exception {
+ try (Registration registration =
+ extensionRegistry
+ .newRegistration()
+ .add(
+ new PluginProjectPermissionDefinition() {
+ @Override
+ public String getDescription() {
+ return "A Plugin Project Permission";
+ }
+ },
+ "fooPermission")) {
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfo = newAccessSectionInfo();
+
+ PermissionInfo foo = newPermissionInfo();
+ PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
+ foo.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
+ accessSectionInfo.permissions.put(
+ "plugin-" + ExtensionRegistry.PLUGIN_NAME + "-fooPermission", foo);
+
+ accessInput.add.put(REFS_HEADS, accessSectionInfo);
+ ProjectAccessInfo updatedAccessSectionInfo = pApi().access(accessInput);
+ assertThat(updatedAccessSectionInfo.local).isEqualTo(accessInput.add);
+
+ assertThat(pApi().access().local).isEqualTo(accessInput.add);
+ }
+ }
+
+ @Test
+ public void addAccessSectionWithInvalidPermission() throws Exception {
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
+
+ PermissionInfo push = newPermissionInfo();
+ PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
+ push.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
+ accessSectionInfo.permissions.put("Invalid Permission", push);
+
+ accessInput.add.put(REFS_HEADS, accessSectionInfo);
+ BadRequestException ex =
+ assertThrows(BadRequestException.class, () -> pApi().access(accessInput));
+ assertThat(ex).hasMessageThat().isEqualTo("Unknown permission: Invalid Permission");
+ }
+
+ @Test
+ public void addAccessSectionWithInvalidLabelPermission() throws Exception {
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
+
+ PermissionInfo push = newPermissionInfo();
+ PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
+ push.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
+ accessSectionInfo.permissions.put("label-Invalid Permission", push);
+
+ accessInput.add.put(REFS_HEADS, accessSectionInfo);
+ BadRequestException ex =
+ assertThrows(BadRequestException.class, () -> pApi().access(accessInput));
+ assertThat(ex).hasMessageThat().isEqualTo("Unknown permission: label-Invalid Permission");
+ }
+
+ @Test
+ public void createAccessChangeNop() throws Exception {
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ assertThrows(BadRequestException.class, () -> pApi().accessChange(accessInput));
+ }
+
+ @Test
+ public void createAccessChangeEmptyConfig() throws Exception {
+ try (Repository repo = repoManager.openRepository(newProjectName)) {
+ RefUpdate ru = repo.updateRef(RefNames.REFS_CONFIG);
+ ru.setForceUpdate(true);
+ assertThat(ru.delete()).isEqualTo(Result.FORCED);
+
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSection = newAccessSectionInfo();
+ PermissionInfo read = newPermissionInfo();
+ PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.BLOCK, false);
+ read.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
+ accessSection.permissions.put(Permission.READ, read);
+ accessInput.add.put(REFS_HEADS, accessSection);
+
+ ChangeInfo out = pApi().accessChange(accessInput);
+ assertThat(out.status).isEqualTo(ChangeStatus.NEW);
+ }
+ }
+
+ @Test
+ public void createAccessChange() throws Exception {
+ projectOperations
+ .project(newProjectName)
+ .forUpdate()
+ .add(allow(Permission.READ).ref(RefNames.REFS_CONFIG).group(REGISTERED_USERS))
+ .update();
+ // User can see the branch
+ requestScopeOperations.setApiUser(user.id());
+ pApi().branch("refs/heads/master").get();
+
+ ProjectAccessInput accessInput = newProjectAccessInput();
+
+ AccessSectionInfo accessSection = newAccessSectionInfo();
+
+ // Deny read to registered users.
+ PermissionInfo read = newPermissionInfo();
+ PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.DENY, false);
+ read.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
+ read.exclusive = true;
+ accessSection.permissions.put(Permission.READ, read);
+ accessInput.add.put(REFS_HEADS, accessSection);
+
+ requestScopeOperations.setApiUser(user.id());
+ ChangeInfo out = pApi().accessChange(accessInput);
+
+ assertThat(out.project).isEqualTo(newProjectName.get());
+ assertThat(out.branch).isEqualTo(RefNames.REFS_CONFIG);
+ assertThat(out.status).isEqualTo(ChangeStatus.NEW);
+ assertThat(out.submitted).isNull();
+
+ requestScopeOperations.setApiUser(admin.id());
+
+ ChangeInfo c = gApi.changes().id(out._number).get(MESSAGES);
+ assertThat(c.messages.stream().map(m -> m.message)).containsExactly("Uploaded patch set 1");
+
+ ReviewInput reviewIn = new ReviewInput();
+ reviewIn.label("Code-Review", (short) 2);
+ gApi.changes().id(out._number).current().review(reviewIn);
+ gApi.changes().id(out._number).current().submit();
+
+ // check that the change took effect.
+ requestScopeOperations.setApiUser(user.id());
+ assertThrows(ResourceNotFoundException.class, () -> pApi().branch("refs/heads/master").get());
+
+ // Restore.
+ accessInput.add.clear();
+ accessInput.remove.put(REFS_HEADS, accessSection);
+ requestScopeOperations.setApiUser(user.id());
+
+ requestScopeOperations.setApiUser(admin.id());
+ out = pApi().accessChange(accessInput);
+
+ gApi.changes().id(out._number).current().review(reviewIn);
+ gApi.changes().id(out._number).current().submit();
+
+ // Now it works again.
+ requestScopeOperations.setApiUser(user.id());
+ pApi().branch("refs/heads/master").get();
+ }
+
+ @Test
+ public void removePermission() throws Exception {
+ // Add initial permission set
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
+
+ accessInput.add.put(REFS_HEADS, accessSectionInfo);
+ pApi().access(accessInput);
+
+ // Remove specific permission
+ AccessSectionInfo accessSectionToRemove = newAccessSectionInfo();
+ accessSectionToRemove.permissions.put(
+ Permission.LABEL + LabelId.CODE_REVIEW, newPermissionInfo());
+ ProjectAccessInput removal = newProjectAccessInput();
+ removal.remove.put(REFS_HEADS, accessSectionToRemove);
+ pApi().access(removal);
+
+ // Remove locally
+ accessInput.add.get(REFS_HEADS).permissions.remove(Permission.LABEL + LabelId.CODE_REVIEW);
+
+ // Check
+ assertThat(pApi().access().local).isEqualTo(accessInput.add);
+ }
+
+ @Test
+ public void removePermissionRule() throws Exception {
+ // Add initial permission set
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
+
+ accessInput.add.put(REFS_HEADS, accessSectionInfo);
+ pApi().access(accessInput);
+
+ // Remove specific permission rule
+ AccessSectionInfo accessSectionToRemove = newAccessSectionInfo();
+ PermissionInfo codeReview = newPermissionInfo();
+ codeReview.label = LabelId.CODE_REVIEW;
+ PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.DENY, false);
+ codeReview.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
+ accessSectionToRemove.permissions.put(Permission.LABEL + LabelId.CODE_REVIEW, codeReview);
+ ProjectAccessInput removal = newProjectAccessInput();
+ removal.remove.put(REFS_HEADS, accessSectionToRemove);
+ pApi().access(removal);
+
+ // Remove locally
+ accessInput
+ .add
+ .get(REFS_HEADS)
+ .permissions
+ .get(Permission.LABEL + LabelId.CODE_REVIEW)
+ .rules
+ .remove(SystemGroupBackend.REGISTERED_USERS.get());
+
+ // Check
+ assertThat(pApi().access().local).isEqualTo(accessInput.add);
+ }
+
+ @Test
+ public void removePermissionRulesAndCleanupEmptyEntries() throws Exception {
+ // Add initial permission set
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
+
+ accessInput.add.put(REFS_HEADS, accessSectionInfo);
+ pApi().access(accessInput);
+
+ // Remove specific permission rules
+ AccessSectionInfo accessSectionToRemove = newAccessSectionInfo();
+ PermissionInfo codeReview = newPermissionInfo();
+ codeReview.label = LabelId.CODE_REVIEW;
+ PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.DENY, false);
+ codeReview.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
+ pri = new PermissionRuleInfo(PermissionRuleInfo.Action.DENY, false);
+ codeReview.rules.put(SystemGroupBackend.PROJECT_OWNERS.get(), pri);
+ accessSectionToRemove.permissions.put(Permission.LABEL + LabelId.CODE_REVIEW, codeReview);
+ ProjectAccessInput removal = newProjectAccessInput();
+ removal.remove.put(REFS_HEADS, accessSectionToRemove);
+ pApi().access(removal);
+
+ // Remove locally
+ accessInput.add.get(REFS_HEADS).permissions.remove(Permission.LABEL + LabelId.CODE_REVIEW);
+
+ // Check
+ assertThat(pApi().access().local).isEqualTo(accessInput.add);
+ }
+
+ @Test
+ public void getPermissionsWithDisallowedUser() throws Exception {
+ // Add initial permission set
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfo = createAccessSectionInfoDenyAll();
+
+ // Disallow READ
+ accessInput.add.put(REFS_META_VERSION, accessSectionInfo);
+ accessInput.add.put(REFS_DRAFTS, accessSectionInfo);
+ accessInput.add.put(REFS_STARRED_CHANGES, accessSectionInfo);
+ accessInput.add.put(REFS_HEADS, accessSectionInfo);
+ pApi().access(accessInput);
+
+ requestScopeOperations.setApiUser(user.id());
+ assertThrows(ResourceNotFoundException.class, () -> pApi().access());
+ }
+
+ @Test
+ public void setPermissionsWithDisallowedUser() throws Exception {
+ // Add initial permission set
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfo = createAccessSectionInfoDenyAll();
+
+ // Disallow READ
+ accessInput.add.put(REFS_META_VERSION, accessSectionInfo);
+ accessInput.add.put(REFS_DRAFTS, accessSectionInfo);
+ accessInput.add.put(REFS_STARRED_CHANGES, accessSectionInfo);
+ accessInput.add.put(REFS_HEADS, accessSectionInfo);
+ pApi().access(accessInput);
+
+ // Create a change to apply
+ ProjectAccessInput accessInfoToApply = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfoToApply = createDefaultAccessSectionInfo();
+ accessInfoToApply.add.put(REFS_HEADS, accessSectionInfoToApply);
+
+ requestScopeOperations.setApiUser(user.id());
+ assertThrows(ResourceNotFoundException.class, () -> pApi().access());
+ }
+
+ @Test
+ public void permissionsGroupMap() throws Exception {
+ // Add initial permission set
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSection = newAccessSectionInfo();
+
+ PermissionInfo push = newPermissionInfo();
+ PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
+ push.rules.put(SystemGroupBackend.PROJECT_OWNERS.get(), pri);
+ accessSection.permissions.put(Permission.PUSH, push);
+
+ PermissionInfo read = newPermissionInfo();
+ pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
+ read.rules.put(SystemGroupBackend.ANONYMOUS_USERS.get(), pri);
+ accessSection.permissions.put(Permission.READ, read);
+
+ accessInput.add.put(REFS_ALL, accessSection);
+ ProjectAccessInfo result = pApi().access(accessInput);
+ assertThatMap(result.groups)
+ .keys()
+ .containsExactly(
+ SystemGroupBackend.PROJECT_OWNERS.get(), SystemGroupBackend.ANONYMOUS_USERS.get());
+
+ // Check the name, which is what the UI cares about; exhaustive
+ // coverage of GroupInfo should be in groups REST API tests.
+ assertThat(result.groups.get(SystemGroupBackend.PROJECT_OWNERS.get()).name)
+ .isEqualTo("Project Owners");
+ // Strip the ID, since it is in the key.
+ assertThat(result.groups.get(SystemGroupBackend.PROJECT_OWNERS.get()).id).isNull();
+
+ // Get call returns groups too.
+ ProjectAccessInfo loggedInResult = pApi().access();
+ assertThatMap(loggedInResult.groups)
+ .keys()
+ .containsExactly(
+ SystemGroupBackend.PROJECT_OWNERS.get(), SystemGroupBackend.ANONYMOUS_USERS.get());
+
+ GroupInfo owners = loggedInResult.groups.get(SystemGroupBackend.PROJECT_OWNERS.get());
+ assertThat(owners.name).isEqualTo("Project Owners");
+ assertThat(owners.id).isNull();
+ assertThat(owners.members).isNull();
+ assertThat(owners.includes).isNull();
+
+ // PROJECT_OWNERS is invisible to anonymous user, but GetAccess disregards visibility.
+ requestScopeOperations.setApiUserAnonymous();
+ ProjectAccessInfo anonResult = pApi().access();
+ assertThatMap(anonResult.groups)
+ .keys()
+ .containsExactly(
+ SystemGroupBackend.PROJECT_OWNERS.get(), SystemGroupBackend.ANONYMOUS_USERS.get());
+ }
+
+ @Test
+ public void updateParentAsUser() throws Exception {
+ // Create child
+ String newParentProjectName = projectOperations.newProject().create().get();
+
+ // Set new parent
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ accessInput.parent = newParentProjectName;
+
+ requestScopeOperations.setApiUser(user.id());
+ AuthException thrown = assertThrows(AuthException.class, () -> pApi().access(accessInput));
+ assertThat(thrown).hasMessageThat().contains("administrate server not permitted");
+ }
+
+ @Test
+ public void updateParentAsAdministrator() throws Exception {
+ // Create parent
+ String newParentProjectName = projectOperations.newProject().create().get();
+
+ // Set new parent
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ accessInput.parent = newParentProjectName;
+
+ pApi().access(accessInput);
+
+ assertThat(pApi().access().inheritsFrom.name).isEqualTo(newParentProjectName);
+ }
+
+ @Test
+ public void addGlobalCapabilityAsUser() throws Exception {
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfo = createDefaultGlobalCapabilitiesAccessSectionInfo();
+
+ accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSectionInfo);
+
+ requestScopeOperations.setApiUser(user.id());
+ assertThrows(
+ AuthException.class, () -> gApi.projects().name(allProjects.get()).access(accessInput));
+ }
+
+ @Test
+ public void addGlobalCapabilityAsAdmin() throws Exception {
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfo = createDefaultGlobalCapabilitiesAccessSectionInfo();
+
+ accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSectionInfo);
+
+ ProjectAccessInfo updatedAccessSectionInfo =
+ gApi.projects().name(allProjects.get()).access(accessInput);
+ assertThatMap(updatedAccessSectionInfo.local.get(AccessSection.GLOBAL_CAPABILITIES).permissions)
+ .keys()
+ .containsAtLeastElementsIn(accessSectionInfo.permissions.keySet());
+ }
+
+ @Test
+ public void addPluginGlobalCapability() throws Exception {
+ try (Registration registration =
+ extensionRegistry
+ .newRegistration()
+ .add(
+ new CapabilityDefinition() {
+ @Override
+ public String getDescription() {
+ return "A Plugin Global Capability";
+ }
+ },
+ "fooCapability")) {
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfo = newAccessSectionInfo();
+
+ PermissionInfo foo = newPermissionInfo();
+ PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
+ foo.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
+ accessSectionInfo.permissions.put(ExtensionRegistry.PLUGIN_NAME + "-fooCapability", foo);
+
+ accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSectionInfo);
+
+ ProjectAccessInfo updatedAccessSectionInfo =
+ gApi.projects().name(allProjects.get()).access(accessInput);
+ assertThatMap(
+ updatedAccessSectionInfo.local.get(AccessSection.GLOBAL_CAPABILITIES).permissions)
+ .keys()
+ .containsAtLeastElementsIn(accessSectionInfo.permissions.keySet());
+ }
+ }
+
+ @Test
+ public void addPermissionAsGlobalCapability() throws Exception {
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfo = newAccessSectionInfo();
+
+ PermissionInfo push = newPermissionInfo();
+ PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
+ push.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
+ accessSectionInfo.permissions.put(Permission.PUSH, push);
+
+ accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSectionInfo);
+ BadRequestException ex =
+ assertThrows(
+ BadRequestException.class,
+ () -> gApi.projects().name(allProjects.get()).access(accessInput));
+ assertThat(ex).hasMessageThat().isEqualTo("Unknown global capability: " + Permission.PUSH);
+ }
+
+ @Test
+ public void addInvalidGlobalCapability() throws Exception {
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfo = createDefaultGlobalCapabilitiesAccessSectionInfo();
+
+ PermissionInfo permissionInfo = newPermissionInfo();
+ PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
+ permissionInfo.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
+ accessSectionInfo.permissions.put("Invalid Global Capability", permissionInfo);
+
+ accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSectionInfo);
+ BadRequestException ex =
+ assertThrows(
+ BadRequestException.class,
+ () -> gApi.projects().name(allProjects.get()).access(accessInput));
+ assertThat(ex)
+ .hasMessageThat()
+ .isEqualTo("Unknown global capability: Invalid Global Capability");
+ }
+
+ @Test
+ public void addGlobalCapabilityForNonRootProject() throws Exception {
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfo = createDefaultGlobalCapabilitiesAccessSectionInfo();
+
+ accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSectionInfo);
+
+ assertThrows(BadRequestException.class, () -> pApi().access(accessInput));
+ }
+
+ @Test
+ public void addNonGlobalCapabilityToGlobalCapabilities() throws Exception {
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfo = newAccessSectionInfo();
+
+ PermissionInfo permissionInfo = newPermissionInfo();
+ permissionInfo.rules.put(adminGroupUuid().get(), null);
+ accessSectionInfo.permissions.put(Permission.PUSH, permissionInfo);
+
+ accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSectionInfo);
+ assertThrows(
+ BadRequestException.class,
+ () -> gApi.projects().name(allProjects.get()).access(accessInput));
+ }
+
+ @Test
+ public void removeGlobalCapabilityAsUser() throws Exception {
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfo = createDefaultGlobalCapabilitiesAccessSectionInfo();
+
+ accessInput.remove.put(AccessSection.GLOBAL_CAPABILITIES, accessSectionInfo);
+
+ requestScopeOperations.setApiUser(user.id());
+ assertThrows(
+ AuthException.class, () -> gApi.projects().name(allProjects.get()).access(accessInput));
+ }
+
+ @Test
+ public void removeGlobalCapabilityAsAdmin() throws Exception {
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfo = newAccessSectionInfo();
+
+ PermissionInfo permissionInfo = newPermissionInfo();
+ permissionInfo.rules.put(adminGroupUuid().get(), null);
+ accessSectionInfo.permissions.put(GlobalCapability.ACCESS_DATABASE, permissionInfo);
+
+ // Add and validate first as removing existing privileges such as
+ // administrateServer would break upcoming tests
+ accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSectionInfo);
+
+ ProjectAccessInfo updatedProjectAccessInfo =
+ gApi.projects().name(allProjects.get()).access(accessInput);
+ assertThatMap(updatedProjectAccessInfo.local.get(AccessSection.GLOBAL_CAPABILITIES).permissions)
+ .keys()
+ .containsAtLeastElementsIn(accessSectionInfo.permissions.keySet());
+
+ // Remove
+ accessInput.add.clear();
+ accessInput.remove.put(AccessSection.GLOBAL_CAPABILITIES, accessSectionInfo);
+
+ updatedProjectAccessInfo = gApi.projects().name(allProjects.get()).access(accessInput);
+ assertThatMap(updatedProjectAccessInfo.local.get(AccessSection.GLOBAL_CAPABILITIES).permissions)
+ .keys()
+ .containsNoneIn(accessSectionInfo.permissions.keySet());
+ }
+
+ @Test
+ public void unknownPermissionRemainsUnchanged() throws Exception {
+ String access = "access";
+ String unknownPermission = "unknownPermission";
+ String registeredUsers = "group Registered Users";
+ String refsFor = "refs/for/*";
+ // Clone repository to forcefully add permission
+ TestRepository<InMemoryRepository> allProjectsRepo = cloneProject(allProjects, admin);
+
+ // Fetch permission ref
+ GitUtil.fetch(allProjectsRepo, "refs/meta/config:cfg");
+ allProjectsRepo.reset("cfg");
+
+ // Load current permissions
+ String config =
+ gApi.projects()
+ .name(allProjects.get())
+ .branch(RefNames.REFS_CONFIG)
+ .file(ProjectConfig.PROJECT_CONFIG)
+ .asString();
+
+ // Append and push unknown permission
+ Config cfg = new Config();
+ cfg.fromText(config);
+ cfg.setString(access, refsFor, unknownPermission, registeredUsers);
+ config = cfg.toText();
+ PushOneCommit push =
+ pushFactory.create(
+ admin.newIdent(), allProjectsRepo, "Subject", ProjectConfig.PROJECT_CONFIG, config);
+ push.to(RefNames.REFS_CONFIG).assertOkStatus();
+
+ // Verify that unknownPermission is present
+ config =
+ gApi.projects()
+ .name(allProjects.get())
+ .branch(RefNames.REFS_CONFIG)
+ .file(ProjectConfig.PROJECT_CONFIG)
+ .asString();
+ cfg.fromText(config);
+ assertThat(cfg).stringValue(access, refsFor, unknownPermission).isEqualTo(registeredUsers);
+
+ // Make permission change through API
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
+ accessInput.add.put(refsFor, accessSectionInfo);
+ gApi.projects().name(allProjects.get()).access(accessInput);
+ accessInput.add.clear();
+ accessInput.remove.put(refsFor, accessSectionInfo);
+ gApi.projects().name(allProjects.get()).access(accessInput);
+
+ // Verify that unknownPermission is still present
+ config =
+ gApi.projects()
+ .name(allProjects.get())
+ .branch(RefNames.REFS_CONFIG)
+ .file(ProjectConfig.PROJECT_CONFIG)
+ .asString();
+ cfg.fromText(config);
+ assertThat(cfg).stringValue(access, refsFor, unknownPermission).isEqualTo(registeredUsers);
+ }
+
+ @Test
+ public void allUsersCanOnlyInheritFromAllProjects() throws Exception {
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ accessInput.parent = project.get();
+ BadRequestException thrown =
+ assertThrows(
+ BadRequestException.class,
+ () -> gApi.projects().name(allUsers.get()).access(accessInput));
+ assertThat(thrown)
+ .hasMessageThat()
+ .contains(allUsers.get() + " must inherit from " + allProjects.get());
+ }
+
+ @Test
+ public void syncCreateGroupPermission_addAndRemoveCreateGroupCapability() throws Exception {
+ // Grant CREATE_GROUP to Registered Users
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSection = newAccessSectionInfo();
+ PermissionInfo createGroup = newPermissionInfo();
+ PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
+ createGroup.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
+ accessSection.permissions.put(GlobalCapability.CREATE_GROUP, createGroup);
+ accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSection);
+ gApi.projects().name(allProjects.get()).access(accessInput);
+
+ // Assert that the permission was synced from All-Projects (global) to All-Users (ref)
+ Map<String, AccessSectionInfo> local = gApi.projects().name("All-Users").access().local;
+ assertThatMap(local).keys().contains(RefNames.REFS_GROUPS + "*");
+ Map<String, PermissionInfo> permissions = local.get(RefNames.REFS_GROUPS + "*").permissions;
+ // READ is the default permission and should be preserved by the syncer
+ assertThatMap(permissions).keys().containsExactly(Permission.READ, Permission.CREATE);
+ Map<String, PermissionRuleInfo> rules = permissions.get(Permission.CREATE).rules;
+ assertThatMap(rules).values().containsExactly(pri);
+
+ // Revoke the permission
+ accessInput.add.clear();
+ accessInput.remove.put(AccessSection.GLOBAL_CAPABILITIES, accessSection);
+ gApi.projects().name(allProjects.get()).access(accessInput);
+
+ // Assert that the permission was synced from All-Projects (global) to All-Users (ref)
+ Map<String, AccessSectionInfo> local2 = gApi.projects().name("All-Users").access().local;
+ assertThatMap(local2).keys().contains(RefNames.REFS_GROUPS + "*");
+ Map<String, PermissionInfo> permissions2 = local2.get(RefNames.REFS_GROUPS + "*").permissions;
+ // READ is the default permission and should be preserved by the syncer
+ assertThatMap(permissions2).keys().containsExactly(Permission.READ);
+ }
+
+ @Test
+ public void syncCreateGroupPermission_addCreateGroupCapabilityToMultipleGroups()
+ throws Exception {
+ PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
+
+ // Grant CREATE_GROUP to Registered Users
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSection = newAccessSectionInfo();
+ PermissionInfo createGroup = newPermissionInfo();
+ createGroup.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
+ accessSection.permissions.put(GlobalCapability.CREATE_GROUP, createGroup);
+ accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSection);
+ gApi.projects().name(allProjects.get()).access(accessInput);
+
+ // Grant CREATE_GROUP to Administrators
+ accessInput = newProjectAccessInput();
+ accessSection = newAccessSectionInfo();
+ createGroup = newPermissionInfo();
+ createGroup.rules.put(adminGroupUuid().get(), pri);
+ accessSection.permissions.put(GlobalCapability.CREATE_GROUP, createGroup);
+ accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSection);
+ gApi.projects().name(allProjects.get()).access(accessInput);
+
+ // Assert that the permissions were synced from All-Projects (global) to All-Users (ref)
+ Map<String, AccessSectionInfo> local = gApi.projects().name("All-Users").access().local;
+ assertThatMap(local).keys().contains(RefNames.REFS_GROUPS + "*");
+ Map<String, PermissionInfo> permissions = local.get(RefNames.REFS_GROUPS + "*").permissions;
+ // READ is the default permission and should be preserved by the syncer
+ assertThatMap(permissions).keys().containsExactly(Permission.READ, Permission.CREATE);
+ Map<String, PermissionRuleInfo> rules = permissions.get(Permission.CREATE).rules;
+ assertThatMap(rules)
+ .keys()
+ .containsExactly(SystemGroupBackend.REGISTERED_USERS.get(), adminGroupUuid().get());
+ assertThat(rules.get(SystemGroupBackend.REGISTERED_USERS.get())).isEqualTo(pri);
+ assertThat(rules.get(adminGroupUuid().get())).isEqualTo(pri);
+ }
+
+ @Test
+ public void addAccessSectionForInvalidRef() throws Exception {
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
+
+ // 'refs/heads/stable_*' is invalid, correct would be '^refs/heads/stable_.*'
+ String invalidRef = Constants.R_HEADS + "stable_*";
+ accessInput.add.put(invalidRef, accessSectionInfo);
+
+ BadRequestException thrown =
+ assertThrows(BadRequestException.class, () -> pApi().access(accessInput));
+ assertThat(thrown).hasMessageThat().contains("Invalid Name: " + invalidRef);
+ }
+
+ @Test
+ public void createAccessChangeWithAccessSectionForInvalidRef() throws Exception {
+ ProjectAccessInput accessInput = newProjectAccessInput();
+ AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
+
+ // 'refs/heads/stable_*' is invalid, correct would be '^refs/heads/stable_.*'
+ String invalidRef = Constants.R_HEADS + "stable_*";
+ accessInput.add.put(invalidRef, accessSectionInfo);
+
+ BadRequestException thrown =
+ assertThrows(BadRequestException.class, () -> pApi().accessChange(accessInput));
+ assertThat(thrown).hasMessageThat().contains("Invalid Name: " + invalidRef);
+ }
+
+ private ProjectApi pApi() throws Exception {
+ return gApi.projects().name(newProjectName.get());
+ }
+
+ private ProjectAccessInput newProjectAccessInput() {
+ ProjectAccessInput p = new ProjectAccessInput();
+ p.add = new HashMap<>();
+ p.remove = new HashMap<>();
+ return p;
+ }
+
+ private PermissionInfo newPermissionInfo() {
+ PermissionInfo p = new PermissionInfo(null, null);
+ p.rules = new HashMap<>();
+ return p;
+ }
+
+ private AccessSectionInfo newAccessSectionInfo() {
+ AccessSectionInfo a = new AccessSectionInfo();
+ a.permissions = new HashMap<>();
+ return a;
+ }
+
+ private AccessSectionInfo createDefaultAccessSectionInfo() {
+ AccessSectionInfo accessSection = newAccessSectionInfo();
+
+ PermissionInfo push = newPermissionInfo();
+ PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
+ push.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
+ accessSection.permissions.put(Permission.PUSH, push);
+
+ PermissionInfo codeReview = newPermissionInfo();
+ codeReview.label = LabelId.CODE_REVIEW;
+ pri = new PermissionRuleInfo(PermissionRuleInfo.Action.DENY, false);
+ codeReview.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
+
+ pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
+ pri.max = 1;
+ pri.min = -1;
+ codeReview.rules.put(SystemGroupBackend.PROJECT_OWNERS.get(), pri);
+ accessSection.permissions.put(Permission.LABEL + LabelId.CODE_REVIEW, codeReview);
+
+ return accessSection;
+ }
+
+ private AccessSectionInfo createDefaultGlobalCapabilitiesAccessSectionInfo() {
+ AccessSectionInfo accessSection = newAccessSectionInfo();
+
+ PermissionInfo email = newPermissionInfo();
+ PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
+ email.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
+ accessSection.permissions.put(GlobalCapability.EMAIL_REVIEWERS, email);
+
+ return accessSection;
+ }
+
+ private AccessSectionInfo createAccessSectionInfoDenyAll() {
+ AccessSectionInfo accessSection = newAccessSectionInfo();
+
+ PermissionInfo read = newPermissionInfo();
+ PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.DENY, false);
+ read.rules.put(SystemGroupBackend.ANONYMOUS_USERS.get(), pri);
+ accessSection.permissions.put(Permission.READ, read);
+
+ return accessSection;
+ }
+}
diff --git a/javatests/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java b/javatests/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java
index 0b18503..9bdc420 100644
--- a/javatests/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/revision/RevisionDiffIT.java
@@ -30,6 +30,8 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.gerrit.acceptance.AbstractDaemonTest;
+import com.google.gerrit.acceptance.ExtensionRegistry;
+import com.google.gerrit.acceptance.ExtensionRegistry.Registration;
import com.google.gerrit.acceptance.GitUtil;
import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.acceptance.PushOneCommit.Result;
@@ -40,8 +42,11 @@
import com.google.gerrit.extensions.common.ChangeType;
import com.google.gerrit.extensions.common.DiffInfo;
import com.google.gerrit.extensions.common.FileInfo;
+import com.google.gerrit.extensions.common.WebLinkInfo;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.BinaryResult;
+import com.google.gerrit.extensions.webui.EditWebLink;
+import com.google.inject.Inject;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -75,6 +80,8 @@
.collect(joining());
private static final String FILE_CONTENT2 = "1st line\n2nd line\n3rd line\n";
+ @Inject private ExtensionRegistry extensionRegistry;
+
private boolean intraline;
private boolean useNewDiffCacheListFiles;
private boolean useNewDiffCacheGetDiff;
@@ -142,6 +149,23 @@
}
@Test
+ public void editWebLinkIncludedInDiff() throws Exception {
+ try (Registration registration = newEditWebLink()) {
+ String fileName = "a_new_file.txt";
+ String fileContent = "First line\nSecond line\n";
+ PushOneCommit.Result result = createChange("Add a file", fileName, fileContent);
+ DiffInfo info =
+ gApi.changes()
+ .id(result.getChangeId())
+ .revision(result.getCommit().name())
+ .file(fileName)
+ .diff();
+ assertThat(info.editWebLinks).hasSize(1);
+ assertThat(info.editWebLinks.get(0).url).isEqualTo("http://edit/" + project + "/" + fileName);
+ }
+ }
+
+ @Test
public void deletedFileIsIncludedInDiff() throws Exception {
gApi.changes().id(changeId).edit().deleteFile(FILE_NAME);
gApi.changes().id(changeId).edit().publish();
@@ -2875,6 +2899,18 @@
assertThat(e).hasMessageThat().isEqualTo("edit not allowed as base");
}
+ private Registration newEditWebLink() {
+ EditWebLink webLink =
+ new EditWebLink() {
+ @Override
+ public WebLinkInfo getEditWebLink(String projectName, String revision, String fileName) {
+ return new WebLinkInfo(
+ "name", "imageURL", "http://edit/" + projectName + "/" + fileName);
+ }
+ };
+ return extensionRegistry.newRegistration().add(webLink);
+ }
+
private String updatedCommitMessage() {
return "An unchanged patchset\n\nChange-Id: " + changeId;
}
diff --git a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java
index f0cdc1d..9d0b1f4 100644
--- a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java
@@ -93,6 +93,8 @@
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.UnprocessableEntityException;
import com.google.gerrit.extensions.webui.PatchSetWebLink;
+import com.google.gerrit.extensions.webui.ResolveConflictsWebLink;
+import com.google.gerrit.server.ChangeMessagesUtil;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.testing.FakeEmailSender;
import com.google.inject.Inject;
@@ -1197,6 +1199,23 @@
}
@Test
+ public void cherryPickSetsReadyChangeOnNewPatchset() throws Exception {
+ PushOneCommit.Result result = pushTo("refs/for/master");
+ CherryPickInput input = new CherryPickInput();
+ input.destination = "foo";
+ gApi.projects().name(project.get()).branch(input.destination).create(new BranchInput());
+ ChangeApi originalChange = gApi.changes().id(project.get() + "~master~" + result.getChangeId());
+
+ ChangeApi cherryPick = originalChange.revision(result.getCommit().name()).cherryPick(input);
+ cherryPick.setWorkInProgress();
+ cherryPick = originalChange.revision(result.getCommit().name()).cherryPick(input);
+
+ ChangeInfo secondCherryPickResult = cherryPick.get(ALL_REVISIONS);
+ assertThat(secondCherryPickResult.revisions).hasSize(2);
+ assertThat(secondCherryPickResult.workInProgress).isNull();
+ }
+
+ @Test
public void canRebase() throws Exception {
PushOneCommit push = pushFactory.create(admin.newIdent(), testRepo);
PushOneCommit.Result r1 = push.to("refs/for/master");
@@ -1615,16 +1634,26 @@
@Test
public void commit() throws Exception {
- WebLinkInfo expectedWebLinkInfo = new WebLinkInfo("foo", "imageUrl", "url");
- PatchSetWebLink link =
+ WebLinkInfo expectedPatchSetLinkInfo = new WebLinkInfo("foo", "imageUrl", "url");
+ PatchSetWebLink patchSetLink =
new PatchSetWebLink() {
@Override
public WebLinkInfo getPatchSetWebLink(
String projectName, String commit, String commitMessage, String branchName) {
- return expectedWebLinkInfo;
+ return expectedPatchSetLinkInfo;
}
};
- try (Registration registration = extensionRegistry.newRegistration().add(link)) {
+ WebLinkInfo expectedResolveConflictsLinkInfo = new WebLinkInfo("bar", "img", "resolve");
+ ResolveConflictsWebLink resolveConflictsLink =
+ new ResolveConflictsWebLink() {
+ @Override
+ public WebLinkInfo getResolveConflictsWebLink(
+ String projectName, String commit, String commitMessage, String branchName) {
+ return expectedResolveConflictsLinkInfo;
+ }
+ };
+ try (Registration registration =
+ extensionRegistry.newRegistration().add(patchSetLink).add(resolveConflictsLink)) {
PushOneCommit.Result r = createChange();
RevCommit c = r.getCommit();
@@ -1641,11 +1670,20 @@
commitInfo = gApi.changes().id(r.getChangeId()).current().commit(true);
assertThat(commitInfo.webLinks).hasSize(1);
- WebLinkInfo webLinkInfo = Iterables.getOnlyElement(commitInfo.webLinks);
- assertThat(webLinkInfo.name).isEqualTo(expectedWebLinkInfo.name);
- assertThat(webLinkInfo.imageUrl).isEqualTo(expectedWebLinkInfo.imageUrl);
- assertThat(webLinkInfo.url).isEqualTo(expectedWebLinkInfo.url);
- assertThat(webLinkInfo.target).isEqualTo(expectedWebLinkInfo.target);
+ WebLinkInfo patchSetLinkInfo = Iterables.getOnlyElement(commitInfo.webLinks);
+ assertThat(patchSetLinkInfo.name).isEqualTo(expectedPatchSetLinkInfo.name);
+ assertThat(patchSetLinkInfo.imageUrl).isEqualTo(expectedPatchSetLinkInfo.imageUrl);
+ assertThat(patchSetLinkInfo.url).isEqualTo(expectedPatchSetLinkInfo.url);
+ assertThat(patchSetLinkInfo.target).isEqualTo(expectedPatchSetLinkInfo.target);
+
+ assertThat(commitInfo.resolveConflictsWebLinks).hasSize(1);
+ WebLinkInfo resolveCommentsLinkInfo =
+ Iterables.getOnlyElement(commitInfo.resolveConflictsWebLinks);
+ assertThat(resolveCommentsLinkInfo.name).isEqualTo(expectedResolveConflictsLinkInfo.name);
+ assertThat(resolveCommentsLinkInfo.imageUrl)
+ .isEqualTo(expectedResolveConflictsLinkInfo.imageUrl);
+ assertThat(resolveCommentsLinkInfo.url).isEqualTo(expectedResolveConflictsLinkInfo.url);
+ assertThat(resolveCommentsLinkInfo.target).isEqualTo(expectedResolveConflictsLinkInfo.target);
}
}
@@ -1877,7 +1915,10 @@
ChangeInfo c = gApi.changes().id(r.getChangeId()).get();
ChangeMessageInfo message = Iterables.getLast(c.messages);
assertThat(message.author._accountId).isEqualTo(admin.id().get());
- assertThat(message.message).isEqualTo("Removed Code-Review+1 by User <user@example.com>\n");
+ assertThat(message.message)
+ .isEqualTo(
+ String.format(
+ "Removed Code-Review+1 by %s\n", ChangeMessagesUtil.getAccountTemplate(user.id())));
assertThat(getReviewers(c.reviewers.get(ReviewerState.REVIEWER)))
.containsExactlyElementsIn(ImmutableSet.of(admin.id(), user.id()));
}
diff --git a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
index a76616a..45d1b76 100644
--- a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
+++ b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
@@ -2823,6 +2823,14 @@
r.assertErrorStatus("\"--unknown\" is not a valid option");
}
+ @Test
+ public void pushForMagicBranchWithSkipValidationOptionIsNotAllowed() throws Exception {
+ PushOneCommit push = pushFactory.create(admin.newIdent(), testRepo);
+ push.setPushOptions(ImmutableList.of(PUSH_OPTION_SKIP_VALIDATION));
+ PushOneCommit.Result r = push.to("refs/for/master");
+ r.assertErrorStatus("\"--skip-validation\" option is only supported for direct push");
+ }
+
private DraftInput newDraft(String path, int line, String message) {
DraftInput d = new DraftInput();
d.path = path;
diff --git a/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java b/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java
index 385780b..9d1bdaa 100644
--- a/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java
+++ b/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java
@@ -103,7 +103,7 @@
assertThat(r)
.hasMessages(
"error: branch refs/heads/master:",
- "To push into this reference you need 'Push' rights.",
+ "Push to refs/for/master to create a review, or get 'Push' rights to update the branch.",
"User: admin",
"Contact an administrator to fix the permissions");
assertThat(r).hasProcessed(ImmutableMap.of("refs", 1));
@@ -183,7 +183,7 @@
"You need 'Delete Reference' rights or 'Push' rights with the ",
"'Force Push' flag set to delete references.",
"error: branch refs/heads/master:",
- "To push into this reference you need 'Push' rights.",
+ "Push to refs/for/master to create a review, or get 'Push' rights to update the branch.",
"User: admin",
"Contact an administrator to fix the permissions");
}
diff --git a/javatests/com/google/gerrit/acceptance/rest/account/CreateAccountIT.java b/javatests/com/google/gerrit/acceptance/rest/account/CreateAccountIT.java
index aca6c4c..8d801f1 100644
--- a/javatests/com/google/gerrit/acceptance/rest/account/CreateAccountIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/account/CreateAccountIT.java
@@ -18,6 +18,7 @@
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.RestResponse;
+import com.google.gerrit.acceptance.config.GerritConfig;
import com.google.gerrit.extensions.api.accounts.AccountInput;
import org.junit.Test;
@@ -31,4 +32,44 @@
r.assertCreated();
assertThat(accountCache.getByUsername(input.username)).isPresent();
}
+
+ @Test
+ @GerritConfig(name = "auth.userNameToLowerCase", value = "false")
+ public void createAccountRestApiUserNameToLowerCaseFalse() throws Exception {
+ AccountInput input = new AccountInput();
+ input.username = "JohnDoe";
+ assertThat(accountCache.getByUsername(input.username)).isEmpty();
+ RestResponse r = adminRestSession.put("/accounts/" + input.username, input);
+ r.assertCreated();
+ assertThat(accountCache.getByUsername(input.username)).isPresent();
+ }
+
+ @Test
+ @GerritConfig(name = "auth.userNameToLowerCase", value = "true")
+ public void createAccountRestApiUserNameToLowerCaseTrue() throws Exception {
+ testUserNameToLowerCase("John1", "John1", "john1");
+ assertThat(accountCache.getByUsername("John1")).isEmpty();
+
+ testUserNameToLowerCase("john2", "John2", "john2");
+ assertThat(accountCache.getByUsername("John2")).isEmpty();
+
+ testUserNameToLowerCase("John3", "john3", "john3");
+ assertThat(accountCache.getByUsername("John3")).isEmpty();
+
+ testUserNameToLowerCase("John4", "johN4", "john4");
+ assertThat(accountCache.getByUsername("John4")).isEmpty();
+ assertThat(accountCache.getByUsername("johN4")).isEmpty();
+
+ testUserNameToLowerCase("john5", "john5", "john5");
+ }
+
+ private void testUserNameToLowerCase(String usernameUrl, String usernameInput, String usernameDb)
+ throws Exception {
+ AccountInput input = new AccountInput();
+ input.username = usernameInput;
+ assertThat(accountCache.getByUsername(usernameDb)).isEmpty();
+ RestResponse r = adminRestSession.put("/accounts/" + usernameUrl, input);
+ r.assertCreated();
+ assertThat(accountCache.getByUsername(usernameDb)).isPresent();
+ }
}
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/ChangeMessagesIT.java b/javatests/com/google/gerrit/acceptance/rest/change/ChangeMessagesIT.java
index ad3a3c1..d93d3f7 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/ChangeMessagesIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/ChangeMessagesIT.java
@@ -11,6 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
+
package com.google.gerrit.acceptance.rest.change;
import static com.google.common.truth.Truth.assertThat;
@@ -21,12 +22,13 @@
import static com.google.gerrit.extensions.client.ListChangesOption.MESSAGES;
import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
import static com.google.gerrit.server.notedb.ChangeNoteUtil.parseCommitMessageRange;
-import static com.google.gerrit.server.restapi.change.DeleteChangeMessage.createNewChangeMessage;
import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import static java.util.stream.Collectors.toSet;
import static org.eclipse.jgit.util.RawParseUtils.decode;
+import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.PushOneCommit;
@@ -45,10 +47,12 @@
import com.google.gerrit.extensions.common.CommentInfo;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
+import com.google.gerrit.server.ChangeMessagesUtil;
import com.google.gerrit.server.notedb.ChangeNoteUtil;
import com.google.inject.Inject;
import java.nio.charset.Charset;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Optional;
@@ -145,6 +149,29 @@
}
@Test
+ public void getChangeMessagesWithTemplate() throws Exception {
+ String changeId = createChange().getChangeId();
+ String messageTemplate = "Review by " + ChangeMessagesUtil.getAccountTemplate(admin.id());
+ postMessage(changeId, messageTemplate);
+ assertMessage(
+ messageTemplate,
+ Iterables.getLast(gApi.changes().id(changeId).get(MESSAGES).messages).message);
+
+ Collection<ChangeMessageInfo> listMessages = gApi.changes().id(changeId).messages();
+ assertThat(listMessages).hasSize(2);
+ ChangeMessageInfo changeMessageApi = Iterables.getLast(gApi.changes().id(changeId).messages());
+ assertMessage("Review by " + admin.getNameEmail(), changeMessageApi.message);
+ assertMessage(
+ "Review by " + admin.getNameEmail(),
+ gApi.changes().id(changeId).message(changeMessageApi.id).get().message);
+ DeleteChangeMessageInput input = new DeleteChangeMessageInput("message deleted");
+ assertThat(gApi.changes().id(changeId).message(changeMessageApi.id).delete(input).message)
+ .isEqualTo(
+ String.format(
+ "Change message removed by: %s\nReason: message deleted", admin.getNameEmail()));
+ }
+
+ @Test
public void deleteCannotBeAppliedWithoutAdministrateServerCapability() throws Exception {
int changeNum = createOneChangeWithMultipleChangeMessagesInHistory();
requestScopeOperations.setApiUser(user.id());
@@ -278,10 +305,18 @@
ChangeMessageInfo info = gApi.changes().id(changeNum).message(id).delete(input);
// Verify the return change message info is as expect.
- assertThat(info.message).isEqualTo(createNewChangeMessage(deletedBy.fullName(), reason));
+ String expectedMessage = "Change message removed by: " + deletedBy.getNameEmail();
+ if (!Strings.isNullOrEmpty(reason)) {
+ expectedMessage = expectedMessage + "\nReason: " + reason;
+ }
+ assertThat(info.message).isEqualTo(expectedMessage);
List<ChangeMessageInfo> messagesAfterDeletion = gApi.changes().id(changeNum).messages();
assertMessagesAfterDeletion(
- messagesBeforeDeletion, messagesAfterDeletion, deletedMessageIndex, deletedBy, reason);
+ messagesBeforeDeletion,
+ messagesAfterDeletion,
+ deletedMessageIndex,
+ deletedBy,
+ expectedMessage);
assertCommentsAfterDeletion(changeNum, commentsBefore);
// Verify change index is updated after deletion.
@@ -297,7 +332,7 @@
List<ChangeMessageInfo> messagesAfterDeletion,
int deletedMessageIndex,
TestAccount deletedBy,
- String deleteReason) {
+ String expectedDeleteMessage) {
assertWithMessage("after: %s; before: %s", messagesAfterDeletion, messagesBeforeDeletion)
.that(messagesAfterDeletion)
.hasSize(messagesBeforeDeletion.size());
@@ -317,8 +352,7 @@
assertThat(after._revisionNumber).isEqualTo(before._revisionNumber);
if (i == deletedMessageIndex) {
- assertThat(after.message)
- .isEqualTo(createNewChangeMessage(deletedBy.fullName(), deleteReason));
+ assertThat(after.message).isEqualTo(expectedDeleteMessage);
} else {
assertThat(after.message).isEqualTo(before.message);
}
@@ -381,7 +415,12 @@
rawAfter,
rangeAfter.get().changeMessageStart(),
rangeAfter.get().changeMessageEnd() + 1);
- assertThat(message).isEqualTo(createNewChangeMessage(deletedBy.fullName(), deleteReason));
+ String expectedMessageTemplate =
+ "Change message removed by: " + ChangeMessagesUtil.getAccountTemplate(deletedBy.id());
+ if (!Strings.isNullOrEmpty(deleteReason)) {
+ expectedMessageTemplate = expectedMessageTemplate + "\nReason: " + deleteReason;
+ }
+ assertThat(message).isEqualTo(expectedMessageTemplate);
} else {
assertThat(commitAfter.getFullMessage()).isEqualTo(commitBefore.getFullMessage());
}
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/DeleteVoteIT.java b/javatests/com/google/gerrit/acceptance/rest/change/DeleteVoteIT.java
index 0c2c3a1..b4eb692 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/DeleteVoteIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/DeleteVoteIT.java
@@ -29,6 +29,7 @@
import com.google.gerrit.extensions.common.AccountInfo;
import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.extensions.common.ChangeMessageInfo;
+import com.google.gerrit.server.ChangeMessagesUtil;
import com.google.gerrit.testing.FakeEmailSender;
import com.google.gson.reflect.TypeToken;
import com.google.inject.Inject;
@@ -99,7 +100,10 @@
ChangeMessageInfo message = Iterables.getLast(c.messages);
assertThat(message.author._accountId).isEqualTo(admin.id().get());
- assertThat(message.message).isEqualTo("Removed Code-Review+1 by User <user@example.com>\n");
+ assertThat(message.message)
+ .isEqualTo(
+ String.format(
+ "Removed Code-Review+1 by %s\n", ChangeMessagesUtil.getAccountTemplate(user.id())));
assertThat(getReviewers(c.reviewers.get(REVIEWER)))
.containsExactlyElementsIn(ImmutableSet.of(admin.id(), user.id()));
}
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/MoveChangeIT.java b/javatests/com/google/gerrit/acceptance/rest/change/MoveChangeIT.java
index e94b660..6ed0bf8 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/MoveChangeIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/MoveChangeIT.java
@@ -24,6 +24,7 @@
import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.GitUtil;
import com.google.gerrit.acceptance.NoHttpd;
@@ -91,7 +92,8 @@
expectedMessage.append("Change destination moved from master to moveTest");
expectedMessage.append("\n\n");
expectedMessage.append(moveMessage);
- assertThat(r.getChange().messages().get(1).getMessage()).isEqualTo(expectedMessage.toString());
+ assertThat(Iterables.getLast(gApi.changes().id(r.getChangeId()).get().messages).message)
+ .isEqualTo(expectedMessage.toString());
}
@Test
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/PredicateIT.java b/javatests/com/google/gerrit/acceptance/rest/change/PredicateIT.java
new file mode 100644
index 0000000..d893dc7
--- /dev/null
+++ b/javatests/com/google/gerrit/acceptance/rest/change/PredicateIT.java
@@ -0,0 +1,53 @@
+// Copyright (C) 2021 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.acceptance.rest.change;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.gerrit.acceptance.AbstractPredicateTest;
+import com.google.gerrit.acceptance.RestResponse;
+import com.google.gerrit.entities.Change;
+import com.google.gerrit.extensions.common.PluginDefinedInfo;
+import com.google.gson.reflect.TypeToken;
+import java.util.List;
+import java.util.Map;
+import org.junit.Test;
+
+public class PredicateIT extends AbstractPredicateTest {
+
+ @Test
+ public void testLabelPredicate() throws Exception {
+ try (AutoCloseable ignored = installPlugin(PLUGIN_NAME, PluginModule.class)) {
+ Change.Id changeId = createChange().getChange().getId();
+ approve(String.valueOf(changeId.get()));
+ List<PluginDefinedInfo> myInfos =
+ pluginInfoFromSingletonList(
+ adminRestSession.get("/changes/?--my-plugin--sample&q=change:" + changeId.get()));
+
+ assertThat(myInfos).hasSize(1);
+ assertThat(myInfos.get(0).name).isEqualTo(PLUGIN_NAME);
+ assertThat(myInfos.get(0).message).isEqualTo("matched");
+ }
+ }
+
+ public List<PluginDefinedInfo> pluginInfoFromSingletonList(RestResponse res) throws Exception {
+ res.assertOK();
+ List<Map<String, Object>> changeInfos =
+ GSON.fromJson(res.getReader(), new TypeToken<List<Map<String, Object>>>() {}.getType());
+
+ assertThat(changeInfos).hasSize(1);
+ return decodeRawPluginsList(changeInfos.get(0).get("plugins"));
+ }
+}
diff --git a/javatests/com/google/gerrit/acceptance/rest/config/ServerInfoIT.java b/javatests/com/google/gerrit/acceptance/rest/config/ServerInfoIT.java
index 4738f64..ea87922 100644
--- a/javatests/com/google/gerrit/acceptance/rest/config/ServerInfoIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/config/ServerInfoIT.java
@@ -214,4 +214,12 @@
ServerInfo i = gApi.config().server().getInfo();
assertThat(i.change.mergeabilityComputationBehavior).isEqualTo("NEVER");
}
+
+ @Test
+ @GerritConfig(name = "download.scheme", value = "fooBar")
+ @GerritConfig(name = "download.command", value = "fooBar")
+ public void misconfiguredDownloadCommands() throws Exception {
+ ServerInfo i = gApi.config().server().getInfo();
+ assertThat(i.download.schemes).isEmpty();
+ }
}
diff --git a/javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java b/javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java
index ff4f203..b99c624 100644
--- a/javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 The Android Open Source Project
+// Copyright (C) 2021 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.
@@ -11,1004 +11,73 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
+
package com.google.gerrit.acceptance.rest.project;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth8.assertThat;
-import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.allow;
-import static com.google.gerrit.extensions.client.ListChangesOption.MESSAGES;
-import static com.google.gerrit.server.group.SystemGroupBackend.ANONYMOUS_USERS;
+import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.block;
import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
-import static com.google.gerrit.server.schema.AclUtil.grant;
-import static com.google.gerrit.testing.GerritJUnit.assertThrows;
-import static com.google.gerrit.truth.ConfigSubject.assertThat;
-import static com.google.gerrit.truth.MapSubject.assertThatMap;
import com.google.gerrit.acceptance.AbstractDaemonTest;
-import com.google.gerrit.acceptance.ExtensionRegistry;
-import com.google.gerrit.acceptance.ExtensionRegistry.Registration;
-import com.google.gerrit.acceptance.GitUtil;
-import com.google.gerrit.acceptance.PushOneCommit;
+import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
-import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
-import com.google.gerrit.common.data.GlobalCapability;
-import com.google.gerrit.entities.AccessSection;
-import com.google.gerrit.entities.GroupReference;
-import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.Permission;
-import com.google.gerrit.entities.Project;
-import com.google.gerrit.entities.RefNames;
-import com.google.gerrit.extensions.api.access.AccessSectionInfo;
-import com.google.gerrit.extensions.api.access.PermissionInfo;
-import com.google.gerrit.extensions.api.access.PermissionRuleInfo;
import com.google.gerrit.extensions.api.access.ProjectAccessInfo;
-import com.google.gerrit.extensions.api.access.ProjectAccessInput;
-import com.google.gerrit.extensions.api.changes.ReviewInput;
-import com.google.gerrit.extensions.api.projects.ProjectApi;
-import com.google.gerrit.extensions.client.ChangeStatus;
-import com.google.gerrit.extensions.common.ChangeInfo;
-import com.google.gerrit.extensions.common.GroupInfo;
-import com.google.gerrit.extensions.common.WebLinkInfo;
-import com.google.gerrit.extensions.config.CapabilityDefinition;
-import com.google.gerrit.extensions.config.PluginProjectPermissionDefinition;
-import com.google.gerrit.extensions.restapi.AuthException;
-import com.google.gerrit.extensions.restapi.BadRequestException;
-import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
-import com.google.gerrit.extensions.webui.FileHistoryWebLink;
-import com.google.gerrit.server.config.AllProjectsNameProvider;
-import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
-import com.google.gerrit.server.git.meta.MetaDataUpdate;
-import com.google.gerrit.server.group.SystemGroupBackend;
-import com.google.gerrit.server.project.ProjectConfig;
-import com.google.gerrit.server.schema.GrantRevertPermission;
+import com.google.gson.reflect.TypeToken;
import com.google.inject.Inject;
-import java.util.HashMap;
import java.util.Map;
-import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
-import org.eclipse.jgit.junit.TestRepository;
-import org.eclipse.jgit.lib.Config;
-import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.RefUpdate;
-import org.eclipse.jgit.lib.RefUpdate.Result;
-import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.junit.Before;
import org.junit.Test;
public class AccessIT extends AbstractDaemonTest {
-
- private static final String REFS_ALL = Constants.R_REFS + "*";
- private static final String REFS_HEADS = Constants.R_HEADS + "*";
- private static final String REFS_META_VERSION = "refs/meta/version";
- private static final String REFS_DRAFTS = "refs/draft-comments/*";
- private static final String REFS_STARRED_CHANGES = "refs/starred-changes/*";
-
@Inject private ProjectOperations projectOperations;
- @Inject private RequestScopeOperations requestScopeOperations;
- @Inject private ExtensionRegistry extensionRegistry;
- @Inject private GrantRevertPermission grantRevertPermission;
- private Project.NameKey newProjectName;
-
- @Before
- public void setUp() throws Exception {
- newProjectName = projectOperations.newProject().create();
+ @Test
+ public void listAccessWithoutSpecifyingProject() throws Exception {
+ RestResponse r = adminRestSession.get("/access/");
+ r.assertOK();
+ Map<String, ProjectAccessInfo> infoByProject =
+ newGson()
+ .fromJson(r.getReader(), new TypeToken<Map<String, ProjectAccessInfo>>() {}.getType());
+ assertThat(infoByProject).isEmpty();
}
@Test
- public void grantRevertPermission() throws Exception {
- String ref = "refs/*";
- String groupId = "global:Registered-Users";
-
- grantRevertPermission.execute(newProjectName);
-
- ProjectAccessInfo info = pApi().access();
- assertThat(info.local.containsKey(ref)).isTrue();
- AccessSectionInfo accessSectionInfo = info.local.get(ref);
- assertThat(accessSectionInfo.permissions.containsKey(Permission.REVERT)).isTrue();
- PermissionInfo permissionInfo = accessSectionInfo.permissions.get(Permission.REVERT);
- assertThat(permissionInfo.rules.containsKey(groupId)).isTrue();
- PermissionRuleInfo permissionRuleInfo = permissionInfo.rules.get(groupId);
- assertThat(permissionRuleInfo.action).isEqualTo(PermissionRuleInfo.Action.ALLOW);
+ public void listAccessWithoutSpecifyingAnEmptyProjectName() throws Exception {
+ RestResponse r = adminRestSession.get("/access/?p=");
+ r.assertOK();
+ Map<String, ProjectAccessInfo> infoByProject =
+ newGson()
+ .fromJson(r.getReader(), new TypeToken<Map<String, ProjectAccessInfo>>() {}.getType());
+ assertThat(infoByProject).isEmpty();
}
@Test
- public void grantRevertPermissionByOnNewRefAndDeletingOnOldRef() throws Exception {
- String refsHeads = "refs/heads/*";
- String refsStar = "refs/*";
- String groupId = "global:Registered-Users";
- GroupReference registeredUsers = systemGroupBackend.getGroup(REGISTERED_USERS);
-
- try (Repository repo = repoManager.openRepository(newProjectName)) {
- MetaDataUpdate md = new MetaDataUpdate(GitReferenceUpdated.DISABLED, newProjectName, repo);
- ProjectConfig projectConfig = projectConfigFactory.read(md);
- projectConfig.upsertAccessSection(
- AccessSection.HEADS,
- heads -> {
- grant(projectConfig, heads, Permission.REVERT, registeredUsers);
- });
- md.getCommitBuilder().setAuthor(admin.newIdent());
- md.getCommitBuilder().setCommitter(admin.newIdent());
- md.setMessage("Add revert permission for all registered users\n");
-
- projectConfig.commit(md);
- }
- grantRevertPermission.execute(newProjectName);
-
- ProjectAccessInfo info = pApi().access();
-
- // Revert permission is removed on refs/heads/*.
- assertThat(info.local.containsKey(refsHeads)).isTrue();
- AccessSectionInfo accessSectionInfo = info.local.get(refsHeads);
- assertThat(accessSectionInfo.permissions.containsKey(Permission.REVERT)).isFalse();
-
- // new permission is added on refs/* with Registered-Users.
- assertThat(info.local.containsKey(refsStar)).isTrue();
- accessSectionInfo = info.local.get(refsStar);
- assertThat(accessSectionInfo.permissions.containsKey(Permission.REVERT)).isTrue();
- PermissionInfo permissionInfo = accessSectionInfo.permissions.get(Permission.REVERT);
- assertThat(permissionInfo.rules.containsKey(groupId)).isTrue();
- PermissionRuleInfo permissionRuleInfo = permissionInfo.rules.get(groupId);
- assertThat(permissionRuleInfo.action).isEqualTo(PermissionRuleInfo.Action.ALLOW);
+ public void listAccessForNonExistingProject() throws Exception {
+ RestResponse r = adminRestSession.get("/access/?project=non-existing");
+ r.assertNotFound();
+ assertThat(r.getEntityContent()).isEqualTo("non-existing");
}
@Test
- public void grantRevertPermissionDoesntDeleteAdminsPreferences() throws Exception {
- GroupReference registeredUsers = systemGroupBackend.getGroup(REGISTERED_USERS);
- GroupReference otherGroup = systemGroupBackend.getGroup(ANONYMOUS_USERS);
-
- try (Repository repo = repoManager.openRepository(newProjectName)) {
- MetaDataUpdate md = new MetaDataUpdate(GitReferenceUpdated.DISABLED, newProjectName, repo);
- ProjectConfig projectConfig = projectConfigFactory.read(md);
- projectConfig.upsertAccessSection(
- AccessSection.HEADS,
- heads -> {
- grant(projectConfig, heads, Permission.REVERT, registeredUsers);
- grant(projectConfig, heads, Permission.REVERT, otherGroup);
- });
- md.getCommitBuilder().setAuthor(admin.newIdent());
- md.getCommitBuilder().setCommitter(admin.newIdent());
- md.setMessage("Add revert permission for all registered users\n");
-
- projectConfig.commit(md);
- }
- projectCache.evict(newProjectName);
- ProjectAccessInfo expected = pApi().access();
-
- grantRevertPermission.execute(newProjectName);
- projectCache.evict(newProjectName);
- ProjectAccessInfo actual = pApi().access();
- // Permissions don't change
- assertThat(expected.local).isEqualTo(actual.local);
- }
-
- @Test
- public void grantRevertPermissionOnlyWorksOnce() throws Exception {
- grantRevertPermission.execute(newProjectName);
- grantRevertPermission.execute(newProjectName);
-
- try (Repository repo = repoManager.openRepository(newProjectName)) {
- MetaDataUpdate md = new MetaDataUpdate(GitReferenceUpdated.DISABLED, newProjectName, repo);
- ProjectConfig projectConfig = projectConfigFactory.read(md);
- AccessSection all = projectConfig.getAccessSection(AccessSection.ALL);
-
- Permission permission = all.getPermission(Permission.REVERT);
- assertThat(permission.getRules()).hasSize(1);
- }
- }
-
- @Test
- public void getDefaultInheritance() throws Exception {
- String inheritedName = pApi().access().inheritsFrom.name;
- assertThat(inheritedName).isEqualTo(AllProjectsNameProvider.DEFAULT);
- }
-
- private Registration newFileHistoryWebLink() {
- FileHistoryWebLink weblink =
- new FileHistoryWebLink() {
- @Override
- public WebLinkInfo getFileHistoryWebLink(
- String projectName, String revision, String fileName) {
- return new WebLinkInfo(
- "name", "imageURL", "http://view/" + projectName + "/" + fileName);
- }
- };
- return extensionRegistry.newRegistration().add(weblink);
- }
-
- @Test
- public void webLink() throws Exception {
- try (Registration registration = newFileHistoryWebLink()) {
- ProjectAccessInfo info = pApi().access();
- assertThat(info.configWebLinks).hasSize(1);
- assertThat(info.configWebLinks.get(0).url)
- .isEqualTo("http://view/" + newProjectName + "/project.config");
- }
- }
-
- @Test
- public void webLinkNoRefsMetaConfig() throws Exception {
- try (Repository repo = repoManager.openRepository(newProjectName);
- Registration registration = newFileHistoryWebLink()) {
- RefUpdate u = repo.updateRef(RefNames.REFS_CONFIG);
- u.setForceUpdate(true);
- assertThat(u.delete()).isEqualTo(Result.FORCED);
-
- // This should not crash.
- pApi().access();
- }
- }
-
- @Test
- public void addAccessSection() throws Exception {
- RevCommit initialHead = projectOperations.project(newProjectName).getHead(RefNames.REFS_CONFIG);
-
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
-
- accessInput.add.put(REFS_HEADS, accessSectionInfo);
- pApi().access(accessInput);
-
- assertThat(pApi().access().local).isEqualTo(accessInput.add);
-
- RevCommit updatedHead = projectOperations.project(newProjectName).getHead(RefNames.REFS_CONFIG);
- eventRecorder.assertRefUpdatedEvents(
- newProjectName.get(), RefNames.REFS_CONFIG, null, initialHead, initialHead, updatedHead);
- }
-
- @Test
- public void addAccessSectionForPluginPermission() throws Exception {
- try (Registration registration =
- extensionRegistry
- .newRegistration()
- .add(
- new PluginProjectPermissionDefinition() {
- @Override
- public String getDescription() {
- return "A Plugin Project Permission";
- }
- },
- "fooPermission")) {
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSectionInfo = newAccessSectionInfo();
-
- PermissionInfo foo = newPermissionInfo();
- PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
- foo.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
- accessSectionInfo.permissions.put(
- "plugin-" + ExtensionRegistry.PLUGIN_NAME + "-fooPermission", foo);
-
- accessInput.add.put(REFS_HEADS, accessSectionInfo);
- ProjectAccessInfo updatedAccessSectionInfo = pApi().access(accessInput);
- assertThat(updatedAccessSectionInfo.local).isEqualTo(accessInput.add);
-
- assertThat(pApi().access().local).isEqualTo(accessInput.add);
- }
- }
-
- @Test
- public void addAccessSectionWithInvalidPermission() throws Exception {
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
-
- PermissionInfo push = newPermissionInfo();
- PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
- push.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
- accessSectionInfo.permissions.put("Invalid Permission", push);
-
- accessInput.add.put(REFS_HEADS, accessSectionInfo);
- BadRequestException ex =
- assertThrows(BadRequestException.class, () -> pApi().access(accessInput));
- assertThat(ex).hasMessageThat().isEqualTo("Unknown permission: Invalid Permission");
- }
-
- @Test
- public void addAccessSectionWithInvalidLabelPermission() throws Exception {
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
-
- PermissionInfo push = newPermissionInfo();
- PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
- push.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
- accessSectionInfo.permissions.put("label-Invalid Permission", push);
-
- accessInput.add.put(REFS_HEADS, accessSectionInfo);
- BadRequestException ex =
- assertThrows(BadRequestException.class, () -> pApi().access(accessInput));
- assertThat(ex).hasMessageThat().isEqualTo("Unknown permission: label-Invalid Permission");
- }
-
- @Test
- public void createAccessChangeNop() throws Exception {
- ProjectAccessInput accessInput = newProjectAccessInput();
- assertThrows(BadRequestException.class, () -> pApi().accessChange(accessInput));
- }
-
- @Test
- public void createAccessChangeEmptyConfig() throws Exception {
- try (Repository repo = repoManager.openRepository(newProjectName)) {
- RefUpdate ru = repo.updateRef(RefNames.REFS_CONFIG);
- ru.setForceUpdate(true);
- assertThat(ru.delete()).isEqualTo(Result.FORCED);
-
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSection = newAccessSectionInfo();
- PermissionInfo read = newPermissionInfo();
- PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.BLOCK, false);
- read.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
- accessSection.permissions.put(Permission.READ, read);
- accessInput.add.put(REFS_HEADS, accessSection);
-
- ChangeInfo out = pApi().accessChange(accessInput);
- assertThat(out.status).isEqualTo(ChangeStatus.NEW);
- }
- }
-
- @Test
- public void createAccessChange() throws Exception {
+ public void listAccessForNonVisibleProject() throws Exception {
projectOperations
- .project(newProjectName)
+ .project(project)
.forUpdate()
- .add(allow(Permission.READ).ref(RefNames.REFS_CONFIG).group(REGISTERED_USERS))
+ .add(block(Permission.READ).ref("refs/*").group(REGISTERED_USERS))
.update();
- // User can see the branch
- requestScopeOperations.setApiUser(user.id());
- pApi().branch("refs/heads/master").get();
- ProjectAccessInput accessInput = newProjectAccessInput();
-
- AccessSectionInfo accessSection = newAccessSectionInfo();
-
- // Deny read to registered users.
- PermissionInfo read = newPermissionInfo();
- PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.DENY, false);
- read.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
- read.exclusive = true;
- accessSection.permissions.put(Permission.READ, read);
- accessInput.add.put(REFS_HEADS, accessSection);
-
- requestScopeOperations.setApiUser(user.id());
- ChangeInfo out = pApi().accessChange(accessInput);
-
- assertThat(out.project).isEqualTo(newProjectName.get());
- assertThat(out.branch).isEqualTo(RefNames.REFS_CONFIG);
- assertThat(out.status).isEqualTo(ChangeStatus.NEW);
- assertThat(out.submitted).isNull();
-
- requestScopeOperations.setApiUser(admin.id());
-
- ChangeInfo c = gApi.changes().id(out._number).get(MESSAGES);
- assertThat(c.messages.stream().map(m -> m.message)).containsExactly("Uploaded patch set 1");
-
- ReviewInput reviewIn = new ReviewInput();
- reviewIn.label("Code-Review", (short) 2);
- gApi.changes().id(out._number).current().review(reviewIn);
- gApi.changes().id(out._number).current().submit();
-
- // check that the change took effect.
- requestScopeOperations.setApiUser(user.id());
- assertThrows(ResourceNotFoundException.class, () -> pApi().branch("refs/heads/master").get());
-
- // Restore.
- accessInput.add.clear();
- accessInput.remove.put(REFS_HEADS, accessSection);
- requestScopeOperations.setApiUser(user.id());
-
- requestScopeOperations.setApiUser(admin.id());
- out = pApi().accessChange(accessInput);
-
- gApi.changes().id(out._number).current().review(reviewIn);
- gApi.changes().id(out._number).current().submit();
-
- // Now it works again.
- requestScopeOperations.setApiUser(user.id());
- pApi().branch("refs/heads/master").get();
+ RestResponse r = userRestSession.get("/access/?project=" + project.get());
+ r.assertNotFound();
+ assertThat(r.getEntityContent()).isEqualTo(project.get());
}
@Test
- public void removePermission() throws Exception {
- // Add initial permission set
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
-
- accessInput.add.put(REFS_HEADS, accessSectionInfo);
- pApi().access(accessInput);
-
- // Remove specific permission
- AccessSectionInfo accessSectionToRemove = newAccessSectionInfo();
- accessSectionToRemove.permissions.put(
- Permission.LABEL + LabelId.CODE_REVIEW, newPermissionInfo());
- ProjectAccessInput removal = newProjectAccessInput();
- removal.remove.put(REFS_HEADS, accessSectionToRemove);
- pApi().access(removal);
-
- // Remove locally
- accessInput.add.get(REFS_HEADS).permissions.remove(Permission.LABEL + LabelId.CODE_REVIEW);
-
- // Check
- assertThat(pApi().access().local).isEqualTo(accessInput.add);
- }
-
- @Test
- public void removePermissionRule() throws Exception {
- // Add initial permission set
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
-
- accessInput.add.put(REFS_HEADS, accessSectionInfo);
- pApi().access(accessInput);
-
- // Remove specific permission rule
- AccessSectionInfo accessSectionToRemove = newAccessSectionInfo();
- PermissionInfo codeReview = newPermissionInfo();
- codeReview.label = LabelId.CODE_REVIEW;
- PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.DENY, false);
- codeReview.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
- accessSectionToRemove.permissions.put(Permission.LABEL + LabelId.CODE_REVIEW, codeReview);
- ProjectAccessInput removal = newProjectAccessInput();
- removal.remove.put(REFS_HEADS, accessSectionToRemove);
- pApi().access(removal);
-
- // Remove locally
- accessInput
- .add
- .get(REFS_HEADS)
- .permissions
- .get(Permission.LABEL + LabelId.CODE_REVIEW)
- .rules
- .remove(SystemGroupBackend.REGISTERED_USERS.get());
-
- // Check
- assertThat(pApi().access().local).isEqualTo(accessInput.add);
- }
-
- @Test
- public void removePermissionRulesAndCleanupEmptyEntries() throws Exception {
- // Add initial permission set
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
-
- accessInput.add.put(REFS_HEADS, accessSectionInfo);
- pApi().access(accessInput);
-
- // Remove specific permission rules
- AccessSectionInfo accessSectionToRemove = newAccessSectionInfo();
- PermissionInfo codeReview = newPermissionInfo();
- codeReview.label = LabelId.CODE_REVIEW;
- PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.DENY, false);
- codeReview.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
- pri = new PermissionRuleInfo(PermissionRuleInfo.Action.DENY, false);
- codeReview.rules.put(SystemGroupBackend.PROJECT_OWNERS.get(), pri);
- accessSectionToRemove.permissions.put(Permission.LABEL + LabelId.CODE_REVIEW, codeReview);
- ProjectAccessInput removal = newProjectAccessInput();
- removal.remove.put(REFS_HEADS, accessSectionToRemove);
- pApi().access(removal);
-
- // Remove locally
- accessInput.add.get(REFS_HEADS).permissions.remove(Permission.LABEL + LabelId.CODE_REVIEW);
-
- // Check
- assertThat(pApi().access().local).isEqualTo(accessInput.add);
- }
-
- @Test
- public void getPermissionsWithDisallowedUser() throws Exception {
- // Add initial permission set
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSectionInfo = createAccessSectionInfoDenyAll();
-
- // Disallow READ
- accessInput.add.put(REFS_META_VERSION, accessSectionInfo);
- accessInput.add.put(REFS_DRAFTS, accessSectionInfo);
- accessInput.add.put(REFS_STARRED_CHANGES, accessSectionInfo);
- accessInput.add.put(REFS_HEADS, accessSectionInfo);
- pApi().access(accessInput);
-
- requestScopeOperations.setApiUser(user.id());
- assertThrows(ResourceNotFoundException.class, () -> pApi().access());
- }
-
- @Test
- public void setPermissionsWithDisallowedUser() throws Exception {
- // Add initial permission set
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSectionInfo = createAccessSectionInfoDenyAll();
-
- // Disallow READ
- accessInput.add.put(REFS_META_VERSION, accessSectionInfo);
- accessInput.add.put(REFS_DRAFTS, accessSectionInfo);
- accessInput.add.put(REFS_STARRED_CHANGES, accessSectionInfo);
- accessInput.add.put(REFS_HEADS, accessSectionInfo);
- pApi().access(accessInput);
-
- // Create a change to apply
- ProjectAccessInput accessInfoToApply = newProjectAccessInput();
- AccessSectionInfo accessSectionInfoToApply = createDefaultAccessSectionInfo();
- accessInfoToApply.add.put(REFS_HEADS, accessSectionInfoToApply);
-
- requestScopeOperations.setApiUser(user.id());
- assertThrows(ResourceNotFoundException.class, () -> pApi().access());
- }
-
- @Test
- public void permissionsGroupMap() throws Exception {
- // Add initial permission set
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSection = newAccessSectionInfo();
-
- PermissionInfo push = newPermissionInfo();
- PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
- push.rules.put(SystemGroupBackend.PROJECT_OWNERS.get(), pri);
- accessSection.permissions.put(Permission.PUSH, push);
-
- PermissionInfo read = newPermissionInfo();
- pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
- read.rules.put(SystemGroupBackend.ANONYMOUS_USERS.get(), pri);
- accessSection.permissions.put(Permission.READ, read);
-
- accessInput.add.put(REFS_ALL, accessSection);
- ProjectAccessInfo result = pApi().access(accessInput);
- assertThatMap(result.groups)
- .keys()
- .containsExactly(
- SystemGroupBackend.PROJECT_OWNERS.get(), SystemGroupBackend.ANONYMOUS_USERS.get());
-
- // Check the name, which is what the UI cares about; exhaustive
- // coverage of GroupInfo should be in groups REST API tests.
- assertThat(result.groups.get(SystemGroupBackend.PROJECT_OWNERS.get()).name)
- .isEqualTo("Project Owners");
- // Strip the ID, since it is in the key.
- assertThat(result.groups.get(SystemGroupBackend.PROJECT_OWNERS.get()).id).isNull();
-
- // Get call returns groups too.
- ProjectAccessInfo loggedInResult = pApi().access();
- assertThatMap(loggedInResult.groups)
- .keys()
- .containsExactly(
- SystemGroupBackend.PROJECT_OWNERS.get(), SystemGroupBackend.ANONYMOUS_USERS.get());
-
- GroupInfo owners = loggedInResult.groups.get(SystemGroupBackend.PROJECT_OWNERS.get());
- assertThat(owners.name).isEqualTo("Project Owners");
- assertThat(owners.id).isNull();
- assertThat(owners.members).isNull();
- assertThat(owners.includes).isNull();
-
- // PROJECT_OWNERS is invisible to anonymous user, but GetAccess disregards visibility.
- requestScopeOperations.setApiUserAnonymous();
- ProjectAccessInfo anonResult = pApi().access();
- assertThatMap(anonResult.groups)
- .keys()
- .containsExactly(
- SystemGroupBackend.PROJECT_OWNERS.get(), SystemGroupBackend.ANONYMOUS_USERS.get());
- }
-
- @Test
- public void updateParentAsUser() throws Exception {
- // Create child
- String newParentProjectName = projectOperations.newProject().create().get();
-
- // Set new parent
- ProjectAccessInput accessInput = newProjectAccessInput();
- accessInput.parent = newParentProjectName;
-
- requestScopeOperations.setApiUser(user.id());
- AuthException thrown = assertThrows(AuthException.class, () -> pApi().access(accessInput));
- assertThat(thrown).hasMessageThat().contains("administrate server not permitted");
- }
-
- @Test
- public void updateParentAsAdministrator() throws Exception {
- // Create parent
- String newParentProjectName = projectOperations.newProject().create().get();
-
- // Set new parent
- ProjectAccessInput accessInput = newProjectAccessInput();
- accessInput.parent = newParentProjectName;
-
- pApi().access(accessInput);
-
- assertThat(pApi().access().inheritsFrom.name).isEqualTo(newParentProjectName);
- }
-
- @Test
- public void addGlobalCapabilityAsUser() throws Exception {
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSectionInfo = createDefaultGlobalCapabilitiesAccessSectionInfo();
-
- accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSectionInfo);
-
- requestScopeOperations.setApiUser(user.id());
- assertThrows(
- AuthException.class, () -> gApi.projects().name(allProjects.get()).access(accessInput));
- }
-
- @Test
- public void addGlobalCapabilityAsAdmin() throws Exception {
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSectionInfo = createDefaultGlobalCapabilitiesAccessSectionInfo();
-
- accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSectionInfo);
-
- ProjectAccessInfo updatedAccessSectionInfo =
- gApi.projects().name(allProjects.get()).access(accessInput);
- assertThatMap(updatedAccessSectionInfo.local.get(AccessSection.GLOBAL_CAPABILITIES).permissions)
- .keys()
- .containsAtLeastElementsIn(accessSectionInfo.permissions.keySet());
- }
-
- @Test
- public void addPluginGlobalCapability() throws Exception {
- try (Registration registration =
- extensionRegistry
- .newRegistration()
- .add(
- new CapabilityDefinition() {
- @Override
- public String getDescription() {
- return "A Plugin Global Capability";
- }
- },
- "fooCapability")) {
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSectionInfo = newAccessSectionInfo();
-
- PermissionInfo foo = newPermissionInfo();
- PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
- foo.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
- accessSectionInfo.permissions.put(ExtensionRegistry.PLUGIN_NAME + "-fooCapability", foo);
-
- accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSectionInfo);
-
- ProjectAccessInfo updatedAccessSectionInfo =
- gApi.projects().name(allProjects.get()).access(accessInput);
- assertThatMap(
- updatedAccessSectionInfo.local.get(AccessSection.GLOBAL_CAPABILITIES).permissions)
- .keys()
- .containsAtLeastElementsIn(accessSectionInfo.permissions.keySet());
- }
- }
-
- @Test
- public void addPermissionAsGlobalCapability() throws Exception {
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSectionInfo = newAccessSectionInfo();
-
- PermissionInfo push = newPermissionInfo();
- PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
- push.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
- accessSectionInfo.permissions.put(Permission.PUSH, push);
-
- accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSectionInfo);
- BadRequestException ex =
- assertThrows(
- BadRequestException.class,
- () -> gApi.projects().name(allProjects.get()).access(accessInput));
- assertThat(ex).hasMessageThat().isEqualTo("Unknown global capability: " + Permission.PUSH);
- }
-
- @Test
- public void addInvalidGlobalCapability() throws Exception {
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSectionInfo = createDefaultGlobalCapabilitiesAccessSectionInfo();
-
- PermissionInfo permissionInfo = newPermissionInfo();
- PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
- permissionInfo.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
- accessSectionInfo.permissions.put("Invalid Global Capability", permissionInfo);
-
- accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSectionInfo);
- BadRequestException ex =
- assertThrows(
- BadRequestException.class,
- () -> gApi.projects().name(allProjects.get()).access(accessInput));
- assertThat(ex)
- .hasMessageThat()
- .isEqualTo("Unknown global capability: Invalid Global Capability");
- }
-
- @Test
- public void addGlobalCapabilityForNonRootProject() throws Exception {
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSectionInfo = createDefaultGlobalCapabilitiesAccessSectionInfo();
-
- accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSectionInfo);
-
- assertThrows(BadRequestException.class, () -> pApi().access(accessInput));
- }
-
- @Test
- public void addNonGlobalCapabilityToGlobalCapabilities() throws Exception {
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSectionInfo = newAccessSectionInfo();
-
- PermissionInfo permissionInfo = newPermissionInfo();
- permissionInfo.rules.put(adminGroupUuid().get(), null);
- accessSectionInfo.permissions.put(Permission.PUSH, permissionInfo);
-
- accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSectionInfo);
- assertThrows(
- BadRequestException.class,
- () -> gApi.projects().name(allProjects.get()).access(accessInput));
- }
-
- @Test
- public void removeGlobalCapabilityAsUser() throws Exception {
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSectionInfo = createDefaultGlobalCapabilitiesAccessSectionInfo();
-
- accessInput.remove.put(AccessSection.GLOBAL_CAPABILITIES, accessSectionInfo);
-
- requestScopeOperations.setApiUser(user.id());
- assertThrows(
- AuthException.class, () -> gApi.projects().name(allProjects.get()).access(accessInput));
- }
-
- @Test
- public void removeGlobalCapabilityAsAdmin() throws Exception {
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSectionInfo = newAccessSectionInfo();
-
- PermissionInfo permissionInfo = newPermissionInfo();
- permissionInfo.rules.put(adminGroupUuid().get(), null);
- accessSectionInfo.permissions.put(GlobalCapability.ACCESS_DATABASE, permissionInfo);
-
- // Add and validate first as removing existing privileges such as
- // administrateServer would break upcoming tests
- accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSectionInfo);
-
- ProjectAccessInfo updatedProjectAccessInfo =
- gApi.projects().name(allProjects.get()).access(accessInput);
- assertThatMap(updatedProjectAccessInfo.local.get(AccessSection.GLOBAL_CAPABILITIES).permissions)
- .keys()
- .containsAtLeastElementsIn(accessSectionInfo.permissions.keySet());
-
- // Remove
- accessInput.add.clear();
- accessInput.remove.put(AccessSection.GLOBAL_CAPABILITIES, accessSectionInfo);
-
- updatedProjectAccessInfo = gApi.projects().name(allProjects.get()).access(accessInput);
- assertThatMap(updatedProjectAccessInfo.local.get(AccessSection.GLOBAL_CAPABILITIES).permissions)
- .keys()
- .containsNoneIn(accessSectionInfo.permissions.keySet());
- }
-
- @Test
- public void unknownPermissionRemainsUnchanged() throws Exception {
- String access = "access";
- String unknownPermission = "unknownPermission";
- String registeredUsers = "group Registered Users";
- String refsFor = "refs/for/*";
- // Clone repository to forcefully add permission
- TestRepository<InMemoryRepository> allProjectsRepo = cloneProject(allProjects, admin);
-
- // Fetch permission ref
- GitUtil.fetch(allProjectsRepo, "refs/meta/config:cfg");
- allProjectsRepo.reset("cfg");
-
- // Load current permissions
- String config =
- gApi.projects()
- .name(allProjects.get())
- .branch(RefNames.REFS_CONFIG)
- .file(ProjectConfig.PROJECT_CONFIG)
- .asString();
-
- // Append and push unknown permission
- Config cfg = new Config();
- cfg.fromText(config);
- cfg.setString(access, refsFor, unknownPermission, registeredUsers);
- config = cfg.toText();
- PushOneCommit push =
- pushFactory.create(
- admin.newIdent(), allProjectsRepo, "Subject", ProjectConfig.PROJECT_CONFIG, config);
- push.to(RefNames.REFS_CONFIG).assertOkStatus();
-
- // Verify that unknownPermission is present
- config =
- gApi.projects()
- .name(allProjects.get())
- .branch(RefNames.REFS_CONFIG)
- .file(ProjectConfig.PROJECT_CONFIG)
- .asString();
- cfg.fromText(config);
- assertThat(cfg).stringValue(access, refsFor, unknownPermission).isEqualTo(registeredUsers);
-
- // Make permission change through API
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
- accessInput.add.put(refsFor, accessSectionInfo);
- gApi.projects().name(allProjects.get()).access(accessInput);
- accessInput.add.clear();
- accessInput.remove.put(refsFor, accessSectionInfo);
- gApi.projects().name(allProjects.get()).access(accessInput);
-
- // Verify that unknownPermission is still present
- config =
- gApi.projects()
- .name(allProjects.get())
- .branch(RefNames.REFS_CONFIG)
- .file(ProjectConfig.PROJECT_CONFIG)
- .asString();
- cfg.fromText(config);
- assertThat(cfg).stringValue(access, refsFor, unknownPermission).isEqualTo(registeredUsers);
- }
-
- @Test
- public void allUsersCanOnlyInheritFromAllProjects() throws Exception {
- ProjectAccessInput accessInput = newProjectAccessInput();
- accessInput.parent = project.get();
- BadRequestException thrown =
- assertThrows(
- BadRequestException.class,
- () -> gApi.projects().name(allUsers.get()).access(accessInput));
- assertThat(thrown)
- .hasMessageThat()
- .contains(allUsers.get() + " must inherit from " + allProjects.get());
- }
-
- @Test
- public void syncCreateGroupPermission_addAndRemoveCreateGroupCapability() throws Exception {
- // Grant CREATE_GROUP to Registered Users
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSection = newAccessSectionInfo();
- PermissionInfo createGroup = newPermissionInfo();
- PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
- createGroup.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
- accessSection.permissions.put(GlobalCapability.CREATE_GROUP, createGroup);
- accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSection);
- gApi.projects().name(allProjects.get()).access(accessInput);
-
- // Assert that the permission was synced from All-Projects (global) to All-Users (ref)
- Map<String, AccessSectionInfo> local = gApi.projects().name("All-Users").access().local;
- assertThatMap(local).keys().contains(RefNames.REFS_GROUPS + "*");
- Map<String, PermissionInfo> permissions = local.get(RefNames.REFS_GROUPS + "*").permissions;
- // READ is the default permission and should be preserved by the syncer
- assertThatMap(permissions).keys().containsExactly(Permission.READ, Permission.CREATE);
- Map<String, PermissionRuleInfo> rules = permissions.get(Permission.CREATE).rules;
- assertThatMap(rules).values().containsExactly(pri);
-
- // Revoke the permission
- accessInput.add.clear();
- accessInput.remove.put(AccessSection.GLOBAL_CAPABILITIES, accessSection);
- gApi.projects().name(allProjects.get()).access(accessInput);
-
- // Assert that the permission was synced from All-Projects (global) to All-Users (ref)
- Map<String, AccessSectionInfo> local2 = gApi.projects().name("All-Users").access().local;
- assertThatMap(local2).keys().contains(RefNames.REFS_GROUPS + "*");
- Map<String, PermissionInfo> permissions2 = local2.get(RefNames.REFS_GROUPS + "*").permissions;
- // READ is the default permission and should be preserved by the syncer
- assertThatMap(permissions2).keys().containsExactly(Permission.READ);
- }
-
- @Test
- public void syncCreateGroupPermission_addCreateGroupCapabilityToMultipleGroups()
- throws Exception {
- PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
-
- // Grant CREATE_GROUP to Registered Users
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSection = newAccessSectionInfo();
- PermissionInfo createGroup = newPermissionInfo();
- createGroup.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
- accessSection.permissions.put(GlobalCapability.CREATE_GROUP, createGroup);
- accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSection);
- gApi.projects().name(allProjects.get()).access(accessInput);
-
- // Grant CREATE_GROUP to Administrators
- accessInput = newProjectAccessInput();
- accessSection = newAccessSectionInfo();
- createGroup = newPermissionInfo();
- createGroup.rules.put(adminGroupUuid().get(), pri);
- accessSection.permissions.put(GlobalCapability.CREATE_GROUP, createGroup);
- accessInput.add.put(AccessSection.GLOBAL_CAPABILITIES, accessSection);
- gApi.projects().name(allProjects.get()).access(accessInput);
-
- // Assert that the permissions were synced from All-Projects (global) to All-Users (ref)
- Map<String, AccessSectionInfo> local = gApi.projects().name("All-Users").access().local;
- assertThatMap(local).keys().contains(RefNames.REFS_GROUPS + "*");
- Map<String, PermissionInfo> permissions = local.get(RefNames.REFS_GROUPS + "*").permissions;
- // READ is the default permission and should be preserved by the syncer
- assertThatMap(permissions).keys().containsExactly(Permission.READ, Permission.CREATE);
- Map<String, PermissionRuleInfo> rules = permissions.get(Permission.CREATE).rules;
- assertThatMap(rules)
- .keys()
- .containsExactly(SystemGroupBackend.REGISTERED_USERS.get(), adminGroupUuid().get());
- assertThat(rules.get(SystemGroupBackend.REGISTERED_USERS.get())).isEqualTo(pri);
- assertThat(rules.get(adminGroupUuid().get())).isEqualTo(pri);
- }
-
- @Test
- public void addAccessSectionForInvalidRef() throws Exception {
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
-
- // 'refs/heads/stable_*' is invalid, correct would be '^refs/heads/stable_.*'
- String invalidRef = Constants.R_HEADS + "stable_*";
- accessInput.add.put(invalidRef, accessSectionInfo);
-
- BadRequestException thrown =
- assertThrows(BadRequestException.class, () -> pApi().access(accessInput));
- assertThat(thrown).hasMessageThat().contains("Invalid Name: " + invalidRef);
- }
-
- @Test
- public void createAccessChangeWithAccessSectionForInvalidRef() throws Exception {
- ProjectAccessInput accessInput = newProjectAccessInput();
- AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
-
- // 'refs/heads/stable_*' is invalid, correct would be '^refs/heads/stable_.*'
- String invalidRef = Constants.R_HEADS + "stable_*";
- accessInput.add.put(invalidRef, accessSectionInfo);
-
- BadRequestException thrown =
- assertThrows(BadRequestException.class, () -> pApi().accessChange(accessInput));
- assertThat(thrown).hasMessageThat().contains("Invalid Name: " + invalidRef);
- }
-
- private ProjectApi pApi() throws Exception {
- return gApi.projects().name(newProjectName.get());
- }
-
- private ProjectAccessInput newProjectAccessInput() {
- ProjectAccessInput p = new ProjectAccessInput();
- p.add = new HashMap<>();
- p.remove = new HashMap<>();
- return p;
- }
-
- private PermissionInfo newPermissionInfo() {
- PermissionInfo p = new PermissionInfo(null, null);
- p.rules = new HashMap<>();
- return p;
- }
-
- private AccessSectionInfo newAccessSectionInfo() {
- AccessSectionInfo a = new AccessSectionInfo();
- a.permissions = new HashMap<>();
- return a;
- }
-
- private AccessSectionInfo createDefaultAccessSectionInfo() {
- AccessSectionInfo accessSection = newAccessSectionInfo();
-
- PermissionInfo push = newPermissionInfo();
- PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
- push.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
- accessSection.permissions.put(Permission.PUSH, push);
-
- PermissionInfo codeReview = newPermissionInfo();
- codeReview.label = LabelId.CODE_REVIEW;
- pri = new PermissionRuleInfo(PermissionRuleInfo.Action.DENY, false);
- codeReview.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
-
- pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
- pri.max = 1;
- pri.min = -1;
- codeReview.rules.put(SystemGroupBackend.PROJECT_OWNERS.get(), pri);
- accessSection.permissions.put(Permission.LABEL + LabelId.CODE_REVIEW, codeReview);
-
- return accessSection;
- }
-
- private AccessSectionInfo createDefaultGlobalCapabilitiesAccessSectionInfo() {
- AccessSectionInfo accessSection = newAccessSectionInfo();
-
- PermissionInfo email = newPermissionInfo();
- PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.ALLOW, false);
- email.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
- accessSection.permissions.put(GlobalCapability.EMAIL_REVIEWERS, email);
-
- return accessSection;
- }
-
- private AccessSectionInfo createAccessSectionInfoDenyAll() {
- AccessSectionInfo accessSection = newAccessSectionInfo();
-
- PermissionInfo read = newPermissionInfo();
- PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.DENY, false);
- read.rules.put(SystemGroupBackend.ANONYMOUS_USERS.get(), pri);
- accessSection.permissions.put(Permission.READ, read);
-
- return accessSection;
+ public void listAccess() throws Exception {
+ RestResponse r = adminRestSession.get("/access/?project=" + project.get());
+ r.assertOK();
+ Map<String, ProjectAccessInfo> infoByProject =
+ newGson()
+ .fromJson(r.getReader(), new TypeToken<Map<String, ProjectAccessInfo>>() {}.getType());
+ assertThat(infoByProject.keySet()).containsExactly(project.get());
}
}
diff --git a/javatests/com/google/gerrit/acceptance/server/mail/MailProcessorIT.java b/javatests/com/google/gerrit/acceptance/server/mail/MailProcessorIT.java
index 5679c41..85c0212 100644
--- a/javatests/com/google/gerrit/acceptance/server/mail/MailProcessorIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/mail/MailProcessorIT.java
@@ -16,6 +16,8 @@
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.block;
+import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.clearInvocations;
import static org.mockito.Mockito.mock;
@@ -28,7 +30,9 @@
import com.google.common.collect.Streams;
import com.google.gerrit.acceptance.config.GerritConfig;
import com.google.gerrit.acceptance.testsuite.account.AccountOperations;
+import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
import com.google.gerrit.entities.EmailHeader;
+import com.google.gerrit.entities.Permission;
import com.google.gerrit.extensions.annotations.Exports;
import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.extensions.api.changes.ReviewInput.CommentInput;
@@ -44,6 +48,7 @@
import com.google.gerrit.mail.MailMessage;
import com.google.gerrit.mail.MailProcessingUtil;
import com.google.gerrit.server.mail.receive.MailProcessor;
+import com.google.gerrit.server.util.time.TimeUtil;
import com.google.gerrit.testing.FakeEmailSender.Message;
import com.google.gerrit.testing.TestCommentHelper;
import com.google.inject.Inject;
@@ -61,6 +66,7 @@
@Inject private MailProcessor mailProcessor;
@Inject private AccountOperations accountOperations;
@Inject private TestCommentHelper testCommentHelper;
+ @Inject private ProjectOperations projectOperations;
private static final CommentValidator mockCommentValidator = mock(CommentValidator.class);
@@ -276,6 +282,133 @@
}
@Test
+ public void sendNotificationOnProjectNotFound() throws Exception {
+ String ts =
+ MailProcessingUtil.rfcDateformatter.format(
+ ZonedDateTime.ofInstant(TimeUtil.now(), ZoneId.of("UTC")));
+
+ String changeUrl = canonicalWebUrl.get() + "c/non-existing-project/+/123";
+
+ // Build Message
+ String txt = newPlaintextBody(changeUrl + "/1", "Test Message", null, null);
+ MailMessage.Builder b =
+ messageBuilderWithDefaultFields()
+ .from(user.getNameEmail())
+ .textContent(txt + textFooterForChange(123, ts));
+
+ sender.clear();
+ mailProcessor.process(b.build());
+
+ assertNotifyTo(user);
+ Message message = sender.nextMessage();
+ assertThat(message.body())
+ .contains(
+ "Gerrit Code Review was unable to process your email because the change was not"
+ + " found.");
+ assertThat(message.headers()).containsKey("Subject");
+ }
+
+ @Test
+ public void sendNotificationOnProjectNotVisible() throws Exception {
+ String changeId = createChangeWithReview();
+ ChangeInfo changeInfo = gApi.changes().id(changeId).get();
+
+ String ts =
+ MailProcessingUtil.rfcDateformatter.format(
+ ZonedDateTime.ofInstant(
+ gApi.changes().id(changeId).get().updated.toInstant(), ZoneId.of("UTC")));
+
+ // Block read permissions on the project.
+ projectOperations
+ .project(project)
+ .forUpdate()
+ .add(block(Permission.READ).ref("refs/*").group(REGISTERED_USERS))
+ .update();
+
+ // Build Message
+ String txt = newPlaintextBody(getChangeUrl(changeInfo) + "/1", "Test Message", null, null);
+ MailMessage.Builder b =
+ messageBuilderWithDefaultFields()
+ .from(user.getNameEmail())
+ .textContent(txt + textFooterForChange(changeInfo._number, ts));
+
+ sender.clear();
+ mailProcessor.process(b.build());
+
+ assertNotifyTo(user);
+ Message message = sender.nextMessage();
+ assertThat(message.body())
+ .contains(
+ "Gerrit Code Review was unable to process your email because the change was not"
+ + " found.");
+ assertThat(message.headers()).containsKey("Subject");
+ }
+
+ @Test
+ public void sendNotificationOnChangeNotFound() throws Exception {
+ String changeId = createChangeWithReview();
+ ChangeInfo changeInfo = gApi.changes().id(changeId).get();
+
+ String ts =
+ MailProcessingUtil.rfcDateformatter.format(
+ ZonedDateTime.ofInstant(
+ gApi.changes().id(changeId).get().updated.toInstant(), ZoneId.of("UTC")));
+
+ // Delete the change so that it's not found.
+ gApi.changes().id(changeId).delete();
+
+ // Build Message
+ String txt = newPlaintextBody(getChangeUrl(changeInfo) + "/1", "Test Message", null, null);
+ MailMessage.Builder b =
+ messageBuilderWithDefaultFields()
+ .from(user.getNameEmail())
+ .textContent(txt + textFooterForChange(changeInfo._number, ts));
+
+ sender.clear();
+ mailProcessor.process(b.build());
+
+ assertNotifyTo(user);
+ Message message = sender.nextMessage();
+ assertThat(message.body())
+ .contains(
+ "Gerrit Code Review was unable to process your email because the change was not"
+ + " found.");
+ assertThat(message.headers()).containsKey("Subject");
+ }
+
+ @Test
+ public void sendNotificationOnChangeNotVisible() throws Exception {
+ String changeId = createChangeWithReview();
+ ChangeInfo changeInfo = gApi.changes().id(changeId).get();
+
+ String ts =
+ MailProcessingUtil.rfcDateformatter.format(
+ ZonedDateTime.ofInstant(
+ gApi.changes().id(changeId).get().updated.toInstant(), ZoneId.of("UTC")));
+
+ // Make change private so that it's no visible to user.
+ gApi.changes().id(changeId).setPrivate(true);
+
+ // Build Message
+ String txt = newPlaintextBody(getChangeUrl(changeInfo) + "/1", "Test Message", null, null);
+ MailMessage.Builder b =
+ messageBuilderWithDefaultFields()
+ .from(user.getNameEmail())
+ .textContent(txt + textFooterForChange(changeInfo._number, ts));
+
+ sender.clear();
+ mailProcessor.process(b.build());
+
+ assertNotifyTo(user);
+ Message message = sender.nextMessage();
+ assertThat(message.body())
+ .contains(
+ "Gerrit Code Review was unable to process your email because the change was not"
+ + " found.");
+ assertThat(message.headers()).containsKey("Subject");
+ }
+
+ @Test
public void validateChangeMessage_rejected() throws Exception {
String changeId = createChangeWithReview();
ChangeInfo changeInfo = gApi.changes().id(changeId).get();
diff --git a/javatests/com/google/gerrit/acceptance/server/quota/RepositorySizeQuotaIT.java b/javatests/com/google/gerrit/acceptance/server/quota/RepositorySizeQuotaIT.java
index 2692584..c9c3bbb 100644
--- a/javatests/com/google/gerrit/acceptance/server/quota/RepositorySizeQuotaIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/quota/RepositorySizeQuotaIT.java
@@ -76,8 +76,13 @@
@Test
public void pushWithAvailableTokens() throws Exception {
+ // The push creates a pack that contains 325 bytes of uncompressed data.
+ // The data in the push contains sha and timestamps which are different on each test run.
+ // Due to it, the push's pack size varies after data compression and lead to a flaky tests
+ // if the amount of availableTokens doesn't cover all possible sizes. To avoid flakiness, we
+ // set availableTokens value large enough to cover all possible pack sizes.
when(quotaBackendWithResource.availableTokens(REPOSITORY_SIZE_GROUP))
- .thenReturn(singletonAggregation(ok(277L)));
+ .thenReturn(singletonAggregation(ok(512L)));
when(quotaBackendWithResource.requestTokens(eq(REPOSITORY_SIZE_GROUP), anyLong()))
.thenReturn(singletonAggregation(ok()));
when(quotaBackendWithUser.project(project)).thenReturn(quotaBackendWithResource);
diff --git a/javatests/com/google/gerrit/acceptance/ssh/PredicateIT.java b/javatests/com/google/gerrit/acceptance/ssh/PredicateIT.java
new file mode 100644
index 0000000..cedd270
--- /dev/null
+++ b/javatests/com/google/gerrit/acceptance/ssh/PredicateIT.java
@@ -0,0 +1,67 @@
+// Copyright (C) 2021 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.acceptance.ssh;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.common.io.CharStreams;
+import com.google.gerrit.acceptance.AbstractPredicateTest;
+import com.google.gerrit.acceptance.NoHttpd;
+import com.google.gerrit.acceptance.UseSsh;
+import com.google.gerrit.entities.Change;
+import com.google.gerrit.extensions.common.PluginDefinedInfo;
+import com.google.gson.reflect.TypeToken;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.junit.Test;
+
+@NoHttpd
+@UseSsh
+public class PredicateIT extends AbstractPredicateTest {
+
+ @Test
+ public void testLabelPredicate() throws Exception {
+ try (AutoCloseable ignored = installPlugin(PLUGIN_NAME, PluginModule.class)) {
+ Change.Id changeId = createChange().getChange().getId();
+ approve(String.valueOf(changeId.get()));
+ String sshOutput =
+ adminSshSession.exec(
+ "gerrit query --format json --my-plugin--sample change:" + changeId.get());
+ adminSshSession.assertSuccess();
+ List<PluginDefinedInfo> myInfos = pluginInfoFromSingletonList(sshOutput);
+
+ assertThat(myInfos).hasSize(1);
+ assertThat(myInfos.get(0).name).isEqualTo(PLUGIN_NAME);
+ assertThat(myInfos.get(0).message).isEqualTo("matched");
+ }
+ }
+
+ private static List<PluginDefinedInfo> pluginInfoFromSingletonList(String sshOutput)
+ throws Exception {
+ List<Map<String, Object>> changeAttrs = new ArrayList<>();
+ for (String line : CharStreams.readLines(new StringReader(sshOutput))) {
+ Map<String, Object> changeAttr =
+ GSON.fromJson(line, new TypeToken<Map<String, Object>>() {}.getType());
+ if (!"stats".equals(changeAttr.get("type"))) {
+ changeAttrs.add(changeAttr);
+ }
+ }
+
+ assertThat(changeAttrs).hasSize(1);
+ return decodeRawPluginsList(changeAttrs.get(0).get("plugins"));
+ }
+}
diff --git a/javatests/com/google/gerrit/acceptance/ssh/SshCommandsIT.java b/javatests/com/google/gerrit/acceptance/ssh/SshCommandsIT.java
index bbe7b81..2b37cfd 100644
--- a/javatests/com/google/gerrit/acceptance/ssh/SshCommandsIT.java
+++ b/javatests/com/google/gerrit/acceptance/ssh/SshCommandsIT.java
@@ -45,6 +45,7 @@
ImmutableList.of(
"apropos",
"close-connection",
+ "convert-ref-storage",
"flush-caches",
"gc",
"logging",
diff --git a/javatests/com/google/gerrit/entities/converter/BUILD b/javatests/com/google/gerrit/entities/converter/BUILD
index 6ca9871..6c4d1e4 100644
--- a/javatests/com/google/gerrit/entities/converter/BUILD
+++ b/javatests/com/google/gerrit/entities/converter/BUILD
@@ -6,6 +6,7 @@
deps = [
"//java/com/google/gerrit/entities",
"//java/com/google/gerrit/proto/testing",
+ "//java/com/google/gerrit/server",
"//lib:guava",
"//lib:jgit",
"//lib:protobuf",
diff --git a/javatests/com/google/gerrit/entities/converter/ChangeMessageProtoConverterTest.java b/javatests/com/google/gerrit/entities/converter/ChangeMessageProtoConverterTest.java
index b185558..f612d0f 100644
--- a/javatests/com/google/gerrit/entities/converter/ChangeMessageProtoConverterTest.java
+++ b/javatests/com/google/gerrit/entities/converter/ChangeMessageProtoConverterTest.java
@@ -19,12 +19,15 @@
import static com.google.gerrit.proto.testing.SerializedClassSubject.assertThatSerializedClass;
import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
import com.google.gerrit.entities.Account;
import com.google.gerrit.entities.Change;
import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.proto.Entities;
import com.google.gerrit.proto.testing.SerializedClassSubject;
+import com.google.gerrit.server.ChangeMessagesUtil;
+import com.google.inject.TypeLiteral;
import java.lang.reflect.Type;
import java.sql.Timestamp;
import org.junit.Test;
@@ -36,14 +39,14 @@
@Test
public void allValuesConvertedToProto() {
ChangeMessage changeMessage =
- new ChangeMessage(
+ ChangeMessage.create(
ChangeMessage.key(Change.id(543), "change-message-21"),
Account.id(63),
new Timestamp(9876543),
- PatchSet.id(Change.id(34), 13));
- changeMessage.setMessage("This is a change message.");
- changeMessage.setTag("An arbitrary tag.");
- changeMessage.setRealAuthor(Account.id(10003));
+ PatchSet.id(Change.id(34), 13),
+ "This is a change message.",
+ Account.id(10003),
+ "An arbitrary tag.");
Entities.ChangeMessage proto = changeMessageProtoConverter.toProto(changeMessage);
@@ -69,7 +72,7 @@
@Test
public void mainValuesConvertedToProto() {
ChangeMessage changeMessage =
- new ChangeMessage(
+ ChangeMessage.create(
ChangeMessage.key(Change.id(543), "change-message-21"),
Account.id(63),
new Timestamp(9876543),
@@ -97,7 +100,7 @@
@Test
public void realAuthorIsNotAutomaticallySetToAuthorWhenConvertedToProto() {
ChangeMessage changeMessage =
- new ChangeMessage(
+ ChangeMessage.create(
ChangeMessage.key(Change.id(543), "change-message-21"), Account.id(63), null, null);
Entities.ChangeMessage proto = changeMessageProtoConverter.toProto(changeMessage);
@@ -118,7 +121,8 @@
// writtenOn may not be null according to the column definition but it's optional for the
// protobuf definition. -> assume as optional and hence test null
ChangeMessage changeMessage =
- new ChangeMessage(ChangeMessage.key(Change.id(543), "change-message-21"), null, null, null);
+ ChangeMessage.create(
+ ChangeMessage.key(Change.id(543), "change-message-21"), null, null, null);
Entities.ChangeMessage proto = changeMessageProtoConverter.toProto(changeMessage);
@@ -135,14 +139,14 @@
@Test
public void allValuesConvertedToProtoAndBackAgain() {
ChangeMessage changeMessage =
- new ChangeMessage(
+ ChangeMessage.create(
ChangeMessage.key(Change.id(543), "change-message-21"),
Account.id(63),
new Timestamp(9876543),
- PatchSet.id(Change.id(34), 13));
- changeMessage.setMessage("This is a change message.");
- changeMessage.setTag("An arbitrary tag.");
- changeMessage.setRealAuthor(Account.id(10003));
+ PatchSet.id(Change.id(34), 13),
+ "This is a change message.",
+ Account.id(10003),
+ "An arbitrary tag.");
ChangeMessage convertedChangeMessage =
changeMessageProtoConverter.fromProto(changeMessageProtoConverter.toProto(changeMessage));
@@ -150,9 +154,31 @@
}
@Test
+ public void messageTemplateConvertedToProtoAndParsedBack() {
+ ChangeMessage changeMessage =
+ ChangeMessage.create(
+ ChangeMessage.key(Change.id(543), "change-message-21"),
+ Account.id(63),
+ new Timestamp(9876543),
+ PatchSet.id(Change.id(34), 13),
+ String.format(
+ "This is a change message by %s and includes %s ",
+ ChangeMessagesUtil.getAccountTemplate(Account.id(10001)),
+ ChangeMessagesUtil.getAccountTemplate(Account.id(10002))),
+ Account.id(10003),
+ "An arbitrary tag.");
+
+ ChangeMessage convertedChangeMessage =
+ changeMessageProtoConverter.fromProto(changeMessageProtoConverter.toProto(changeMessage));
+ assertThat(convertedChangeMessage.getAccountsInMessage())
+ .containsExactly(Account.id(10001), Account.id(10002));
+ assertThat(convertedChangeMessage).isEqualTo(changeMessage);
+ }
+
+ @Test
public void mainValuesConvertedToProtoAndBackAgain() {
ChangeMessage changeMessage =
- new ChangeMessage(
+ ChangeMessage.create(
ChangeMessage.key(Change.id(543), "change-message-21"),
Account.id(63),
new Timestamp(9876543),
@@ -166,7 +192,8 @@
@Test
public void mandatoryValuesConvertedToProtoAndBackAgain() {
ChangeMessage changeMessage =
- new ChangeMessage(ChangeMessage.key(Change.id(543), "change-message-21"), null, null, null);
+ ChangeMessage.create(
+ ChangeMessage.key(Change.id(543), "change-message-21"), null, null, null);
ChangeMessage convertedChangeMessage =
changeMessageProtoConverter.fromProto(changeMessageProtoConverter.toProto(changeMessage));
@@ -183,6 +210,8 @@
.put("author", Account.Id.class)
.put("writtenOn", Timestamp.class)
.put("message", String.class)
+ // accountsInMessage are parsed from message template and are not serialized.
+ .put("accountsInMessage", new TypeLiteral<ImmutableSet<Account.Id>>() {}.getType())
.put("patchset", PatchSet.Id.class)
.put("tag", String.class)
.put("realAuthor", Account.Id.class)
diff --git a/javatests/com/google/gerrit/extensions/client/ListOptionTest.java b/javatests/com/google/gerrit/extensions/client/ListOptionTest.java
index 5e8c7b6..543428a 100644
--- a/javatests/com/google/gerrit/extensions/client/ListOptionTest.java
+++ b/javatests/com/google/gerrit/extensions/client/ListOptionTest.java
@@ -19,8 +19,10 @@
import static com.google.gerrit.extensions.client.ListOptionTest.MyOption.BAR;
import static com.google.gerrit.extensions.client.ListOptionTest.MyOption.BAZ;
import static com.google.gerrit.extensions.client.ListOptionTest.MyOption.FOO;
+import static org.junit.Assert.fail;
import com.google.common.math.IntMath;
+import com.google.gerrit.extensions.restapi.BadRequestException;
import java.util.EnumSet;
import org.junit.Test;
@@ -43,6 +45,17 @@
}
@Test
+ public void fromHexString() {
+ try {
+ // TODO(hanwen): move GerritJUnit.assertThrows to a place that doesn't depend on everything.
+ ListOption.fromHexString(MyOption.class, "xyz");
+ fail("must throw");
+ } catch (BadRequestException e) {
+ assertThat(e.getMessage()).contains("32-bit integer");
+ }
+ }
+
+ @Test
public void fromBits() {
assertThat(IntMath.pow(2, BAZ.getValue())).isEqualTo(131072);
assertThat(ListOption.fromBits(MyOption.class, 0)).isEmpty();
diff --git a/javatests/com/google/gerrit/httpd/BUILD b/javatests/com/google/gerrit/httpd/BUILD
index d751890..121cbc4 100644
--- a/javatests/com/google/gerrit/httpd/BUILD
+++ b/javatests/com/google/gerrit/httpd/BUILD
@@ -4,6 +4,7 @@
name = "httpd_tests",
srcs = glob(["**/*.java"]),
deps = [
+ "//java/com/google/gerrit/entities",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/httpd",
"//java/com/google/gerrit/server",
@@ -17,6 +18,7 @@
"//lib:junit",
"//lib:servlet-api-without-neverlink",
"//lib:soy",
+ "//lib/bouncycastle:bcprov",
"//lib/guice",
"//lib/guice:guice-servlet",
"//lib/mockito",
diff --git a/javatests/com/google/gerrit/httpd/ProjectBasicAuthFilterTest.java b/javatests/com/google/gerrit/httpd/ProjectBasicAuthFilterTest.java
new file mode 100644
index 0000000..735abbf
--- /dev/null
+++ b/javatests/com/google/gerrit/httpd/ProjectBasicAuthFilterTest.java
@@ -0,0 +1,266 @@
+// Copyright (C) 2021 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.httpd;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.gerrit.entities.Account;
+import com.google.gerrit.extensions.client.GitBasicAuthPolicy;
+import com.google.gerrit.extensions.registration.DynamicItem;
+import com.google.gerrit.server.IdentifiedUser;
+import com.google.gerrit.server.account.AccountCache;
+import com.google.gerrit.server.account.AccountException;
+import com.google.gerrit.server.account.AccountManager;
+import com.google.gerrit.server.account.AccountState;
+import com.google.gerrit.server.account.AuthResult;
+import com.google.gerrit.server.account.externalids.ExternalId;
+import com.google.gerrit.server.config.AuthConfig;
+import com.google.gerrit.util.http.testutil.FakeHttpServletRequest;
+import com.google.gerrit.util.http.testutil.FakeHttpServletResponse;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.Optional;
+import javax.servlet.FilterChain;
+import javax.servlet.http.HttpServletResponse;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ProjectBasicAuthFilterTest {
+ private static final Base64.Encoder B64_ENC = Base64.getEncoder();
+ private static final Account.Id AUTH_ACCOUNT_ID = Account.id(1000);
+ private static final String AUTH_USER = "johndoe";
+ private static final String AUTH_USER_B64 =
+ B64_ENC.encodeToString(AUTH_USER.getBytes(StandardCharsets.UTF_8));
+ private static final String AUTH_PASSWORD = "jd123";
+ private static final String GERRIT_COOKIE_KEY = "GerritAccount";
+ private static final String AUTH_COOKIE_VALUE = "gerritcookie";
+ private static final ExternalId AUTH_USER_PASSWORD_EXTERNAL_ID =
+ ExternalId.createWithPassword(
+ ExternalId.Key.create(ExternalId.SCHEME_USERNAME, AUTH_USER),
+ AUTH_ACCOUNT_ID,
+ null,
+ AUTH_PASSWORD);
+
+ @Mock private DynamicItem<WebSession> webSessionItem;
+
+ @Mock private AccountCache accountCache;
+
+ @Mock private AccountState accountState;
+
+ @Mock private Account account;
+
+ @Mock private AccountManager accountManager;
+
+ @Mock private AuthConfig authConfig;
+
+ @Mock private FilterChain chain;
+
+ @Captor private ArgumentCaptor<HttpServletResponse> filterResponseCaptor;
+
+ @Mock private IdentifiedUser.RequestFactory userRequestFactory;
+
+ @Mock private WebSessionManager webSessionManager;
+
+ private WebSession webSession;
+ private FakeHttpServletRequest req;
+ private HttpServletResponse res;
+ private AuthResult authSuccessful;
+
+ @Before
+ public void setUp() throws Exception {
+ req = new FakeHttpServletRequest();
+ res = new FakeHttpServletResponse();
+
+ authSuccessful =
+ new AuthResult(AUTH_ACCOUNT_ID, ExternalId.Key.create("username", AUTH_USER), false);
+ doReturn(Optional.of(accountState)).when(accountCache).getByUsername(AUTH_USER);
+ doReturn(Optional.of(accountState)).when(accountCache).get(AUTH_ACCOUNT_ID);
+ doReturn(account).when(accountState).account();
+ doReturn(ImmutableSet.builder().add(AUTH_USER_PASSWORD_EXTERNAL_ID).build())
+ .when(accountState)
+ .externalIds();
+
+ doReturn(new WebSessionManager.Key(AUTH_COOKIE_VALUE)).when(webSessionManager).createKey(any());
+ WebSessionManager.Val webSessionValue =
+ new WebSessionManager.Val(AUTH_ACCOUNT_ID, 0L, false, null, 0L, "", "");
+ doReturn(webSessionValue)
+ .when(webSessionManager)
+ .createVal(any(), any(), eq(false), any(), any(), any());
+ }
+
+ private void initWebSessionWithCookie(String cookie) {
+ req.addHeader("Cookie", cookie);
+ initWebSessionWithoutCookie();
+ }
+
+ private void initWebSessionWithoutCookie() {
+ webSession =
+ new CacheBasedWebSession(
+ req, res, webSessionManager, authConfig, null, userRequestFactory, accountCache) {};
+ doReturn(webSession).when(webSessionItem).get();
+ }
+
+ private void initMockedWebSession() {
+ webSession = mock(WebSession.class);
+ doReturn(webSession).when(webSessionItem).get();
+ }
+
+ @Test
+ public void shouldAllowAnonymousRequest() throws Exception {
+ initMockedWebSession();
+ res.setStatus(HttpServletResponse.SC_OK);
+
+ ProjectBasicAuthFilter basicAuthFilter =
+ new ProjectBasicAuthFilter(webSessionItem, accountCache, accountManager, authConfig);
+
+ basicAuthFilter.doFilter(req, res, chain);
+
+ verify(chain).doFilter(eq(req), filterResponseCaptor.capture());
+ assertThat(res.getStatus()).isEqualTo(HttpServletResponse.SC_OK);
+ }
+
+ @Test
+ public void shouldRequestAuthenticationForBasicAuthRequest() throws Exception {
+ initMockedWebSession();
+ req.addHeader("Authorization", "Basic " + AUTH_USER_B64);
+ res.setStatus(HttpServletResponse.SC_OK);
+
+ ProjectBasicAuthFilter basicAuthFilter =
+ new ProjectBasicAuthFilter(webSessionItem, accountCache, accountManager, authConfig);
+
+ basicAuthFilter.doFilter(req, res, chain);
+
+ verify(chain, never()).doFilter(any(), any());
+ assertThat(res.getStatus()).isEqualTo(HttpServletResponse.SC_UNAUTHORIZED);
+ assertThat(res.getHeader("WWW-Authenticate")).contains("Basic realm=");
+ }
+
+ @Test
+ public void shouldAuthenticateSucessfullyAgainstRealmAndReturnCookie() throws Exception {
+ initWebSessionWithoutCookie();
+ requestBasicAuth(req);
+ res.setStatus(HttpServletResponse.SC_OK);
+
+ doReturn(true).when(account).isActive();
+ doReturn(authSuccessful).when(accountManager).authenticate(any());
+ doReturn(GitBasicAuthPolicy.LDAP).when(authConfig).getGitBasicAuthPolicy();
+
+ ProjectBasicAuthFilter basicAuthFilter =
+ new ProjectBasicAuthFilter(webSessionItem, accountCache, accountManager, authConfig);
+
+ basicAuthFilter.doFilter(req, res, chain);
+
+ verify(accountManager).authenticate(any());
+
+ verify(chain).doFilter(eq(req), any());
+ assertThat(res.getStatus()).isEqualTo(HttpServletResponse.SC_OK);
+ assertThat(res.getHeader("Set-Cookie")).contains(GERRIT_COOKIE_KEY);
+ }
+
+ @Test
+ public void shouldValidateUserPasswordAndNotReturnCookie() throws Exception {
+ initWebSessionWithoutCookie();
+ requestBasicAuth(req);
+ res.setStatus(HttpServletResponse.SC_OK);
+
+ doReturn(true).when(account).isActive();
+ doReturn(GitBasicAuthPolicy.HTTP).when(authConfig).getGitBasicAuthPolicy();
+
+ ProjectBasicAuthFilter basicAuthFilter =
+ new ProjectBasicAuthFilter(webSessionItem, accountCache, accountManager, authConfig);
+
+ basicAuthFilter.doFilter(req, res, chain);
+
+ verify(accountManager, never()).authenticate(any());
+
+ verify(chain).doFilter(eq(req), any());
+ assertThat(res.getStatus()).isEqualTo(HttpServletResponse.SC_OK);
+ assertThat(res.getHeader("Set-Cookie")).isNull();
+ }
+
+ @Test
+ public void shouldNotReauthenticateIfAlreadySignedIn() throws Exception {
+ initMockedWebSession();
+ doReturn(true).when(webSession).isSignedIn();
+ requestBasicAuth(req);
+ res.setStatus(HttpServletResponse.SC_OK);
+
+ ProjectBasicAuthFilter basicAuthFilter =
+ new ProjectBasicAuthFilter(webSessionItem, accountCache, accountManager, authConfig);
+
+ basicAuthFilter.doFilter(req, res, chain);
+
+ verify(accountManager, never()).authenticate(any());
+ verify(chain).doFilter(eq(req), any());
+ assertThat(res.getStatus()).isEqualTo(HttpServletResponse.SC_OK);
+ }
+
+ @Test
+ public void shouldNotReauthenticateIfHasExistingCookie() throws Exception {
+ initWebSessionWithCookie("GerritAccount=" + AUTH_COOKIE_VALUE);
+ res.setStatus(HttpServletResponse.SC_OK);
+
+ ProjectBasicAuthFilter basicAuthFilter =
+ new ProjectBasicAuthFilter(webSessionItem, accountCache, accountManager, authConfig);
+
+ basicAuthFilter.doFilter(req, res, chain);
+
+ verify(accountManager, never()).authenticate(any());
+ verify(chain).doFilter(eq(req), any());
+ assertThat(res.getStatus()).isEqualTo(HttpServletResponse.SC_OK);
+ }
+
+ @Test
+ public void shouldFailedAuthenticationAgainstRealm() throws Exception {
+ initMockedWebSession();
+ requestBasicAuth(req);
+
+ doReturn(true).when(account).isActive();
+ doThrow(new AccountException("Authentication error")).when(accountManager).authenticate(any());
+ doReturn(GitBasicAuthPolicy.LDAP).when(authConfig).getGitBasicAuthPolicy();
+
+ ProjectBasicAuthFilter basicAuthFilter =
+ new ProjectBasicAuthFilter(webSessionItem, accountCache, accountManager, authConfig);
+
+ basicAuthFilter.doFilter(req, res, chain);
+
+ verify(accountManager).authenticate(any());
+
+ verify(chain, never()).doFilter(any(), any());
+ assertThat(res.getStatus()).isEqualTo(HttpServletResponse.SC_UNAUTHORIZED);
+ }
+
+ private void requestBasicAuth(FakeHttpServletRequest fakeReq) {
+ fakeReq.addHeader(
+ "Authorization",
+ "Basic "
+ + B64_ENC.encodeToString(
+ (AUTH_USER + ":" + AUTH_PASSWORD).getBytes(StandardCharsets.UTF_8)));
+ }
+}
diff --git a/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java b/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java
index 5f375ad..feff89c 100644
--- a/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java
+++ b/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java
@@ -721,7 +721,7 @@
@Test
public void serializeChangeMessages() throws Exception {
ChangeMessage m1 =
- new ChangeMessage(
+ ChangeMessage.create(
ChangeMessage.key(ID, "uuid1"),
Account.id(1000),
new Timestamp(1212L),
@@ -731,7 +731,7 @@
assertThat(m1Bytes.size()).isEqualTo(35);
ChangeMessage m2 =
- new ChangeMessage(
+ ChangeMessage.create(
ChangeMessage.key(ID, "uuid2"),
Account.id(2000),
new Timestamp(3434L),
@@ -1007,6 +1007,8 @@
.put("author", Account.Id.class)
.put("writtenOn", Timestamp.class)
.put("message", String.class)
+ // accountsInMessage are parsed from message template and are not serialized.
+ .put("accountsInMessage", new TypeLiteral<ImmutableSet<Account.Id>>() {}.getType())
.put("patchset", PatchSet.Id.class)
.put("tag", String.class)
.put("realAuthor", Account.Id.class)
diff --git a/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java b/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java
index de49cdf..fa37704 100644
--- a/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java
+++ b/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java
@@ -52,6 +52,7 @@
import com.google.gerrit.entities.SubmitRecord;
import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.server.AssigneeStatusUpdate;
+import com.google.gerrit.server.ChangeMessagesUtil;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.ReviewerSet;
@@ -1602,6 +1603,7 @@
ChangeNotes notes = newNotes(c);
ChangeMessage cm1 = Iterables.getOnlyElement(notes.getChangeMessages());
assertThat(cm1.getMessage()).isEqualTo("Testing trailing double newline\n\n");
+
assertThat(cm1.getAuthor()).isEqualTo(changeOwner.getAccount().id());
}
@@ -1621,10 +1623,32 @@
+ "Testing paragraph 2\n"
+ "\n"
+ "Testing paragraph 3");
+
assertThat(cm1.getAuthor()).isEqualTo(changeOwner.getAccount().id());
}
@Test
+ public void changeMessageWithTemplate() throws Exception {
+ Change c = newChange();
+ ChangeUpdate update = newUpdate(c, changeOwner);
+ update.putReviewer(changeOwner.getAccount().id(), REVIEWER);
+ String messageTemplate =
+ String.format(
+ "Change update by %s, also includes %s",
+ ChangeMessagesUtil.getAccountTemplate(changeOwner.getAccountId()),
+ ChangeMessagesUtil.getAccountTemplate(otherUser.getAccountId()));
+ update.setChangeMessage(messageTemplate);
+ update.commit();
+
+ ChangeNotes notes = newNotes(c);
+ ChangeMessage cm = Iterables.getOnlyElement(notes.getChangeMessages());
+ assertThat(cm.getMessage()).isEqualTo(messageTemplate);
+
+ assertThat(cm.getAccountsInMessage())
+ .containsExactly(changeOwner.getAccountId(), otherUser.getAccountId());
+ }
+
+ @Test
public void changeMessagesMultiplePatchSets() throws Exception {
Change c = newChange();
ChangeUpdate update = newUpdate(c, changeOwner);
@@ -1646,11 +1670,13 @@
ChangeMessage cm1 = notes.getChangeMessages().get(0);
assertThat(cm1.getPatchSetId()).isEqualTo(ps1);
assertThat(cm1.getMessage()).isEqualTo("This is the change message for the first PS.");
+
assertThat(cm1.getAuthor()).isEqualTo(changeOwner.getAccount().id());
ChangeMessage cm2 = notes.getChangeMessages().get(1);
assertThat(cm2.getPatchSetId()).isEqualTo(ps2);
assertThat(cm2.getMessage()).isEqualTo("This is the change message for the second PS.");
+
assertThat(cm2.getAuthor()).isEqualTo(changeOwner.getAccount().id());
assertThat(cm2.getPatchSetId()).isEqualTo(ps2);
}
diff --git a/javatests/com/google/gerrit/server/restapi/change/ListChangeCommentsTest.java b/javatests/com/google/gerrit/server/restapi/change/ListChangeCommentsTest.java
index b3e0c56..44c3cef 100644
--- a/javatests/com/google/gerrit/server/restapi/change/ListChangeCommentsTest.java
+++ b/javatests/com/google/gerrit/server/restapi/change/ListChangeCommentsTest.java
@@ -125,9 +125,8 @@
private static ChangeMessage newChangeMessage(String id, String message, String ts, String tag) {
ChangeMessage.Key key = ChangeMessage.key(Change.id(1), id);
ChangeMessage cm =
- new ChangeMessage(key, null, Timestamp.valueOf("2000-01-01 00:00:" + ts), null);
- cm.setMessage(message);
- cm.setTag(tag);
+ ChangeMessage.create(
+ key, null, Timestamp.valueOf("2000-01-01 00:00:" + ts), null, message, null, tag);
return cm;
}
diff --git a/javatests/com/google/gerrit/util/http/testutil/FakeHttpServletRequest.java b/javatests/com/google/gerrit/util/http/testutil/FakeHttpServletRequest.java
index a4175e3..2efa94b 100644
--- a/javatests/com/google/gerrit/util/http/testutil/FakeHttpServletRequest.java
+++ b/javatests/com/google/gerrit/util/http/testutil/FakeHttpServletRequest.java
@@ -17,6 +17,7 @@
import static com.google.common.base.Preconditions.checkArgument;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.toList;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
@@ -257,7 +258,15 @@
@Override
public Cookie[] getCookies() {
- return new Cookie[0];
+ return Splitter.on(";").splitToList(Strings.nullToEmpty(getHeader("Cookie"))).stream()
+ .filter(s -> !s.isEmpty())
+ .map(
+ (String cookieValue) -> {
+ String[] kv = cookieValue.split("=");
+ return new Cookie(kv[0], kv[1]);
+ })
+ .collect(toList())
+ .toArray(new Cookie[0]);
}
@Override
diff --git a/javatests/com/google/gerrit/util/http/testutil/FakeHttpServletResponse.java b/javatests/com/google/gerrit/util/http/testutil/FakeHttpServletResponse.java
index 9a98ecd..f39b875 100644
--- a/javatests/com/google/gerrit/util/http/testutil/FakeHttpServletResponse.java
+++ b/javatests/com/google/gerrit/util/http/testutil/FakeHttpServletResponse.java
@@ -161,7 +161,7 @@
@Override
public void addCookie(Cookie cookie) {
- throw new UnsupportedOperationException();
+ addHeader("Set-Cookie", cookie.getName() + "=" + cookie.getValue());
}
@Override
diff --git a/lib/LICENSE-CC-BY3.0-unported b/lib/LICENSE-CC-BY3.0-unported
deleted file mode 100644
index d2f2550..0000000
--- a/lib/LICENSE-CC-BY3.0-unported
+++ /dev/null
@@ -1,333 +0,0 @@
-link:http://creativecommons.org/licenses/by/3.0/[CC-BY 3.0]
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
-CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS
-PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE
-WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS
-PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND
-AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS
-LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU
-THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH
-TERMS AND CONDITIONS.
-
-1. Definitions
-
- a. "Adaptation" means a work based upon the Work, or upon the Work
- and other pre-existing works, such as a translation, adaptation,
- derivative work, arrangement of music or other alterations of a
- literary or artistic work, or phonogram or performance and
- includes cinematographic adaptations or any other form in which
- the Work may be recast, transformed, or adapted including in any
- form recognizably derived from the original, except that a work
- that constitutes a Collection will not be considered an
- Adaptation for the purpose of this License. For the avoidance
- of doubt, where the Work is a musical work, performance or
- phonogram, the synchronization of the Work in timed-relation
- with a moving image ("synching") will be considered an
- Adaptation for the purpose of this License.
-
- b. "Collection" means a collection of literary or artistic works,
- such as encyclopedias and anthologies, or performances,
- phonograms or broadcasts, or other works or subject matter other
- than works listed in Section 1(f) below, which, by reason of the
- selection and arrangement of their contents, constitute
- intellectual creations, in which the Work is included in its
- entirety in unmodified form along with one or more other
- contributions, each constituting separate and independent works
- in themselves, which together are assembled into a collective
- whole. A work that constitutes a Collection will not be
- considered an Adaptation (as defined above) for the purposes of
- this License.
-
- c. "Distribute" means to make available to the public the original
- and copies of the Work or Adaptation, as appropriate, through
- sale or other transfer of ownership.
-
- d. "Licensor" means the individual, individuals, entity or entities
- that offer(s) the Work under the terms of this License.
-
- e. "Original Author" means, in the case of a literary or artistic
- work, the individual, individuals, entity or entities who
- created the Work or if no individual or entity can be
- identified, the publisher; and in addition (i) in the case of a
- performance the actors, singers, musicians, dancers, and other
- persons who act, sing, deliver, declaim, play in, interpret or
- otherwise perform literary or artistic works or expressions of
- folklore; (ii) in the case of a phonogram the producer being the
- person or legal entity who first fixes the sounds of a
- performance or other sounds; and, (iii) in the case of
- broadcasts, the organization that transmits the broadcast.
-
- f. "Work" means the literary and/or artistic work offered under the
- terms of this License including without limitation any
- production in the literary, scientific and artistic domain,
- whatever may be the mode or form of its expression including
- digital form, such as a book, pamphlet and other writing; a
- lecture, address, sermon or other work of the same nature; a
- dramatic or dramatico-musical work; a choreographic work or
- entertainment in dumb show; a musical composition with or
- without words; a cinematographic work to which are assimilated
- works expressed by a process analogous to cinematography; a work
- of drawing, painting, architecture, sculpture, engraving or
- lithography; a photographic work to which are assimilated works
- expressed by a process analogous to photography; a work of
- applied art; an illustration, map, plan, sketch or
- three-dimensional work relative to geography, topography,
- architecture or science; a performance; a broadcast; a
- phonogram; a compilation of data to the extent it is protected
- as a copyrightable work; or a work performed by a variety or
- circus performer to the extent it is not otherwise considered a
- literary or artistic work.
-
- g. "You" means an individual or entity exercising rights under this
- License who has not previously violated the terms of this
- License with respect to the Work, or who has received express
- permission from the Licensor to exercise rights under this
- License despite a previous violation.
-
- h. "Publicly Perform" means to perform public recitations of the
- Work and to communicate to the public those public recitations,
- by any means or process, including by wire or wireless means or
- public digital performances; to make available to the public
- Works in such a way that members of the public may access these
- Works from a place and at a place individually chosen by them;
- to perform the Work to the public by any means or process and
- the communication to the public of the performances of the Work,
- including by public digital performance; to broadcast and
- rebroadcast the Work by any means including signs, sounds or
- images.
-
- i. "Reproduce" means to make copies of the Work by any means
- including without limitation by sound or visual recordings and
- the right of fixation and reproducing fixations of the Work,
- including storage of a protected performance or phonogram in
- digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to
- reduce, limit, or restrict any uses free from copyright or rights
- arising from limitations or exceptions that are provided for in
- connection with the copyright protection under copyright law or
- other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this
- License, Licensor hereby grants You a worldwide, royalty-free,
- non-exclusive, perpetual (for the duration of the applicable
- copyright) license to exercise the rights in the Work as stated
- below:
-
- a. to Reproduce the Work, to incorporate the Work into one or more
- Collections, and to Reproduce the Work as incorporated in the
- Collections;
-
- b. to create and Reproduce Adaptations provided that any such
- Adaptation, including any translation in any medium, takes
- reasonable steps to clearly label, demarcate or otherwise
- identify that changes were made to the original Work. For
- example, a translation could be marked "The original work was
- translated from English to Spanish," or a modification could
- indicate "The original work has been modified.";
-
- c. to Distribute and Publicly Perform the Work including as
- incorporated in Collections; and,
-
- d. to Distribute and Publicly Perform Adaptations.
-
- e. For the avoidance of doubt:
-
- i. Non-waivable Compulsory License Schemes. In those
- jurisdictions in which the right to collect royalties
- through any statutory or compulsory licensing scheme
- cannot be waived, the Licensor reserves the exclusive
- right to collect such royalties for any exercise by You
- of the rights granted under this License;
-
- ii. Waivable Compulsory License Schemes. In those jurisdictions
- in which the right to collect royalties through any
- statutory or compulsory licensing scheme can be waived,
- the Licensor waives the exclusive right to collect such
- royalties for any exercise by You of the rights granted
- under this License; and,
-
- iii. Voluntary License Schemes. The Licensor waives the right to
- collect royalties, whether individually or, in the event
- that the Licensor is a member of a collecting society
- that administers voluntary licensing schemes, via that
- society, from any exercise by You of the rights granted
- under this License.
-
-The above rights may be exercised in all media and formats whether now
-known or hereafter devised. The above rights include the right to
-make such modifications as are technically necessary to exercise the
-rights in other media and formats. Subject to Section 8(f), all
-rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly
- made subject to and limited by the following restrictions:
-
- a. You may Distribute or Publicly Perform the Work only under the
- terms of this License. You must include a copy of, or the
- Uniform Resource Identifier (URI) for, this License with every
- copy of the Work You Distribute or Publicly Perform. You may
- not offer or impose any terms on the Work that restrict the
- terms of this License or the ability of the recipient of the
- Work to exercise the rights granted to that recipient under the
- terms of the License. You may not sublicense the Work. You
- must keep intact all notices that refer to this License and to
- the disclaimer of warranties with every copy of the Work You
- Distribute or Publicly Perform. When You Distribute or Publicly
- Perform the Work, You may not impose any effective technological
- measures on the Work that restrict the ability of a recipient of
- the Work from You to exercise the rights granted to that
- recipient under the terms of the License. This Section 4(a)
- applies to the Work as incorporated in a Collection, but this
- does not require the Collection apart from the Work itself to be
- made subject to the terms of this License. If You create a
- Collection, upon notice from any Licensor You must, to the
- extent practicable, remove from the Collection any credit as
- required by Section 4(b), as requested. If You create an
- Adaptation, upon notice from any Licensor You must, to the
- extent practicable, remove from the Adaptation any credit as
- required by Section 4(b), as requested.
-
- b. If You Distribute, or Publicly Perform the Work or any
- Adaptations or Collections, You must, unless a request has been
- made pursuant to Section 4(a), keep intact all copyright notices
- for the Work and provide, reasonable to the medium or means You
- are utilizing: (i) the name of the Original Author (or
- pseudonym, if applicable) if supplied, and/or if the Original
- Author and/or Licensor designate another party or parties (e.g.,
- a sponsor institute, publishing entity, journal) for attribution
- ("Attribution Parties") in Licensor's copyright notice, terms of
- service or by other reasonable means, the name of such party or
- parties; (ii) the title of the Work if supplied; (iii) to the
- extent reasonably practicable, the URI, if any, that Licensor
- specifies to be associated with the Work, unless such URI does
- not refer to the copyright notice or licensing information for
- the Work; and (iv) , consistent with Section 3(b), in the case
- of an Adaptation, a credit identifying the use of the Work in
- the Adaptation (e.g., "French translation of the Work by
- Original Author," or "Screenplay based on original Work by
- Original Author"). The credit required by this Section 4 (b)
- may be implemented in any reasonable manner; provided, however,
- that in the case of a Adaptation or Collection, at a minimum
- such credit will appear, if a credit for all contributing
- authors of the Adaptation or Collection appears, then as part of
- these credits and in a manner at least as prominent as the
- credits for the other contributing authors. For the avoidance
- of doubt, You may only use the credit required by this Section
- for the purpose of attribution in the manner set out above and,
- by exercising Your rights under this License, You may not
- implicitly or explicitly assert or imply any connection with,
- sponsorship or endorsement by the Original Author, Licensor
- and/or Attribution Parties, as appropriate, of You or Your use
- of the Work, without the separate, express prior written
- permission of the Original Author, Licensor and/or Attribution
- Parties.
-
- c. Except as otherwise agreed in writing by the Licensor or as may
- be otherwise permitted by applicable law, if You Reproduce,
- Distribute or Publicly Perform the Work either by itself or as
- part of any Adaptations or Collections, You must not distort,
- mutilate, modify or take other derogatory action in relation to
- the Work which would be prejudicial to the Original Author's
- honor or reputation. Licensor agrees that in those
- jurisdictions (e.g. Japan), in which any exercise of the right
- granted in Section 3(b) of this License (the right to make
- Adaptations) would be deemed to be a distortion, mutilation,
- modification or other derogatory action prejudicial to the
- Original Author's honor and reputation, the Licensor will waive
- or not assert, as appropriate, this Section, to the fullest
- extent permitted by the applicable national law, to enable You
- to reasonably exercise Your right under Section 3(b) of this
- License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING,
-LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR
-WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED,
-STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF
-TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE,
-NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY,
-OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE.
-SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES,
-SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY
- APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY
- LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE
- OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE
- WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- DAMAGES.
-
-7. Termination
-
- a. This License and the rights granted hereunder will terminate
- automatically upon any breach by You of the terms of this
- License. Individuals or entities who have received Adaptations
- or Collections from You under this License, however, will not
- have their licenses terminated provided such individuals or
- entities remain in full compliance with those licenses.
- Sections 1, 2, 5, 6, 7, and 8 will survive any termination of
- this License.
-
- b. Subject to the above terms and conditions, the license granted
- here is perpetual (for the duration of the applicable copyright
- in the Work). Notwithstanding the above, Licensor reserves the
- right to release the Work under different license terms or to
- stop distributing the Work at any time; provided, however that
- any such election will not serve to withdraw this License (or
- any other license that has been, or is required to be, granted
- under the terms of this License), and this License will continue
- in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
- a. Each time You Distribute or Publicly Perform the Work or a
- Collection, the Licensor offers to the recipient a license to
- the Work on the same terms and conditions as the license granted
- to You under this License.
-
- b. Each time You Distribute or Publicly Perform an Adaptation,
- Licensor offers to the recipient a license to the original Work
- on the same terms and conditions as the license granted to You
- under this License.
-
- c. If any provision of this License is invalid or unenforceable
- under applicable law, it shall not affect the validity or
- enforceability of the remainder of the terms of this License,
- and without further action by the parties to this agreement,
- such provision shall be reformed to the minimum extent necessary
- to make such provision valid and enforceable.
-
- d. No term or provision of this License shall be deemed waived and
- no breach consented to unless such waiver or consent shall be in
- writing and signed by the party to be charged with such waiver
- or consent.
-
- e. This License constitutes the entire agreement between the
- parties with respect to the Work licensed here. There are no
- understandings, agreements or representations with respect to
- the Work not specified here. Licensor shall not be bound by any
- additional provisions that may appear in any communication from
- You. This License may not be modified without the mutual
- written agreement of the Licensor and You.
-
- f. The rights granted under, and the subject matter referenced, in
- this License were drafted utilizing the terminology of the Berne
- Convention for the Protection of Literary and Artistic Works (as
- amended on September 28, 1979), the Rome Convention of 1961, the
- WIPO Copyright Treaty of 1996, the WIPO Performances and
- Phonograms Treaty of 1996 and the Universal Copyright Convention
- (as revised on July 24, 1971). These rights and subject matter
- take effect in the relevant jurisdiction in which the License
- terms are sought to be enforced according to the corresponding
- provisions of the implementation of those treaty provisions in
- the applicable national law. If the standard suite of rights
- granted under applicable copyright law includes additional
- rights not granted under this License, such additional rights
- are deemed to be included in the License; this License is not
- intended to restrict the license of any rights under applicable
- law.
diff --git a/lib/LICENSE-OFL1.1 b/lib/LICENSE-OFL1.1
deleted file mode 100644
index 0754257..0000000
--- a/lib/LICENSE-OFL1.1
+++ /dev/null
@@ -1,93 +0,0 @@
-Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-
-This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/lib/LICENSE-ba-linkify b/lib/LICENSE-ba-linkify
deleted file mode 100644
index 93672f9..0000000
--- a/lib/LICENSE-ba-linkify
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2009 "Cowboy" Ben Alman
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/LICENSE-codemirror-minified b/lib/LICENSE-codemirror-minified
deleted file mode 100644
index 89f23625..0000000
--- a/lib/LICENSE-codemirror-minified
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Marijn Haverbeke <marijnh@gmail.com> and others
-Copyright (c) 2016 Michael Zhou <zhoumotongxue008@gmail.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/lib/LICENSE-es6-promise b/lib/LICENSE-es6-promise
deleted file mode 100644
index 954ec59..0000000
--- a/lib/LICENSE-es6-promise
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/lib/LICENSE-fetch b/lib/LICENSE-fetch
deleted file mode 100644
index 0e319d5..0000000
--- a/lib/LICENSE-fetch
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2014-2016 GitHub, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/LICENSE-moment b/lib/LICENSE-moment
deleted file mode 100644
index 9ee5374..0000000
--- a/lib/LICENSE-moment
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2011-2016 Tim Wood, Iskren Chernev, Moment.js contributors
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/LICENSE-page.js b/lib/LICENSE-page.js
deleted file mode 100644
index 78152a9..0000000
--- a/lib/LICENSE-page.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(The MIT License)
-
-Copyright (c) 2012 TJ Holowaychuk <tj@vision-media.ca>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the 'Software'), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/LICENSE-polymer b/lib/LICENSE-polymer
deleted file mode 100644
index 322c5a8..0000000
--- a/lib/LICENSE-polymer
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2014 The Polymer Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/lib/LICENSE-promise-polyfill b/lib/LICENSE-promise-polyfill
deleted file mode 100644
index 6f7c0123..0000000
--- a/lib/LICENSE-promise-polyfill
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2014 Taylor Hakes
-Copyright (c) 2014 Forbes Lindesay
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/lib/LICENSE-resemblejs b/lib/LICENSE-resemblejs
deleted file mode 100644
index b265c8a..0000000
--- a/lib/LICENSE-resemblejs
+++ /dev/null
@@ -1,18 +0,0 @@
-The MIT License (MIT) Copyright © 2013 Huddle
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the “Software”), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/LICENSE-shadycss b/lib/LICENSE-shadycss
deleted file mode 100644
index 0fe5c52..0000000
--- a/lib/LICENSE-shadycss
+++ /dev/null
@@ -1,20 +0,0 @@
-# License
-
-Everything in this repo is BSD style license unless otherwise specified.
-
-Copyright (c) 2015 The Polymer Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/lib/js/BUILD b/lib/js/BUILD
index 106aabb..82089bd 100644
--- a/lib/js/BUILD
+++ b/lib/js/BUILD
@@ -1,4 +1,4 @@
-load("//tools/bzl:js.bzl", "bower_component", "js_component")
+load("//tools/bzl:js.bzl", "js_component")
package(default_visibility = ["//visibility:public"])
@@ -22,15 +22,3 @@
srcs = ["//lib/ba-linkify:ba-linkify.js"],
license = "//lib:LICENSE-ba-linkify",
)
-
-##TODO: remove after plugins migration to npm
-bower_component(
- name = "codemirror-minified",
- license = "//lib:LICENSE-codemirror-minified",
-)
-
-bower_component(
- name = "resemblejs",
- license = "//lib:LICENSE-resemblejs",
-)
-#End of removal
diff --git a/lib/js/npm.bzl b/lib/js/npm.bzl
deleted file mode 100644
index 5a6a8c0..0000000
--- a/lib/js/npm.bzl
+++ /dev/null
@@ -1,11 +0,0 @@
-NPM_VERSIONS = {
- "bower": "1.8.8",
- "crisper": "2.0.2",
- "polymer-bundler": "4.0.9",
-}
-
-NPM_SHA1S = {
- "bower": "82544be34a33aeae7efb8bdf9905247b2cffa985",
- "crisper": "7183c58cea33632fb036c91cefd1b43e390d22a2",
- "polymer-bundler": "c80c9815690d76656d1fa6a231481850b4fa3874",
-}
diff --git a/modules/jgit b/modules/jgit
index c82818e..a9579ba 160000
--- a/modules/jgit
+++ b/modules/jgit
@@ -1 +1 @@
-Subproject commit c82818e0e02a9d1bd979d27bd342bb05661150d4
+Subproject commit a9579ba60cd2fd72179dfd8c2c37d389db5ec402
diff --git a/plugins/codemirror-editor b/plugins/codemirror-editor
index 7c94eb2..42d5fe0 160000
--- a/plugins/codemirror-editor
+++ b/plugins/codemirror-editor
@@ -1 +1 @@
-Subproject commit 7c94eb2fd3cdea33a200ae7c73c19777ca865a41
+Subproject commit 42d5fe041ee2ef6be579c0085396fa5e60889222
diff --git a/plugins/download-commands b/plugins/download-commands
index 5bd359c..774e915 160000
--- a/plugins/download-commands
+++ b/plugins/download-commands
@@ -1 +1 @@
-Subproject commit 5bd359c08e10b93d2c08762f75cde01a14e45fc6
+Subproject commit 774e9159128a72a76a0b226033b038c8f24fd88b
diff --git a/plugins/replication b/plugins/replication
index 75c44d0..13cefb7 160000
--- a/plugins/replication
+++ b/plugins/replication
@@ -1 +1 @@
-Subproject commit 75c44d0b1dec203859112ad42074eb16839ea353
+Subproject commit 13cefb724df786d254ecbc24261589ab473be267
diff --git a/polygerrit-ui/Polymer2.md b/polygerrit-ui/Polymer2.md
deleted file mode 100644
index e2a9124..0000000
--- a/polygerrit-ui/Polymer2.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Note: Gerrit has moved to polymer 3 as of submitted of https://gerrit-review.googlesource.com/q/topic:%22bower+to+npm+packages+switch%22+(status:open%20OR%20status:merged).
-
-The change is backward compatible, so no code change needed to support all plugins, but we would highly recommend to start moving to latest polymer 3 for all plugins, check out [Polymer3.md](./Polymer3.md) for more insights.
-
-## Polymer 2 upgrade
-
-Gerrit is updating to use polymer 2 from polymer 1 by following the [Polymer 2.0 upgrade guide](https://polymer-library.polymer-project.org/2.0/docs/upgrade).
-
-Polymer 2 contains several breaking changes that may affect some of the UI features and plugins. One of the biggest change is to have the shadow DOM enabled. This will affect how you query elements inside of your component, how css style works within and across components, and several other usages.
-
-If you are owner of any plugins, please start following the [Polymer 2.0 upgrade guide](https://polymer-library.polymer-project.org/2.0/docs/upgrade) to migrate your plugins to be polymer 2 ready.
-
-If you notice any issues or need help with anything, don't hesitate to report to us [here](https://bugs.chromium.org/p/gerrit/issues/list).
-
-
-### Related resources
-
-- [Polymer 2.0 upgrade guide](https://polymer-library.polymer-project.org/2.0/docs/upgrade)
-- [Polymer Shadow DOM](https://polymer-library.polymer-project.org/2.0/docs/devguide/shadow-dom)
diff --git a/polygerrit-ui/Polymer3.md b/polygerrit-ui/Polymer3.md
deleted file mode 100644
index 186f0f4..0000000
--- a/polygerrit-ui/Polymer3.md
+++ /dev/null
@@ -1,25 +0,0 @@
-## Gerrit in Polymer 3
-
-Gerrit has migrated to polymer 3 as of submitted of submitted of https://gerrit-review.googlesource.com/q/topic:%22bower+to+npm+packages+switch%22+(status:open%20OR%20status:merged).
-
-## Polymer 3 vs Polymer 2
-
-The biggest difference between 2 and 3 is the changing of package management from bower to npm and also replaced the html imports with es6 imports so we no longer need templates in separate `html` files for polymer components.
-
-### How that impact plugins
-
-As of now, we still support all syntax in Polymer 2 and most from Polymer 1 with the [legacy layer](https://polymer-library.polymer-project.org/3.0/docs/devguide/legacy-elements). But we do plan to remove those in the future.
-
-So we recommend all plugin owners to start migrating to Polymer 3 for your plugins. You can refer more about polymer 3 from the related resources section.
-
-To get inspirations, check out our [samples here](https://gerrit.googlesource.com/gerrit/+/master/polygerrit-ui/app/samples).
-
-### Plugin dependencies
-
-Since most of Gerrit plugins are treated as sub modules and part of the Gerrit workspace when develop, dependencies of plugins are also defined and installed from Gerrit WORKSPACE, currently most of them are `bower_archives`. When moving to npm, if your plugin requires dependencies, you can have them added to your plugin's `package.json` and then link that file to `plugins/package.json` in gerrit.
-Then use `@plugins_npm//:node_modules` to make sure `rollup_bundle` knows the right place to look for. More examples from `image-diff` plugin, [change 271672](https://gerrit-review.googlesource.com/c/plugins/image-diff/+/271672).
-
-### Related resources
-
-- [Polymer 3.0 upgrade guide](https://polymer-library.polymer-project.org/3.0/docs/upgrade)
--[What's new in Polymer 3.0](https://polymer-library.polymer-project.org/3.0/docs/about_30)
\ No newline at end of file
diff --git a/polygerrit-ui/app/api/admin.ts b/polygerrit-ui/app/api/admin.ts
index a7b549d..0606153 100644
--- a/polygerrit-ui/app/api/admin.ts
+++ b/polygerrit-ui/app/api/admin.ts
@@ -16,13 +16,13 @@
*/
/** Interface for menu link */
-export interface MenuLink {
+export declare interface MenuLink {
text: string;
url: string;
capability: string | null;
}
-export interface AdminPluginApi {
+export declare interface AdminPluginApi {
addMenuLink(text: string, url: string, capability?: string): void;
getMenuLinks(): MenuLink[];
diff --git a/polygerrit-ui/app/api/annotation.ts b/polygerrit-ui/app/api/annotation.ts
index bd4f399..ad0846d 100644
--- a/polygerrit-ui/app/api/annotation.ts
+++ b/polygerrit-ui/app/api/annotation.ts
@@ -36,7 +36,7 @@
change?: unknown
) => Promise<Array<CoverageRange>>;
-export interface AnnotationPluginApi {
+export declare interface AnnotationPluginApi {
/**
* The specified function will be called when a gr-diff component is built,
* and feeds the returned coverage data into the diff. Optional.
diff --git a/polygerrit-ui/app/api/attribute-helper.ts b/polygerrit-ui/app/api/attribute-helper.ts
index cd52259..d813beb 100644
--- a/polygerrit-ui/app/api/attribute-helper.ts
+++ b/polygerrit-ui/app/api/attribute-helper.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-export interface AttributeHelperPluginApi {
+export declare interface AttributeHelperPluginApi {
/**
* Binds callback to property updates.
*
diff --git a/polygerrit-ui/app/api/change-actions.ts b/polygerrit-ui/app/api/change-actions.ts
index 8638295..2ce697a 100644
--- a/polygerrit-ui/app/api/change-actions.ts
+++ b/polygerrit-ui/app/api/change-actions.ts
@@ -16,7 +16,7 @@
*/
import {HttpMethod} from './rest';
-export interface ActionInfo {
+export declare interface ActionInfo {
method?: HttpMethod;
label?: string;
title?: string;
@@ -71,7 +71,7 @@
export type PrimaryActionKey = ChangeActions | RevisionActions;
-export interface ChangeActionsPluginApi {
+export declare interface ChangeActionsPluginApi {
addPrimaryActionKey(key: PrimaryActionKey): void;
removePrimaryActionKey(key: string): void;
diff --git a/polygerrit-ui/app/api/change-reply.ts b/polygerrit-ui/app/api/change-reply.ts
index 6016004..bcbdc61 100644
--- a/polygerrit-ui/app/api/change-reply.ts
+++ b/polygerrit-ui/app/api/change-reply.ts
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-export interface LabelsChangedDetail {
+export declare interface LabelsChangedDetail {
name: string;
value: string;
}
-export interface ValueChangedDetail {
+export declare interface ValueChangedDetail {
value: string;
}
export type ReplyChangedCallback = (text: string) => void;
export type LabelsChangedCallback = (detail: LabelsChangedDetail) => void;
-export interface ChangeReplyPluginApi {
+export declare interface ChangeReplyPluginApi {
getLabelValue(label: string): string;
setLabelValue(label: string, value: string): void;
diff --git a/polygerrit-ui/app/api/checks.ts b/polygerrit-ui/app/api/checks.ts
index 658a97e..5d20f3f 100644
--- a/polygerrit-ui/app/api/checks.ts
+++ b/polygerrit-ui/app/api/checks.ts
@@ -15,12 +15,7 @@
* limitations under the License.
*/
-// IMPORTANT !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-// The entire API is currently in DRAFT state.
-// Changes to all type and interfaces are expected.
-// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-export interface ChecksPluginApi {
+export declare interface ChecksPluginApi {
/**
* Must only be called once. You cannot register twice. You cannot unregister.
*/
@@ -34,7 +29,7 @@
announceUpdate(): void;
}
-export interface ChecksApiConfig {
+export declare interface ChecksApiConfig {
/**
* How often should the provider be called for new CheckData while the user
* navigates change related pages and the browser tab remains visible?
@@ -43,7 +38,7 @@
fetchPollingIntervalSeconds: number;
}
-export interface ChangeData {
+export declare interface ChangeData {
changeNumber: number;
patchsetNumber: number;
patchsetSha: string;
@@ -53,7 +48,7 @@
changeInfo: unknown;
}
-export interface ChecksProvider {
+export declare interface ChecksProvider {
/**
* Gerrit calls this method when ...
* - ... the change or diff page is loaded.
@@ -64,7 +59,7 @@
fetch(change: ChangeData): Promise<FetchResponse>;
}
-export interface FetchResponse {
+export declare interface FetchResponse {
responseCode: ResponseCode;
/** Only relevant when the responseCode is ERROR. */
@@ -107,7 +102,7 @@
* runs are completed the users' interest shifts to results: What do I have to
* fix? The only actions that can be associated with runs are RUN and CANCEL.
*/
-export interface CheckRun {
+export declare interface CheckRun {
/**
* Gerrit requests check runs and results from the plugin by change number and
* patchset number. So these two properties can as well be left empty when
@@ -226,7 +221,7 @@
results?: CheckResult[];
}
-export interface Action {
+export declare interface Action {
name: string;
tooltip?: string;
/**
@@ -260,10 +255,32 @@
checkName: string | undefined,
/** Identical to 'name' property of Action entity. */
actionName: string
+ /**
+ * If the callback does not return a promise, then the user will get no
+ * feedback from the Gerrit UI. This is adequate when the plugin opens a
+ * dialog for example. If a Promise<ActionResult> is returned, then Gerrit
+ * will show toasts for user feedback, see ActionResult below.
+ */
) => Promise<ActionResult> | undefined;
-export interface ActionResult {
+/**
+ * Until the Promise<ActionResult> resolves (max. 5 seconds) Gerrit will show a
+ * toast with the message `Triggering action '${action.name}' ...`.
+ *
+ * When the promise resolves (within 5 seconds) then Gerrit will replace the
+ * toast with a new one with the message `${message}` and show it for 5 seconds.
+ * If `message` is empty or undefined, then the `Triggering ...` toast will just
+ * be hidden and no further toast will be shown.
+ */
+export declare interface ActionResult {
/** An empty errorMessage means success. */
+ message?: string;
+ /**
+ * If true, then ChecksProvider.fetch() is called. Has the same affect as if
+ * the plugin would call announceUpdate(). So just for convenience.
+ */
+ shouldReload?: boolean;
+ /** DEPRECATED: Use `message` instead. */
errorMessage?: string;
}
@@ -273,7 +290,7 @@
COMPLETED = 'COMPLETED',
}
-export interface CheckResult {
+export declare interface CheckResult {
/**
* An optional opaque identifier not used by Gerrit directly, but might be
* used by plugin extensions and callbacks.
@@ -281,6 +298,11 @@
externalId?: string;
/**
+ * SUCCESS: Indicates that some build, test or check is passing. A COMPLETED
+ * run without results will also be treated as "passing" and will get
+ * an artificial SUCCESS result. But you can also make this explicit,
+ * which also allows one run to have multiple "passing" results,
+ * maybe along with results of other categories.
* INFO: The user will typically not bother to look into this category,
* only for looking up something that they are searching for. Can be
* used for reporting secondary metrics and analysis, or a wider
@@ -366,12 +388,13 @@
}
export enum Category {
+ SUCCESS = 'SUCCESS',
INFO = 'INFO',
WARNING = 'WARNING',
ERROR = 'ERROR',
}
-export interface Tag {
+export declare interface Tag {
name: string;
tooltip?: string;
color?: TagColor;
@@ -387,7 +410,7 @@
BROWN = 'brown',
}
-export interface Link {
+export declare interface Link {
/** Must begin with 'http'. */
url: string;
tooltip?: string;
diff --git a/polygerrit-ui/app/api/diff.ts b/polygerrit-ui/app/api/diff.ts
index b2d5f3b..f6b3aa0 100644
--- a/polygerrit-ui/app/api/diff.ts
+++ b/polygerrit-ui/app/api/diff.ts
@@ -53,6 +53,35 @@
}
/**
+ * Represents a syntax block in a code (e.g. method, function, class, if-else).
+ */
+export declare interface SyntaxBlock {
+ /** Name of the block (e.g. name of the method/class)*/
+ name: string;
+ /** Where does this block syntatically starts and ends (line number and column).*/
+ range: {
+ /** first line of the block (1-based inclusive). */
+ start_line: number;
+ /**
+ * column of the range start inside the first line (e.g. "{" character ending a function/method)
+ * (1-based inclusive).
+ */
+ start_column: number;
+ /**
+ * last line of the block (1-based inclusive).
+ */
+ end_line: number;
+ /**
+ * column of the block end inside the end line (e.g. "}" character ending a function/method)
+ * (1-based inclusive).
+ */
+ end_column: number;
+ };
+ /** Sub-blocks of the current syntax block (e.g. methods of a class) */
+ children: SyntaxBlock[];
+}
+
+/**
* The DiffFileMetaInfo entity contains meta information about a file diff.
* https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#diff-file-meta-info
*/
@@ -65,6 +94,12 @@
lines: number;
// TODO: Not documented.
language?: string;
+ /**
+ * The first level of syntax blocks tree (outline) within the current file.
+ * It contains an hierarchical structure where each block contains its
+ * sub-blocks (children).
+ */
+ syntax_tree?: SyntaxBlock[];
}
export declare type ChangeType =
@@ -178,6 +213,7 @@
disable_context_control_buttons?: boolean;
show_file_comment_button?: boolean;
hide_line_length_indicator?: boolean;
+ use_block_expansion?: boolean;
}
/**
@@ -255,6 +291,8 @@
export enum ContextButtonType {
ABOVE = 'above',
BELOW = 'below',
+ BLOCK_ABOVE = 'block-above',
+ BLOCK_BELOW = 'block-below',
ALL = 'all',
}
@@ -265,18 +303,15 @@
}
export declare type ImageDiffAction =
- | {
- type: 'overview-image-clicked';
- }
- | {
- type: 'overview-frame-dragged';
- }
+ | {type: 'overview-image-clicked'}
+ | {type: 'overview-frame-dragged'}
| {type: 'magnifier-clicked'}
| {type: 'magnifier-dragged'}
- | {type: 'version-switcher-clicked'; button: 'base' | 'revision'}
+ | {type: 'version-switcher-clicked'; button: 'base' | 'revision' | 'switch'}
| {type: 'zoom-level-changed'; scale: number | 'fit'}
| {type: 'follow-mouse-changed'; value: boolean}
- | {type: 'background-color-changed'; value: string};
+ | {type: 'background-color-changed'; value: string}
+ | {type: 'automatic-blink-changed'; value: boolean};
export enum GrDiffLineType {
ADD = 'add',
diff --git a/polygerrit-ui/app/api/event-helper.ts b/polygerrit-ui/app/api/event-helper.ts
index 16c327d..5dc15dc 100644
--- a/polygerrit-ui/app/api/event-helper.ts
+++ b/polygerrit-ui/app/api/event-helper.ts
@@ -16,7 +16,7 @@
*/
export type UnsubscribeCallback = () => void;
-export interface EventHelperPluginApi {
+export declare interface EventHelperPluginApi {
/**
* Alias for @see onClick
*/
diff --git a/polygerrit-ui/app/api/hook.ts b/polygerrit-ui/app/api/hook.ts
index 179b967..0ac6468 100644
--- a/polygerrit-ui/app/api/hook.ts
+++ b/polygerrit-ui/app/api/hook.ts
@@ -30,12 +30,12 @@
export type HookCallback = (el: HTMLElement & GerritElementExtensions) => void;
-export interface RegisterOptions {
+export declare interface RegisterOptions {
slot?: string;
replace: unknown;
}
-export interface HookApi {
+export declare interface HookApi {
onAttached(callback: HookCallback): HookApi;
onDetached(callback: HookCallback): HookApi;
diff --git a/polygerrit-ui/app/api/plugin.ts b/polygerrit-ui/app/api/plugin.ts
index 0aadb38..0c91546 100644
--- a/polygerrit-ui/app/api/plugin.ts
+++ b/polygerrit-ui/app/api/plugin.ts
@@ -48,7 +48,7 @@
HIGHLIGHTJS_LOADED = 'highlightjs-loaded',
}
-export interface PluginApi {
+export declare interface PluginApi {
_url?: URL;
admin(): AdminPluginApi;
annotationApi(): AnnotationPluginApi;
diff --git a/polygerrit-ui/app/api/popup.ts b/polygerrit-ui/app/api/popup.ts
index 60772cc..8d81831 100644
--- a/polygerrit-ui/app/api/popup.ts
+++ b/polygerrit-ui/app/api/popup.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-export interface PopupPluginApi {
+export declare interface PopupPluginApi {
/**
* Opens the popup, inserts it into DOM over current UI.
* Creates the popup if not previously created. Creates popup content element,
diff --git a/polygerrit-ui/app/api/reporting.ts b/polygerrit-ui/app/api/reporting.ts
index 65bdc3f..c3655bb 100644
--- a/polygerrit-ui/app/api/reporting.ts
+++ b/polygerrit-ui/app/api/reporting.ts
@@ -18,7 +18,7 @@
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export type EventDetails = any;
-export interface ReportingPluginApi {
+export declare interface ReportingPluginApi {
reportInteraction(eventName: string, details?: EventDetails): void;
reportLifeCycle(eventName: string, details?: EventDetails): void;
diff --git a/polygerrit-ui/app/api/rest.ts b/polygerrit-ui/app/api/rest.ts
index fd9cada..2b91bf6 100644
--- a/polygerrit-ui/app/api/rest.ts
+++ b/polygerrit-ui/app/api/rest.ts
@@ -26,7 +26,7 @@
export type ErrorCallback = (response?: Response | null, err?: Error) => void;
-export interface RestPluginApi {
+export declare interface RestPluginApi {
getLoggedIn(): Promise<boolean>;
getVersion(): Promise<string | undefined>;
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_html.ts b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_html.ts
index 2f07268..06087ed 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_html.ts
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_html.ts
@@ -28,10 +28,6 @@
:host(:hover) {
background-color: var(--hover-background-color);
}
- :host([needs-review]) {
- font-weight: var(--font-weight-bold);
- color: var(--primary-text-color);
- }
.container {
position: relative;
}
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.ts b/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.ts
index 8ce00f2..ea5339e 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.ts
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.ts
@@ -33,7 +33,6 @@
EmailAddress,
PreferencesInput,
} from '../../../types/common';
-import {ChangeListToggleReviewedDetail} from '../gr-change-list-item/gr-change-list-item';
import {ChangeStarToggleStarDetail} from '../../shared/gr-change-star/gr-change-star';
import {ChangeListViewState} from '../../../types/types';
import {fireTitleChange} from '../../../utils/event-util';
@@ -278,13 +277,6 @@
e.detail.starred
);
}
-
- _handleToggleReviewed(e: CustomEvent<ChangeListToggleReviewedDetail>) {
- this.restApiService.saveChangeReviewed(
- e.detail.change._number,
- e.detail.reviewed
- );
- }
}
declare global {
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view_html.ts b/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view_html.ts
index 9914e70..5155596 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view_html.ts
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view_html.ts
@@ -77,7 +77,6 @@
selected-index="{{viewState.selectedChangeIndex}}"
show-star="[[_loggedIn]]"
on-toggle-star="_handleToggleStar"
- on-toggle-reviewed="_handleToggleReviewed"
></gr-change-list>
<nav class$="[[_computeNavClass(_loading)]]">
Page [[_computePage(_offset, _changesPerPage)]]
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list.ts b/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list.ts
index 2b79fe0..8c33f52 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list.ts
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list.ts
@@ -37,7 +37,7 @@
} from '../../core/gr-navigation/gr-navigation';
import {getPluginEndpoints} from '../../shared/gr-js-api-interface/gr-plugin-endpoints';
import {getPluginLoader} from '../../shared/gr-js-api-interface/gr-plugin-loader';
-import {changeIsOpen, isOwner} from '../../../utils/change-util';
+import {isOwner} from '../../../utils/change-util';
import {customElement, property, observe} from '@polymer/decorators';
import {GrCursorManager} from '../../shared/gr-cursor-manager/gr-cursor-manager';
import {
@@ -46,13 +46,10 @@
ServerInfo,
PreferencesInput,
} from '../../../types/common';
-import {
- hasAttention,
- isAttentionSetEnabled,
-} from '../../../utils/attention-set-util';
+import {hasAttention} from '../../../utils/attention-set-util';
import {CustomKeyboardEvent} from '../../../types/events';
-import {fireEvent} from '../../../utils/event-util';
-import {isShiftPressed, windowLocationReload} from '../../../utils/dom-util';
+import {fireEvent, fireReload} from '../../../utils/event-util';
+import {isShiftPressed} from '../../../utils/dom-util';
import {ScrollMode} from '../../../constants/constants';
const NUMBER_FIXED_COLUMNS = 3;
@@ -370,35 +367,18 @@
: undefined;
}
- _computeItemNeedsReview(
- account: AccountInfo | undefined,
- change: ChangeInfo,
- showReviewedState: boolean,
- config?: ServerInfo
- ) {
- return (
- !isAttentionSetEnabled(config) &&
- showReviewedState &&
- !change.reviewed &&
- !change.work_in_progress &&
- changeIsOpen(change) &&
- (!account || account._account_id !== change.owner._account_id)
- );
- }
-
_computeItemHighlight(
account?: AccountInfo,
change?: ChangeInfo,
- config?: ServerInfo,
sectionName?: string
) {
if (!change || !account) return false;
if (CLOSED_STATUS.indexOf(change.status) !== -1) return false;
- return isAttentionSetEnabled(config)
- ? hasAttention(config, account, change) &&
- !isOwner(change, account) &&
- sectionName === YOUR_TURN.name
- : account._account_id === change.assignee?._account_id;
+ return (
+ hasAttention(account, change) &&
+ !isOwner(change, account) &&
+ sectionName === YOUR_TURN.name
+ );
}
_nextChange(e: CustomKeyboardEvent) {
@@ -489,11 +469,7 @@
}
e.preventDefault();
- this._reloadWindow();
- }
-
- _reloadWindow() {
- windowLocationReload();
+ fireReload(this);
}
_toggleChangeStar(e: CustomKeyboardEvent) {
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list_html.ts b/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list_html.ts
index 317d27f..37d969e 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list_html.ts
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list_html.ts
@@ -144,8 +144,7 @@
<gr-change-list-item
account="[[account]]"
selected$="[[_computeItemSelected(sectionIndex, index, selectedIndex)]]"
- highlight$="[[_computeItemHighlight(account, change, _config, changeSection.name)]]"
- needs-review$="[[_computeItemNeedsReview(account, change, showReviewedState, _config)]]"
+ highlight$="[[_computeItemHighlight(account, change, changeSection.name)]]"
change="[[change]]"
config="[[_config]]"
section-name="[[changeSection.name]]"
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list_test.js b/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list_test.js
index 494d05a..13490d7 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list_test.js
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list_test.js
@@ -192,82 +192,10 @@
MockInteractions.pressAndReleaseKeyOn(element, 75, null, 'k');
assert.equal(element.selectedIndex, 0);
- const reloadStub = sinon.stub(element, '_reloadWindow');
- MockInteractions.pressAndReleaseKeyOn(element, 82, 'shift', 'r');
- assert.isTrue(reloadStub.called);
-
done();
});
});
- test('changes needing review', () => {
- element.changes = [
- {
- _number: 0,
- status: 'NEW',
- reviewed: true,
- owner: {_account_id: 0},
- },
- {
- _number: 1,
- status: 'NEW',
- owner: {_account_id: 0},
- },
- {
- _number: 2,
- status: 'MERGED',
- owner: {_account_id: 0},
- },
- {
- _number: 3,
- status: 'ABANDONED',
- owner: {_account_id: 0},
- },
- {
- _number: 4,
- status: 'NEW',
- work_in_progress: true,
- owner: {_account_id: 0},
- },
- ];
- flush();
- let elementItems = element.root.querySelectorAll(
- 'gr-change-list-item');
- assert.equal(elementItems.length, 5);
- for (let i = 0; i < elementItems.length; i++) {
- assert.isFalse(elementItems[i].hasAttribute('needs-review'));
- }
-
- element.showReviewedState = true;
- elementItems = element.root.querySelectorAll(
- 'gr-change-list-item');
- assert.equal(elementItems.length, 5);
- assert.isFalse(elementItems[0].hasAttribute('needs-review'));
- assert.isTrue(elementItems[1].hasAttribute('needs-review'));
- assert.isFalse(elementItems[2].hasAttribute('needs-review'));
- assert.isFalse(elementItems[3].hasAttribute('needs-review'));
- assert.isFalse(elementItems[4].hasAttribute('needs-review'));
-
- element.account = {_account_id: 42};
- elementItems = element.root.querySelectorAll(
- 'gr-change-list-item');
- assert.equal(elementItems.length, 5);
- assert.isFalse(elementItems[0].hasAttribute('needs-review'));
- assert.isTrue(elementItems[1].hasAttribute('needs-review'));
- assert.isFalse(elementItems[2].hasAttribute('needs-review'));
- assert.isFalse(elementItems[3].hasAttribute('needs-review'));
- assert.isFalse(elementItems[4].hasAttribute('needs-review'));
-
- element._config = {
- change: {enable_attention_set: true},
- };
- elementItems = element.root.querySelectorAll(
- 'gr-change-list-item');
- for (let i = 0; i < elementItems.length; i++) {
- assert.isFalse(elementItems[i].hasAttribute('needs-review'));
- }
- });
-
test('no changes', () => {
element.changes = [];
flush();
@@ -575,37 +503,6 @@
});
});
- test('highlight attribute is updated correctly', () => {
- element.changes = [
- {
- _number: 0,
- status: 'NEW',
- owner: {_account_id: 0},
- },
- {
- _number: 1,
- status: 'ABANDONED',
- owner: {_account_id: 0},
- },
- ];
- element.account = {_account_id: 42};
- flush();
- let items = element._getListItems();
- assert.equal(items.length, 2);
- assert.isFalse(items[0].hasAttribute('highlight'));
- assert.isFalse(items[1].hasAttribute('highlight'));
-
- // Assign all issues to the user, but only the first one is highlighted
- // because the second one is abandoned.
- element.set(['changes', 0, 'assignee'], {_account_id: 12});
- element.set(['changes', 1, 'assignee'], {_account_id: 12});
- element.account = {_account_id: 12};
- flush();
- items = element._getListItems();
- assert.isTrue(items[0].hasAttribute('highlight'));
- assert.isFalse(items[1].hasAttribute('highlight'));
- });
-
test('_computeItemHighlight gives false for null account', () => {
assert.isFalse(
element._computeItemHighlight(null, {assignee: {_account_id: 42}}));
diff --git a/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view.ts b/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view.ts
index f9dee5f..bde7d77 100644
--- a/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view.ts
+++ b/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view.ts
@@ -50,7 +50,6 @@
GrCreateDestinationDialog,
} from '../gr-create-destination-dialog/gr-create-destination-dialog';
import {GrOverlay} from '../../shared/gr-overlay/gr-overlay';
-import {ChangeListToggleReviewedDetail} from '../gr-change-list-item/gr-change-list-item';
import {ChangeStarToggleStarDetail} from '../../shared/gr-change-star/gr-change-star';
import {DashboardViewState} from '../../../types/types';
import {firePageError, fireTitleChange} from '../../../utils/event-util';
@@ -129,10 +128,7 @@
connectedCallback() {
super.connectedCallback();
this._loadPreferences();
- this.addEventListener('reload', e => {
- e.stopPropagation();
- this._reload(this.params);
- });
+ this.addEventListener('reload', () => this._reload(this.params));
document.addEventListener('visibilitychange', () => {
if (document.visibilityState === 'visible') {
if (
@@ -391,26 +387,6 @@
);
}
- _handleToggleReviewed(e: CustomEvent<ChangeListToggleReviewedDetail>) {
- this.restApiService.saveChangeReviewed(
- e.detail.change._number,
- e.detail.reviewed
- );
- // When a change is updated the same change may appear elsewhere in the
- // dashboard (but is not the same object), so we must update other
- // occurrences of the same change.
- this._results?.forEach((dashboardChange, dashboardIndex) =>
- dashboardChange.results.forEach((change, changeIndex) => {
- if (change.id === e.detail.change.id) {
- this.set(
- `_results.${dashboardIndex}.results.${changeIndex}.reviewed`,
- e.detail.reviewed
- );
- }
- })
- );
- }
-
/**
* Banner is shown if a user is on their own dashboard and they have draft
* comments on closed changes.
diff --git a/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view_html.ts b/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view_html.ts
index fd23970..fb6b391 100644
--- a/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view_html.ts
+++ b/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view_html.ts
@@ -78,13 +78,11 @@
<h1 class="assistive-tech-only">Dashboard</h1>
<gr-change-list
show-star=""
- show-reviewed-state=""
account="[[account]]"
preferences="[[preferences]]"
selected-index="{{_selectedChangeIndex}}"
sections="[[_results]]"
on-toggle-star="_handleToggleStar"
- on-toggle-reviewed="_handleToggleReviewed"
>
<div id="emptyOutgoing" slot="empty-outgoing">
<template is="dom-if" if="[[_showNewUserHelp]]">
diff --git a/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view_test.js b/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view_test.js
index 165306e..473d2b9 100644
--- a/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view_test.js
+++ b/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view_test.js
@@ -356,31 +356,6 @@
assert.isFalse(differentChange.starred);
});
- test('toggling reviewed will update change everywhere', () => {
- // It is important that the same change is represented by multiple objects
- // and all are updated.
- const change = {id: '5', reviewed: false};
- const sameChange = {id: '5', reviewed: false};
- const differentChange = {id: '4', reviewed: false};
- element._results = [
- {query: 'has:draft', results: [change]},
- {query: 'is:open', results: [sameChange, differentChange]},
- ];
-
- element._handleToggleReviewed(
- new CustomEvent('toggle-reviewed', {
- detail: {
- change,
- reviewed: true,
- },
- })
- );
-
- assert.isTrue(change.reviewed);
- assert.isTrue(sameChange.reviewed);
- assert.isFalse(differentChange.reviewed);
- });
-
test('_showNewUserHelp', () => {
element._loading = false;
element._showNewUserHelp = false;
diff --git a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.ts b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.ts
index 4e52cd2..df9fa95 100644
--- a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.ts
+++ b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.ts
@@ -93,7 +93,7 @@
GrChangeActionsElement,
UIActionInfo,
} from '../../shared/gr-js-api-interface/gr-change-actions-js-api';
-import {fireAlert, fireEvent} from '../../../utils/event-util';
+import {fireAlert, fireEvent, fireReload} from '../../../utils/event-util';
import {
CODE_REVIEW,
getApprovalInfo,
@@ -269,13 +269,9 @@
const AWAIT_CHANGE_ATTEMPTS = 5;
const AWAIT_CHANGE_TIMEOUT_MS = 1000;
-/* Revert submission is skipped as the normal revert dialog will now show
-the user a choice between reverting single change or an entire submission.
-Hence, a second button is not needed.
-*/
-const SKIP_ACTION_KEYS = [ChangeActions.REVERT_SUBMISSION];
-
-const SKIP_ACTION_KEYS_ATTENTION_SET = [
+// TODO: Remove these once we are sure that the backend does not support/send
+// them anymore.
+const SKIP_ACTION_KEYS: string[] = [
ChangeActions.REVIEWED,
ChangeActions.UNREVIEWED,
];
@@ -457,7 +453,7 @@
computed:
'_computeAllActions(actions.*, revisionActions.*,' +
'primaryActionKeys.*, _additionalActions.*, change, ' +
- '_config, _actionPriorityOverrides.*)',
+ '_actionPriorityOverrides.*)',
})
_allActionValues: UIActionInfo[] = []; // _computeAllActions always returns an array
@@ -1637,13 +1633,7 @@
case ChangeActions.REBASE_EDIT:
case ChangeActions.REBASE:
case ChangeActions.SUBMIT:
- this.dispatchEvent(
- new CustomEvent('reload', {
- detail: {clearPatchset: true},
- bubbles: false,
- composed: true,
- })
- );
+ fireReload(this, true);
break;
case ChangeActions.REVERT_SUBMISSION: {
const revertSubmistionInfo = (obj as unknown) as RevertSubmissionInfo;
@@ -1660,13 +1650,7 @@
break;
}
default:
- this.dispatchEvent(
- new CustomEvent('reload', {
- detail: {action: action.__key, clearPatchset: true},
- bubbles: false,
- composed: true,
- })
- );
+ fireReload(this, true);
break;
}
});
@@ -1739,15 +1723,7 @@
'Cannot set label: a newer patch has been ' +
'uploaded to this change.',
action: 'Reload',
- callback: () => {
- this.dispatchEvent(
- new CustomEvent('reload', {
- detail: {clearPatchset: true},
- bubbles: false,
- composed: true,
- })
- );
- },
+ callback: () => fireReload(this, true),
},
composed: true,
bubbles: true,
@@ -1884,8 +1860,7 @@
UIActionInfo[],
UIActionInfo[]
>,
- change?: ChangeInfo,
- config?: ServerInfo
+ change?: ChangeInfo
): UIActionInfo[] {
// Polymer 2: check for undefined
if (
@@ -1932,7 +1907,7 @@
// End of hack
return action;
})
- .filter(action => !this._shouldSkipAction(action, config));
+ .filter(action => !this._shouldSkipAction(action));
}
_getActionPriority(action: UIActionInfo) {
@@ -1971,14 +1946,8 @@
}
}
- _shouldSkipAction(action: UIActionInfo, config?: ServerInfo) {
- const skipActionKeys: string[] = [...SKIP_ACTION_KEYS];
- const isAttentionSetEnabled =
- !!config && !!config.change && config.change.enable_attention_set;
- if (isAttentionSetEnabled) {
- skipActionKeys.push(...SKIP_ACTION_KEYS_ATTENTION_SET);
- }
- return skipActionKeys.includes(action.__key);
+ _shouldSkipAction(action: UIActionInfo) {
+ return SKIP_ACTION_KEYS.includes(action.__key);
}
_computeTopLevelActions(
diff --git a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions_test.ts b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions_test.ts
index ffee84c..1790651 100644
--- a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions_test.ts
+++ b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions_test.ts
@@ -23,12 +23,10 @@
createAccountWithId,
createApproval,
createChange,
- createChangeConfig,
createChangeMessages,
createChangeViewChange,
createRevision,
createRevisions,
- createServerInfo,
} from '../../../test/test-data-generators';
import {ChangeStatus, HttpMethod} from '../../../constants/constants';
import {
@@ -1703,112 +1701,6 @@
});
});
- suite('reviewed change', () => {
- setup(done => {
- sinon.stub(element, '_fireAction');
-
- const ReviewedAction = {
- __key: 'reviewed',
- __type: 'change',
- __primary: false,
- method: HttpMethod.PUT,
- label: 'Mark reviewed',
- title: 'Working...',
- enabled: true,
- };
-
- element.actions = {
- reviewed: ReviewedAction,
- };
-
- element.changeNum = 2 as NumericChangeId;
- element.latestPatchNum = 2 as PatchSetNum;
-
- element.reload().then(() => {
- flush(done);
- });
- });
-
- test('action is enabled', () => {
- assert.equal(
- element._allActionValues.filter(action => action.__key === 'reviewed')
- .length,
- 1
- );
- });
-
- test('action is skipped when attention set is enabled', () => {
- element._config = {
- ...createServerInfo(),
- change: {...createChangeConfig(), enable_attention_set: true},
- };
- assert.equal(
- element._allActionValues.filter(action => action.__key === 'reviewed')
- .length,
- 0
- );
- });
-
- test('make sure the reviewed button is not outside of the overflow menu', () => {
- assert.isNotOk(query(element, '[data-action-key="reviewed"]'));
- });
-
- test('reviewing change', () => {
- assert.isOk(
- query(element.$.moreActions, 'span[data-id="reviewed-change"]')
- );
- element.setActionOverflow(ActionType.CHANGE, 'reviewed', false);
- flush();
- assert.isOk(query(element, '[data-action-key="reviewed"]'));
- assert.isNotOk(
- query(element.$.moreActions, 'span[data-id="reviewed-change"]')
- );
- });
- });
-
- suite('unreviewed change', () => {
- setup(done => {
- sinon.stub(element, '_fireAction');
-
- const UnreviewedAction = {
- __key: 'unreviewed',
- __type: 'change',
- __primary: false,
- method: HttpMethod.PUT,
- label: 'Mark unreviewed',
- title: 'Working...',
- enabled: true,
- };
-
- element.actions = {
- unreviewed: UnreviewedAction,
- };
-
- element.changeNum = 2 as NumericChangeId;
- element.latestPatchNum = 2 as PatchSetNum;
-
- element.reload().then(() => {
- flush(done);
- });
- });
-
- test('unreviewed button not outside of the overflow menu', () => {
- assert.isNotOk(query(element, '[data-action-key="unreviewed"]'));
- });
-
- test('unreviewed change', () => {
- assert.isOk(
- query(element.$.moreActions, 'span[data-id="unreviewed-change"]')
- );
- element.setActionOverflow(ActionType.CHANGE, 'unreviewed', false);
- flush();
- assert.isOk(query(element, '[data-action-key="unreviewed"]'));
- assert.isNotOk(
- query(element.$.moreActions, 'span[data-id="unreviewed-change"]')
- );
- });
- });
-
suite('quick approve', () => {
setup(() => {
element.change = {
diff --git a/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata_html.ts b/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata_html.ts
index 9f0c780..931579b 100644
--- a/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata_html.ts
+++ b/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata_html.ts
@@ -165,7 +165,14 @@
<section
class$="[[_computeDisplayState(_showAllSections, change, _SECTION.OWNER)]]"
>
- <span class="title">Owner</span>
+ <span class="title">
+ <gr-tooltip-content
+ has-tooltip=""
+ title="This user created or uploaded the first patchset of this change."
+ >
+ Owner
+ </gr-tooltip-content>
+ </span>
<span class="value">
<gr-account-chip
account="[[change.owner]]"
@@ -187,7 +194,14 @@
</span>
</section>
<section class$="[[_computeShowRoleClass(change, _CHANGE_ROLE.UPLOADER)]]">
- <span class="title">Uploader</span>
+ <span class="title">
+ <gr-tooltip-content
+ has-tooltip=""
+ title="This user uploaded the patchset to Gerrit (typically by running the 'git push' command)."
+ >
+ Uploader
+ </gr-tooltip-content>
+ </span>
<span class="value">
<gr-account-chip
account="[[_getNonOwnerRole(change, _CHANGE_ROLE.UPLOADER)]]"
@@ -197,7 +211,14 @@
</span>
</section>
<section class$="[[_computeShowRoleClass(change, _CHANGE_ROLE.AUTHOR)]]">
- <span class="title">Author</span>
+ <span class="title">
+ <gr-tooltip-content
+ has-tooltip=""
+ title="This user wrote the code change."
+ >
+ Author
+ </gr-tooltip-content>
+ </span>
<span class="value">
<gr-account-chip
account="[[_getNonOwnerRole(change, _CHANGE_ROLE.AUTHOR)]]"
@@ -206,7 +227,14 @@
</span>
</section>
<section class$="[[_computeShowRoleClass(change, _CHANGE_ROLE.COMMITTER)]]">
- <span class="title">Committer</span>
+ <span class="title">
+ <gr-tooltip-content
+ has-tooltip=""
+ title="This user committed the code change to the Git repository (typically to the local Git repo before uploading)."
+ >
+ Committer
+ </gr-tooltip-content>
+ </span>
<span class="value">
<gr-account-chip
account="[[_getNonOwnerRole(change, _CHANGE_ROLE.COMMITTER)]]"
diff --git a/polygerrit-ui/app/elements/change/gr-change-summary/gr-change-summary.ts b/polygerrit-ui/app/elements/change/gr-change-summary/gr-change-summary.ts
index 89f7b89..dd19a76 100644
--- a/polygerrit-ui/app/elements/change/gr-change-summary/gr-change-summary.ts
+++ b/polygerrit-ui/app/elements/change/gr-change-summary/gr-change-summary.ts
@@ -287,9 +287,23 @@
@property()
loginCallback?: () => void;
- /** Is reset when rendering beings and decreases while chips are rendered. */
+ /**
+ * How many check chips may still be rendered as a detailed chip. Is reset
+ * when rendering begins and decreases while chips are rendered. So when
+ * there are two ERRORs, then those would consume 2 from this quota and then
+ * there would only by DETAILS_QUOTA - 2 left for the other summary chips.
+ * Once there are more results than quota left we will stop rendering
+ * detailed chips and fall back to just icon+number rendering.
+ */
private detailsQuota = DETAILS_QUOTA;
+ /**
+ * Is reset when rendering begins and contains the check names of runs that
+ * have a detailed chip. We keep track of this such that we can ensure to not
+ * show two detailed chips with the same name.
+ */
+ private detailsCheckNames: string[] = [];
+
constructor() {
super();
this.subscribe('runs', allRunsLatest$);
@@ -411,9 +425,17 @@
if (runs.length === 0) {
return html``;
}
- if (runs.length <= this.detailsQuota) {
+ // If a run has both an error and a warning result, then we only want to
+ // show a detailed chip with the expanded checkName once. For simplicity
+ // just stop rendering detailed chips completely as soon as we run into
+ // this by setting detailsQuota to 0 (after the if-block).
+ const hasDetailChipAlready = runs.some(run =>
+ this.detailsCheckNames.includes(run.checkName)
+ );
+ if (!hasDetailChipAlready && runs.length <= this.detailsQuota) {
this.detailsQuota -= runs.length;
return runs.map(run => {
+ this.detailsCheckNames.push(run.checkName);
const allLinks = resultFilter(run)
.reduce(
(links, result) => links.concat(result.links ?? []),
@@ -437,8 +459,8 @@
</gr-checks-chip>`;
});
}
- // runs.length > this.detailsQuota
this.detailsQuota = 0;
+ this.detailsCheckNames = [];
const sum = runs.reduce(
(sum, run) => sum + (resultFilter(run).length || 1),
0
@@ -465,6 +487,7 @@
render() {
this.detailsQuota = DETAILS_QUOTA;
+ this.detailsCheckNames = [];
const commentThreads =
this.commentThreads?.filter(t => !isRobotThread(t) || hasHumanReply(t)) ??
[];
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 827cbf1..c6d2ee0 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
@@ -122,6 +122,7 @@
DraftInfo,
isDraftThread,
isRobot,
+ isUnresolved,
} from '../../../utils/comment-util';
import {
PolymerDeepPropertyChange,
@@ -161,6 +162,7 @@
firePageError,
fireDialogChange,
fireTitleChange,
+ fireReload,
} from '../../../utils/event-util';
import {GerritView} from '../../../services/router/router-model';
import {takeUntil} from 'rxjs/operators';
@@ -519,8 +521,6 @@
restApiService = appContext.restApiService;
- checksService = appContext.checksService;
-
keyboardShortcuts() {
return {
[Shortcut.SEND_REPLY]: null, // DOC_ONLY binding
@@ -632,7 +632,7 @@
this.addEventListener('comment-discard', e =>
this._handleCommentDiscard(e)
);
- this.addEventListener('change-message-deleted', () => this._reload());
+ this.addEventListener('change-message-deleted', () => fireReload(this));
this.addEventListener('editable-content-save', e =>
this._handleCommitMessageSave(e)
);
@@ -648,8 +648,7 @@
this._setActivePrimaryTab(e)
);
this.addEventListener('reload', e => {
- e.stopPropagation();
- this._reload(
+ this.loadData(
/* isLocationChange= */ false,
/* clearPatchset= */ e.detail && e.detail.clearPatchset
);
@@ -704,7 +703,7 @@
}
_onCloseFixPreview(e: CloseFixPreviewEvent) {
- if (e.detail.fixApplied) this._reload();
+ if (e.detail.fixApplied) fireReload(this);
}
_handleToggleDiffMode(e: CustomKeyboardEvent) {
@@ -901,6 +900,13 @@
return false;
}
+ _computeShowUnresolved(threads?: CommentThread[]) {
+ // If all threads are resolved and the Comments Tab is opened then show
+ // all threads instead
+ if (!threads?.length) return true;
+ return threads.filter(thread => isUnresolved(thread)).length > 0;
+ }
+
_robotCommentCountPerPatchSet(threads: CommentThread[]) {
return threads.reduce((robotCommentCountMap, thread) => {
const comments = thread.comments;
@@ -1161,7 +1167,7 @@
{once: true}
);
this.$.replyOverlay.cancel();
- this._reload();
+ fireReload(this);
}
_handleReplyCancel() {
@@ -1214,6 +1220,14 @@
return;
}
+ // Everything in the change view is tied to the change. It seems better to
+ // force the re-creation of the change view when the change number changes.
+ const changeChanged = this._changeNum !== value.changeNum;
+ if (this._changeNum !== undefined && changeChanged) {
+ fireEvent(this, EventType.RECREATE_CHANGE_VIEW);
+ return;
+ }
+
if (value.changeNum && value.project) {
this.restApiService.setInProjectLookup(value.changeNum, value.project);
}
@@ -1224,7 +1238,6 @@
value.basePatchNum !== undefined &&
(this._patchRange.patchNum !== value.patchNum ||
this._patchRange.basePatchNum !== value.basePatchNum);
- const changeChanged = this._changeNum !== value.changeNum;
let rightPatchNumChanged =
this._patchRange &&
@@ -1239,9 +1252,13 @@
this.$.fileList.collapseAllDiffs();
this._patchRange = patchRange;
+ const patchKnown =
+ !patchRange.patchNum ||
+ (this._allPatchSets ?? []).some(ps => ps.num === patchRange.patchNum);
+
// If the change has already been loaded and the parameter change is only
// in the patch range, then don't do a full reload.
- if (!changeChanged && patchChanged) {
+ if (!changeChanged && patchChanged && patchKnown) {
if (!patchRange.patchNum) {
patchRange.patchNum = computeLatestPatchNum(this._allPatchSets);
rightPatchNumChanged = true;
@@ -1254,7 +1271,7 @@
this._initialLoadComplete = false;
this._changeNum = value.changeNum;
- this._reload(true).then(() => {
+ this.loadData(true).then(() => {
this._performPostLoadTasks();
});
@@ -1642,7 +1659,7 @@
return;
}
e.preventDefault();
- this._reload(/* isLocationChange= */ false, /* clearPatchset= */ true);
+ fireReload(this, true);
}
_handleToggleChangeStar(e: CustomKeyboardEvent) {
@@ -1716,7 +1733,7 @@
labelDict.approved &&
labelDict.approved._account_id === removed._account_id
) {
- this._reload();
+ fireReload(this);
return;
}
}
@@ -2067,7 +2084,7 @@
* Some non-core data loading may still be in-flight when the core data
* promise resolves.
*/
- _reload(isLocationChange?: boolean, clearPatchset?: boolean) {
+ loadData(isLocationChange?: boolean, clearPatchset?: boolean) {
if (clearPatchset && this._change) {
GerritNav.navigateToChange(this._change);
return Promise.resolve([]);
@@ -2083,7 +2100,6 @@
// are loaded.
const detailCompletes = this._getChangeDetail();
allDataPromises.push(detailCompletes);
- this.checksService.reloadAll();
// Resolves when the loading flag is set to false, meaning that some
// change content may start appearing.
@@ -2346,12 +2362,7 @@
dismissOnNavigation: true,
showDismiss: true,
action: 'Reload',
- callback: () => {
- this._reload(
- /* isLocationChange= */ false,
- /* clearPatchset= */ true
- );
- },
+ callback: () => fireReload(this, true),
},
composed: true,
bubbles: true,
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_html.ts b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_html.ts
index ae4ad79..6025268 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_html.ts
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_html.ts
@@ -570,7 +570,7 @@
logged-in="[[_loggedIn]]"
comment-tab-state="[[_tabState.commentTab]]"
only-show-robot-comments-with-human-reply=""
- unresolved-only
+ unresolved-only="[[_computeShowUnresolved(_commentThreads)]]"
show-comment-context
></gr-thread-list>
</template>
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 3650d01..3d51ac6 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
@@ -380,7 +380,7 @@
stubRestApi('getDiffRobotComments').returns(Promise.resolve({}));
stubRestApi('getDiffDrafts').returns(Promise.resolve({}));
element = fixture.instantiate();
- element._changeNum = 1 as NumericChangeId;
+ element._changeNum = TEST_NUMERIC_CHANGE_ID;
sinon.stub(element.$.actions, 'reload').returns(Promise.resolve());
getPluginLoader().loadPlugins([]);
pluginApi.install(
@@ -518,7 +518,7 @@
suite('plugins adding to file tab', () => {
setup(done => {
- element._changeNum = 1 as NumericChangeId;
+ element._changeNum = TEST_NUMERIC_CHANGE_ID;
// Resolving it here instead of during setup() as other tests depend
// on flush() not being called during setup.
flush(() => done());
@@ -819,43 +819,6 @@
});
});
- test('reload event from reply dialog is processed', () => {
- const handleReloadStub = sinon.stub(element, '_reload');
- element.$.replyDialog.dispatchEvent(
- new CustomEvent('reload', {
- detail: {clearPatchset: true},
- bubbles: true,
- composed: true,
- })
- );
- assert.isTrue(handleReloadStub.called);
- });
-
- test('shift + R should fetch and navigate to the latest patch set', done => {
- element._changeNum = TEST_NUMERIC_CHANGE_ID;
- element._patchRange = {
- basePatchNum: ParentPatchSetNum,
- patchNum: 1 as RevisionPatchSetNum,
- };
- element._change = {
- ...createChangeViewChange(),
- revisions: {
- rev1: createRevision(),
- },
- current_revision: 'rev1' as CommitId,
- status: ChangeStatus.NEW,
- labels: {},
- actions: {},
- };
-
- const reloadChangeStub = sinon.stub(element, '_reload');
- pressAndReleaseKeyOn(element, 82, 'shift', 'r');
- flush(() => {
- assert.isTrue(reloadChangeStub.called);
- done();
- });
- });
-
test('d should open download overlay', () => {
const stub = sinon
.stub(element.$.downloadOverlay, 'open')
@@ -1105,7 +1068,7 @@
'#relatedChanges'
) as GrRelatedChangesList;
sinon.stub(relatedChanges, 'reload');
- sinon.stub(element, '_reload').returns(Promise.resolve([]));
+ sinon.stub(element, 'loadData').returns(Promise.resolve([]));
sinon.spy(element, '_paramsChanged');
element.params = createAppElementChangeViewParams();
});
@@ -1480,7 +1443,7 @@
};
element._change = change;
flush();
- const reloadStub = sinon.stub(element, '_reload');
+ const reloadStub = sinon.stub(element, 'loadData');
element.splice('_change.labels.test.all', 0, 1);
assert.isFalse(reloadStub.called);
change.labels.test.all.push(vote);
@@ -1653,7 +1616,7 @@
test('don’t reload entire page when patchRange changes', () => {
const reloadStub = sinon
- .stub(element, '_reload')
+ .stub(element, 'loadData')
.callsFake(() => Promise.resolve([]));
const reloadPatchDependentStub = sinon
.stub(element, '_reloadPatchNumDependentResources')
@@ -1670,6 +1633,13 @@
assert.isTrue(reloadStub.calledOnce);
element._initialLoadComplete = true;
+ element._change = {
+ ...createChangeViewChange(),
+ revisions: {
+ rev1: createRevision(1),
+ rev2: createRevision(2),
+ },
+ };
value.basePatchNum = 1 as BasePatchSetNum;
value.patchNum = 2 as RevisionPatchSetNum;
@@ -1680,7 +1650,7 @@
});
test('reload ported comments when patchNum changes', () => {
- sinon.stub(element, '_reload').callsFake(() => Promise.resolve([]));
+ sinon.stub(element, 'loadData').callsFake(() => Promise.resolve([]));
sinon.stub(element, '_getCommitInfo');
sinon.stub(element.$.fileList, 'reload');
flush();
@@ -1698,6 +1668,13 @@
element._paramsChanged(value);
element._initialLoadComplete = true;
+ element._change = {
+ ...createChangeViewChange(),
+ revisions: {
+ rev1: createRevision(1),
+ rev2: createRevision(2),
+ },
+ };
value.basePatchNum = 1 as BasePatchSetNum;
value.patchNum = 2 as RevisionPatchSetNum;
@@ -1707,7 +1684,7 @@
test('reload entire page when patchRange doesnt change', () => {
const reloadStub = sinon
- .stub(element, '_reload')
+ .stub(element, 'loadData')
.callsFake(() => Promise.resolve([]));
const collapseStub = sinon.stub(element.$.fileList, 'collapseAllDiffs');
const value: AppElementChangeViewParams = createAppElementChangeViewParams();
@@ -1720,13 +1697,13 @@
});
test('related changes are not updated after other action', done => {
- sinon.stub(element, '_reload').callsFake(() => Promise.resolve([]));
+ sinon.stub(element, 'loadData').callsFake(() => Promise.resolve([]));
flush();
const relatedChanges = element.shadowRoot!.querySelector(
'#relatedChanges'
) as GrRelatedChangesList;
sinon.stub(relatedChanges, 'reload');
- element._reload(true).then(() => {
+ element.loadData(true).then(() => {
assert.isFalse(navigateToChangeStub.called);
done();
});
@@ -2052,7 +2029,7 @@
test('scrollTop is set correctly', () => {
element.viewState = {scrollTop: TEST_SCROLL_TOP_PX};
- sinon.stub(element, '_reload').callsFake(() => {
+ sinon.stub(element, 'loadData').callsFake(() => {
// When element is reloaded, ensure that the history
// state has the scrollTop set earlier. This will then
// be reset.
@@ -2567,23 +2544,6 @@
});
});
- test('_paramsChanged sets in projectLookup', () => {
- flush();
- const relatedChanges = element.shadowRoot!.querySelector(
- '#relatedChanges'
- ) as GrRelatedChangesList;
- sinon.stub(relatedChanges, 'reload');
- sinon.stub(element, '_reload').returns(Promise.resolve([]));
- const setStub = stubRestApi('setInProjectLookup');
- element._paramsChanged({
- view: GerritNav.View.CHANGE,
- changeNum: 101 as NumericChangeId,
- project: TEST_PROJECT_NAME,
- });
- assert.isTrue(setStub.calledOnce);
- assert.isTrue(setStub.calledWith(101 as never, TEST_PROJECT_NAME as never));
- });
-
test('_handleToggleStar called when star is tapped', () => {
element._change = {
...createChangeViewChange(),
@@ -2642,7 +2602,7 @@
);
element._paramsChanged({
...createAppElementChangeViewParams(),
- changeNum: 101 as NumericChangeId,
+ changeNum: TEST_NUMERIC_CHANGE_ID,
project: TEST_PROJECT_NAME,
});
flush(() => {
diff --git a/polygerrit-ui/app/elements/change/gr-confirm-revert-dialog/gr-confirm-revert-dialog_html.ts b/polygerrit-ui/app/elements/change/gr-confirm-revert-dialog/gr-confirm-revert-dialog_html.ts
index 17647ad..3ec4f2c 100644
--- a/polygerrit-ui/app/elements/change/gr-confirm-revert-dialog/gr-confirm-revert-dialog_html.ts
+++ b/polygerrit-ui/app/elements/change/gr-confirm-revert-dialog/gr-confirm-revert-dialog_html.ts
@@ -32,10 +32,10 @@
}
.revertSubmissionLayout {
display: flex;
+ align-items: center;
}
.label {
margin-left: var(--spacing-m);
- margin-bottom: var(--spacing-m);
}
iron-autogrow-textarea {
font-family: var(--monospace-font-family);
@@ -47,6 +47,9 @@
color: var(--error-text-color);
margin-bottom: var(--spacing-m);
}
+ label[for='messageInput'] {
+ margin-top: var(--spacing-m);
+ }
</style>
<gr-dialog
confirm-label="Revert"
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 bb3c975..ca16ec0 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
@@ -618,52 +618,20 @@
return changeComments.computeCommentsString(patchRange, file.__path, file);
}
- _computeDraftCount(
- changeComments?: ChangeComments,
- patchRange?: PatchRange,
- path?: string
- ) {
- if (
- changeComments === undefined ||
- patchRange === undefined ||
- path === undefined
- ) {
- return '';
- }
- return (
- changeComments.computeDraftCount({
- patchNum: patchRange.basePatchNum,
- path,
- }) +
- changeComments.computeDraftCount({
- patchNum: patchRange.patchNum,
- path,
- }) +
- changeComments.computePortedDraftCount(
- {
- patchNum: patchRange.patchNum,
- basePatchNum: patchRange.basePatchNum,
- },
- path
- )
- );
- }
-
/**
* Computes a string with the number of drafts.
*/
_computeDraftsString(
changeComments?: ChangeComments,
patchRange?: PatchRange,
- path?: string
+ file?: NormalizedFileInfo
) {
- const draftCount = this._computeDraftCount(
- changeComments,
+ const draftCount = changeComments?.computeDraftCountForFile(
patchRange,
- path
+ file
);
- if (draftCount === '') return draftCount;
- return pluralize(draftCount, 'draft');
+ if (draftCount === 0) return '';
+ return pluralize(Number(draftCount), 'draft');
}
/**
@@ -672,12 +640,11 @@
_computeDraftsStringMobile(
changeComments?: ChangeComments,
patchRange?: PatchRange,
- path?: string
+ file?: NormalizedFileInfo
) {
- const draftCount = this._computeDraftCount(
- changeComments,
+ const draftCount = changeComments?.computeDraftCountForFile(
patchRange,
- path
+ file
);
return draftCount === 0 ? '' : `${draftCount}d`;
}
@@ -688,23 +655,23 @@
_computeCommentsStringMobile(
changeComments?: ChangeComments,
patchRange?: PatchRange,
- path?: string
+ file?: NormalizedFileInfo
) {
if (
changeComments === undefined ||
patchRange === undefined ||
- path === undefined
+ file === undefined
) {
return '';
}
const commentThreadCount =
changeComments.computeCommentThreadCount({
patchNum: patchRange.basePatchNum,
- path,
+ path: file.__path,
}) +
changeComments.computeCommentThreadCount({
patchNum: patchRange.patchNum,
- path,
+ path: file.__path,
});
return commentThreadCount === 0 ? '' : `${commentThreadCount}c`;
}
diff --git a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_html.ts b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_html.ts
index 89983ad..40bd5bc 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_html.ts
+++ b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_html.ts
@@ -309,12 +309,12 @@
as="headerEndpoint"
>
<gr-endpoint-decorator name$="[[headerEndpoint]]" role="columnheader">
- <gr-endpoint-param
- name="change"
- value="[[change]]"
- ></gr-endpoint-param>
+ <gr-endpoint-param name="change" value="[[change]]">
+ </gr-endpoint-param>
<gr-endpoint-param name="patchRange" value="[[patchRange]]">
</gr-endpoint-param>
+ <gr-endpoint-param name="files" value="[[_files]]">
+ </gr-endpoint-param>
</gr-endpoint-decorator>
</template>
</template>
@@ -423,8 +423,7 @@
<span class="drafts"
><!-- This comments ensure that span is empty when the function
returns empty string.
- -->[[_computeDraftsString(changeComments, patchRange,
- file.__path)]]<!-- This comments ensure that span is empty when
+ -->[[_computeDraftsString(changeComments, patchRange, file)]]<!-- This comments ensure that span is empty when
the function returns empty string.
--></span
>
@@ -450,14 +449,14 @@
><!-- This comments ensure that span is empty when the function
returns empty string.
-->[[_computeDraftsStringMobile(changeComments, patchRange,
- file.__path)]]<!-- This comments ensure that span is empty when
+ file)]]<!-- This comments ensure that span is empty when
the function returns empty string.
--></span
>
<span
><!--
-->[[_computeCommentsStringMobile(changeComments, patchRange,
- file.__path)]]<!--
+ file)]]<!--
--></span
>
<span class="noCommentsScreenReaderText">
diff --git a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.js b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.js
index b8ba86c..dcc2e46 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.js
+++ b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.js
@@ -360,103 +360,103 @@
assert.equal(
element._computeCommentsStringMobile(element.changeComments, parentTo1
- , '/COMMIT_MSG'), '2c');
+ , {__path: '/COMMIT_MSG'}), '2c');
assert.equal(
element._computeCommentsStringMobile(element.changeComments, _1To2
- , '/COMMIT_MSG'), '3c');
+ , {__path: '/COMMIT_MSG'}), '3c');
assert.equal(
element._computeDraftsString(element.changeComments, parentTo1,
- 'unresolved.file'), '1 draft');
+ {__path: 'unresolved.file'}), '1 draft');
assert.equal(
element._computeDraftsString(element.changeComments, _1To2,
- 'unresolved.file'), '1 draft');
+ {__path: 'unresolved.file'}), '1 draft');
assert.equal(
element._computeDraftsStringMobile(element.changeComments, parentTo1,
- 'unresolved.file'), '1d');
+ {__path: 'unresolved.file'}), '1d');
assert.equal(
element._computeDraftsStringMobile(element.changeComments, _1To2,
- 'unresolved.file'), '1d');
+ {__path: 'unresolved.file'}), '1d');
assert.equal(
element._computeCommentsStringMobile(
element.changeComments,
parentTo1,
- 'myfile.txt'
+ {__path: 'myfile.txt'}
), '1c');
assert.equal(
element._computeCommentsStringMobile(element.changeComments, _1To2,
- 'myfile.txt'), '3c');
+ {__path: 'myfile.txt'}), '3c');
assert.equal(
element._computeDraftsString(element.changeComments, parentTo1,
- 'myfile.txt'), '');
+ {__path: 'myfile.txt'}), '');
assert.equal(
element._computeDraftsString(element.changeComments, _1To2,
- 'myfile.txt'), '');
+ {__path: 'myfile.txt'}), '');
assert.equal(
element._computeDraftsStringMobile(element.changeComments, parentTo1,
- 'myfile.txt'), '');
+ {__path: 'myfile.txt'}), '');
assert.equal(
element._computeDraftsStringMobile(element.changeComments, _1To2,
- 'myfile.txt'), '');
+ {__path: 'myfile.txt'}), '');
assert.equal(
element._computeCommentsStringMobile(
element.changeComments,
parentTo1,
- 'file_added_in_rev2.txt'
+ {__path: 'file_added_in_rev2.txt'}
), '');
assert.equal(
element._computeCommentsStringMobile(element.changeComments, _1To2,
- 'file_added_in_rev2.txt'), '');
+ {__path: 'file_added_in_rev2.txt'}), '');
assert.equal(
element._computeDraftsString(element.changeComments, parentTo1,
- 'file_added_in_rev2.txt'), '');
+ {__path: 'file_added_in_rev2.txt'}), '');
assert.equal(
element._computeDraftsString(element.changeComments, _1To2,
- 'file_added_in_rev2.txt'), '');
+ {__path: 'file_added_in_rev2.txt'}), '');
assert.equal(
element._computeDraftsStringMobile(element.changeComments, parentTo1,
- 'file_added_in_rev2.txt'), '');
+ {__path: 'file_added_in_rev2.txt'}), '');
assert.equal(
element._computeDraftsStringMobile(element.changeComments, _1To2,
- 'file_added_in_rev2.txt'), '');
+ {__path: 'file_added_in_rev2.txt'}), '');
assert.equal(
element._computeCommentsStringMobile(
element.changeComments,
parentTo2,
- '/COMMIT_MSG'
+ {__path: '/COMMIT_MSG'}
), '1c');
assert.equal(
element._computeCommentsStringMobile(element.changeComments, _1To2,
- '/COMMIT_MSG'), '3c');
+ {__path: '/COMMIT_MSG'}), '3c');
assert.equal(
element._computeDraftsString(element.changeComments, parentTo1,
- '/COMMIT_MSG'), '2 drafts');
+ {__path: '/COMMIT_MSG'}), '2 drafts');
assert.equal(
element._computeDraftsString(element.changeComments, _1To2,
- '/COMMIT_MSG'), '2 drafts');
+ {__path: '/COMMIT_MSG'}), '2 drafts');
assert.equal(
element._computeDraftsStringMobile(
element.changeComments,
parentTo1,
- '/COMMIT_MSG'
+ {__path: '/COMMIT_MSG'}
), '2d');
assert.equal(
element._computeDraftsStringMobile(element.changeComments, _1To2,
- '/COMMIT_MSG'), '2d');
+ {__path: '/COMMIT_MSG'}), '2d');
assert.equal(
element._computeCommentsStringMobile(
element.changeComments,
parentTo2,
- 'myfile.txt'
+ {__path: 'myfile.txt'}
), '2c');
assert.equal(
element._computeCommentsStringMobile(element.changeComments, _1To2,
- 'myfile.txt'), '3c');
+ {__path: 'myfile.txt'}), '3c');
assert.equal(
element._computeDraftsStringMobile(element.changeComments, parentTo2,
- 'myfile.txt'), '');
+ {__path: 'myfile.txt'}), '');
assert.equal(
element._computeDraftsStringMobile(element.changeComments, _1To2,
- 'myfile.txt'), '');
+ {__path: 'myfile.txt'}), '');
});
test('_reviewedTitle', () => {
diff --git a/polygerrit-ui/app/elements/change/gr-message/gr-message.ts b/polygerrit-ui/app/elements/change/gr-message/gr-message.ts
index fed02a7..1711499 100644
--- a/polygerrit-ui/app/elements/change/gr-message/gr-message.ts
+++ b/polygerrit-ui/app/elements/change/gr-message/gr-message.ts
@@ -62,6 +62,7 @@
const LABEL_TITLE_SCORE_PATTERN = /^(-?)([A-Za-z0-9-]+?)([+-]\d+)?[.]?$/;
const UPLOADED_NEW_PATCHSET_PATTERN = /Uploaded patch set (\d+)./;
const MERGED_PATCHSET_PATTERN = /(\d+) is the latest approved patch-set/;
+const VOTE_RESET_TEXT = '0 (vote reset)';
declare global {
interface HTMLElementTagNameMap {
@@ -183,7 +184,7 @@
type: String,
computed:
'_computeMessageContentExpanded(message.message,' +
- ' message.accountsInMessage,' +
+ ' message.accounts_in_message,' +
' message.tag)',
})
_messageContentExpanded = '';
@@ -192,7 +193,7 @@
type: String,
computed:
'_computeMessageContentCollapsed(message.message,' +
- ' message.accountsInMessage,' +
+ ' message.accounts_in_message,' +
' message.tag,' +
' message.commentThreads)',
})
@@ -466,7 +467,7 @@
)
.map(ms => {
const label = ms?.[2];
- const value = ms?.[1] === '-' ? 'removed' : ms?.[3];
+ const value = ms?.[1] === '-' ? VOTE_RESET_TEXT : ms?.[3];
return {label, value};
});
}
@@ -479,7 +480,7 @@
if (!score.value) {
return '';
}
- if (score.value === 'removed') {
+ if (score.value.includes(VOTE_RESET_TEXT)) {
return 'removed';
}
const classes = [];
diff --git a/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list.ts b/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list.ts
index 8d5bc33..5595d15 100644
--- a/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list.ts
+++ b/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list.ts
@@ -21,13 +21,7 @@
import '../../plugins/gr-endpoint-slot/gr-endpoint-slot';
import {classMap} from 'lit-html/directives/class-map';
import {GrLitElement} from '../../lit/gr-lit-element';
-import {
- customElement,
- property,
- css,
- internalProperty,
- TemplateResult,
-} from 'lit-element';
+import {customElement, property, css, state, TemplateResult} from 'lit-element';
import {sharedStyles} from '../../../styles/shared-styles';
import {
SubmittedTogetherInfo,
@@ -76,22 +70,22 @@
@property()
mergeable?: boolean;
- @internalProperty()
+ @state()
submittedTogether?: SubmittedTogetherInfo = {
changes: [],
non_visible_changes: 0,
};
- @internalProperty()
+ @state()
relatedChanges: RelatedChangeAndCommitInfo[] = [];
- @internalProperty()
+ @state()
conflictingChanges: ChangeInfo[] = [];
- @internalProperty()
+ @state()
cherryPickChanges: ChangeInfo[] = [];
- @internalProperty()
+ @state()
sameTopicChanges: ChangeInfo[] = [];
private readonly restApiService = appContext.restApiService;
diff --git a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog-it_test.js b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog-it_test.js
index 5f35fd3..2767940 100644
--- a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog-it_test.js
+++ b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog-it_test.js
@@ -87,9 +87,6 @@
test('_submit blocked when invalid email is supplied to ccs', () => {
const sendStub = sinon.stub(element, 'send').returns(Promise.resolve());
- // Stub the below function to avoid side effects from the send promise
- // resolving.
- sinon.stub(element, '_purgeReviewersPendingRemove');
element.$.ccs.$.entry.setText('test');
MockInteractions.tap(element.shadowRoot
diff --git a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.ts b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.ts
index bf61aa5..e303dad 100644
--- a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.ts
+++ b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.ts
@@ -39,7 +39,11 @@
SpecialFilePath,
} from '../../../constants/constants';
import {KeyboardShortcutMixin} from '../../../mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin';
-import {accountKey, removeServiceUsers} from '../../../utils/account-util';
+import {
+ accountKey,
+ accountOrGroupKey,
+ removeServiceUsers,
+} from '../../../utils/account-util';
import {getDisplayName} from '../../../utils/display-name-util';
import {IronA11yAnnouncer} from '@polymer/iron-a11y-announcer/iron-a11y-announcer';
import {TargetElement} from '../../../api/plugin';
@@ -64,7 +68,6 @@
GroupInfo,
isAccount,
isDetailedLabelInfo,
- isGroup,
isReviewerAccountSuggestion,
isReviewerGroupSuggestion,
LabelNameToValueMap,
@@ -83,20 +86,17 @@
import {GrLabelScoreRow} from '../gr-label-score-row/gr-label-score-row';
import {
PolymerDeepPropertyChange,
- PolymerSplice,
PolymerSpliceChange,
} from '@polymer/polymer/interfaces';
import {
areSetsEqual,
assertIsDefined,
- assertNever,
containsAll,
} from '../../../utils/common-util';
import {CommentThread, isUnresolved} from '../../../utils/comment-util';
import {GrTextarea} from '../../shared/gr-textarea/gr-textarea';
import {GrAccountChip} from '../../shared/gr-account-chip/gr-account-chip';
import {GrOverlay} from '../../shared/gr-overlay/gr-overlay';
-import {isAttentionSetEnabled} from '../../../utils/attention-set-util';
import {
CODE_REVIEW,
getApprovalInfo,
@@ -107,6 +107,7 @@
fireAlert,
fireEvent,
fireIronAnnounce,
+ fireReload,
fireServerError,
} from '../../../utils/event-util';
import {ErrorCallback} from '../../../api/rest';
@@ -148,15 +149,6 @@
const EMPTY_REPLY_MESSAGE = 'Cannot send an empty reply.';
-interface PendingRemovals {
- CC: (AccountInfoInput | GroupInfoInput)[];
- REVIEWER: (AccountInfoInput | GroupInfoInput)[];
-}
-const PENDING_REMOVAL_KEYS: (keyof PendingRemovals)[] = [
- ReviewerType.CC,
- ReviewerType.REVIEWER,
-];
-
export interface GrReplyDialog {
$: {
reviewers: GrAccountList;
@@ -311,12 +303,6 @@
@property({type: Boolean, observer: '_handleHeightChanged'})
_previewFormatting = false;
- @property({type: Object})
- _reviewersPendingRemove: PendingRemovals = {
- CC: [],
- REVIEWER: [],
- };
-
@property({type: String, computed: '_computeSendButtonLabel(canBeStarted)'})
_sendButtonLabel?: string;
@@ -514,22 +500,21 @@
}
@observe('_ccs.splices')
- _ccsChanged(splices: PolymerSpliceChange<AccountInfo[]>) {
+ _ccsChanged(splices: PolymerSpliceChange<AccountInfo[] | GroupInfo[]>) {
this._reviewerTypeChanged(splices, ReviewerType.CC);
}
@observe('_reviewers.splices')
- _reviewersChanged(splices: PolymerSpliceChange<AccountInfo[]>) {
+ _reviewersChanged(splices: PolymerSpliceChange<AccountInfo[] | GroupInfo[]>) {
this._reviewerTypeChanged(splices, ReviewerType.REVIEWER);
}
_reviewerTypeChanged(
- splices: PolymerSpliceChange<AccountInfo[]>,
+ splices: PolymerSpliceChange<AccountInfo[] | GroupInfo[]>,
reviewerType: ReviewerType
) {
if (splices && splices.indexSplices) {
this._reviewersMutated = true;
- this._processReviewerChange(splices.indexSplices, reviewerType);
let key: AccountId | EmailAddress | GroupId | undefined;
let index;
let account;
@@ -539,16 +524,16 @@
for (const splice of splices.indexSplices) {
for (let i = 0; i < splice.addedCount; i++) {
account = splice.object[splice.index + i];
- key = this._accountOrGroupKey(account);
+ key = accountOrGroupKey(account);
const array = isReviewer ? this._ccs : this._reviewers;
index = array.findIndex(
- account => this._accountOrGroupKey(account) === key
+ account => accountOrGroupKey(account) === key
);
if (index >= 0) {
this.splice(isReviewer ? '_ccs' : '_reviewers', index, 1);
const moveFrom = isReviewer ? 'CC' : 'reviewer';
const moveTo = isReviewer ? 'reviewer' : 'CC';
- const id = account.name || account.email || key;
+ const id = account.name || key;
const message = `${id} moved from ${moveFrom} to ${moveTo}.`;
fireAlert(this, message);
}
@@ -557,76 +542,6 @@
}
}
- _processReviewerChange(
- indexSplices: Array<PolymerSplice<AccountInfo[]>>,
- type: ReviewerType
- ) {
- for (const splice of indexSplices) {
- for (const account of splice.removed) {
- if (!this._reviewersPendingRemove[type]) {
- this.reporting.error(new Error(`Invalid type ${type} for reviewer.`));
- return;
- }
- this._reviewersPendingRemove[type].push(account);
- }
- }
- }
-
- /**
- * Resets the state of the _reviewersPendingRemove object, and removes
- * accounts if necessary.
- *
- * @param isCancel true if the action is a cancel.
- * @param keep map of account IDs that must
- * not be removed, because they have been readded in another state.
- */
- _purgeReviewersPendingRemove(
- isCancel: boolean,
- keep = new Map<AccountId | EmailAddress, boolean>()
- ) {
- let reviewerArr: (AccountInfoInput | GroupInfoInput)[];
- for (const type of PENDING_REMOVAL_KEYS) {
- if (!isCancel) {
- reviewerArr = this._reviewersPendingRemove[type];
- for (let i = 0; i < reviewerArr.length; i++) {
- const reviewer = reviewerArr[i];
- if (!isAccount(reviewer) || !keep.get(accountKey(reviewer))) {
- this._removeAccount(reviewer, type as ReviewerType);
- }
- }
- }
- this._reviewersPendingRemove[type] = [];
- }
- }
-
- /**
- * Removes an account from the change, both on the backend and the client.
- * Does nothing if the account is a pending addition.
- */
- _removeAccount(
- account: AccountInfoInput | GroupInfoInput,
- type: ReviewerType
- ) {
- assertIsDefined(this.change, 'change');
- if (account._pendingAdd || !isAccount(account)) {
- return;
- }
-
- return this.restApiService
- .removeChangeReviewer(this.change._number, accountKey(account))
- .then((response?: Response) => {
- if (!response?.ok || !this.change) return;
-
- const reviewers = this.change.reviewers[type] || [];
- for (let i = 0; i < reviewers.length; i++) {
- if (reviewers[i]._account_id === account._account_id) {
- this.splice(`change.reviewers.${type}`, i, 1);
- break;
- }
- }
- });
- }
-
_mapReviewer(addition: AccountAddition): ReviewerInput {
if (addition.account) {
return {reviewer: accountKey(addition.account)};
@@ -639,10 +554,7 @@
throw new Error('Reviewer must be either an account or a group.');
}
- send(
- includeComments: boolean,
- startReview: boolean
- ): Promise<Map<AccountId | EmailAddress, boolean>> {
+ send(includeComments: boolean, startReview: boolean) {
this.reporting.time(Timing.SEND_REPLY);
const labels = this.$.labelScores.getLabelValues();
@@ -657,29 +569,27 @@
reviewInput.ready = true;
}
- if (isAttentionSetEnabled(this.serverConfig)) {
- const selfName = getDisplayName(this.serverConfig, this._account);
- const reason = `${selfName} replied on the change`;
+ const selfName = getDisplayName(this.serverConfig, this._account);
+ const reason = `${selfName} replied on the change`;
- reviewInput.ignore_automatic_attention_set_rules = true;
- reviewInput.add_to_attention_set = [];
- for (const user of this._newAttentionSet) {
- if (!this._currentAttentionSet.has(user)) {
- reviewInput.add_to_attention_set.push({user, reason});
- }
+ reviewInput.ignore_automatic_attention_set_rules = true;
+ reviewInput.add_to_attention_set = [];
+ for (const user of this._newAttentionSet) {
+ if (!this._currentAttentionSet.has(user)) {
+ reviewInput.add_to_attention_set.push({user, reason});
}
- reviewInput.remove_from_attention_set = [];
- for (const user of this._currentAttentionSet) {
- if (!this._newAttentionSet.has(user)) {
- reviewInput.remove_from_attention_set.push({user, reason});
- }
- }
- this.reportAttentionSetChanges(
- this._attentionExpanded,
- reviewInput.add_to_attention_set,
- reviewInput.remove_from_attention_set
- );
}
+ reviewInput.remove_from_attention_set = [];
+ for (const user of this._currentAttentionSet) {
+ if (!this._newAttentionSet.has(user)) {
+ reviewInput.remove_from_attention_set.push({user, reason});
+ }
+ }
+ this.reportAttentionSetChanges(
+ this._attentionExpanded,
+ reviewInput.add_to_attention_set,
+ reviewInput.remove_from_attention_set
+ );
if (this.draft) {
const comment: CommentInput = {
@@ -691,24 +601,21 @@
};
}
- const accountAdditions = new Map<AccountId | EmailAddress, boolean>();
- reviewInput.reviewers = this.$.reviewers.additions().map(reviewer => {
- if (reviewer.account) {
- accountAdditions.set(accountKey(reviewer.account), true);
- }
- return this._mapReviewer(reviewer);
- });
- const ccsEl = this.$.ccs;
- if (ccsEl) {
- for (const addition of ccsEl.additions()) {
- if (addition.account) {
- accountAdditions.set(accountKey(addition.account), true);
- }
+ const addToReviewInput = (
+ additions: AccountAddition[],
+ state?: ReviewerState
+ ) => {
+ additions.forEach(addition => {
const reviewer = this._mapReviewer(addition);
- reviewer.state = ReviewerState.CC;
- reviewInput.reviewers.push(reviewer);
- }
- }
+ if (state) reviewer.state = state;
+ reviewInput.reviewers?.push(reviewer);
+ });
+ };
+ reviewInput.reviewers = [];
+ addToReviewInput(this.$.reviewers.additions(), ReviewerState.REVIEWER);
+ addToReviewInput(this.$.ccs.additions(), ReviewerState.CC);
+ addToReviewInput(this.$.reviewers.removals(), ReviewerState.REMOVED);
+ addToReviewInput(this.$.ccs.removals(), ReviewerState.REMOVED);
this.disabled = true;
@@ -718,11 +625,11 @@
if (!response) {
// Null or undefined response indicates that an error handler
// took responsibility, so just return.
- return new Map<AccountId | EmailAddress, boolean>();
+ return;
}
if (!response.ok) {
fireServerError(response);
- return new Map<AccountId | EmailAddress, boolean>();
+ return;
}
this.draft = '';
@@ -734,7 +641,7 @@
})
);
fireIronAnnounce(this, 'Reply sent');
- return accountAdditions;
+ return;
})
.then(result => {
this.disabled = false;
@@ -890,12 +797,12 @@
fireEvent(this, 'iron-resize');
}
- _showAttentionSummary(config?: ServerInfo, attentionExpanded?: boolean) {
- return isAttentionSetEnabled(config) && !attentionExpanded;
+ _showAttentionSummary(attentionExpanded?: boolean) {
+ return !attentionExpanded;
}
- _showAttentionDetails(config?: ServerInfo, attentionExpanded?: boolean) {
- return isAttentionSetEnabled(config) && attentionExpanded;
+ _showAttentionDetails(attentionExpanded?: boolean) {
+ return attentionExpanded;
}
_computeAttentionButtonTitle(sendDisabled?: boolean) {
@@ -1164,12 +1071,6 @@
return rev.uploader;
}
- _accountOrGroupKey(entry: AccountInfo | GroupInfo) {
- if (isAccount(entry)) return accountKey(entry);
- if (isGroup(entry)) return entry.id;
- assertNever(entry, 'entry must be account or group');
- }
-
/**
* Generates a function to filter out reviewer/CC entries. When isCCs is
* truthy, the function filters out entries that already exist in this._ccs.
@@ -1195,9 +1096,9 @@
return false;
}
- const key = this._accountOrGroupKey(entry);
+ const key = accountOrGroupKey(entry);
const finder = (entry: AccountInfo | GroupInfo) =>
- this._accountOrGroupKey(entry) === key;
+ accountOrGroupKey(entry) === key;
if (isCCs) {
return this._ccs.find(finder) === undefined;
}
@@ -1224,7 +1125,7 @@
})
);
this.$.textarea.closeDropdown();
- this._purgeReviewersPendingRemove(true);
+ this.$.reviewers.clearPendingRemovals();
this._rebuildReviewerArrays(this.change.reviewers, this._owner);
}
@@ -1235,9 +1136,7 @@
// the text field of the CC entry.
return;
}
- this.send(this._includeComments, false).then(keepReviewers => {
- this._purgeReviewersPendingRemove(false, keepReviewers);
- });
+ this.send(this._includeComments, false);
}
_sendTapHandler(e: Event) {
@@ -1255,19 +1154,15 @@
fireAlert(this, EMPTY_REPLY_MESSAGE);
return;
}
- return this.send(this._includeComments, this.canBeStarted)
- .then(keepReviewers => {
- this._purgeReviewersPendingRemove(false, keepReviewers);
- })
- .catch(err => {
- this.dispatchEvent(
- new CustomEvent('show-error', {
- bubbles: true,
- composed: true,
- detail: {message: `Error submitting review ${err}`},
- })
- );
- });
+ return this.send(this._includeComments, this.canBeStarted).catch(err => {
+ this.dispatchEvent(
+ new CustomEvent('show-error', {
+ bubbles: true,
+ composed: true,
+ detail: {message: `Error submitting review ${err}`},
+ })
+ );
+ });
}
_saveReview(review: ReviewInput, errFn?: ErrorCallback) {
@@ -1369,13 +1264,7 @@
}
_reload() {
- this.dispatchEvent(
- new CustomEvent('reload', {
- detail: {clearPatchset: true},
- bubbles: false,
- composed: true,
- })
- );
+ fireReload(this, true);
this.cancel();
}
diff --git a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_html.ts b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_html.ts
index f458994..17e5e26 100644
--- a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_html.ts
+++ b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_html.ts
@@ -363,7 +363,7 @@
</section>
<div class="stickyBottom">
<section
- hidden$="[[!_showAttentionSummary(serverConfig, _attentionExpanded)]]"
+ hidden$="[[!_showAttentionSummary(_attentionExpanded)]]"
class="attention"
>
<div class="attentionSummary">
@@ -429,7 +429,7 @@
</div>
</section>
<section
- hidden$="[[!_showAttentionDetails(serverConfig, _attentionExpanded)]]"
+ hidden$="[[!_showAttentionDetails(_attentionExpanded)]]"
class="attention-detail"
>
<div class="attentionDetailsTitle">
diff --git a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.js b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.js
index c1e2564..b51eb5f 100644
--- a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.js
+++ b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.js
@@ -19,7 +19,7 @@
import {IronOverlayManager} from '@polymer/iron-overlay-behavior/iron-overlay-manager.js';
import './gr-reply-dialog.js';
import {mockPromise, stubStorage} from '../../../test/test-utils.js';
-import {SpecialFilePath} from '../../../constants/constants.js';
+import {ReviewerState, SpecialFilePath} from '../../../constants/constants.js';
import {appContext} from '../../../services/app-context.js';
import {addListenerForTest} from '../../../test/test-utils.js';
import {stubRestApi} from '../../../test/test-utils.js';
@@ -57,7 +57,7 @@
let setDraftCommentStub;
let eraseDraftCommentStub;
- let lastId = 0;
+ let lastId = 1;
const makeAccount = function() { return {_account_id: lastId++}; };
const makeGroup = function() { return {id: lastId++}; };
@@ -144,47 +144,47 @@
}));
}
- test('default to publishing draft comments with reply', done => {
+ function interceptSaveReview() {
+ let resolver;
+ const promise = new Promise(resolve => { resolver = resolve; });
+ stubSaveReview(review => { resolver(review); });
+ return promise;
+ }
+
+ test('default to publishing draft comments with reply', async () => {
// Async tick is needed because iron-selector content is distributed and
// distributed content requires an observer to be set up.
- // Note: Double flush seems to be needed in Safari. {@see Issue 4963}.
- flush(() => {
- flush(() => {
- element.draft = 'I wholeheartedly disapprove';
+ await flush();
+ element.draft = 'I wholeheartedly disapprove';
+ const saveReviewPromise = interceptSaveReview();
- stubSaveReview(review => {
- assert.deepEqual(review, {
- drafts: 'PUBLISH_ALL_REVISIONS',
- labels: {
- 'Code-Review': 0,
- 'Verified': 0,
- },
- comments: {
- [SpecialFilePath.PATCHSET_LEVEL_COMMENTS]: [{
- message: 'I wholeheartedly disapprove',
- unresolved: false,
- }],
- },
- reviewers: [],
- });
- assert.isFalse(element.$.commentList.hidden);
- done();
- });
+ // This is needed on non-Blink engines most likely due to the ways in
+ // which the dom-repeat elements are stamped.
+ await flush();
+ MockInteractions.tap(element.shadowRoot.querySelector('.send'));
- // This is needed on non-Blink engines most likely due to the ways in
- // which the dom-repeat elements are stamped.
- flush(() => {
- MockInteractions.tap(element.shadowRoot
- .querySelector('.send'));
- });
- });
+ const review = await saveReviewPromise;
+ assert.deepEqual(review, {
+ drafts: 'PUBLISH_ALL_REVISIONS',
+ labels: {
+ 'Code-Review': 0,
+ 'Verified': 0,
+ },
+ comments: {
+ [SpecialFilePath.PATCHSET_LEVEL_COMMENTS]: [{
+ message: 'I wholeheartedly disapprove',
+ unresolved: false,
+ }],
+ },
+ reviewers: [],
+ add_to_attention_set: [],
+ remove_from_attention_set: [],
+ ignore_automatic_attention_set_rules: true,
});
+ assert.isFalse(element.$.commentList.hidden);
});
test('modified attention set', done => {
- element.serverConfig = {
- change: {enable_attention_set: true},
- };
element._newAttentionSet = new Set([314]);
const buttonEl = element.shadowRoot.querySelector('.edit-attention-button');
MockInteractions.tap(buttonEl);
@@ -203,17 +203,17 @@
});
function checkComputeAttention(status, userId, reviewerIds, ownerId,
- attSetIds, replyToIds, expectedIds, uploaderId, hasDraft,
+ attSetIds, replyToIds, expectedIds, uploaderId, hasDraft = true,
includeComments = true) {
const user = {_account_id: userId};
const reviewers = {base: reviewerIds.map(id => {
return {_account_id: id};
})};
- const draftThreads = [
- {comments: []},
- ];
+ let draftThreads = [];
if (hasDraft) {
- draftThreads[0].comments.push({__draft: true, unresolved: true});
+ draftThreads = [
+ {comments: [{__draft: true, unresolved: true}]},
+ ];
}
replyToIds.forEach(id => draftThreads[0].comments.push({
author: {_account_id: id},
@@ -240,7 +240,6 @@
}
test('computeNewAttention NEW', () => {
- checkComputeAttention('NEW', null, [], 999, [], [], [999]);
checkComputeAttention('NEW', 1, [], 999, [], [], [999]);
checkComputeAttention('NEW', 1, [], 999, [1], [], [999]);
checkComputeAttention('NEW', 1, [22], 999, [], [], [999]);
@@ -264,14 +263,14 @@
});
test('computeNewAttention MERGED', () => {
- checkComputeAttention('MERGED', null, [], 999, [], [], []);
- checkComputeAttention('MERGED', 1, [], 999, [], [], []);
- checkComputeAttention('MERGED', 1, [], 999, [], [], [999], undefined, true);
+ checkComputeAttention('MERGED', 1, [], 999, [], [], [], undefined, false);
+ checkComputeAttention('MERGED', 1, [], 999, [], [], [999], undefined);
checkComputeAttention(
'MERGED', 1, [], 999, [], [], [], undefined, true, false);
- checkComputeAttention('MERGED', 1, [], 999, [1], [], []);
- checkComputeAttention('MERGED', 1, [22], 999, [], [], []);
- checkComputeAttention('MERGED', 1, [22], 999, [22], [], [22]);
+ checkComputeAttention('MERGED', 1, [], 999, [1], [], [], undefined, false);
+ checkComputeAttention('MERGED', 1, [22], 999, [], [], [], undefined, false);
+ checkComputeAttention('MERGED', 1, [22], 999, [22], [], [22], undefined,
+ false);
checkComputeAttention('MERGED', 1, [22], 999, [], [22], []);
checkComputeAttention('MERGED', 1, [22, 33], 999, [33], [22], [33]);
checkComputeAttention('MERGED', 1, [], 1, [], [], []);
@@ -406,103 +405,45 @@
assert.sameMembers(actualAccounts, [1, 2, 4]);
});
- test('toggle resolved checkbox', done => {
- // Async tick is needed because iron-selector content is distributed and
- // distributed content requires an observer to be set up.
- // Note: Double flush seems to be needed in Safari. {@see Issue 4963}.
+ test('toggle resolved checkbox', async () => {
const checkboxEl = element.shadowRoot.querySelector(
'#resolvedPatchsetLevelCommentCheckbox');
MockInteractions.tap(checkboxEl);
- flush(() => {
- flush(() => {
- element.draft = 'I wholeheartedly disapprove';
-
- stubSaveReview(review => {
- assert.deepEqual(review, {
- drafts: 'PUBLISH_ALL_REVISIONS',
- labels: {
- 'Code-Review': 0,
- 'Verified': 0,
- },
- comments: {
- [SpecialFilePath.PATCHSET_LEVEL_COMMENTS]: [{
- message: 'I wholeheartedly disapprove',
- unresolved: true,
- }],
- },
- reviewers: [],
- });
- done();
- });
-
- // This is needed on non-Blink engines most likely due to the ways in
- // which the dom-repeat elements are stamped.
- flush(() => {
- MockInteractions.tap(element.shadowRoot
- .querySelector('.send'));
- });
- });
- });
- });
-
- test('keep draft comments with reply', done => {
- MockInteractions.tap(element.shadowRoot.querySelector('#includeComments'));
- assert.equal(element._includeComments, false);
// Async tick is needed because iron-selector content is distributed and
// distributed content requires an observer to be set up.
- // Note: Double flush seems to be needed in Safari. {@see Issue 4963}.
- flush(() => {
- flush(() => {
- element.draft = 'I wholeheartedly disapprove';
+ await flush();
+ element.draft = 'I wholeheartedly disapprove';
+ const saveReviewPromise = interceptSaveReview();
- stubSaveReview(review => {
- assert.deepEqual(review, {
- drafts: 'KEEP',
- labels: {
- 'Code-Review': 0,
- 'Verified': 0,
- },
- comments: {
- [SpecialFilePath.PATCHSET_LEVEL_COMMENTS]: [{
- message: 'I wholeheartedly disapprove',
- unresolved: false,
- }],
- },
- reviewers: [],
- });
- assert.isTrue(element.$.commentList.hidden);
- done();
- });
+ // This is needed on non-Blink engines most likely due to the ways in
+ // which the dom-repeat elements are stamped.
+ await flush();
+ MockInteractions.tap(element.shadowRoot.querySelector('.send'));
- // This is needed on non-Blink engines most likely due to the ways in
- // which the dom-repeat elements are stamped.
- flush(() => {
- MockInteractions.tap(element.shadowRoot
- .querySelector('.send'));
- });
- });
+ const review = await saveReviewPromise;
+ assert.deepEqual(review, {
+ drafts: 'PUBLISH_ALL_REVISIONS',
+ labels: {
+ 'Code-Review': 0,
+ 'Verified': 0,
+ },
+ comments: {
+ [SpecialFilePath.PATCHSET_LEVEL_COMMENTS]: [{
+ message: 'I wholeheartedly disapprove',
+ unresolved: true,
+ }],
+ },
+ reviewers: [],
+ add_to_attention_set: [],
+ remove_from_attention_set: [],
+ ignore_automatic_attention_set_rules: true,
});
});
- test('label picker', done => {
+ test('label picker', async () => {
element.draft = 'I wholeheartedly disapprove';
- stubSaveReview(review => {
- assert.deepEqual(review, {
- drafts: 'PUBLISH_ALL_REVISIONS',
- labels: {
- 'Code-Review': -1,
- 'Verified': -1,
- },
- comments: {
- [SpecialFilePath.PATCHSET_LEVEL_COMMENTS]: [{
- message: 'I wholeheartedly disapprove',
- unresolved: false,
- }],
- },
- reviewers: [],
- });
- });
+ const saveReviewPromise = interceptSaveReview();
sinon.stub(element.$.labelScores, 'getLabelValues').callsFake( () => {
return {
@@ -511,22 +452,69 @@
};
});
- element.addEventListener('send', () => {
- // Flush to ensure properties are updated.
- flush(() => {
- assert.isFalse(element.disabled,
- 'Element should be enabled when done sending reply.');
- assert.equal(element.draft.length, 0);
- done();
- });
+ // This is needed on non-Blink engines most likely due to the ways in
+ // which the dom-repeat elements are stamped.
+ await flush();
+ MockInteractions.tap(element.shadowRoot.querySelector('.send'));
+ assert.isTrue(element.disabled);
+
+ const review = await saveReviewPromise;
+ await flush();
+ assert.isFalse(element.disabled,
+ 'Element should be enabled when done sending reply.');
+ assert.equal(element.draft.length, 0);
+ assert.deepEqual(review, {
+ drafts: 'PUBLISH_ALL_REVISIONS',
+ labels: {
+ 'Code-Review': -1,
+ 'Verified': -1,
+ },
+ comments: {
+ [SpecialFilePath.PATCHSET_LEVEL_COMMENTS]: [{
+ message: 'I wholeheartedly disapprove',
+ unresolved: false,
+ }],
+ },
+ reviewers: [],
+ add_to_attention_set: [],
+ remove_from_attention_set: [],
+ ignore_automatic_attention_set_rules: true,
});
+ });
+
+ test('keep draft comments with reply', async () => {
+ MockInteractions.tap(element.shadowRoot.querySelector('#includeComments'));
+ assert.equal(element._includeComments, false);
+
+ // Async tick is needed because iron-selector content is distributed and
+ // distributed content requires an observer to be set up.
+ await flush();
+ element.draft = 'I wholeheartedly disapprove';
+ const saveReviewPromise = interceptSaveReview();
// This is needed on non-Blink engines most likely due to the ways in
// which the dom-repeat elements are stamped.
- flush(() => {
- MockInteractions.tap(element.shadowRoot
- .querySelector('.send'));
- assert.isTrue(element.disabled);
+ await flush();
+ MockInteractions.tap(element.shadowRoot.querySelector('.send'));
+
+ const review = await saveReviewPromise;
+ await flush();
+ assert.deepEqual(review, {
+ drafts: 'KEEP',
+ labels: {
+ 'Code-Review': 0,
+ 'Verified': 0,
+ },
+ comments: {
+ [SpecialFilePath.PATCHSET_LEVEL_COMMENTS]: [{
+ message: 'I wholeheartedly disapprove',
+ unresolved: false,
+ }],
+ },
+ reviewers: [],
+ add_to_attention_set: [],
+ remove_from_attention_set: [],
+ ignore_automatic_attention_set_rules: true,
});
});
@@ -969,63 +957,7 @@
});
});
- test('_processReviewerChange', () => {
- const mockIndexSplices = function(toRemove) {
- return [{
- removed: [toRemove],
- }];
- };
-
- element._processReviewerChange(
- mockIndexSplices(makeAccount()), 'REVIEWER');
- assert.equal(element._reviewersPendingRemove.REVIEWER.length, 1);
- });
-
- test('_purgeReviewersPendingRemove', () => {
- const removeStub = sinon.stub(element, '_removeAccount');
- const mock = function() {
- element._reviewersPendingRemove = {
- CC: [makeAccount()],
- REVIEWER: [makeAccount(), makeAccount()],
- };
- };
- const checkObjEmpty = function(obj) {
- for (const prop of Object.keys(obj)) {
- if (obj[prop].length) { return false; }
- }
- return true;
- };
- mock();
- element._purgeReviewersPendingRemove(true); // Cancel
- assert.isFalse(removeStub.called);
- assert.isTrue(checkObjEmpty(element._reviewersPendingRemove));
-
- mock();
- element._purgeReviewersPendingRemove(false); // Submit
- assert.isTrue(removeStub.called);
- assert.isTrue(checkObjEmpty(element._reviewersPendingRemove));
- });
-
- test('_removeAccount', done => {
- stubRestApi('removeChangeReviewer')
- .returns(Promise.resolve({ok: true}));
- const arr = [makeAccount(), makeAccount()];
- element.change.reviewers = {
- REVIEWER: arr.slice(),
- };
-
- element._removeAccount(arr[1], 'REVIEWER').then(() => {
- assert.equal(element.change.reviewers.REVIEWER.length, 1);
- assert.deepEqual(element.change.reviewers.REVIEWER, arr.slice(0, 1));
- done();
- });
- });
-
test('moving from cc to reviewer', () => {
- element._reviewersPendingRemove = {
- CC: [],
- REVIEWER: [],
- };
flush();
const reviewer1 = makeAccount();
@@ -1043,7 +975,6 @@
assert.deepEqual(element._reviewers,
[reviewer1, reviewer2, reviewer3, cc1]);
assert.deepEqual(element._ccs, [cc2, cc3, cc4]);
- assert.deepEqual(element._reviewersPendingRemove.CC, [cc1]);
element.push('_reviewers', cc4, cc3);
flush();
@@ -1051,7 +982,6 @@
assert.deepEqual(element._reviewers,
[reviewer1, reviewer2, reviewer3, cc1, cc4, cc3]);
assert.deepEqual(element._ccs, [cc2]);
- assert.deepEqual(element._reviewersPendingRemove.CC, [cc1, cc4, cc3]);
});
test('update attention section when reviewers and ccs change', () => {
@@ -1107,10 +1037,6 @@
});
test('moving from reviewer to cc', () => {
- element._reviewersPendingRemove = {
- CC: [],
- REVIEWER: [],
- };
flush();
const reviewer1 = makeAccount();
@@ -1128,7 +1054,6 @@
assert.deepEqual(element._reviewers,
[reviewer2, reviewer3]);
assert.deepEqual(element._ccs, [cc1, cc2, cc3, cc4, reviewer1]);
- assert.deepEqual(element._reviewersPendingRemove.REVIEWER, [reviewer1]);
element.push('_ccs', reviewer3, reviewer2);
flush();
@@ -1136,15 +1061,9 @@
assert.deepEqual(element._reviewers, []);
assert.deepEqual(element._ccs,
[cc1, cc2, cc3, cc4, reviewer1, reviewer3, reviewer2]);
- assert.deepEqual(element._reviewersPendingRemove.REVIEWER,
- [reviewer1, reviewer3, reviewer2]);
});
test('migrate reviewers between states', async () => {
- element._reviewersPendingRemove = {
- CC: [],
- REVIEWER: [],
- };
flush();
const reviewers = element.$.reviewers;
const ccs = element.$.ccs;
@@ -1160,11 +1079,6 @@
stubSaveReview(review => mutations.push(...review.reviewers));
- sinon.stub(element, '_removeAccount').callsFake((account, type) => {
- mutations.push({state: 'REMOVED', account});
- return Promise.resolve();
- });
-
// Remove and add to other field.
reviewers.dispatchEvent(
new CustomEvent('remove', {
@@ -1213,15 +1127,24 @@
};
// Send and purge and verify moves, delete cc3.
- await element.send()
- .then(keepReviewers =>
- element._purgeReviewersPendingRemove(false, keepReviewers));
- expect(mutations).to.have.lengthOf(5);
- expect(mutations[0]).to.deep.equal(mapReviewer(cc1));
- expect(mutations[1]).to.deep.equal(mapReviewer(cc2));
- expect(mutations[2]).to.deep.equal(mapReviewer(reviewer1, 'CC'));
- expect(mutations[3]).to.deep.equal(mapReviewer(reviewer2, 'CC'));
- expect(mutations[4]).to.deep.equal({account: cc3, state: 'REMOVED'});
+ await element.send();
+ expect(mutations).to.have.lengthOf(7);
+ expect(mutations[0]).to.deep.equal(mapReviewer(cc1,
+ ReviewerState.REVIEWER));
+ expect(mutations[1]).to.deep.equal(mapReviewer(cc2,
+ ReviewerState.REVIEWER));
+ expect(mutations[2]).to.deep.equal(mapReviewer(reviewer1,
+ ReviewerState.CC));
+ expect(mutations[3]).to.deep.equal(mapReviewer(reviewer2,
+ ReviewerState.CC));
+
+ // 3 remove events stored
+ expect(mutations[4]).to.deep.equal({reviewer: 33, state:
+ ReviewerState.REMOVED});
+ expect(mutations[5]).to.deep.equal({reviewer: 35, state:
+ ReviewerState.REMOVED});
+ expect(mutations[6]).to.deep.equal({reviewer: 37, state:
+ ReviewerState.REMOVED});
});
test('emits cancel on esc key', () => {
@@ -1544,9 +1467,6 @@
test('_submit blocked when no mutations exist', async () => {
const sendStub = sinon.stub(element, 'send').returns(Promise.resolve());
- // Stub the below function to avoid side effects from the send promise
- // resolving.
- sinon.stub(element, '_purgeReviewersPendingRemove');
element.account = makeAccount();
element.draftCommentThreads = [];
await flush();
diff --git a/polygerrit-ui/app/elements/change/gr-reviewer-list/gr-reviewer-list.ts b/polygerrit-ui/app/elements/change/gr-reviewer-list/gr-reviewer-list.ts
index adf4f71..ffcafdd 100644
--- a/polygerrit-ui/app/elements/change/gr-reviewer-list/gr-reviewer-list.ts
+++ b/polygerrit-ui/app/elements/change/gr-reviewer-list/gr-reviewer-list.ts
@@ -25,7 +25,6 @@
import {customElement, property, computed, observe} from '@polymer/decorators';
import {
ChangeInfo,
- ServerInfo,
LabelNameToValueMap,
AccountInfo,
ApprovalInfo,
@@ -61,9 +60,6 @@
@property({type: Object})
account?: AccountDetailInfo;
- @property({type: Object})
- serverConfig?: ServerInfo;
-
@property({type: Boolean, reflectToAttribute: true})
disabled = false;
@@ -201,17 +197,15 @@
return maxScores.join(', ');
}
- @observe('change.reviewers.*', 'change.owner', 'serverConfig')
+ @observe('change.reviewers.*', 'change.owner')
_reviewersChanged(
changeRecord: PolymerDeepPropertyChange<Reviewers, Reviewers>,
- owner: AccountInfo,
- serverConfig: ServerInfo
+ owner: AccountInfo
) {
// Polymer 2: check for undefined
if (
changeRecord === undefined ||
owner === undefined ||
- serverConfig === undefined ||
this.change === undefined
) {
return;
@@ -241,8 +235,8 @@
if (isSelf(r1, this.account)) return -1;
if (isSelf(r2, this.account)) return 1;
}
- const a1 = hasAttention(serverConfig, r1, this.change!) ? 1 : 0;
- const a2 = hasAttention(serverConfig, r2, this.change!) ? 1 : 0;
+ const a1 = hasAttention(r1, this.change!) ? 1 : 0;
+ const a2 = hasAttention(r2, this.change!) ? 1 : 0;
const s1 = isServiceUser(r1) ? -2 : 0;
const s2 = isServiceUser(r2) ? -2 : 0;
return a2 - a1 + s2 - s1;
diff --git a/polygerrit-ui/app/elements/change/gr-reviewer-list/gr-reviewer-list_test.ts b/polygerrit-ui/app/elements/change/gr-reviewer-list/gr-reviewer-list_test.ts
index 0a709e1..4b57651 100644
--- a/polygerrit-ui/app/elements/change/gr-reviewer-list/gr-reviewer-list_test.ts
+++ b/polygerrit-ui/app/elements/change/gr-reviewer-list/gr-reviewer-list_test.ts
@@ -22,7 +22,6 @@
import {
createAccountDetailWithId,
createChange,
- createServerInfo,
} from '../../../test/test-data-generators';
import {tap} from '@polymer/iron-test-helpers/mock-interactions';
import {GrButton} from '../../shared/gr-button/gr-button';
@@ -36,7 +35,6 @@
setup(() => {
element = basicFixture.instantiate();
- element.serverConfig = createServerInfo();
stubRestApi('removeChangeReviewer').returns(
Promise.resolve({...new Response(), ok: true})
diff --git a/polygerrit-ui/app/elements/checks/gr-checks-results.ts b/polygerrit-ui/app/elements/checks/gr-checks-results.ts
index 57bed1c..c74f6f9 100644
--- a/polygerrit-ui/app/elements/checks/gr-checks-results.ts
+++ b/polygerrit-ui/app/elements/checks/gr-checks-results.ts
@@ -20,10 +20,10 @@
import {
css,
customElement,
- internalProperty,
property,
PropertyValues,
query,
+ state,
TemplateResult,
} from 'lit-element';
import {GrLitElement} from '../lit/gr-lit-element';
@@ -39,17 +39,15 @@
import {sharedStyles} from '../../styles/shared-styles';
import {
allActions$,
- checksPatchsetNumber$,
- someProvidersAreLoading$,
- RunResult,
- CheckRun,
allLinks$,
+ CheckRun,
+ checksPatchsetNumber$,
+ RunResult,
+ someProvidersAreLoading$,
} from '../../services/checks/checks-model';
import {
allResults,
fireActionTriggered,
- hasCompletedWithoutResults,
- hasResultsOf,
iconForCategory,
iconForLink,
tooltipForLink,
@@ -169,6 +167,9 @@
display: inline-block;
margin-left: var(--spacing-s);
}
+ tr.collapsed td .summary-cell .message {
+ color: var(--deemphasized-text-color);
+ }
tr.collapsed td .summary-cell .links,
tr.collapsed td .summary-cell .actions {
display: none;
@@ -459,18 +460,18 @@
}
}
-const SHOW_ALL_THRESHOLDS: Map<Category | 'SUCCESS', number> = new Map();
+const SHOW_ALL_THRESHOLDS: Map<Category, number> = new Map();
SHOW_ALL_THRESHOLDS.set(Category.ERROR, 20);
-SHOW_ALL_THRESHOLDS.set(Category.WARNING, 20);
+SHOW_ALL_THRESHOLDS.set(Category.WARNING, 10);
SHOW_ALL_THRESHOLDS.set(Category.INFO, 5);
-SHOW_ALL_THRESHOLDS.set('SUCCESS', 5);
+SHOW_ALL_THRESHOLDS.set(Category.SUCCESS, 5);
@customElement('gr-checks-results')
export class GrChecksResults extends GrLitElement {
@query('#filterInput')
filterInput?: HTMLInputElement;
- @internalProperty()
+ @state()
filterRegExp = new RegExp('');
/** All runs. Shown should only the selected/filtered ones. */
@@ -510,22 +511,22 @@
>();
/** Maintains the state of which result sections should show all results. */
- @internalProperty()
- isShowAll: Map<Category | 'SUCCESS', boolean> = new Map();
+ @state()
+ isShowAll: Map<Category, boolean> = new Map();
/**
* This is the current state of whether a section is expanded or not. As long
* as isSectionExpandedByUser is false this will be computed by a default rule
* on every render.
*/
- private isSectionExpanded = new Map<Category | 'SUCCESS', boolean>();
+ private isSectionExpanded = new Map<Category, boolean>();
/**
* Keeps track of whether the user intentionally changed the expansion state.
* Once this is true the default rule for showing a section expanded or not
* is not applied anymore.
*/
- private isSectionExpandedByUser = new Map<Category | 'SUCCESS', boolean>();
+ private isSectionExpandedByUser = new Map<Category, boolean>();
private readonly checksService = appContext.checksService;
@@ -729,7 +730,8 @@
<div class="body">
${this.renderSection(Category.ERROR)}
${this.renderSection(Category.WARNING)}
- ${this.renderSection(Category.INFO)} ${this.renderSection('SUCCESS')}
+ ${this.renderSection(Category.INFO)}
+ ${this.renderSection(Category.SUCCESS)}
</div>
`;
}
@@ -856,16 +858,11 @@
this.filterRegExp = new RegExp(this.filterInput.value, 'i');
}
- renderSection(category: Category | 'SUCCESS') {
+ renderSection(category: Category) {
const catString = category.toString().toLowerCase();
- let allRuns = this.runs.filter(run =>
+ const allRuns = this.runs.filter(run =>
isAttemptSelected(this.selectedAttempts, run)
);
- if (category === 'SUCCESS') {
- allRuns = allRuns.filter(hasCompletedWithoutResults);
- } else {
- allRuns = allRuns.filter(r => hasResultsOf(r, category));
- }
const all = allRuns.reduce(
(results: RunResult[], run) => [
...results,
@@ -925,7 +922,7 @@
}
renderShowAllButton(
- category: Category | 'SUCCESS',
+ category: Category,
isShowAll: boolean,
showAllThreshold: number,
resultCount: number
@@ -944,7 +941,7 @@
`;
}
- toggleShowAll(category: Category | 'SUCCESS') {
+ toggleShowAll(category: Category) {
const current = this.isShowAll.get(category) ?? false;
this.isShowAll.set(category, !current);
this.requestUpdate();
@@ -1008,7 +1005,7 @@
return html`(${filtered.length} of ${all.length})`;
}
- toggleExpanded(category: Category | 'SUCCESS') {
+ toggleExpanded(category: Category) {
const expanded = this.isSectionExpanded.get(category);
assertIsDefined(expanded, 'expanded must have been set in initial render');
this.isSectionExpanded.set(category, !expanded);
@@ -1016,8 +1013,11 @@
this.requestUpdate();
}
- computeRunResults(category: Category | 'SUCCESS', run: CheckRun) {
- if (category === 'SUCCESS') return [this.computeSuccessfulRunResult(run)];
+ computeRunResults(category: Category, run: CheckRun) {
+ const noResults = (run.results ?? []).length === 0;
+ if (noResults && category === Category.SUCCESS) {
+ return [this.computeSuccessfulRunResult(run)];
+ }
return (
run.results
?.filter(result => result.category === category)
@@ -1030,7 +1030,7 @@
computeSuccessfulRunResult(run: CheckRun): RunResult {
const adaptedRun: RunResult = {
internalResultId: run.internalRunId + '-0',
- category: Category.INFO, // will not be used, but is required
+ category: Category.SUCCESS,
summary: run.statusDescription ?? '',
...run,
};
diff --git a/polygerrit-ui/app/elements/checks/gr-checks-runs.ts b/polygerrit-ui/app/elements/checks/gr-checks-runs.ts
index de9c5fb..8ff42ee 100644
--- a/polygerrit-ui/app/elements/checks/gr-checks-runs.ts
+++ b/polygerrit-ui/app/elements/checks/gr-checks-runs.ts
@@ -20,10 +20,10 @@
import {
css,
customElement,
- internalProperty,
property,
PropertyValues,
query,
+ state,
} from 'lit-element';
import {GrLitElement} from '../lit/gr-lit-element';
import {Action, Link, RunStatus} from '../../api/checks';
@@ -326,7 +326,7 @@
@query('#filterInput')
filterInput?: HTMLInputElement;
- @internalProperty()
+ @state()
filterRegExp = new RegExp('');
@property()
diff --git a/polygerrit-ui/app/elements/checks/gr-checks-tab.ts b/polygerrit-ui/app/elements/checks/gr-checks-tab.ts
index acabb22..b28596a 100644
--- a/polygerrit-ui/app/elements/checks/gr-checks-tab.ts
+++ b/polygerrit-ui/app/elements/checks/gr-checks-tab.ts
@@ -15,13 +15,7 @@
* limitations under the License.
*/
import {html} from 'lit-html';
-import {
- css,
- customElement,
- internalProperty,
- property,
- PropertyValues,
-} from 'lit-element';
+import {css, customElement, property, PropertyValues, state} from 'lit-element';
import {GrLitElement} from '../lit/gr-lit-element';
import {Action} from '../../api/checks';
import {
@@ -38,7 +32,7 @@
import {ActionTriggeredEvent} from '../../services/checks/checks-util';
import {AttemptSelectedEvent, RunSelectedEvent} from './gr-checks-util';
import {ChecksTabState} from '../../types/events';
-import {fireAlert} from '../../utils/event-util';
+import {fireAlert, fireEvent} from '../../utils/event-util';
import {appContext} from '../../services/app-context';
import {from, timer} from 'rxjs';
import {takeUntil} from 'rxjs/operators';
@@ -64,11 +58,11 @@
@property()
changeNum: NumericChangeId | undefined = undefined;
- @internalProperty()
+ @state()
selectedRuns: string[] = [];
/** Maps checkName to selected attempt number. `undefined` means `latest`. */
- @internalProperty()
+ @state()
selectedAttempts: Map<string, number | undefined> = new Map<
string,
number | undefined
@@ -151,25 +145,24 @@
run?.checkName,
action.name
);
- // Plugins *should* return a promise, but you never know ...
- if (promise?.then) {
- const prefix = `Triggering action '${action.name}'`;
- fireAlert(this, `${prefix} ...`);
- from(promise)
- // If the action takes longer than 5 seconds, then most likely the
- // user is either not interested or the result not relevant anymore.
- .pipe(takeUntil(timer(5000)))
- .subscribe(result => {
- if (result.errorMessage) {
- fireAlert(this, `${prefix} failed with ${result.errorMessage}.`);
- } else {
- fireAlert(this, `${prefix} successful.`);
- this.checksService.reloadForCheck(run?.checkName);
- }
- });
- } else {
- fireAlert(this, `Action '${action.name}' triggered.`);
- }
+ // If plugins return undefined or not a promise, then show no toast.
+ if (!promise?.then) return;
+
+ fireAlert(this, `Triggering action '${action.name}' ...`);
+ from(promise)
+ // If the action takes longer than 5 seconds, then most likely the
+ // user is either not interested or the result not relevant anymore.
+ .pipe(takeUntil(timer(5000)))
+ .subscribe(result => {
+ if (result.errorMessage || result.message) {
+ fireAlert(this, `${result.message ?? result.errorMessage}`);
+ } else {
+ fireEvent(this, 'hide-alert');
+ }
+ if (result.shouldReload) {
+ this.checksService.reloadForCheck(run?.checkName);
+ }
+ });
}
handleRunSelected(e: RunSelectedEvent) {
diff --git a/polygerrit-ui/app/elements/core/gr-navigation/gr-navigation.ts b/polygerrit-ui/app/elements/core/gr-navigation/gr-navigation.ts
index fa81103..2f5eaf2 100644
--- a/polygerrit-ui/app/elements/core/gr-navigation/gr-navigation.ts
+++ b/polygerrit-ui/app/elements/core/gr-navigation/gr-navigation.ts
@@ -130,7 +130,6 @@
name: string;
query: string;
suffixForDashboard?: string;
- attentionSetOnly?: boolean;
selfOnly?: boolean;
hideIfEmpty?: boolean;
assigneeOnly?: boolean;
@@ -165,7 +164,6 @@
query: 'attention:${user}',
hideIfEmpty: false,
suffixForDashboard: 'limit:25',
- attentionSetOnly: true,
};
const ASSIGNED: DashboardSection = {
// Changes that are assigned to the viewed user.
@@ -359,6 +357,13 @@
commit?: CommitId;
options?: GenerateWebLinksOptions;
}
+export interface GenerateWebLinksEditParameters {
+ type: WeblinkType.EDIT;
+ repo: RepoName;
+ commit: CommitId;
+ file: string;
+ options?: GenerateWebLinksOptions;
+}
export interface GenerateWebLinksFileParameters {
type: WeblinkType.FILE;
repo: RepoName;
@@ -375,11 +380,13 @@
export type GenerateWebLinksParameters =
| GenerateWebLinksPatchsetParameters
+ | GenerateWebLinksEditParameters
| GenerateWebLinksFileParameters
| GenerateWebLinksChangeParameters;
export type NavigateCallback = (target: string, redirect?: boolean) => void;
export type GenerateUrlCallback = (params: GenerateUrlParameters) => string;
+// TODO: Refactor to return only GeneratedWebLink[]
export type GenerateWebLinksCallback = (
params: GenerateWebLinksParameters
) => GeneratedWebLink[] | GeneratedWebLink;
@@ -413,6 +420,7 @@
export enum WeblinkType {
CHANGE = 'change',
+ EDIT = 'edit',
FILE = 'file',
PATCHSET = 'patchset',
}
@@ -889,6 +897,24 @@
return this._getUrlFor({view: GerritView.SETTINGS});
},
+ getEditWebLinks(
+ repo: RepoName,
+ commit: CommitId,
+ file: string,
+ options?: GenerateWebLinksOptions
+ ): GeneratedWebLink[] {
+ const params: GenerateWebLinksEditParameters = {
+ type: WeblinkType.EDIT,
+ repo,
+ commit,
+ file,
+ };
+ if (options) {
+ params.options = options;
+ }
+ return ([] as GeneratedWebLink[]).concat(this._generateWeblinks(params));
+ },
+
getFileWebLinks(
repo: RepoName,
commit: CommitId,
@@ -953,11 +979,8 @@
title = '',
config: UserDashboardConfig = {}
): UserDashboard {
- const attentionEnabled =
- config.change && !!config.change.enable_attention_set;
const assigneeEnabled = config.change && !!config.change.enable_assignee;
sections = sections
- .filter(section => attentionEnabled || !section.attentionSetOnly)
.filter(section => assigneeEnabled || !section.assigneeOnly)
.filter(section => user === 'self' || !section.selfOnly)
.map(section => {
diff --git a/polygerrit-ui/app/elements/core/gr-router/gr-router.ts b/polygerrit-ui/app/elements/core/gr-router/gr-router.ts
index 4aefc16..27708ab 100644
--- a/polygerrit-ui/app/elements/core/gr-router/gr-router.ts
+++ b/polygerrit-ui/app/elements/core/gr-router/gr-router.ts
@@ -33,6 +33,7 @@
GenerateUrlRepoViewParameters,
GenerateUrlSearchViewParameters,
GenerateWebLinksChangeParameters,
+ GenerateWebLinksEditParameters,
GenerateWebLinksFileParameters,
GenerateWebLinksParameters,
GenerateWebLinksPatchsetParameters,
@@ -382,6 +383,8 @@
params: GenerateWebLinksParameters
): GeneratedWebLink[] | GeneratedWebLink {
switch (params.type) {
+ case WeblinkType.EDIT:
+ return this._getEditWebLinks(params);
case WeblinkType.FILE:
return this._getFileWebLinks(params);
case WeblinkType.CHANGE:
@@ -457,6 +460,10 @@
);
}
+ _getEditWebLinks(params: GenerateWebLinksEditParameters): GeneratedWebLink[] {
+ return params.options?.weblinks || [];
+ }
+
_getFileWebLinks(params: GenerateWebLinksFileParameters): GeneratedWebLink[] {
return params.options?.weblinks || [];
}
diff --git a/polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api.ts b/polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api.ts
index 8cc7a3f..73afde8 100644
--- a/polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api.ts
+++ b/polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api.ts
@@ -51,6 +51,7 @@
import {appContext} from '../../../services/app-context';
import {CommentSide, Side} from '../../../constants/constants';
import {pluralize} from '../../../utils/string-util';
+import {NormalizedFileInfo} from '../../change/gr-file-list/gr-file-list';
export type CommentIdToCommentThreadMap = {
[urlEncodedCommentId: string]: CommentThread;
@@ -522,6 +523,33 @@
.length;
}
+ computeDraftCountForFile(patchRange?: PatchRange, file?: NormalizedFileInfo) {
+ if (patchRange === undefined || file === undefined) {
+ return 0;
+ }
+ const getCommentForPath = (path?: string) => {
+ if (!path) return 0;
+ return (
+ this.computeDraftCount({
+ patchNum: patchRange.basePatchNum,
+ path,
+ }) +
+ this.computeDraftCount({
+ patchNum: patchRange.patchNum,
+ path,
+ }) +
+ this.computePortedDraftCount(
+ {
+ patchNum: patchRange.patchNum,
+ basePatchNum: patchRange.basePatchNum,
+ },
+ path
+ )
+ );
+ };
+ return getCommentForPath(file.__path) + getCommentForPath(file.old_path);
+ }
+
/**
* @param includeUnmodified Included unmodified status of the file in the
* comment string or not. For files we opt of chip instead of a string.
@@ -537,6 +565,14 @@
if (!patchRange) return '';
const threads = this.getThreadsBySideForFile({path}, patchRange);
+ if (changeFileInfo?.old_path) {
+ threads.push(
+ ...this.getThreadsBySideForFile(
+ {path: changeFileInfo.old_path},
+ patchRange
+ )
+ );
+ }
const commentThreadCount = threads.filter(thread => !isDraftThread(thread))
.length;
const unresolvedCount = threads.reduce((cnt, thread) => {
diff --git a/polygerrit-ui/app/elements/diff/gr-context-controls/gr-context-controls.ts b/polygerrit-ui/app/elements/diff/gr-context-controls/gr-context-controls.ts
new file mode 100644
index 0000000..41a448e
--- /dev/null
+++ b/polygerrit-ui/app/elements/diff/gr-context-controls/gr-context-controls.ts
@@ -0,0 +1,482 @@
+/**
+ * @license
+ * Copyright (C) 2021 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.
+ */
+import '@polymer/paper-button/paper-button';
+import '@polymer/paper-card/paper-card';
+import '@polymer/paper-checkbox/paper-checkbox';
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu';
+import '@polymer/paper-fab/paper-fab';
+import '@polymer/paper-icon-button/paper-icon-button';
+import '@polymer/paper-item/paper-item';
+import '@polymer/paper-listbox/paper-listbox';
+import '@polymer/paper-tooltip/paper-tooltip.js';
+
+import '../../shared/gr-button/gr-button';
+import {pluralize} from '../../../utils/string-util';
+import {fire} from '../../../utils/event-util';
+import {DiffInfo} from '../../../types/diff';
+import {assertIsDefined} from '../../../utils/common-util';
+import {
+ css,
+ customElement,
+ html,
+ LitElement,
+ property,
+ TemplateResult,
+} from 'lit-element';
+
+import {
+ ContextButtonType,
+ RenderPreferences,
+ SyntaxBlock,
+} from '../../../api/diff';
+
+import {GrDiffGroup, hideInContextControl} from '../gr-diff/gr-diff-group';
+
+const PARTIAL_CONTEXT_AMOUNT = 10;
+
+/**
+ * Traverses a hierarchical structure of syntax blocks and
+ * finds the most local/nested block that can be associated line.
+ * It finds the closest block that contains the whole line and
+ * returns the whole path from the syntax layer (blocks) sent as parameter
+ * to the most nested block - the complete path from the top to bottom layer of
+ * a syntax tree. Example: [myNamepace, MyClass, myMethod1, aLocalFunctionInsideMethod1]
+ *
+ * @param lineNum line number for the targeted line.
+ * @param blocks Blocks for a specific syntax level in the file (to allow recursive calls)
+ */
+function findBlockTreePathForLine(
+ lineNum: number,
+ blocks?: SyntaxBlock[]
+): SyntaxBlock[] {
+ const containingBlock = blocks?.find(
+ ({range}) => range.start_line < lineNum && range.end_line > lineNum
+ );
+ if (!containingBlock) return [];
+ const innerPathInChild = findBlockTreePathForLine(
+ lineNum,
+ containingBlock?.children
+ );
+ return [containingBlock].concat(innerPathInChild);
+}
+
+@customElement('gr-context-controls')
+export class GrContextControls extends LitElement {
+ @property({type: Object}) renderPreferences?: RenderPreferences;
+
+ @property({type: Object}) diff?: DiffInfo;
+
+ @property({type: Object}) section?: HTMLElement;
+
+ @property({type: Object}) contextGroups: GrDiffGroup[] = [];
+
+ @property({type: Boolean}) showAbove = false;
+
+ @property({type: Boolean}) showBelow = false;
+
+ static styles = css`
+ :host {
+ display: flex;
+ width: 100%;
+ height: 100%;
+ justify-content: center;
+ position: absolute;
+ }
+ .contextControlButton {
+ background-color: var(--default-button-background-color);
+ font: var(--context-control-button-font, inherit);
+ /* All position is relative to container, so ignore sibling buttons. */
+ position: absolute;
+ }
+ .contextControlButton:first-child {
+ /* First button needs to claim width to display without text wrapping. */
+ position: relative;
+ }
+ .centeredButton {
+ /* Center over divider. */
+ top: 50%;
+ transform: translateY(-50%);
+ }
+ .aboveBelowButtons {
+ display: flex;
+ flex-direction: column;
+ margin-left: var(--spacing-m);
+ position: relative;
+ }
+ .aboveBelowButtons:first-child {
+ margin-left: 0;
+ }
+
+ .aboveButton {
+ /* Display over preceding content / background placeholder. */
+ transform: translateY(-100%);
+ }
+ .belowButton {
+ top: calc(100% + var(--divider-border));
+ }
+ .breadcrumbTooltip {
+ white-space: nowrap;
+ }
+ `;
+
+ // To pass CSS mixins for @apply to Polymer components, they need to be
+ // wrapped in a <custom-style>.
+ static customStyles = html`
+ <custom-style>
+ <style>
+ .centeredButton {
+ --gr-button: {
+ color: var(--diff-context-control-color);
+ border-style: solid;
+ border-color: var(--border-color);
+ border-top-width: 1px;
+ border-right-width: 1px;
+ border-bottom-width: 1px;
+ border-left-width: 1px;
+
+ border-top-left-radius: var(--border-radius);
+ border-top-right-radius: var(--border-radius);
+ border-bottom-right-radius: var(--border-radius);
+ border-bottom-left-radius: var(--border-radius);
+ padding: var(--spacing-s) var(--spacing-l);
+ }
+ }
+ .aboveButton {
+ --gr-button: {
+ color: var(--diff-context-control-color);
+ border-style: solid;
+ border-color: var(--border-color);
+ border-top-width: 1px;
+ border-right-width: 1px;
+ border-bottom-width: 0;
+ border-left-width: 1px;
+
+ border-top-left-radius: var(--border-radius);
+ border-top-right-radius: var(--border-radius);
+ border-bottom-right-radius: 0;
+ border-bottom-left-radius: var(--border-radius);
+ padding: var(--spacing-xxs) var(--spacing-l);
+ }
+ }
+ .belowButton {
+ --gr-button: {
+ color: var(--diff-context-control-color);
+ border-style: solid;
+ border-color: var(--border-color);
+ border-top-width: 0;
+ border-right-width: 1px;
+ border-bottom-width: 1px;
+ border-left-width: 1px;
+
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+ border-bottom-right-radius: var(--border-radius);
+ border-bottom-left-radius: var(--border-radius);
+ padding: var(--spacing-xxs) var(--spacing-l);
+ }
+ }
+ </style>
+ </custom-style>
+ `;
+
+ private numLines() {
+ const {leftStart, leftEnd} = this.contextRange();
+ return leftEnd - leftStart + 1;
+ }
+
+ private createExpandAllButtonContainer() {
+ return html` <div
+ class="style-scope gr-diff aboveBelowButtons fullExpansion"
+ >
+ ${this.createContextButton(ContextButtonType.ALL, this.numLines())}
+ </div>`;
+ }
+
+ /**
+ * Creates a specific expansion button (e.g. +X common lines, +10, +Block).
+ */
+ private createContextButton(
+ type: ContextButtonType,
+ linesToExpand: number,
+ tooltip?: TemplateResult
+ ) {
+ let text = '';
+ let groups: GrDiffGroup[] = []; // The groups that replace this one if tapped.
+ let ariaLabel = '';
+ let classes = 'contextControlButton showContext ';
+
+ if (type === ContextButtonType.ALL) {
+ text = `+${pluralize(linesToExpand, 'common line')}`;
+ ariaLabel = `Show ${pluralize(linesToExpand, 'common line')}`;
+ classes +=
+ this.showAbove && this.showBelow
+ ? 'centeredButton'
+ : this.showAbove
+ ? 'aboveButton'
+ : 'belowButton';
+ if (this.partialContent) {
+ // Expanding content would require load of more data
+ text += ' (too large)';
+ }
+ groups.push(...this.contextGroups);
+ } else if (type === ContextButtonType.ABOVE) {
+ groups = hideInContextControl(
+ this.contextGroups,
+ linesToExpand,
+ this.numLines()
+ );
+ text = `+${linesToExpand}`;
+ classes += 'aboveButton';
+ ariaLabel = `Show ${pluralize(linesToExpand, 'line')} above`;
+ } else if (type === ContextButtonType.BELOW) {
+ groups = hideInContextControl(
+ this.contextGroups,
+ 0,
+ this.numLines() - linesToExpand
+ );
+ text = `+${linesToExpand}`;
+ classes += 'belowButton';
+ ariaLabel = `Show ${pluralize(linesToExpand, 'line')} below`;
+ } else if (type === ContextButtonType.BLOCK_ABOVE) {
+ groups = hideInContextControl(
+ this.contextGroups,
+ linesToExpand,
+ this.numLines()
+ );
+ text = '+Block';
+ classes += 'aboveButton';
+ ariaLabel = 'Show block above';
+ } else if (type === ContextButtonType.BLOCK_BELOW) {
+ groups = hideInContextControl(
+ this.contextGroups,
+ 0,
+ this.numLines() - linesToExpand
+ );
+ text = '+Block';
+ classes += 'belowButton';
+ ariaLabel = 'Show block below';
+ }
+ const expandHandler = this.createExpansionHandler(
+ linesToExpand,
+ type,
+ groups
+ );
+
+ const button = html` <gr-button
+ class="${classes}"
+ link="true"
+ no-uppercase="true"
+ aria-label="${ariaLabel}"
+ @click="${expandHandler}"
+ >
+ <span class="showContext">${text}</span>
+ ${tooltip}
+ </gr-button>`;
+ return button;
+ }
+
+ private createExpansionHandler(
+ linesToExpand: number,
+ type: ContextButtonType,
+ groups: GrDiffGroup[]
+ ) {
+ return (e: Event) => {
+ e.stopPropagation();
+ if (type === ContextButtonType.ALL && this.partialContent) {
+ const {leftStart, leftEnd, rightStart, rightEnd} = this.contextRange();
+ const lineRange = {
+ left: {
+ start_line: leftStart,
+ end_line: leftEnd,
+ },
+ right: {
+ start_line: rightStart,
+ end_line: rightEnd,
+ },
+ };
+ fire(this, 'content-load-needed', {
+ lineRange,
+ });
+ } else {
+ assertIsDefined(this.section, 'section');
+ fire(this, 'diff-context-expanded', {
+ groups,
+ section: this.section!,
+ numLines: this.numLines(),
+ buttonType: type,
+ expandedLines: linesToExpand,
+ });
+ }
+ };
+ }
+
+ private showPartialLinks() {
+ return this.numLines() > PARTIAL_CONTEXT_AMOUNT;
+ }
+
+ /**
+ * Creates a container div with partial (+10) expansion buttons (above and/or below).
+ */
+ private createPartialExpansionButtons() {
+ if (!this.showPartialLinks()) {
+ return undefined;
+ }
+ let aboveButton;
+ let belowButton;
+ if (this.showAbove) {
+ aboveButton = this.createContextButton(
+ ContextButtonType.ABOVE,
+ PARTIAL_CONTEXT_AMOUNT
+ );
+ }
+ if (this.showBelow) {
+ belowButton = this.createContextButton(
+ ContextButtonType.BELOW,
+ PARTIAL_CONTEXT_AMOUNT
+ );
+ }
+ return aboveButton || belowButton
+ ? html` <div class="aboveBelowButtons partialExpansion">
+ ${aboveButton} ${belowButton}
+ </div>`
+ : undefined;
+ }
+
+ /**
+ * Checks if the collapsed section contains unavailable content (skip chunks).
+ */
+ private get partialContent() {
+ return this.contextGroups.some(c => !!c.skip);
+ }
+
+ /**
+ * Creates a container div with block expansion buttons (above and/or below).
+ */
+ private createBlockExpansionButtons() {
+ if (
+ !this.showPartialLinks() ||
+ !this.renderPreferences?.use_block_expansion ||
+ this.partialContent
+ ) {
+ return undefined;
+ }
+ let aboveBlockButton;
+ let belowBlockButton;
+ if (this.showAbove) {
+ aboveBlockButton = this.createBlockButton(
+ ContextButtonType.BLOCK_ABOVE,
+ this.numLines(),
+ this.contextRange().rightStart - 1
+ );
+ }
+ if (this.showBelow) {
+ belowBlockButton = this.createBlockButton(
+ ContextButtonType.BLOCK_BELOW,
+ this.numLines(),
+ this.contextRange().rightEnd + 1
+ );
+ }
+ if (aboveBlockButton || belowBlockButton) {
+ return html` <div class="aboveBelowButtons blockExpansion">
+ ${aboveBlockButton} ${belowBlockButton}
+ </div>`;
+ }
+ return undefined;
+ }
+
+ private createBlockButtonTooltip(
+ buttonType: ContextButtonType,
+ syntaxPath: SyntaxBlock[],
+ linesToExpand: number
+ ) {
+ // Create breadcrumb string:
+ // myNamepace > MyClass > myMethod1 > aLocalFunctionInsideMethod1 > (anonymous)
+ const tooltipText = syntaxPath.length
+ ? syntaxPath.map(b => b.name || '(anonymous)').join(' > ')
+ : `${linesToExpand} common lines`;
+
+ const position =
+ buttonType === ContextButtonType.BLOCK_ABOVE ? 'top' : 'bottom';
+ return html`<paper-tooltip offset="10" position="${position}"
+ ><div class="breadcrumbTooltip">${tooltipText}</div></paper-tooltip
+ >`;
+ }
+
+ private createBlockButton(
+ buttonType: ContextButtonType,
+ numLines: number,
+ referenceLine: number
+ ) {
+ assertIsDefined(this.diff, 'diff');
+ const syntaxTree = this.diff!.meta_b.syntax_tree;
+ const outlineSyntaxPath = findBlockTreePathForLine(
+ referenceLine,
+ syntaxTree
+ );
+ let linesToExpand = numLines;
+ if (outlineSyntaxPath.length) {
+ const {range} = outlineSyntaxPath[outlineSyntaxPath.length - 1];
+ const targetLine =
+ buttonType === ContextButtonType.BLOCK_ABOVE
+ ? range.end_line
+ : range.start_line;
+ const distanceToTargetLine = Math.abs(targetLine - referenceLine);
+ if (distanceToTargetLine < numLines) {
+ linesToExpand = distanceToTargetLine;
+ }
+ }
+ const tooltip = this.createBlockButtonTooltip(
+ buttonType,
+ outlineSyntaxPath,
+ linesToExpand
+ );
+ return this.createContextButton(buttonType, linesToExpand, tooltip);
+ }
+
+ private contextRange() {
+ return {
+ leftStart: this.contextGroups[0].lineRange.left.start_line,
+ leftEnd: this.contextGroups[this.contextGroups.length - 1].lineRange.left
+ .end_line,
+ rightStart: this.contextGroups[0].lineRange.right.start_line,
+ rightEnd: this.contextGroups[this.contextGroups.length - 1].lineRange
+ .right.end_line,
+ };
+ }
+
+ private hasValidProperties() {
+ return !!(this.diff && this.section && this.contextGroups?.length);
+ }
+
+ render() {
+ if (!this.hasValidProperties()) {
+ console.error('Invalid properties for gr-context-controls!');
+ return html`<p>invalid properties</p>`;
+ }
+ return html`
+ ${GrContextControls.customStyles} ${this.createExpandAllButtonContainer()}
+ ${this.createPartialExpansionButtons()}
+ ${this.createBlockExpansionButtons()}
+ `;
+ }
+}
+
+declare global {
+ interface HTMLElementTagNameMap {
+ 'gr-context-controls': GrContextControls;
+ }
+}
diff --git a/polygerrit-ui/app/elements/diff/gr-context-controls/gr-context-controls_test.ts b/polygerrit-ui/app/elements/diff/gr-context-controls/gr-context-controls_test.ts
new file mode 100644
index 0000000..f59b19d
--- /dev/null
+++ b/polygerrit-ui/app/elements/diff/gr-context-controls/gr-context-controls_test.ts
@@ -0,0 +1,386 @@
+/**
+ * @license
+ * Copyright (C) 2021 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.
+ */
+
+import '../../../test/common-test-setup-karma';
+import '../gr-diff/gr-diff-group';
+import './gr-context-controls';
+import {GrContextControls} from './gr-context-controls';
+import {flush} from '@polymer/polymer/lib/legacy/polymer.dom';
+
+import {GrDiffLine, GrDiffLineType} from '../gr-diff/gr-diff-line';
+import {GrDiffGroup, GrDiffGroupType} from '../gr-diff/gr-diff-group';
+import {DiffFileMetaInfo, DiffInfo, SyntaxBlock} from '../../../api/diff';
+
+const blankFixture = fixtureFromElement('div');
+
+suite('gr-context-control tests', () => {
+ let element: GrContextControls;
+
+ setup(async () => {
+ element = document.createElement('gr-context-controls');
+ element.diff = ({content: []} as any) as DiffInfo;
+ element.renderPreferences = {};
+ element.section = document.createElement('div');
+ blankFixture.instantiate().appendChild(element);
+ await flush();
+ });
+
+ function createContextGroups(options: {offset?: number; count?: number}) {
+ const offset = options.offset || 0;
+ const numLines = options.count || 10;
+ const lines = [];
+ for (let i = 0; i < numLines; i++) {
+ const line = new GrDiffLine(GrDiffLineType.BOTH);
+ line.beforeNumber = offset + i + 1;
+ line.afterNumber = offset + i + 1;
+ line.text = 'lorem upsum';
+ lines.push(line);
+ }
+
+ return [new GrDiffGroup(GrDiffGroupType.BOTH, lines)];
+ }
+
+ test('no +10 buttons for 10 or less lines', async () => {
+ element.contextGroups = createContextGroups({count: 10});
+
+ await flush();
+
+ const buttons = element.shadowRoot!.querySelectorAll(
+ 'gr-button.showContext'
+ );
+ assert.equal(buttons.length, 1);
+ assert.equal(buttons[0].textContent!.trim(), '+10 common lines');
+ });
+
+ test('context control at the top', async () => {
+ element.contextGroups = createContextGroups({offset: 0, count: 20});
+ element.showBelow = true;
+
+ await flush();
+
+ const buttons = element.shadowRoot!.querySelectorAll(
+ 'gr-button.showContext'
+ );
+
+ assert.equal(buttons.length, 2);
+ assert.equal(buttons[0].textContent!.trim(), '+20 common lines');
+ assert.equal(buttons[1].textContent!.trim(), '+10');
+
+ assert.include([...buttons[0].classList.values()], 'belowButton');
+ assert.include([...buttons[1].classList.values()], 'belowButton');
+ });
+
+ test('context control in the middle', async () => {
+ element.contextGroups = createContextGroups({offset: 10, count: 20});
+ element.showAbove = true;
+ element.showBelow = true;
+
+ await flush();
+
+ const buttons = element.shadowRoot!.querySelectorAll(
+ 'gr-button.showContext'
+ );
+
+ assert.equal(buttons.length, 3);
+ assert.equal(buttons[0].textContent!.trim(), '+20 common lines');
+ assert.equal(buttons[1].textContent!.trim(), '+10');
+ assert.equal(buttons[2].textContent!.trim(), '+10');
+
+ assert.include([...buttons[0].classList.values()], 'centeredButton');
+ assert.include([...buttons[1].classList.values()], 'aboveButton');
+ assert.include([...buttons[2].classList.values()], 'belowButton');
+ });
+
+ test('context control at the bottom', async () => {
+ element.contextGroups = createContextGroups({offset: 30, count: 20});
+ element.showAbove = true;
+
+ await flush();
+
+ const buttons = element.shadowRoot!.querySelectorAll(
+ 'gr-button.showContext'
+ );
+
+ assert.equal(buttons.length, 2);
+ assert.equal(buttons[0].textContent!.trim(), '+20 common lines');
+ assert.equal(buttons[1].textContent!.trim(), '+10');
+
+ assert.include([...buttons[0].classList.values()], 'aboveButton');
+ assert.include([...buttons[1].classList.values()], 'aboveButton');
+ });
+
+ function prepareForBlockExpansion(syntaxTree: SyntaxBlock[]) {
+ element.renderPreferences!.use_block_expansion = true;
+ element.diff!.meta_b = ({
+ syntax_tree: syntaxTree,
+ } as any) as DiffFileMetaInfo;
+ }
+
+ test('context control with block expansion at the top', async () => {
+ prepareForBlockExpansion([]);
+ element.contextGroups = createContextGroups({offset: 0, count: 20});
+ element.showBelow = true;
+
+ await flush();
+
+ const fullExpansionButtons = element.shadowRoot!.querySelectorAll(
+ '.fullExpansion gr-button'
+ );
+ const partialExpansionButtons = element.shadowRoot!.querySelectorAll(
+ '.partialExpansion gr-button'
+ );
+ const blockExpansionButtons = element.shadowRoot!.querySelectorAll(
+ '.blockExpansion gr-button'
+ );
+ assert.equal(fullExpansionButtons.length, 1);
+ assert.equal(partialExpansionButtons.length, 1);
+ assert.equal(blockExpansionButtons.length, 1);
+ assert.equal(
+ blockExpansionButtons[0].querySelector('span')!.textContent!.trim(),
+ '+Block'
+ );
+ assert.include(
+ [...blockExpansionButtons[0].classList.values()],
+ 'belowButton'
+ );
+ });
+
+ test('context control with block expansion in the middle', async () => {
+ prepareForBlockExpansion([]);
+ element.contextGroups = createContextGroups({offset: 10, count: 20});
+ element.showAbove = true;
+ element.showBelow = true;
+
+ await flush();
+
+ const fullExpansionButtons = element.shadowRoot!.querySelectorAll(
+ '.fullExpansion gr-button'
+ );
+ const partialExpansionButtons = element.shadowRoot!.querySelectorAll(
+ '.partialExpansion gr-button'
+ );
+ const blockExpansionButtons = element.shadowRoot!.querySelectorAll(
+ '.blockExpansion gr-button'
+ );
+ assert.equal(fullExpansionButtons.length, 1);
+ assert.equal(partialExpansionButtons.length, 2);
+ assert.equal(blockExpansionButtons.length, 2);
+ assert.equal(
+ blockExpansionButtons[0].querySelector('span')!.textContent!.trim(),
+ '+Block'
+ );
+ assert.equal(
+ blockExpansionButtons[1].querySelector('span')!.textContent!.trim(),
+ '+Block'
+ );
+ assert.include(
+ [...blockExpansionButtons[0].classList.values()],
+ 'aboveButton'
+ );
+ assert.include(
+ [...blockExpansionButtons[1].classList.values()],
+ 'belowButton'
+ );
+ });
+
+ test('context control with block expansion at the bottom', async () => {
+ prepareForBlockExpansion([]);
+ element.contextGroups = createContextGroups({offset: 30, count: 20});
+ element.showAbove = true;
+
+ await flush();
+
+ const fullExpansionButtons = element.shadowRoot!.querySelectorAll(
+ '.fullExpansion gr-button'
+ );
+ const partialExpansionButtons = element.shadowRoot!.querySelectorAll(
+ '.partialExpansion gr-button'
+ );
+ const blockExpansionButtons = element.shadowRoot!.querySelectorAll(
+ '.blockExpansion gr-button'
+ );
+ assert.equal(fullExpansionButtons.length, 1);
+ assert.equal(partialExpansionButtons.length, 1);
+ assert.equal(blockExpansionButtons.length, 1);
+ assert.equal(
+ blockExpansionButtons[0].querySelector('span')!.textContent!.trim(),
+ '+Block'
+ );
+ assert.include(
+ [...blockExpansionButtons[0].classList.values()],
+ 'aboveButton'
+ );
+ });
+
+ test('+ Block tooltip tooltip shows syntax block containing the target lines above and below', async () => {
+ prepareForBlockExpansion([
+ {
+ name: 'aSpecificFunction',
+ range: {start_line: 1, start_column: 0, end_line: 25, end_column: 0},
+ children: [],
+ },
+ {
+ name: 'anotherFunction',
+ range: {start_line: 26, start_column: 0, end_line: 50, end_column: 0},
+ children: [],
+ },
+ ]);
+ element.contextGroups = createContextGroups({offset: 10, count: 20});
+ element.showAbove = true;
+ element.showBelow = true;
+
+ await flush();
+
+ const blockExpansionButtons = element.shadowRoot!.querySelectorAll(
+ '.blockExpansion gr-button'
+ );
+ assert.equal(
+ blockExpansionButtons[0]
+ .querySelector('.breadcrumbTooltip')!
+ .textContent?.trim(),
+ 'aSpecificFunction'
+ );
+ assert.equal(
+ blockExpansionButtons[1]
+ .querySelector('.breadcrumbTooltip')!
+ .textContent?.trim(),
+ 'anotherFunction'
+ );
+ });
+
+ test('+Block tooltip shows nested syntax blocks as breadcrumbs', async () => {
+ prepareForBlockExpansion([
+ {
+ name: 'aSpecificNamespace',
+ range: {start_line: 1, start_column: 0, end_line: 200, end_column: 0},
+ children: [
+ {
+ name: 'MyClass',
+ range: {
+ start_line: 2,
+ start_column: 0,
+ end_line: 100,
+ end_column: 0,
+ },
+ children: [
+ {
+ name: 'aMethod',
+ range: {
+ start_line: 5,
+ start_column: 0,
+ end_line: 80,
+ end_column: 0,
+ },
+ children: [],
+ },
+ ],
+ },
+ ],
+ },
+ ]);
+ element.contextGroups = createContextGroups({offset: 10, count: 20});
+ element.showAbove = true;
+ element.showBelow = true;
+
+ await flush();
+
+ const blockExpansionButtons = element.shadowRoot!.querySelectorAll(
+ '.blockExpansion gr-button'
+ );
+ assert.equal(
+ blockExpansionButtons[0]
+ .querySelector('.breadcrumbTooltip')!
+ .textContent?.trim(),
+ 'aSpecificNamespace > MyClass > aMethod'
+ );
+ });
+
+ test('+Block tooltip shows (anonymous) for empty blocks', async () => {
+ prepareForBlockExpansion([
+ {
+ name: 'aSpecificNamespace',
+ range: {start_line: 1, start_column: 0, end_line: 200, end_column: 0},
+ children: [
+ {
+ name: '',
+ range: {
+ start_line: 2,
+ start_column: 0,
+ end_line: 100,
+ end_column: 0,
+ },
+ children: [
+ {
+ name: 'aMethod',
+ range: {
+ start_line: 5,
+ start_column: 0,
+ end_line: 80,
+ end_column: 0,
+ },
+ children: [],
+ },
+ ],
+ },
+ ],
+ },
+ ]);
+ element.contextGroups = createContextGroups({offset: 10, count: 20});
+ element.showAbove = true;
+ element.showBelow = true;
+ await flush();
+
+ const blockExpansionButtons = element.shadowRoot!.querySelectorAll(
+ '.blockExpansion gr-button'
+ );
+ assert.equal(
+ blockExpansionButtons[0]
+ .querySelector('.breadcrumbTooltip')!
+ .textContent?.trim(),
+ 'aSpecificNamespace > (anonymous) > aMethod'
+ );
+ });
+
+ test('+Block tooltip shows "all common lines" for empty syntax tree', async () => {
+ prepareForBlockExpansion([]);
+
+ element.contextGroups = createContextGroups({offset: 10, count: 20});
+ element.showAbove = true;
+ element.showBelow = true;
+ await flush();
+
+ const blockExpansionButtons = element.shadowRoot!.querySelectorAll(
+ '.blockExpansion gr-button'
+ );
+ const tooltipAbove = blockExpansionButtons[0].querySelector(
+ 'paper-tooltip'
+ )!;
+ const tooltipBelow = blockExpansionButtons[1].querySelector(
+ 'paper-tooltip'
+ )!;
+ assert.equal(
+ tooltipAbove.querySelector('.breadcrumbTooltip')!.textContent?.trim(),
+ '20 common lines'
+ );
+ assert.equal(
+ tooltipBelow.querySelector('.breadcrumbTooltip')!.textContent?.trim(),
+ '20 common lines'
+ );
+ assert.equal(tooltipAbove!.getAttribute('position'), 'top');
+ assert.equal(tooltipBelow!.getAttribute('position'), 'bottom');
+ });
+});
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder-element_test.js b/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder-element_test.js
index 7c01a95..4455bd5 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder-element_test.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder-element_test.js
@@ -18,6 +18,7 @@
import '../../../test/common-test-setup-karma.js';
import '../gr-diff/gr-diff-group.js';
import './gr-diff-builder.js';
+import '../gr-context-controls/gr-context-controls.js';
import {getMockDiffResponse} from '../../../test/mocks/diff-response.js';
import './gr-diff-builder-element.js';
import {stubBaseUrl} from '../../../test/test-utils.js';
@@ -74,83 +75,6 @@
assert.isTrue(node.classList.contains('classes'));
});
- suite('context control', () => {
- function createContextGroups(options) {
- const offset = options.offset || 0;
- const numLines = options.count || 10;
- const lines = [];
- for (let i = 0; i < numLines; i++) {
- const line = new GrDiffLine(GrDiffLineType.BOTH);
- line.beforeNumber = offset + i + 1;
- line.afterNumber = offset + i + 1;
- line.text = 'lorem upsum';
- lines.push(line);
- }
-
- return [new GrDiffGroup(GrDiffGroupType.BOTH, lines)];
- }
-
- function createContextSectionForGroups(options) {
- const section = document.createElement('div');
- builder._createContextControls(
- section, createContextGroups(options), DiffViewMode.UNIFIED);
- return section;
- }
-
- setup(() => {
- builder = new GrDiffBuilder({content: []}, prefs, null, []);
- });
-
- test('no +10 buttons for 10 or less lines', () => {
- const section = createContextSectionForGroups({count: 10});
- const buttons = section.querySelectorAll('gr-button.showContext');
-
- assert.equal(buttons.length, 1);
- assert.equal(buttons[0].textContent, '+10 common lines');
- });
-
- test('context control at the top', () => {
- builder._numLinesLeft = 50;
- const section = createContextSectionForGroups({offset: 0, count: 20});
- const buttons = section.querySelectorAll('gr-button.showContext');
-
- assert.equal(buttons.length, 2);
- assert.equal(buttons[0].textContent, '+20 common lines');
- assert.equal(buttons[1].textContent, '+10');
-
- assert.include([...buttons[0].classList.values()], 'belowButton');
- assert.include([...buttons[1].classList.values()], 'belowButton');
- });
-
- test('context control in the middle', () => {
- builder._numLinesLeft = 50;
- const section = createContextSectionForGroups({offset: 10, count: 20});
- const buttons = section.querySelectorAll('gr-button.showContext');
-
- assert.equal(buttons.length, 3);
- assert.equal(buttons[0].textContent, '+20 common lines');
- assert.equal(buttons[1].textContent, '+10');
- assert.equal(buttons[2].textContent, '+10');
-
- assert.include([...buttons[0].classList.values()], 'centeredButton');
- assert.include([...buttons[1].classList.values()], 'aboveButton');
- assert.include([...buttons[2].classList.values()], 'belowButton');
- });
-
- test('context control at the bottom', () => {
- builder._numLinesLeft = 50;
- const section = createContextSectionForGroups({offset: 30, count: 20});
- const buttons = section.querySelectorAll('gr-button.showContext');
-
- assert.equal(buttons.length, 2);
- assert.equal(buttons[0].textContent, '+20 common lines');
- assert.equal(buttons[1].textContent, '+10');
-
- assert.include([...buttons[0].classList.values()], 'aboveButton');
- assert.include([...buttons[1].classList.values()], 'aboveButton');
- });
- });
-
test('newlines 1', () => {
let text = 'abcdef';
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder.ts b/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder.ts
index 65c991c..0ccf8bc 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder.ts
+++ b/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder.ts
@@ -16,24 +16,20 @@
*/
import {
ContentLoadNeededEventDetail,
- ContextButtonType,
DiffContextExpandedExternalDetail,
MovedLinkClickedEventDetail,
RenderPreferences,
} from '../../../api/diff';
import {getBaseUrl} from '../../../utils/url-util';
import {GrDiffLine, GrDiffLineType, LineNumber} from '../gr-diff/gr-diff-line';
-import {
- GrDiffGroup,
- GrDiffGroupType,
- hideInContextControl,
-} from '../gr-diff/gr-diff-group';
+import {GrDiffGroup, GrDiffGroupType} from '../gr-diff/gr-diff-group';
+
+import '../gr-context-controls/gr-context-controls';
+import {GrContextControls} from '../gr-context-controls/gr-context-controls';
import {BlameInfo} from '../../../types/common';
import {DiffInfo, DiffPreferencesInfo} from '../../../types/diff';
import {DiffViewMode, Side} from '../../../constants/constants';
import {DiffLayer} from '../../../types/types';
-import {pluralize} from '../../../utils/string-util';
-import {fire} from '../../../utils/event-util';
/**
* In JS, unicode code points above 0xFFFF occupy two elements of a string.
@@ -57,8 +53,6 @@
*/
const REGEX_TAB_OR_SURROGATE_PAIR = /\t|[\uD800-\uDBFF][\uDC00-\uDFFF]/;
-const PARTIAL_CONTEXT_AMOUNT = 10;
-
export interface DiffContextExpandedEventDetail
extends DiffContextExpandedExternalDetail {
groups: GrDiffGroup[];
@@ -314,10 +308,6 @@
const leftStart = contextGroups[0].lineRange.left.start_line;
const leftEnd =
contextGroups[contextGroups.length - 1].lineRange.left.end_line;
- const numLines = leftEnd - leftStart + 1;
-
- if (numLines === 0) console.error('context group without lines');
-
const firstGroupIsSkipped = !!contextGroups[0].skip;
const lastGroupIsSkipped = !!contextGroups[contextGroups.length - 1].skip;
@@ -334,8 +324,7 @@
section,
contextGroups,
showAbove,
- showBelow,
- numLines
+ showBelow
)
);
if (showBelow) {
@@ -353,8 +342,7 @@
section: HTMLElement,
contextGroups: GrDiffGroup[],
showAbove: boolean,
- showBelow: boolean,
- numLines: number
+ showBelow: boolean
): HTMLElement {
const row = this._createElement('tr', 'contextDivider');
if (!(showAbove && showBelow)) {
@@ -364,50 +352,16 @@
const element = this._createElement('td', 'dividerCell');
row.appendChild(element);
- const showAllContainer = this._createElement('div', 'aboveBelowButtons');
- element.appendChild(showAllContainer);
-
- const showAllButton = this._createContextButton(
- ContextButtonType.ALL,
- section,
- contextGroups,
- numLines
- );
- showAllButton.classList.add(
- showAbove && showBelow
- ? 'centeredButton'
- : showAbove
- ? 'aboveButton'
- : 'belowButton'
- );
- showAllContainer.appendChild(showAllButton);
-
- const showPartialLinks = numLines > PARTIAL_CONTEXT_AMOUNT;
- if (showPartialLinks) {
- const container = this._createElement('div', 'aboveBelowButtons');
- if (showAbove) {
- container.appendChild(
- this._createContextButton(
- ContextButtonType.ABOVE,
- section,
- contextGroups,
- numLines
- )
- );
- }
- if (showBelow) {
- container.appendChild(
- this._createContextButton(
- ContextButtonType.BELOW,
- section,
- contextGroups,
- numLines
- )
- );
- }
- element.appendChild(container);
- }
-
+ const contextControls = this._createElement(
+ 'gr-context-controls'
+ ) as GrContextControls;
+ contextControls.diff = this._diff;
+ contextControls.renderPreferences = this._renderPrefs;
+ contextControls.section = section;
+ contextControls.contextGroups = contextGroups;
+ contextControls.showAbove = showAbove;
+ contextControls.showBelow = showBelow;
+ element.appendChild(contextControls);
return row;
}
@@ -439,90 +393,6 @@
return row;
}
- _createContextButton(
- type: ContextButtonType,
- section: HTMLElement,
- contextGroups: GrDiffGroup[],
- numLines: number
- ) {
- const linesToExpand =
- type === ContextButtonType.ALL ? numLines : PARTIAL_CONTEXT_AMOUNT;
- const button = this._createElement('gr-button', 'showContext');
- button.classList.add('contextControlButton');
- button.setAttribute('link', 'true');
- button.setAttribute('no-uppercase', 'true');
-
- let text = '';
- let groups: GrDiffGroup[] = []; // The groups that replace this one if tapped.
- let requiresLoad = false;
- if (type === ContextButtonType.ALL) {
- text = `+${pluralize(linesToExpand, 'common line')}`;
- button.setAttribute(
- 'aria-label',
- `Show ${pluralize(linesToExpand, 'common line')}`
- );
- requiresLoad = contextGroups.find(c => !!c.skip) !== undefined;
- if (requiresLoad) {
- // Expanding content would require load of more data
- text += ' (too large)';
- }
- groups.push(...contextGroups);
- } else if (type === ContextButtonType.ABOVE) {
- groups = hideInContextControl(contextGroups, linesToExpand, numLines);
- text = `+${linesToExpand}`;
- button.classList.add('aboveButton');
- button.setAttribute(
- 'aria-label',
- `Show ${pluralize(linesToExpand, 'line')} above`
- );
- } else if (type === ContextButtonType.BELOW) {
- groups = hideInContextControl(contextGroups, 0, numLines - linesToExpand);
- text = `+${linesToExpand}`;
- button.classList.add('belowButton');
- button.setAttribute(
- 'aria-label',
- `Show ${pluralize(linesToExpand, 'line')} below`
- );
- }
- const textSpan = this._createElement('span', 'showContext');
- textSpan.textContent = text;
- button.appendChild(textSpan);
-
- if (requiresLoad) {
- button.addEventListener('click', e => {
- e.stopPropagation();
- const firstRange = groups[0].lineRange;
- const lastRange = groups[groups.length - 1].lineRange;
- const lineRange = {
- left: {
- start_line: firstRange.left.start_line,
- end_line: lastRange.left.end_line,
- },
- right: {
- start_line: firstRange.right.start_line,
- end_line: lastRange.right.end_line,
- },
- };
- fire(button, 'content-load-needed', {
- lineRange,
- });
- });
- } else {
- button.addEventListener('click', e => {
- e.stopPropagation();
- fire(button, 'diff-context-expanded', {
- groups,
- section,
- numLines,
- buttonType: type,
- expandedLines: linesToExpand,
- });
- });
- }
-
- return button;
- }
-
_createLineEl(
line: GrDiffLine,
number: LineNumber,
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-cursor/gr-diff-cursor_test.js b/polygerrit-ui/app/elements/diff/gr-diff-cursor/gr-diff-cursor_test.js
index 75439c8..901f72a 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-cursor/gr-diff-cursor_test.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-cursor/gr-diff-cursor_test.js
@@ -617,6 +617,7 @@
test('expand context updates stops', done => {
sinon.spy(cursorElement, '_updateStops');
MockInteractions.tap(diffElement.shadowRoot
+ .querySelector('gr-context-controls').shadowRoot
.querySelector('.showContext'));
flush(() => {
assert.isTrue(cursorElement._updateStops.called);
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host.ts b/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host.ts
index 6f34067..09e9d7c 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host.ts
+++ b/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host.ts
@@ -18,7 +18,10 @@
import '../gr-diff/gr-diff';
import {PolymerElement} from '@polymer/polymer/polymer-element';
import {htmlTemplate} from './gr-diff-host_html';
-import {GerritNav} from '../../core/gr-navigation/gr-navigation';
+import {
+ GerritNav,
+ GeneratedWebLink,
+} from '../../core/gr-navigation/gr-navigation';
import {
getLine,
getRange,
@@ -188,6 +191,9 @@
commitRange?: CommitRange;
@property({type: Object, notify: true})
+ editWeblinks?: GeneratedWebLink[];
+
+ @property({type: Object, notify: true})
filesWeblinks: FilesWebLinks | {} = {};
@property({type: Boolean, reflectToAttribute: true})
@@ -372,6 +378,7 @@
// Not waiting for coverage ranges intentionally as
// plugin loading should not block the content rendering
+ this.editWeblinks = this._getEditWeblinks(diff);
this.filesWeblinks = this._getFilesWeblinks(diff);
this.diff = diff;
const event = (await waitForEventOnce(this, 'render')) as CustomEvent;
@@ -487,6 +494,16 @@
});
}
+ _getEditWeblinks(diff: DiffInfo) {
+ if (!this.projectName || !this.commitRange || !this.path) return undefined;
+ return GerritNav.getEditWebLinks(
+ this.projectName,
+ this.commitRange.baseCommit,
+ this.path,
+ {weblinks: diff?.edit_web_links}
+ );
+ }
+
_getFilesWeblinks(diff: DiffInfo) {
if (!this.projectName || !this.commitRange || !this.path) return {};
return {
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host_test.js b/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host_test.js
index 5e1b5ff..6c96e34 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host_test.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host_test.js
@@ -211,7 +211,7 @@
assert.isTrue(cancelStub.called);
});
- test('reload() loads files weblinks', () => {
+ test('reload() loads files weblinks', async () => {
element.change = createChange();
const weblinksStub = sinon.stub(GerritNav, '_generateWeblinks')
.returns({name: 'stubb', url: '#s'});
@@ -222,28 +222,40 @@
element.path = 'test-path';
element.commitRange = {baseCommit: 'test-base', commit: 'test-commit'};
element.patchRange = {};
- return element.reload().then(() => {
- assert.isTrue(weblinksStub.calledTwice);
- assert.isTrue(weblinksStub.firstCall.calledWith({
- commit: 'test-base',
- file: 'test-path',
- options: {
- weblinks: undefined,
- },
- repo: 'test-project',
- type: GerritNav.WeblinkType.FILE}));
- assert.isTrue(weblinksStub.secondCall.calledWith({
- commit: 'test-commit',
- file: 'test-path',
- options: {
- weblinks: undefined,
- },
- repo: 'test-project',
- type: GerritNav.WeblinkType.FILE}));
- assert.deepEqual(element.filesWeblinks, {
- meta_a: [{name: 'stubb', url: '#s'}],
- meta_b: [{name: 'stubb', url: '#s'}],
- });
+
+ await element.reload();
+
+ assert.equal(weblinksStub.callCount, 3);
+ assert.deepEqual(weblinksStub.firstCall.args[0], {
+ commit: 'test-base',
+ file: 'test-path',
+ options: {
+ weblinks: undefined,
+ },
+ repo: 'test-project',
+ type: GerritNav.WeblinkType.EDIT});
+ assert.deepEqual(element.editWeblinks, [{
+ name: 'stubb', url: '#s',
+ }]);
+ assert.deepEqual(weblinksStub.secondCall.args[0], {
+ commit: 'test-base',
+ file: 'test-path',
+ options: {
+ weblinks: undefined,
+ },
+ repo: 'test-project',
+ type: GerritNav.WeblinkType.FILE});
+ assert.deepEqual(weblinksStub.thirdCall.args[0], {
+ commit: 'test-commit',
+ file: 'test-path',
+ options: {
+ weblinks: undefined,
+ },
+ repo: 'test-project',
+ type: GerritNav.WeblinkType.FILE});
+ assert.deepEqual(element.filesWeblinks, {
+ meta_a: [{name: 'stubb', url: '#s'}],
+ meta_b: [{name: 'stubb', url: '#s'}],
});
});
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-image-viewer/gr-image-viewer.ts b/polygerrit-ui/app/elements/diff/gr-diff-image-viewer/gr-image-viewer.ts
index a1e89f5..9a98a21 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-image-viewer/gr-image-viewer.ts
+++ b/polygerrit-ui/app/elements/diff/gr-diff-image-viewer/gr-image-viewer.ts
@@ -29,11 +29,11 @@
css,
customElement,
html,
- internalProperty,
LitElement,
property,
PropertyValues,
query,
+ state,
} from 'lit-element';
import {classMap} from 'lit-html/directives/class-map';
import {StyleInfo, styleMap} from 'lit-html/directives/style-map';
@@ -51,6 +51,8 @@
const DEFAULT_AUTOMATIC_BLINK_TIME_MS = 1000;
+const AUTOMATIC_BLINK_BUTTON_ACTIVE_AREA_PIXELS = 350;
+
/**
* This components allows the user to rapidly switch between two given images
* rendered in the same location, to make subtle differences more noticeable.
@@ -64,21 +66,23 @@
// URL for the image to use as revision.
@property({type: String}) revisionUrl = '';
- @internalProperty() protected baseSelected = true;
+ @state() protected baseSelected = true;
- @internalProperty() protected scaledSelected = true;
+ @state() protected scaledSelected = true;
- @internalProperty() protected followMouse = false;
+ @state() protected followMouse = false;
- @internalProperty() protected scale = 1;
+ @state() protected scale = 1;
- @internalProperty() protected checkerboardSelected = true;
+ @state() protected checkerboardSelected = true;
- @internalProperty() protected backgroundColor = '';
+ @state() protected backgroundColor = '';
- @internalProperty() protected automaticBlink = false;
+ @state() protected automaticBlink = false;
- @internalProperty() protected zoomedImageStyle: StyleInfo = {};
+ @state() protected automaticBlinkShown = false;
+
+ @state() protected zoomedImageStyle: StyleInfo = {};
@query('.imageArea') protected imageArea!: HTMLDivElement;
@@ -86,18 +90,20 @@
@query('#source-image') protected sourceImage!: HTMLImageElement;
+ @query('#automatic-blink-button') protected automaticBlinkButton?: Element;
+
private imageSize: Dimensions = {width: 0, height: 0};
- @internalProperty()
+ @state()
protected magnifierSize: Dimensions = {width: 0, height: 0};
- @internalProperty()
+ @state()
protected magnifierFrame: Rect = {
origin: {x: 0, y: 0},
dimensions: {width: 0, height: 0},
};
- @internalProperty()
+ @state()
protected overviewFrame: Rect = {
origin: {x: 0, y: 0},
dimensions: {width: 0, height: 0},
@@ -112,7 +118,7 @@
2,
];
- @internalProperty() protected grabbing = false;
+ @state() protected grabbing = false;
private ownsMouseDown = false;
@@ -188,14 +194,7 @@
gr-zoomed-image.revision {
border-color: var(--revision-image-border-color, rgb(170, 242, 170));
}
- .automatic-blink-area {
- position: absolute;
- width: 30%;
- height: 100%;
- right: 0;
- bottom: 0;
- }
- .automatic-blink-button {
+ #automatic-blink-button {
position: absolute;
right: var(--spacing-xl);
bottom: var(--spacing-xl);
@@ -206,8 +205,8 @@
--primary-button-background-color
);
}
- .automatic-blink-area:hover .automatic-blink-button,
- .automatic-blink-button:focus-visible {
+ #automatic-blink-button.show,
+ #automatic-blink-button:focus-visible {
opacity: 1;
}
.checkerboard {
@@ -395,7 +394,7 @@
>
Base
</paper-button>
- <paper-fab mini icon="gr-icons:swapHoriz" @click="${this.toggleImage}">
+ <paper-fab mini icon="gr-icons:swapHoriz" @click="${this.manualBlink}">
</paper-fab>
<paper-button
class="right"
@@ -492,15 +491,14 @@
`;
const automaticBlink = html`
- <div class="automatic-blink-area">
- <paper-fab
- class="automatic-blink-button"
- title="Automatic blink"
- icon="gr-icons:${this.automaticBlink ? 'pause' : 'playArrow'}"
- @click="${this.toggleAutomaticBlink}"
- >
- </paper-fab>
- </div>
+ <paper-fab
+ id="automatic-blink-button"
+ class="${classMap({show: this.automaticBlinkShown})}"
+ title="Automatic blink"
+ icon="gr-icons:${this.automaticBlink ? 'pause' : 'playArrow'}"
+ @click="${this.toggleAutomaticBlink}"
+ >
+ </paper-fab>
`;
// To pass CSS mixins for @apply to Polymer components, they need to be
@@ -564,7 +562,11 @@
return html`
${customStyle}
- <div class="imageArea" @mousemove="${this.mousemoveMagnifier}">
+ <div
+ class="imageArea"
+ @mousemove="${this.mousemoveImageArea}"
+ @mouseleave="${this.mouseleaveImageArea}"
+ >
<gr-zoomed-image
class="${classMap({
base: this.baseSelected,
@@ -632,7 +634,14 @@
);
}
- toggleImage() {
+ manualBlink() {
+ this.toggleImage();
+ this.dispatchEvent(
+ createEvent({type: 'version-switcher-clicked', button: 'switch'})
+ );
+ }
+
+ private toggleImage() {
if (this.baseUrl && this.revisionUrl) {
this.baseSelected = !this.baseSelected;
}
@@ -649,6 +658,9 @@
this.automaticBlinkTimer = undefined;
}
}
+ this.dispatchEvent(
+ createEvent({type: 'automatic-blink-changed', value: this.automaticBlink})
+ );
}
private setBlinkInterval() {
@@ -699,6 +711,28 @@
);
}
+ mousemoveImageArea(event: MouseEvent) {
+ if (this.automaticBlinkButton) {
+ this.updateAutomaticBlinkVisibility(event);
+ }
+ this.mousemoveMagnifier(event);
+ }
+
+ private updateAutomaticBlinkVisibility(event: MouseEvent) {
+ const rect = this.automaticBlinkButton!.getBoundingClientRect();
+ const centerX = rect.left + (rect.right - rect.left) / 2;
+ const centerY = rect.top + (rect.bottom - rect.top) / 2;
+ const distX = Math.abs(centerX - event.clientX);
+ const distY = Math.abs(centerY - event.clientY);
+ this.automaticBlinkShown =
+ distX < AUTOMATIC_BLINK_BUTTON_ACTIVE_AREA_PIXELS &&
+ distY < AUTOMATIC_BLINK_BUTTON_ACTIVE_AREA_PIXELS;
+ }
+
+ mouseleaveImageArea() {
+ this.automaticBlinkShown = false;
+ }
+
mousedownMagnifier(event: MouseEvent) {
if (event.buttons === 1) {
this.ownsMouseDown = true;
@@ -711,16 +745,20 @@
}
mouseupMagnifier(event: MouseEvent) {
+ if (!this.ownsMouseDown) return;
+ this.grabbing = false;
+ this.ownsMouseDown = false;
const offsetX = event.clientX - this.pointerOnDown.x;
const offsetY = event.clientY - this.pointerOnDown.y;
const distance = Math.max(Math.abs(offsetX), Math.abs(offsetY));
// Consider very short drags as clicks. These tend to happen more often on
// external mice.
- if (this.ownsMouseDown && distance < DRAG_DEAD_ZONE_PIXELS) {
+ if (distance < DRAG_DEAD_ZONE_PIXELS) {
this.toggleImage();
+ this.dispatchEvent(createEvent({type: 'magnifier-clicked'}));
+ } else {
+ this.dispatchEvent(createEvent({type: 'magnifier-dragged'}));
}
- this.grabbing = false;
- this.ownsMouseDown = false;
}
mousemoveMagnifier(event: MouseEvent) {
@@ -759,8 +797,10 @@
}
mouseleaveMagnifier() {
+ if (!this.ownsMouseDown) return;
this.grabbing = false;
this.ownsMouseDown = false;
+ this.dispatchEvent(createEvent({type: 'magnifier-dragged'}));
}
dragstartMagnifier(event: DragEvent) {
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-image-viewer/gr-overview-image.ts b/polygerrit-ui/app/elements/diff/gr-diff-image-viewer/gr-overview-image.ts
index d7b6916..9439dca 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-image-viewer/gr-overview-image.ts
+++ b/polygerrit-ui/app/elements/diff/gr-diff-image-viewer/gr-overview-image.ts
@@ -18,11 +18,11 @@
css,
customElement,
html,
- internalProperty,
LitElement,
property,
PropertyValues,
query,
+ state,
} from 'lit-element';
import {StyleInfo, styleMap} from 'lit-html/directives/style-map';
import {ImageDiffAction} from '../../../api/diff';
@@ -45,13 +45,13 @@
@property({type: Object})
frameRect: Rect = {origin: {x: 0, y: 0}, dimensions: {width: 0, height: 0}};
- @internalProperty() protected contentStyle: StyleInfo = {};
+ @state() protected contentStyle: StyleInfo = {};
- @internalProperty() protected contentTransformStyle: StyleInfo = {};
+ @state() protected contentTransformStyle: StyleInfo = {};
- @internalProperty() protected frameStyle: StyleInfo = {};
+ @state() protected frameStyle: StyleInfo = {};
- @internalProperty() protected dragging = false;
+ @state() protected dragging = false;
@query('.content-box') protected contentBox!: HTMLDivElement;
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-image-viewer/gr-zoomed-image.ts b/polygerrit-ui/app/elements/diff/gr-diff-image-viewer/gr-zoomed-image.ts
index a14a9cc..4558dda 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-image-viewer/gr-zoomed-image.ts
+++ b/polygerrit-ui/app/elements/diff/gr-diff-image-viewer/gr-zoomed-image.ts
@@ -18,10 +18,10 @@
css,
customElement,
html,
- internalProperty,
LitElement,
property,
PropertyValues,
+ state,
} from 'lit-element';
import {StyleInfo, styleMap} from 'lit-html/directives/style-map';
import {Rect} from './util';
@@ -41,7 +41,7 @@
@property({type: Object})
frameRect: Rect = {origin: {x: 0, y: 0}, dimensions: {width: 0, height: 0}};
- @internalProperty() protected imageStyles: StyleInfo = {};
+ @state() protected imageStyles: StyleInfo = {};
static styles = css`
:host {
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 8ead181..638b49e 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
@@ -37,7 +37,10 @@
KeyboardShortcutMixin,
Shortcut,
} from '../../../mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin';
-import {GerritNav} from '../../core/gr-navigation/gr-navigation';
+import {
+ GeneratedWebLink,
+ GerritNav,
+} from '../../core/gr-navigation/gr-navigation';
import {appContext} from '../../../services/app-context';
import {
computeAllPatchSets,
@@ -94,7 +97,11 @@
getPatchRangeForCommentUrl,
} from '../../../utils/comment-util';
import {AppElementParams} from '../../gr-app-types';
-import {CustomKeyboardEvent, OpenFixPreviewEvent} from '../../../types/events';
+import {
+ CustomKeyboardEvent,
+ EventType,
+ OpenFixPreviewEvent,
+} from '../../../types/events';
import {fireAlert, fireEvent, fireTitleChange} from '../../../utils/event-util';
import {GerritView} from '../../../services/router/router-model';
import {assertIsDefined} from '../../../utils/common-util';
@@ -226,6 +233,9 @@
_isImageDiff?: boolean;
@property({type: Object})
+ _editWeblinks?: GeneratedWebLink[];
+
+ @property({type: Object})
_filesWeblinks?: FilesWebLinks;
@property({type: Object})
@@ -1002,6 +1012,14 @@
return;
}
+ // Everything in the diff view is tied to the change. It seems better to
+ // force the re-creation of the diff view when the change number changes.
+ const changeChanged = this._changeNum !== value.changeNum;
+ if (this._changeNum !== undefined && changeChanged) {
+ fireEvent(this, EventType.RECREATE_DIFF_VIEW);
+ return;
+ }
+
this._change = undefined;
this._files = {sortedFileList: [], changeFilesByPath: {}};
this._path = undefined;
@@ -1785,10 +1803,19 @@
_computeCanEdit(
loggedIn?: boolean,
+ editWeblinks?: GeneratedWebLink[],
changeChangeRecord?: PolymerDeepPropertyChange<ChangeInfo, ChangeInfo>
) {
if (!changeChangeRecord?.base) return false;
- return loggedIn && changeIsOpen(changeChangeRecord.base);
+ return (
+ loggedIn &&
+ changeIsOpen(changeChangeRecord.base) &&
+ (!editWeblinks || editWeblinks.length === 0)
+ );
+ }
+
+ _computeShowEditLinks(editWeblinks?: GeneratedWebLink[]) {
+ return !!editWeblinks && editWeblinks.length > 0;
}
/**
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_html.ts b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_html.ts
index 0412779..63bf74e 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_html.ts
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_html.ts
@@ -316,7 +316,10 @@
_isBlameLoading)]]</gr-button
>
</span>
- <template is="dom-if" if="[[_computeCanEdit(_loggedIn, _change.*)]]">
+ <template
+ is="dom-if"
+ if="[[_computeCanEdit(_loggedIn, _editWeblinks, _change.*)]]"
+ >
<span class="separator"></span>
<span class="editButton">
<gr-button
@@ -327,6 +330,12 @@
>
</span>
</template>
+ <template is="dom-if" if="[[_computeShowEditLinks(_editWeblinks)]]">
+ <span class="separator"></span>
+ <template is="dom-repeat" items="[[_editWeblinks]]" as="weblink">
+ <a target="_blank" href$="[[weblink.url]]">[[weblink.name]]</a>
+ </template>
+ </template>
<span class="separator"></span>
<div class$="diffModeSelector [[_computeModeSelectHideClass(_diff)]]">
<span>Diff view:</span>
@@ -390,6 +399,7 @@
hidden=""
hidden$="[[_loading]]"
is-image-diff="{{_isImageDiff}}"
+ edit-weblinks="{{_editWeblinks}}"
files-weblinks="{{_filesWeblinks}}"
diff="{{_diff}}"
change-num="[[_changeNum]]"
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js
index 5c3dfdc..244bafb 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js
@@ -1735,19 +1735,6 @@
});
});
- test('_paramsChanged sets in projectLookup', () => {
- sinon.stub(element, '_initLineOfInterestAndCursor');
- const setStub = stubRestApi('setInProjectLookup');
- element._paramsChanged({
- view: GerritNav.View.DIFF,
- changeNum: 101,
- project: 'test-project',
- path: '',
- });
- assert.isTrue(setStub.calledOnce);
- assert.isTrue(setStub.calledWith(101, 'test-project'));
- });
-
test('shift+m navigates to next unreviewed file', () => {
element._files = getFilesFromFileList(['file1', 'file2', 'file3']);
element._reviewedFiles = new Set(['file1', 'file2']);
diff --git a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_html.ts b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_html.ts
index 285c942..f48d15a 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_html.ts
+++ b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_html.ts
@@ -344,81 +344,6 @@
top: 0;
left: 0;
}
- .contextControlButton {
- background-color: var(--default-button-background-color);
- font: var(--context-control-button-font, inherit);
- /* All position is relative to container, so ignore sibling buttons. */
- position: absolute;
- }
- .contextControlButton:first-child {
- /* First button needs to claim width to display without text wrapping. */
- position: relative;
- }
- .centeredButton {
- /* Center over divider. */
- top: 50%;
- transform: translateY(-50%);
- --gr-button: {
- color: var(--diff-context-control-color);
- border-style: solid;
- border-color: var(--border-color);
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- border-top-left-radius: var(--border-radius);
- border-top-right-radius: var(--border-radius);
- border-bottom-right-radius: var(--border-radius);
- border-bottom-left-radius: var(--border-radius);
- padding: var(--spacing-s) var(--spacing-l);
- }
- }
- .aboveBelowButtons {
- display: flex;
- flex-direction: column;
- margin-left: var(--spacing-m);
- position: relative;
- }
- .aboveBelowButtons:first-child {
- margin-left: 0;
- }
- .aboveButton {
- /* Display over preceding content / background placeholder. */
- transform: translateY(-100%);
- --gr-button: {
- color: var(--diff-context-control-color);
- border-style: solid;
- border-color: var(--border-color);
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 0;
- border-left-width: 1px;
- border-top-left-radius: var(--border-radius);
- border-top-right-radius: var(--border-radius);
- border-bottom-right-radius: 0;
- border-bottom-left-radius: 0;
- padding: var(--spacing-xxs) var(--spacing-l);
- }
- }
- .belowButton {
- /* Display over following content / background placeholder. */
- top: calc(100% + var(--divider-border));
- --gr-button: {
- color: var(--diff-context-control-color);
- border-style: solid;
- border-color: var(--border-color);
- border-top-width: 0;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- border-top-left-radius: 0;
- border-top-right-radius: 0;
- border-bottom-right-radius: var(--border-radius);
- border-bottom-left-radius: var(--border-radius);
- padding: var(--spacing-xxs) var(--spacing-l);
- }
- }
-
.displayLine .diff-row.target-row td {
box-shadow: inset 0 -1px var(--border-color);
}
diff --git a/polygerrit-ui/app/elements/gr-app-element.ts b/polygerrit-ui/app/elements/gr-app-element.ts
index e96f6e4..6e20a55 100644
--- a/polygerrit-ui/app/elements/gr-app-element.ts
+++ b/polygerrit-ui/app/elements/gr-app-element.ts
@@ -67,19 +67,19 @@
import {GrSettingsView} from './settings/gr-settings-view/gr-settings-view';
import {
CustomKeyboardEvent,
+ DialogChangeEventDetail,
+ EventType,
LocationChangeEvent,
PageErrorEventDetail,
RpcLogEvent,
ShortcutTriggeredEvent,
TitleChangeEventDetail,
- DialogChangeEventDetail,
- EventType,
} from '../types/events';
import {ViewState} from '../types/types';
import {GerritView} from '../services/router/router-model';
-import {windowLocationReload} from '../utils/dom-util';
import {LifeCycle} from '../constants/reporting';
import {fireIronAnnounce} from '../utils/event-util';
+import {assertIsDefined} from '../utils/common-util';
interface ErrorInfo {
text: string;
@@ -96,6 +96,10 @@
};
}
+type DomIf = PolymerElement & {
+ restamp: boolean;
+};
+
// TODO(TS): implement AppElement interface from gr-app-types.ts
@customElement('gr-app-element')
export class GrAppElement extends KeyboardShortcutMixin(PolymerElement) {
@@ -236,14 +240,16 @@
this.addEventListener('location-change', e =>
this._handleLocationChange(e)
);
+ this.addEventListener(EventType.RECREATE_CHANGE_VIEW, () =>
+ this.handleRecreateView(GerritView.CHANGE)
+ );
+ this.addEventListener(EventType.RECREATE_DIFF_VIEW, () =>
+ this.handleRecreateView(GerritView.DIFF)
+ );
document.addEventListener('gr-rpc-log', e => this._handleRpcLog(e));
this.addEventListener('shortcut-triggered', e =>
this._handleShortcutTriggered(e)
);
- // Ideally individual views should handle this event and respond with a soft
- // reload. This is a catch-all for all views that cannot or have not
- // implemented that.
- this.addEventListener('reload', () => windowLocationReload());
}
/** @override */
@@ -463,35 +469,58 @@
(this._account && this._account._account_id) || null;
}
- @observe('params.view')
- _viewChanged(view?: GerritView) {
+ /**
+ * Throws away the view and re-creates it. The view itself fires an event, if
+ * it wants to be re-created.
+ */
+ private handleRecreateView(view: GerritView.DIFF | GerritView.CHANGE) {
+ const isDiff = view === GerritView.DIFF;
+ const domId = isDiff ? '#dom-if-diff-view' : '#dom-if-change-view';
+ const domIf = this.root!.querySelector(domId) as DomIf;
+ assertIsDefined(domIf, '<dom-if> for the view');
+ // The rendering of DomIf is debounced, so just changing _show...View and
+ // restamp properties back and forth won't work. That is why we are using
+ // timeouts.
+ // The first timeout is needed, because the _viewChanged() observer also
+ // affects _show...View and would change _show...View=false directly back to
+ // _show...View=true.
+ setTimeout(() => {
+ this._showChangeView = false;
+ this._showDiffView = false;
+ domIf.restamp = true;
+ setTimeout(() => {
+ this._showChangeView = this.params?.view === GerritView.CHANGE;
+ this._showDiffView = this.params?.view === GerritView.DIFF;
+ domIf.restamp = false;
+ }, 1);
+ }, 1);
+ }
+
+ @observe('params.*')
+ _viewChanged() {
+ const view = this.params?.view;
this.$.errorView.classList.remove('show');
- this.set('_showChangeListView', view === GerritView.SEARCH);
- this.set('_showDashboardView', view === GerritView.DASHBOARD);
- this.set('_showChangeView', view === GerritView.CHANGE);
- this.set('_showDiffView', view === GerritView.DIFF);
- this.set('_showSettingsView', view === GerritView.SETTINGS);
+ this._showChangeListView = view === GerritView.SEARCH;
+ this._showDashboardView = view === GerritView.DASHBOARD;
+ this._showChangeView = view === GerritView.CHANGE;
+ this._showDiffView = view === GerritView.DIFF;
+ this._showSettingsView = view === GerritView.SETTINGS;
// _showAdminView must be in sync with the gr-admin-view AdminViewParams type
- this.set(
- '_showAdminView',
+ this._showAdminView =
view === GerritView.ADMIN ||
- view === GerritView.GROUP ||
- view === GerritView.REPO
- );
- this.set('_showCLAView', view === GerritView.AGREEMENTS);
- this.set('_showEditorView', view === GerritView.EDIT);
+ view === GerritView.GROUP ||
+ view === GerritView.REPO;
+ this._showCLAView = view === GerritView.AGREEMENTS;
+ this._showEditorView = view === GerritView.EDIT;
const isPluginScreen = view === GerritView.PLUGIN_SCREEN;
- this.set('_showPluginScreen', false);
+ this._showPluginScreen = false;
// Navigation within plugin screens does not restamp gr-endpoint-decorator
// because _showPluginScreen value does not change. To force restamp,
// change _showPluginScreen value between true and false.
if (isPluginScreen) {
- setTimeout(() => this.set('_showPluginScreen', true), 1);
+ setTimeout(() => (this._showPluginScreen = true), 1);
}
- this.set(
- '_showDocumentationSearch',
- view === GerritView.DOCUMENTATION_SEARCH
- );
+ this._showDocumentationSearch = view === GerritView.DOCUMENTATION_SEARCH;
if (
this.params &&
isAppElementJustRegisteredParams(this.params) &&
@@ -572,7 +601,7 @@
if (pathname.startsWith('/c/') && Number(hash) > 0) {
pathname += '@' + hash;
}
- this.set('_path', pathname);
+ this._path = pathname;
}
_updateLoginUrl() {
@@ -607,7 +636,7 @@
const params = paramsRecord.base;
const viewsToCheck = [GerritView.SEARCH, GerritView.DASHBOARD];
if (params?.view && viewsToCheck.includes(params.view)) {
- this.set('_lastSearchPage', location.pathname);
+ this._lastSearchPage = location.pathname;
}
}
diff --git a/polygerrit-ui/app/elements/gr-app-element_html.ts b/polygerrit-ui/app/elements/gr-app-element_html.ts
index 81a9988..a1e6ac9 100644
--- a/polygerrit-ui/app/elements/gr-app-element_html.ts
+++ b/polygerrit-ui/app/elements/gr-app-element_html.ts
@@ -131,7 +131,9 @@
view-state="{{_viewState.dashboardView}}"
></gr-dashboard-view>
</template>
- <template is="dom-if" if="[[_showChangeView]]" restamp="true">
+ <!-- Note that the change view does not have restamp="true" set, because we
+ want to re-use it as long as the change number does not change. -->
+ <template id="dom-if-change-view" is="dom-if" if="[[_showChangeView]]">
<gr-change-view
params="[[params]]"
view-state="{{_viewState.changeView}}"
@@ -141,7 +143,9 @@
<template is="dom-if" if="[[_showEditorView]]" restamp="true">
<gr-editor-view params="[[params]]"></gr-editor-view>
</template>
- <template is="dom-if" if="[[_showDiffView]]" restamp="true">
+ <!-- Note that the diff view does not have restamp="true" set, because we
+ want to re-use it as long as the change number does not change. -->
+ <template id="dom-if-diff-view" is="dom-if" if="[[_showDiffView]]">
<gr-diff-view
params="[[params]]"
change-view-state="{{_viewState.changeView}}"
diff --git a/polygerrit-ui/app/elements/gr-app-types.ts b/polygerrit-ui/app/elements/gr-app-types.ts
index 2ae85f7..4d60274 100644
--- a/polygerrit-ui/app/elements/gr-app-types.ts
+++ b/polygerrit-ui/app/elements/gr-app-types.ts
@@ -106,6 +106,16 @@
leftSide?: boolean;
commentLink?: boolean;
}
+
+export interface AppElementDiffEditViewParam {
+ view: GerritView.EDIT;
+ changeNum: NumericChangeId;
+ project: RepoName;
+ path: string;
+ patchNum: RevisionPatchSetNum;
+ lineNum?: number;
+}
+
export interface AppElementChangeViewParams {
view: GerritView.CHANGE;
changeNum: NumericChangeId;
@@ -138,6 +148,7 @@
| AppElementSettingsParam
| AppElementAgreementParam
| AppElementDiffViewParam
+ | AppElementDiffEditViewParam
| AppElementJustRegisteredParams;
export function isAppElementJustRegisteredParams(
diff --git a/polygerrit-ui/app/elements/settings/gr-registration-dialog/gr-registration-dialog.ts b/polygerrit-ui/app/elements/settings/gr-registration-dialog/gr-registration-dialog.ts
index 39a5d54..738abc0 100644
--- a/polygerrit-ui/app/elements/settings/gr-registration-dialog/gr-registration-dialog.ts
+++ b/polygerrit-ui/app/elements/settings/gr-registration-dialog/gr-registration-dialog.ts
@@ -30,7 +30,6 @@
$: {
name: HTMLInputElement;
username: HTMLInputElement;
- email: HTMLSelectElement;
};
}
@@ -73,11 +72,17 @@
_serverConfig?: ServerInfo;
@property({
- computed: '_computeUsernameMutable(_serverConfig,_account.username)',
+ computed: '_computeUsernameMutable(_serverConfig, _account.username)',
type: Boolean,
})
_usernameMutable = false;
+ @property({type: Boolean})
+ _hasUsernameChange?: boolean;
+
+ @property({type: String, observer: '_usernameChanged'})
+ _username?: string;
+
private readonly restApiService = appContext.restApiService;
/** @override */
@@ -86,26 +91,17 @@
this._ensureAttribute('role', 'dialog');
}
- _computeUsernameMutable(config?: ServerInfo, username?: string) {
- // Polymer 2: check for undefined
- // username is not being checked for undefined as we want to avoid
- // setting it null explicitly to trigger the computation
- if (config === undefined) {
- return false;
- }
-
- return (
- config.auth.editable_account_fields.includes(
- EditableAccountField.USER_NAME
- ) && !username
- );
- }
-
loadData() {
this._loading = true;
const loadAccount = this.restApiService.getAccount().then(account => {
- this._account = {...this._account, ...account};
+ if (!account) return;
+ this._hasUsernameChange = false;
+ // Provide predefined value for username to trigger computation of
+ // username mutability.
+ account.username = account.username || '';
+ this._account = account;
+ this._username = account.username;
});
const loadConfig = this.restApiService.getConfig().then(config => {
@@ -117,17 +113,37 @@
});
}
+ _usernameChanged() {
+ if (this._loading || !this._account) {
+ return;
+ }
+ this._hasUsernameChange =
+ (this._account.username || '') !== (this._username || '');
+ }
+
+ _computeUsernameMutable(config?: ServerInfo, username?: string) {
+ // Polymer 2: check for undefined
+ if (config === undefined) {
+ return false;
+ }
+
+ // Username may not be changed once it is set.
+ return (
+ config.auth.editable_account_fields.includes(
+ EditableAccountField.USER_NAME
+ ) && !username
+ );
+ }
+
_save() {
this._saving = true;
- const promises = [
- this.restApiService.setAccountName(this.$.name.value),
- this.restApiService.setPreferredAccountEmail(this.$.email.value || ''),
- ];
- if (this._usernameMutable) {
- promises.push(
- this.restApiService.setAccountUsername(this.$.username.value)
- );
+ const promises = [this.restApiService.setAccountName(this.$.name.value)];
+
+ // Note that we are intentionally not acting on this._username being the
+ // empty string (which is falsy).
+ if (this._hasUsernameChange && this._usernameMutable && this._username) {
+ promises.push(this.restApiService.setAccountUsername(this._username));
}
return Promise.all(promises).then(() => {
@@ -151,12 +167,8 @@
fireEvent(this, 'close');
}
- _computeSaveDisabled(name?: string, email?: string, saving?: boolean) {
- return !name || !email || saving;
- }
-
- _computeUsernameClass(usernameMutable: boolean) {
- return usernameMutable ? '' : 'hide';
+ _computeSaveDisabled(name?: string, username?: string, saving?: boolean) {
+ return saving || (!name && !username);
}
@observe('_loading')
diff --git a/polygerrit-ui/app/elements/settings/gr-registration-dialog/gr-registration-dialog_html.ts b/polygerrit-ui/app/elements/settings/gr-registration-dialog/gr-registration-dialog_html.ts
index a1d6a5c..0e31bc9 100644
--- a/polygerrit-ui/app/elements/settings/gr-registration-dialog/gr-registration-dialog_html.ts
+++ b/polygerrit-ui/app/elements/settings/gr-registration-dialog/gr-registration-dialog_html.ts
@@ -59,9 +59,6 @@
input {
width: 20em;
}
- section.hide {
- display: none;
- }
</style>
<div class="container gr-form-styles">
<header>Please confirm your contact information</header>
@@ -75,35 +72,31 @@
</p>
<hr />
<section>
- <div class="title">Full Name</div>
- <iron-input bind-value="{{_account.name}}">
- <input
- is="iron-input"
- id="name"
- bind-value="{{_account.name}}"
- disabled="[[_saving]]"
- />
- </iron-input>
- </section>
- <section class$="[[_computeUsernameClass(_usernameMutable)]]">
- <div class="title">Username</div>
- <iron-input bind-value="{{_account.username}}">
- <input
- is="iron-input"
- id="username"
- bind-value="{{_account.username}}"
- disabled="[[_saving]]"
- />
- </iron-input>
+ <span class="title">Full Name</span>
+ <span class="value">
+ <iron-input bind-value="{{_account.name}}">
+ <input
+ is="iron-input"
+ id="name"
+ bind-value="{{_account.name}}"
+ disabled="[[_saving]]"
+ />
+ </iron-input>
+ </span>
</section>
<section>
- <div class="title">Preferred Email</div>
- <select id="email" disabled="[[_saving]]">
- <option value="[[_account.email]]">[[_account.email]]</option>
- <template is="dom-repeat" items="[[_account.secondary_emails]]">
- <option value="[[item]]">[[item]]</option>
- </template>
- </select>
+ <span class="title">Username</span>
+ <span hidden$="[[_usernameMutable]]" class="value">[[_username]]</span>
+ <span hidden$="[[!_usernameMutable]]" class="value">
+ <iron-input bind-value="{{_username}}">
+ <input
+ is="iron-input"
+ id="username"
+ bind-value="{{_username}}"
+ disabled="[[_saving]]"
+ />
+ </iron-input>
+ </span>
</section>
<hr />
<p>
@@ -123,7 +116,7 @@
id="saveButton"
primary=""
link=""
- disabled="[[_computeSaveDisabled(_account.name, _account.email, _saving)]]"
+ disabled="[[_computeSaveDisabled(_account.name, _username, _saving)]]"
on-click="_handleSave"
>Save</gr-button
>
diff --git a/polygerrit-ui/app/elements/settings/gr-registration-dialog/gr-registration-dialog_test.ts b/polygerrit-ui/app/elements/settings/gr-registration-dialog/gr-registration-dialog_test.ts
index ccb7404..22f21e1 100644
--- a/polygerrit-ui/app/elements/settings/gr-registration-dialog/gr-registration-dialog_test.ts
+++ b/polygerrit-ui/app/elements/settings/gr-registration-dialog/gr-registration-dialog_test.ts
@@ -17,11 +17,7 @@
import '../../../test/common-test-setup-karma';
import {GrRegistrationDialog} from './gr-registration-dialog';
import {queryAndAssert, stubRestApi} from '../../../test/test-utils';
-import {
- AccountDetailInfo,
- EmailAddress,
- Timestamp,
-} from '../../../types/common';
+import {AccountDetailInfo, Timestamp} from '../../../types/common';
import * as MockInteractions from '@polymer/iron-test-helpers/mock-interactions';
import {AuthType, EditableAccountField} from '../../../constants/constants';
import {createServerInfo} from '../../../test/test-data-generators';
@@ -39,8 +35,6 @@
account = {
name: 'name',
- email: 'email' as EmailAddress,
- secondary_emails: ['email2', 'email3'],
registered_on: '2018-02-08 18:49:18.000000000' as Timestamp,
};
@@ -53,10 +47,6 @@
account.username = username;
return Promise.resolve();
});
- stubRestApi('setPreferredAccountEmail').callsFake(email => {
- account.email = email as EmailAddress;
- return Promise.resolve();
- });
stubRestApi('getConfig').returns(
Promise.resolve({
...createServerInfo(),
@@ -116,41 +106,32 @@
test('saves account details', done => {
flush(() => {
element.$.name.value = 'new name';
- element.$.username.value = 'new username';
- element.$.email.value = 'email3';
+
+ element.set('_account.username', '');
+ element._hasUsernameChange = false;
+ assert.isTrue(element._usernameMutable);
+
+ element.set('_username', 'new username');
// Nothing should be committed yet.
assert.equal(account.name, 'name');
assert.isNotOk(account.username);
- assert.equal(account.email, 'email' as EmailAddress);
// Save and verify new values are committed.
save()
.then(() => {
assert.equal(account.name, 'new name');
assert.equal(account.username, 'new username');
- assert.equal(account.email, 'email3' as EmailAddress);
})
.then(done);
});
});
- test('email select properly populated', done => {
- element._account = {
- email: 'foo' as EmailAddress,
- secondary_emails: ['bar', 'baz'],
- };
- flush(() => {
- assert.equal(element.$.email.value, 'foo');
- done();
- });
- });
-
test('save btn disabled', () => {
const compute = element._computeSaveDisabled;
assert.isTrue(compute('', '', false));
- assert.isTrue(compute('', 'test', false));
- assert.isTrue(compute('test', '', false));
+ assert.isFalse(compute('', 'test', false));
+ assert.isFalse(compute('test', '', false));
assert.isTrue(compute('test', 'test', true));
assert.isFalse(compute('test', 'test', false));
});
diff --git a/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label.ts b/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label.ts
index 64bae58..ab4c5a5 100644
--- a/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label.ts
+++ b/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label.ts
@@ -85,7 +85,7 @@
type: Boolean,
reflectToAttribute: true,
computed:
- '_computeCancelLeftPadding(hideAvatar, _config, ' +
+ '_computeCancelLeftPadding(hideAvatar, ' +
'highlightAttention, account, change, forceAttention)',
})
cancelLeftPadding = false;
@@ -127,56 +127,41 @@
}
_isAttentionSetEnabled(
- config: ServerInfo | undefined,
highlight: boolean,
account: AccountInfo,
change: ChangeInfo
) {
- return (
- !!config &&
- !!config.change &&
- !!config.change.enable_attention_set &&
- !!highlight &&
- !!change &&
- !!account &&
- !isServiceUser(account)
- );
+ return highlight && !!change && !!account && !isServiceUser(account);
}
_computeCancelLeftPadding(
hideAvatar: boolean,
- config: ServerInfo | undefined,
highlight: boolean,
account: AccountInfo,
change: ChangeInfo,
force: boolean
) {
return (
- !hideAvatar &&
- !this._hasAttention(config, highlight, account, change, force)
+ !hideAvatar && !this._hasAttention(highlight, account, change, force)
);
}
_hasAttention(
- config: ServerInfo | undefined,
highlight: boolean,
account: AccountInfo,
change: ChangeInfo,
force: boolean
) {
- return (
- force || this._hasUnforcedAttention(config, highlight, account, change)
- );
+ return force || this._hasUnforcedAttention(highlight, account, change);
}
_hasUnforcedAttention(
- config: ServerInfo | undefined,
highlight: boolean,
account: AccountInfo,
change: ChangeInfo
) {
return (
- this._isAttentionSetEnabled(config, highlight, account, change) &&
+ this._isAttentionSetEnabled(highlight, account, change) &&
change.attention_set &&
!!account._account_id &&
hasOwnProperty(change.attention_set, account._account_id)
@@ -184,13 +169,12 @@
}
_computeHasAttentionClass(
- config: ServerInfo | undefined,
highlight: boolean,
account: AccountInfo,
change: ChangeInfo,
force: boolean
) {
- return this._hasAttention(config, highlight, account, change, force)
+ return this._hasAttention(highlight, account, change, force)
? 'hasAttention'
: '';
}
@@ -266,7 +250,6 @@
}
_computeAttentionButtonEnabled(
- config: ServerInfo | undefined,
highlight: boolean,
account: AccountInfo,
change: ChangeInfo,
@@ -275,13 +258,12 @@
) {
if (selected) return true;
return (
- this._hasUnforcedAttention(config, highlight, account, change) &&
+ this._hasUnforcedAttention(highlight, account, change) &&
(isInvolved(change, selfAccount) || isSelf(account, selfAccount))
);
}
_computeAttentionIconTitle(
- config: ServerInfo | undefined,
highlight: boolean,
account: AccountInfo,
change: ChangeInfo,
@@ -290,7 +272,6 @@
selected: boolean
) {
const enabled = this._computeAttentionButtonEnabled(
- config,
highlight,
account,
change,
diff --git a/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_html.ts b/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_html.ts
index ff40aeb..c5b66ce3 100644
--- a/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_html.ts
+++ b/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_html.ts
@@ -109,23 +109,23 @@
</template>
<template
is="dom-if"
- if="[[_hasAttention(_config, highlightAttention, account, change, forceAttention)]]"
+ if="[[_hasAttention(highlightAttention, account, change, forceAttention)]]"
>
<gr-button
id="attentionButton"
link=""
aria-label="Remove user from attention set"
on-click="_handleRemoveAttentionClick"
- disabled="[[!_computeAttentionButtonEnabled(_config, highlightAttention, account, change, _selfAccount, selected)]]"
- has-tooltip="[[_computeAttentionButtonEnabled(_config, highlightAttention, account, change, _selfAccount, false)]]"
- title="[[_computeAttentionIconTitle(_config, highlightAttention, account, change, _selfAccount, forceAttention, selected)]]"
+ disabled="[[!_computeAttentionButtonEnabled(highlightAttention, account, change, _selfAccount, selected)]]"
+ has-tooltip="[[_computeAttentionButtonEnabled(highlightAttention, account, change, _selfAccount, false)]]"
+ title="[[_computeAttentionIconTitle(highlightAttention, account, change, _selfAccount, forceAttention, selected)]]"
><iron-icon class="attention" icon="gr-icons:attention"></iron-icon>
</gr-button>
</template>
</span>
<span
id="hovercardTarget"
- class$="[[_computeHasAttentionClass(_config, highlightAttention, account, change, forceAttention)]]"
+ class$="[[_computeHasAttentionClass(highlightAttention, account, change, forceAttention)]]"
>
<template is="dom-if" if="[[!hideAvatar]]">
<gr-avatar account="[[account]]" image-size="32"></gr-avatar>
diff --git a/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_test.js b/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_test.js
index f37aa01..459c8c7 100644
--- a/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_test.js
+++ b/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_test.js
@@ -23,12 +23,14 @@
suite('gr-account-label tests', () => {
let element;
+ const kermit = createAccount('kermit', 31);
function createAccount(name, id) {
return {name, _account_id: id};
}
setup(() => {
+ stubRestApi('getAccount').callsFake(() => Promise.resolve(kermit));
stubRestApi('getLoggedIn').returns(Promise.resolve(false));
element = basicFixture.instantiate();
element._config = {
@@ -81,10 +83,8 @@
suite('attention set', () => {
setup(async () => {
- const kermit = createAccount('kermit', 31);
element.highlightAttention = true;
element._config = {
- change: {enable_attention_set: true},
user: {anonymous_coward_name: 'Anonymous Coward'},
};
element._selfAccount = kermit;
@@ -98,15 +98,18 @@
});
test('show attention button', () => {
- assert.ok(element.shadowRoot.querySelector('#attentionButton'));
+ const button = element.shadowRoot.querySelector('#attentionButton');
+ assert.ok(button);
+ assert.isNull(button.getAttribute('disabled'));
});
- test('tap attention button', () => {
+ test('tap attention button', async () => {
const apiStub = stubRestApi(
'removeFromAttentionSet')
.callsFake(() => Promise.resolve());
const button = element.shadowRoot.querySelector('#attentionButton');
assert.ok(button);
+ assert.isNull(button.getAttribute('disabled'));
MockInteractions.tap(button);
assert.isTrue(apiStub.calledOnce);
assert.equal(apiStub.lastCall.args[1], 42);
diff --git a/polygerrit-ui/app/elements/shared/gr-account-list/gr-account-list.ts b/polygerrit-ui/app/elements/shared/gr-account-list/gr-account-list.ts
index 1e54f69..231fc36 100644
--- a/polygerrit-ui/app/elements/shared/gr-account-list/gr-account-list.ts
+++ b/polygerrit-ui/app/elements/shared/gr-account-list/gr-account-list.ts
@@ -26,6 +26,7 @@
Suggestion,
AccountInfo,
GroupInfo,
+ EmailAddress,
} from '../../../types/common';
import {
GrReviewerSuggestionsProvider,
@@ -37,6 +38,7 @@
import {PolymerDeepPropertyChange} from '@polymer/polymer/interfaces';
import {PaperInputElementExt} from '../../../types/types';
import {fireAlert} from '../../../utils/event-util';
+import {accountOrGroupKey} from '../../../utils/account-util';
const VALID_EMAIL_ALERT = 'Please input a valid email.';
@@ -184,6 +186,8 @@
reporting: ReportingService;
+ private pendingRemoval: Set<AccountInput> = new Set();
+
constructor() {
super();
this.reporting = appContext.reportingService;
@@ -233,6 +237,7 @@
let itemTypeAdded = 'unknown';
if (isAccountObject(item)) {
const account = {...item.account, _pendingAdd: true};
+ this.removeFromPendingRemoval(account);
this.push('accounts', account);
itemTypeAdded = 'account';
} else if (isGroupObjectInput(item)) {
@@ -242,6 +247,7 @@
}
const group = {...item.group, _pendingAdd: true, _group: true};
this.push('accounts', group);
+ this.removeFromPendingRemoval(group);
itemTypeAdded = 'group';
} else if (this.allowAnyInput) {
if (!item.includes('@')) {
@@ -251,8 +257,9 @@
fireAlert(this, VALID_EMAIL_ALERT);
return false;
} else {
- const account = {email: item, _pendingAdd: true};
+ const account = {email: item as EmailAddress, _pendingAdd: true};
this.push('accounts', account);
+ this.removeFromPendingRemoval(account);
itemTypeAdded = 'email';
}
}
@@ -283,32 +290,16 @@
return classes.join(' ');
}
- _accountMatches(a: AccountInput, b: AccountInput) {
- // TODO(TS): seems a & b always exists ?
- if (a && b) {
- // both conditions are checking against AccountInfo
- // and only check a not b.. typeguard won't work very good without
- // changing logic, so keep it as inline casting
- if ((a as AccountInfoInput)._account_id) {
- return (
- (a as AccountInfoInput)._account_id ===
- (b as AccountInfoInput)._account_id
- );
- }
- if ((a as AccountInfoInput).email) {
- return (a as AccountInfoInput).email === (b as AccountInfoInput).email;
- }
- }
- return a === b;
- }
-
_computeRemovable(account: AccountInput, readonly: boolean) {
if (readonly) {
return false;
}
if (this.removableValues) {
for (let i = 0; i < this.removableValues.length; i++) {
- if (this._accountMatches(this.removableValues[i], account)) {
+ if (
+ accountOrGroupKey(this.removableValues[i]) ===
+ accountOrGroupKey(account)
+ ) {
return true;
}
}
@@ -328,16 +319,9 @@
return;
}
for (let i = 0; i < this.accounts.length; i++) {
- let matches;
- const account = this.accounts[i];
- if (toRemove._group) {
- matches =
- (toRemove as GroupInfoInput).id === (account as GroupInfoInput).id;
- } else {
- matches = this._accountMatches(toRemove, account);
- }
- if (matches) {
+ if (accountOrGroupKey(toRemove) === accountOrGroupKey(this.accounts[i])) {
this.splice('accounts', i, 1);
+ this.pendingRemoval.add(toRemove);
this.reporting.reportInteraction(`Remove from ${this.id}`);
return;
}
@@ -445,6 +429,26 @@
});
}
+ removals(): AccountAddition[] {
+ return Array.from(this.pendingRemoval).map(account => {
+ if (isGroupInfoInput(account)) {
+ return {group: account};
+ } else if (isAccountInfoInput(account)) {
+ return {account};
+ } else {
+ throw new Error('AccountInput must be either Account or Group.');
+ }
+ });
+ }
+
+ removeFromPendingRemoval(account: AccountInput) {
+ this.pendingRemoval.delete(account);
+ }
+
+ clearPendingRemovals() {
+ this.pendingRemoval.clear();
+ }
+
_computeEntryHidden(
maxCount: number,
accountsRecord: PolymerDeepPropertyChange<AccountInput[], AccountInput[]>,
diff --git a/polygerrit-ui/app/elements/shared/gr-account-list/gr-account-list_test.js b/polygerrit-ui/app/elements/shared/gr-account-list/gr-account-list_test.js
index 20e8672..693f4cb 100644
--- a/polygerrit-ui/app/elements/shared/gr-account-list/gr-account-list_test.js
+++ b/polygerrit-ui/app/elements/shared/gr-account-list/gr-account-list_test.js
@@ -441,19 +441,6 @@
});
});
- test('_accountMatches', () => {
- const acct = makeAccount();
-
- assert.isTrue(element._accountMatches(acct, acct));
- acct.email = 'test';
- assert.isTrue(element._accountMatches(acct, acct));
- assert.isTrue(element._accountMatches({email: 'test'}, acct));
-
- assert.isFalse(element._accountMatches({}, acct));
- assert.isFalse(element._accountMatches({email: 'test2'}, acct));
- assert.isFalse(element._accountMatches({_account_id: -1}, acct));
- });
-
suite('keyboard interactions', () => {
test('backspace at text input start removes last account', async () => {
const input = element.$.entry.$.input;
diff --git a/polygerrit-ui/app/elements/shared/gr-comment/gr-comment.ts b/polygerrit-ui/app/elements/shared/gr-comment/gr-comment.ts
index b7f1bcc..2d20510 100644
--- a/polygerrit-ui/app/elements/shared/gr-comment/gr-comment.ts
+++ b/polygerrit-ui/app/elements/shared/gr-comment/gr-comment.ts
@@ -97,6 +97,7 @@
$: {
container: HTMLDivElement;
resolvedCheckbox: HTMLInputElement;
+ header: HTMLDivElement;
};
}
diff --git a/polygerrit-ui/app/elements/shared/gr-comment/gr-comment_test.js b/polygerrit-ui/app/elements/shared/gr-comment/gr-comment_test.js
deleted file mode 100644
index be647ab..0000000
--- a/polygerrit-ui/app/elements/shared/gr-comment/gr-comment_test.js
+++ /dev/null
@@ -1,1354 +0,0 @@
-/**
- * @license
- * Copyright (C) 2015 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.
- */
-
-import '../../../test/common-test-setup-karma.js';
-import './gr-comment.js';
-import {html} from '@polymer/polymer/lib/utils/html-tag.js';
-import {__testOnly_UNSAVED_MESSAGE} from './gr-comment.js';
-import {SpecialFilePath, Side} from '../../../constants/constants.js';
-import {stubRestApi, stubStorage} from '../../../test/test-utils.js';
-
-const basicFixture = fixtureFromElement('gr-comment');
-
-const draftFixture = fixtureFromTemplate(html`
-<gr-comment draft="true"></gr-comment>
-`);
-
-function isVisible(el) {
- assert.ok(el);
- return getComputedStyle(el).getPropertyValue('display') !== 'none';
-}
-
-suite('gr-comment tests', () => {
- suite('basic tests', () => {
- let element;
-
- let openOverlaySpy;
-
- setup(() => {
- stubRestApi('getAccount').returns(Promise.resolve({
- email: 'dhruvsri@google.com',
- name: 'Dhruv Srivastava',
- _account_id: 1083225,
- avatars: [{url: 'abc', height: 32}],
- }));
- element = basicFixture.instantiate();
- element.comment = {
- author: {
- name: 'Mr. Peanutbutter',
- email: 'tenn1sballchaser@aol.com',
- },
- id: 'baf0414d_60047215',
- line: 5,
- message: 'is this a crossover episode!?',
- updated: '2015-12-08 19:48:33.843000000',
- };
-
- openOverlaySpy = sinon.spy(element, '_openOverlay');
- });
-
- teardown(() => {
- openOverlaySpy.getCalls().forEach(call => {
- call.args[0].remove();
- });
- });
-
- test('collapsible comments', () => {
- // When a comment (not draft) is loaded, it should be collapsed
- assert.isTrue(element.collapsed);
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('gr-formatted-text')),
- 'gr-formatted-text is not visible');
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('.actions')),
- 'actions are not visible');
- assert.isNotOk(element.textarea, 'textarea is not visible');
-
- // The header middle content is only visible when comments are collapsed.
- // It shows the message in a condensed way, and limits to a single line.
- assert.isTrue(isVisible(element.shadowRoot
- .querySelector('.collapsedContent')),
- 'header middle content is visible');
-
- // When the header row is clicked, the comment should expand
- MockInteractions.tap(element.$.header);
- assert.isFalse(element.collapsed);
- assert.isTrue(isVisible(element.shadowRoot
- .querySelector('gr-formatted-text')),
- 'gr-formatted-text is visible');
- assert.isTrue(isVisible(element.shadowRoot
- .querySelector('.actions')),
- 'actions are visible');
- assert.isNotOk(element.textarea, 'textarea is not visible');
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('.collapsedContent')),
- 'header middle content is not visible');
- });
-
- test('clicking on date link fires event', () => {
- element.side = 'PARENT';
- const stub = sinon.stub();
- element.addEventListener('comment-anchor-tap', stub);
- flush();
- const dateEl = element.shadowRoot
- .querySelector('.date');
- assert.ok(dateEl);
- MockInteractions.tap(dateEl);
-
- assert.isTrue(stub.called);
- assert.deepEqual(stub.lastCall.args[0].detail,
- {side: element.side, number: element.comment.line});
- });
-
- test('message is not retrieved from storage when other edits', done => {
- const storageStub = stubStorage('getDraftComment');
- const loadSpy = sinon.spy(element, '_loadLocalDraft');
-
- element.changeNum = 1;
- element.patchNum = 1;
- element.comment = {
- author: {
- name: 'Mr. Peanutbutter',
- email: 'tenn1sballchaser@aol.com',
- },
- line: 5,
- };
- flush(() => {
- assert.isTrue(loadSpy.called);
- assert.isFalse(storageStub.called);
- done();
- });
- });
-
- test('message is retrieved from storage when no other edits', done => {
- const storageStub = stubStorage('getDraftComment');
- const loadSpy = sinon.spy(element, '_loadLocalDraft');
-
- element.changeNum = 1;
- element.patchNum = 1;
- element.comment = {
- author: {
- name: 'Mr. Peanutbutter',
- email: 'tenn1sballchaser@aol.com',
- },
- line: 5,
- path: 'test',
- };
- flush(() => {
- assert.isTrue(loadSpy.called);
- assert.isTrue(storageStub.called);
- done();
- });
- });
-
- test('_getPatchNum', () => {
- element.side = 'PARENT';
- element.patchNum = 1;
- assert.equal(element._getPatchNum(), 'PARENT');
- element.side = 'REVISION';
- assert.equal(element._getPatchNum(), 1);
- });
-
- test('comment expand and collapse', () => {
- element.collapsed = true;
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('gr-formatted-text')),
- 'gr-formatted-text is not visible');
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('.actions')),
- 'actions are not visible');
- assert.isNotOk(element.textarea, 'textarea is not visible');
- assert.isTrue(isVisible(element.shadowRoot
- .querySelector('.collapsedContent')),
- 'header middle content is visible');
-
- element.collapsed = false;
- assert.isFalse(element.collapsed);
- assert.isTrue(isVisible(element.shadowRoot
- .querySelector('gr-formatted-text')),
- 'gr-formatted-text is visible');
- assert.isTrue(isVisible(element.shadowRoot
- .querySelector('.actions')),
- 'actions are visible');
- assert.isNotOk(element.textarea, 'textarea is not visible');
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('.collapsedContent')),
- 'header middle content is is not visible');
- });
-
- suite('while editing', () => {
- setup(() => {
- element.editing = true;
- element._messageText = 'test';
- sinon.stub(element, '_handleCancel');
- sinon.stub(element, '_handleSave');
- flush();
- });
-
- suite('when text is empty', () => {
- setup(() => {
- element._messageText = '';
- element.comment = {};
- });
-
- test('esc closes comment when text is empty', () => {
- MockInteractions.pressAndReleaseKeyOn(
- element.textarea, 27); // esc
- assert.isTrue(element._handleCancel.called);
- });
-
- test('ctrl+enter does not save', () => {
- MockInteractions.pressAndReleaseKeyOn(
- element.textarea, 13, 'ctrl'); // ctrl + enter
- assert.isFalse(element._handleSave.called);
- });
-
- test('meta+enter does not save', () => {
- MockInteractions.pressAndReleaseKeyOn(
- element.textarea, 13, 'meta'); // meta + enter
- assert.isFalse(element._handleSave.called);
- });
-
- test('ctrl+s does not save', () => {
- MockInteractions.pressAndReleaseKeyOn(
- element.textarea, 83, 'ctrl'); // ctrl + s
- assert.isFalse(element._handleSave.called);
- });
- });
-
- test('esc does not close comment that has content', () => {
- MockInteractions.pressAndReleaseKeyOn(
- element.textarea, 27); // esc
- assert.isFalse(element._handleCancel.called);
- });
-
- test('ctrl+enter saves', () => {
- MockInteractions.pressAndReleaseKeyOn(
- element.textarea, 13, 'ctrl'); // ctrl + enter
- assert.isTrue(element._handleSave.called);
- });
-
- test('meta+enter saves', () => {
- MockInteractions.pressAndReleaseKeyOn(
- element.textarea, 13, 'meta'); // meta + enter
- assert.isTrue(element._handleSave.called);
- });
-
- test('ctrl+s saves', () => {
- MockInteractions.pressAndReleaseKeyOn(
- element.textarea, 83, 'ctrl'); // ctrl + s
- assert.isTrue(element._handleSave.called);
- });
- });
-
- test('delete comment button for non-admins is hidden', () => {
- element._isAdmin = false;
- assert.isFalse(element.shadowRoot
- .querySelector('.action.delete')
- .classList.contains('showDeleteButtons'));
- });
-
- test('delete comment button for admins with draft is hidden', () => {
- element._isAdmin = false;
- element.draft = true;
- assert.isFalse(element.shadowRoot
- .querySelector('.action.delete')
- .classList.contains('showDeleteButtons'));
- });
-
- test('delete comment', done => {
- const stub = stubRestApi('deleteComment').returns(Promise.resolve({}));
- sinon.spy(element.confirmDeleteOverlay, 'open');
- element.changeNum = 42;
- element.patchNum = 0xDEADBEEF;
- element._isAdmin = true;
- assert.isTrue(element.shadowRoot
- .querySelector('.action.delete')
- .classList.contains('showDeleteButtons'));
- MockInteractions.tap(element.shadowRoot
- .querySelector('.action.delete'));
- flush(() => {
- element.confirmDeleteOverlay.open.lastCall.returnValue.then(() => {
- const dialog =
- window.confirmDeleteOverlay
- .querySelector('#confirmDeleteComment');
- dialog.message = 'removal reason';
- element._handleConfirmDeleteComment();
- assert.isTrue(stub.calledWith(
- 42, 0xDEADBEEF, 'baf0414d_60047215', 'removal reason'));
- done();
- });
- });
- });
-
- suite('draft update reporting', () => {
- let endStub;
- let getTimerStub;
- let mockEvent;
-
- setup(() => {
- mockEvent = {preventDefault() {}};
- sinon.stub(element, 'save')
- .returns(Promise.resolve({}));
- sinon.stub(element, '_discardDraft')
- .returns(Promise.resolve({}));
- endStub = sinon.stub();
- getTimerStub = sinon.stub(element.reporting, 'getTimer')
- .returns({end: endStub});
- });
-
- test('create', () => {
- element.patchNum = 1;
- element.comment = {};
- return element._handleSave(mockEvent).then(() => {
- assert.equal(element.shadowRoot.querySelector('gr-account-label').
- shadowRoot.querySelector('span.name').innerText.trim(),
- 'Dhruv Srivastava');
- assert.isTrue(endStub.calledOnce);
- assert.isTrue(getTimerStub.calledOnce);
- assert.equal(getTimerStub.lastCall.args[0], 'CreateDraftComment');
- });
- });
-
- test('update', () => {
- element.comment = {id: 'abc_123'};
- return element._handleSave(mockEvent).then(() => {
- assert.isTrue(endStub.calledOnce);
- assert.isTrue(getTimerStub.calledOnce);
- assert.equal(getTimerStub.lastCall.args[0], 'UpdateDraftComment');
- });
- });
-
- test('discard', () => {
- element.comment = {id: 'abc_123'};
- sinon.stub(element, '_closeConfirmDiscardOverlay');
- return element._handleConfirmDiscard(mockEvent).then(() => {
- assert.isTrue(endStub.calledOnce);
- assert.isTrue(getTimerStub.calledOnce);
- assert.equal(getTimerStub.lastCall.args[0], 'DiscardDraftComment');
- });
- });
- });
-
- test('edit reports interaction', () => {
- const reportStub = sinon.stub(element.reporting,
- 'recordDraftInteraction');
- element.draft = true;
- flush();
- MockInteractions.tap(element.shadowRoot
- .querySelector('.edit'));
- assert.isTrue(reportStub.calledOnce);
- });
-
- test('discard reports interaction', () => {
- const reportStub = sinon.stub(element.reporting,
- 'recordDraftInteraction');
- element.draft = true;
- flush();
- MockInteractions.tap(element.shadowRoot
- .querySelector('.discard'));
- assert.isTrue(reportStub.calledOnce);
- });
-
- test('failed save draft request', done => {
- element.draft = true;
- element.changeNum = 1;
- element.patchNum = 1;
- const updateRequestStub = sinon.stub(element, '_updateRequestToast');
- const diffDraftStub =
- stubRestApi('saveDiffDraft').returns(
- Promise.resolve({ok: false}));
- element._saveDraft({id: 'abc_123'});
- flush(() => {
- let args = updateRequestStub.lastCall.args;
- assert.deepEqual(args, [0, true]);
- assert.equal(element._getSavingMessage(...args),
- __testOnly_UNSAVED_MESSAGE);
- assert.equal(element.shadowRoot.querySelector('.draftLabel').innerText,
- 'DRAFT(Failed to save)');
- assert.isTrue(isVisible(element.shadowRoot
- .querySelector('.save')), 'save is visible');
- diffDraftStub.returns(
- Promise.resolve({ok: true}));
- element._saveDraft({id: 'abc_123'});
- flush(() => {
- args = updateRequestStub.lastCall.args;
- assert.deepEqual(args, [0]);
- assert.equal(element._getSavingMessage(...args),
- 'All changes saved');
- assert.equal(element.shadowRoot.querySelector('.draftLabel')
- .innerText, 'DRAFT');
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('.save')), 'save is not visible');
- assert.isFalse(element._unableToSave);
- done();
- });
- });
- });
-
- test('failed save draft request with promise failure', done => {
- element.draft = true;
- element.changeNum = 1;
- element.patchNum = 1;
- const updateRequestStub = sinon.stub(element, '_updateRequestToast');
- const diffDraftStub =
- stubRestApi('saveDiffDraft').returns(
- Promise.reject(new Error()));
- element._saveDraft({id: 'abc_123'});
- flush(() => {
- let args = updateRequestStub.lastCall.args;
- assert.deepEqual(args, [0, true]);
- assert.equal(element._getSavingMessage(...args),
- __testOnly_UNSAVED_MESSAGE);
- assert.equal(element.shadowRoot.querySelector('.draftLabel').innerText,
- 'DRAFT(Failed to save)');
- assert.isTrue(isVisible(element.shadowRoot
- .querySelector('.save')), 'save is visible');
- diffDraftStub.returns(
- Promise.resolve({ok: true}));
- element._saveDraft({id: 'abc_123'});
- flush(() => {
- args = updateRequestStub.lastCall.args;
- assert.deepEqual(args, [0]);
- assert.equal(element._getSavingMessage(...args),
- 'All changes saved');
- assert.equal(element.shadowRoot.querySelector('.draftLabel')
- .innerText, 'DRAFT');
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('.save')), 'save is not visible');
- assert.isFalse(element._unableToSave);
- done();
- });
- });
- });
- });
-
- suite('gr-comment draft tests', () => {
- let element;
-
- setup(() => {
- stubRestApi('getAccount').returns(Promise.resolve(null));
- stubRestApi('saveDiffDraft').returns(Promise.resolve({
- ok: true,
- text() {
- return Promise.resolve(
- ')]}\'\n{' +
- '"id": "baf0414d_40572e03",' +
- '"path": "/path/to/file",' +
- '"line": 5,' +
- '"updated": "2015-12-08 21:52:36.177000000",' +
- '"message": "saved!"' +
- '}'
- );
- },
- }));
- stubRestApi('removeChangeReviewer').returns(Promise.resolve({ok: true}));
- element = draftFixture.instantiate();
- sinon.stub(element.storage, 'getDraftComment').returns(null);
- element.changeNum = 42;
- element.patchNum = 1;
- element.editing = false;
- element.comment = {
- diffSide: Side.RIGHT,
- __draft: true,
- __draftID: 'temp_draft_id',
- path: '/path/to/file',
- line: 5,
- };
- element.diffSide = Side.RIGHT;
- });
-
- test('button visibility states', () => {
- element.showActions = false;
- assert.isTrue(element.shadowRoot
- .querySelector('.humanActions').hasAttribute('hidden'));
- assert.isTrue(element.shadowRoot
- .querySelector('.robotActions').hasAttribute('hidden'));
-
- element.showActions = true;
- assert.isFalse(element.shadowRoot
- .querySelector('.humanActions').hasAttribute('hidden'));
- assert.isTrue(element.shadowRoot
- .querySelector('.robotActions').hasAttribute('hidden'));
-
- element.draft = true;
- flush();
- assert.isTrue(isVisible(element.shadowRoot
- .querySelector('.edit')), 'edit is visible');
- assert.isTrue(isVisible(element.shadowRoot
- .querySelector('.discard')), 'discard is visible');
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('.save')), 'save is not visible');
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('.cancel')), 'cancel is not visible');
- assert.isTrue(isVisible(element.shadowRoot
- .querySelector('.resolve')), 'resolve is visible');
- assert.isFalse(element.shadowRoot
- .querySelector('.humanActions').hasAttribute('hidden'));
- assert.isTrue(element.shadowRoot
- .querySelector('.robotActions').hasAttribute('hidden'));
-
- element.editing = true;
- flush();
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('.edit')), 'edit is not visible');
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('.discard')), 'discard not visible');
- assert.isTrue(isVisible(element.shadowRoot
- .querySelector('.save')), 'save is visible');
- assert.isTrue(isVisible(element.shadowRoot
- .querySelector('.cancel')), 'cancel is visible');
- assert.isTrue(isVisible(element.shadowRoot
- .querySelector('.resolve')), 'resolve is visible');
- assert.isFalse(element.shadowRoot
- .querySelector('.humanActions').hasAttribute('hidden'));
- assert.isTrue(element.shadowRoot
- .querySelector('.robotActions').hasAttribute('hidden'));
-
- element.draft = false;
- element.editing = false;
- flush();
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('.edit')), 'edit is not visible');
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('.discard')),
- 'discard is not visible');
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('.save')), 'save is not visible');
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('.cancel')), 'cancel is not visible');
- assert.isFalse(element.shadowRoot
- .querySelector('.humanActions').hasAttribute('hidden'));
- assert.isTrue(element.shadowRoot
- .querySelector('.robotActions').hasAttribute('hidden'));
-
- element.comment.id = 'foo';
- element.draft = true;
- element.editing = true;
- flush();
- assert.isTrue(isVisible(element.shadowRoot
- .querySelector('.cancel')), 'cancel is visible');
- assert.isFalse(element.shadowRoot
- .querySelector('.humanActions').hasAttribute('hidden'));
- assert.isTrue(element.shadowRoot
- .querySelector('.robotActions').hasAttribute('hidden'));
-
- // Delete button is not hidden by default
- assert.isFalse(element.shadowRoot.querySelector('#deleteBtn').hidden);
-
- element.isRobotComment = true;
- element.draft = true;
- assert.isTrue(element.shadowRoot
- .querySelector('.humanActions').hasAttribute('hidden'));
- assert.isFalse(element.shadowRoot
- .querySelector('.robotActions').hasAttribute('hidden'));
-
- // It is not expected to see Robot comment drafts, but if they appear,
- // they will behave the same as non-drafts.
- element.draft = false;
- assert.isTrue(element.shadowRoot
- .querySelector('.humanActions').hasAttribute('hidden'));
- assert.isFalse(element.shadowRoot
- .querySelector('.robotActions').hasAttribute('hidden'));
-
- // A robot comment with run ID should display plain text.
- element.set(['comment', 'robot_run_id'], 'text');
- element.editing = false;
- element.collapsed = false;
- flush();
- assert.isTrue(element.shadowRoot
- .querySelector('.robotRun.link').textContent === 'Run Details');
-
- // A robot comment with run ID and url should display a link.
- element.set(['comment', 'url'], '/path/to/run');
- flush();
- assert.notEqual(getComputedStyle(element.shadowRoot
- .querySelector('.robotRun.link')).display,
- 'none');
-
- // Delete button is hidden for robot comments
- assert.isTrue(element.shadowRoot.querySelector('#deleteBtn').hidden);
- });
-
- test('collapsible drafts', () => {
- assert.isTrue(element.collapsed);
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('gr-formatted-text')),
- 'gr-formatted-text is not visible');
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('.actions')),
- 'actions are not visible');
- assert.isNotOk(element.textarea, 'textarea is not visible');
- assert.isTrue(isVisible(element.shadowRoot
- .querySelector('.collapsedContent')),
- 'header middle content is visible');
-
- MockInteractions.tap(element.$.header);
- assert.isFalse(element.collapsed);
- assert.isTrue(isVisible(element.shadowRoot
- .querySelector('gr-formatted-text')),
- 'gr-formatted-text is visible');
- assert.isTrue(isVisible(element.shadowRoot
- .querySelector('.actions')),
- 'actions are visible');
- assert.isNotOk(element.textarea, 'textarea is not visible');
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('.collapsedContent')),
- 'header middle content is is not visible');
-
- // When the edit button is pressed, should still see the actions
- // and also textarea
- element.draft = true;
- flush();
- MockInteractions.tap(element.shadowRoot
- .querySelector('.edit'));
- flush();
- assert.isFalse(element.collapsed);
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('gr-formatted-text')),
- 'gr-formatted-text is not visible');
- assert.isTrue(isVisible(element.shadowRoot
- .querySelector('.actions')),
- 'actions are visible');
- assert.isTrue(isVisible(element.textarea), 'textarea is visible');
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('.collapsedContent')),
- 'header middle content is not visible');
-
- // When toggle again, everything should be hidden except for textarea
- // and header middle content should be visible
- MockInteractions.tap(element.$.header);
- assert.isTrue(element.collapsed);
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('gr-formatted-text')),
- 'gr-formatted-text is not visible');
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('.actions')),
- 'actions are not visible');
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('gr-textarea')),
- 'textarea is not visible');
- assert.isTrue(isVisible(element.shadowRoot
- .querySelector('.collapsedContent')),
- 'header middle content is visible');
-
- // When toggle again, textarea should remain open in the state it was
- // before
- MockInteractions.tap(element.$.header);
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('gr-formatted-text')),
- 'gr-formatted-text is not visible');
- assert.isTrue(isVisible(element.shadowRoot
- .querySelector('.actions')),
- 'actions are visible');
- assert.isTrue(isVisible(element.textarea), 'textarea is visible');
- assert.isFalse(isVisible(element.shadowRoot
- .querySelector('.collapsedContent')),
- 'header middle content is not visible');
- });
-
- test('robot comment layout', done => {
- const comment = {robot_id: 'happy_robot_id',
- url: '/robot/comment',
- author: {
- name: 'Happy Robot',
- display_name: 'Display name Robot',
- }, ...element.comment};
- element.comment = comment;
- element.collapsed = false;
- flush(() => {
- let runIdMessage;
- runIdMessage = element.shadowRoot
- .querySelector('.runIdMessage');
- assert.isFalse(runIdMessage.hidden);
-
- const runDetailsLink = element.shadowRoot
- .querySelector('.robotRunLink');
- assert.isTrue(runDetailsLink.href.indexOf(element.comment.url) !== -1);
-
- const robotServiceName = element.shadowRoot
- .querySelector('.robotName');
- assert.equal(robotServiceName.textContent.trim(), 'happy_robot_id');
-
- const authorName = element.shadowRoot
- .querySelector('.robotId');
- assert.isTrue(authorName.innerText === 'Happy Robot');
-
- element.collapsed = true;
- flush();
- runIdMessage = element.shadowRoot
- .querySelector('.runIdMessage');
- assert.isTrue(runIdMessage.hidden);
- done();
- });
- });
-
- test('author name fallback to email', done => {
- const comment = {url: '/robot/comment',
- author: {
- email: 'test@test.com',
- }, ...element.comment};
- element.comment = comment;
- element.collapsed = false;
- flush(() => {
- const authorName = element.shadowRoot
- .querySelector('gr-account-label')
- .shadowRoot.querySelector('span.name');
- assert.equal(authorName.innerText.trim(), 'test@test.com');
- done();
- });
- });
-
- test('patchset level comment', done => {
- const comment = {...element.comment,
- path: SpecialFilePath.PATCHSET_LEVEL_COMMENTS, line: undefined,
- range: undefined};
- element.comment = comment;
- flush();
- MockInteractions.tap(element.shadowRoot
- .querySelector('.edit'));
- assert.isTrue(element.editing);
-
- element._messageText = 'hello world';
- const eraseMessageDraftSpy = sinon.spy(element.storage,
- 'eraseDraftComment');
- const mockEvent = {preventDefault: sinon.stub()};
- element._handleSave(mockEvent);
- flush(() => {
- assert.isTrue(eraseMessageDraftSpy.called);
- done();
- });
- });
-
- test('draft creation/cancellation', done => {
- assert.isFalse(element.editing);
- element.draft = true;
- flush();
- MockInteractions.tap(element.shadowRoot
- .querySelector('.edit'));
- assert.isTrue(element.editing);
-
- element._messageText = '';
- const eraseMessageDraftSpy = sinon.spy(element, '_eraseDraftComment');
-
- // Save should be disabled on an empty message.
- let disabled = element.shadowRoot
- .querySelector('.save').hasAttribute('disabled');
- assert.isTrue(disabled, 'save button should be disabled.');
- element._messageText = ' ';
- disabled = element.shadowRoot
- .querySelector('.save').hasAttribute('disabled');
- assert.isTrue(disabled, 'save button should be disabled.');
-
- const updateStub = sinon.stub();
- element.addEventListener('comment-update', updateStub);
-
- let numDiscardEvents = 0;
- element.addEventListener('comment-discard', e => {
- numDiscardEvents++;
- assert.isFalse(eraseMessageDraftSpy.called);
- if (numDiscardEvents === 2) {
- assert.isFalse(updateStub.called);
- done();
- }
- });
- MockInteractions.tap(element.shadowRoot
- .querySelector('.cancel'));
- element.fireUpdateTask.flush();
- element._messageText = '';
- flush();
- MockInteractions.pressAndReleaseKeyOn(element.textarea, 27); // esc
- });
-
- test('draft discard removes message from storage', done => {
- element._messageText = '';
- const eraseMessageDraftSpy = sinon.spy(element, '_eraseDraftComment');
- sinon.stub(element, '_closeConfirmDiscardOverlay');
-
- element.addEventListener('comment-discard', e => {
- assert.isTrue(eraseMessageDraftSpy.called);
- done();
- });
- element._handleConfirmDiscard({preventDefault: sinon.stub()});
- });
-
- test('storage is cleared only after save success', () => {
- element._messageText = 'test';
- const eraseStub = sinon.stub(element, '_eraseDraftComment');
- stubRestApi('getResponseObject')
- .returns(Promise.resolve({}));
-
- sinon.stub(element, '_saveDraft').returns(Promise.resolve({ok: false}));
-
- const savePromise = element.save();
- assert.isFalse(eraseStub.called);
- return savePromise.then(() => {
- assert.isFalse(eraseStub.called);
-
- element._saveDraft.restore();
- sinon.stub(element, '_saveDraft')
- .returns(Promise.resolve({ok: true}));
- return element.save().then(() => {
- assert.isTrue(eraseStub.called);
- });
- });
- });
-
- test('_computeSaveDisabled', () => {
- const comment = {unresolved: true};
- const msgComment = {message: 'test', unresolved: true};
- assert.equal(element._computeSaveDisabled('', comment, false), true);
- assert.equal(element._computeSaveDisabled('test', comment, false), false);
- assert.equal(element._computeSaveDisabled('', msgComment, false), true);
- assert.equal(
- element._computeSaveDisabled('test', msgComment, false), false);
- assert.equal(
- element._computeSaveDisabled('test2', msgComment, false), false);
- assert.equal(element._computeSaveDisabled('test', comment, true), false);
- assert.equal(element._computeSaveDisabled('', comment, true), true);
- assert.equal(element._computeSaveDisabled('', comment, false), true);
- });
-
- suite('confirm discard', () => {
- let discardStub;
- let overlayStub;
- let mockEvent;
-
- setup(() => {
- discardStub = sinon.stub(element, '_discardDraft');
- overlayStub = sinon.stub(element, '_openOverlay')
- .returns(Promise.resolve());
- mockEvent = {preventDefault: sinon.stub()};
- });
-
- test('confirms discard of comments with message text', () => {
- element._messageText = 'test';
- element._handleDiscard(mockEvent);
- assert.isTrue(overlayStub.calledWith(element.confirmDiscardOverlay));
- assert.isFalse(discardStub.called);
- });
-
- test('no confirmation for comments without message text', () => {
- element._messageText = '';
- element._handleDiscard(mockEvent);
- assert.isFalse(overlayStub.called);
- assert.isTrue(discardStub.calledOnce);
- });
- });
-
- test('ctrl+s saves comment', done => {
- const stub = sinon.stub(element, 'save').callsFake(() => {
- assert.isTrue(stub.called);
- stub.restore();
- done();
- return Promise.resolve();
- });
- element._messageText = 'is that the horse from horsing around??';
- element.editing = true;
- flush();
- MockInteractions.pressAndReleaseKeyOn(
- element.textarea.$.textarea.textarea,
- 83, 'ctrl'); // 'ctrl + s'
- });
-
- test('draft saving/editing', done => {
- const dispatchEventStub = sinon.stub(element, 'dispatchEvent');
-
- element.draft = true;
- flush();
- MockInteractions.tap(element.shadowRoot
- .querySelector('.edit'));
- element._messageText = 'good news, everyone!';
- element.fireUpdateTask.flush();
- element.storeTask.flush();
- assert.equal(dispatchEventStub.lastCall.args[0].type, 'comment-update');
- assert.isTrue(dispatchEventStub.calledTwice);
-
- element._messageText = 'good news, everyone!';
- element.fireUpdateTask.flush();
- element.storeTask.flush();
- assert.isTrue(dispatchEventStub.calledTwice);
-
- MockInteractions.tap(element.shadowRoot
- .querySelector('.save'));
-
- assert.isTrue(element.disabled,
- 'Element should be disabled when creating draft.');
-
- element._xhrPromise.then(draft => {
- assert.equal(dispatchEventStub.lastCall.args[0].type, 'comment-save');
- assert.isFalse(element.storeTask.isActive());
-
- assert.deepEqual(dispatchEventStub.lastCall.args[0].detail, {
- comment: {
- __draft: true,
- __draftID: 'temp_draft_id',
- id: 'baf0414d_40572e03',
- line: 5,
- message: 'saved!',
- path: '/path/to/file',
- updated: '2015-12-08 21:52:36.177000000',
- },
- patchNum: 1,
- });
- assert.isFalse(element.disabled,
- 'Element should be enabled when done creating draft.');
- assert.equal(draft.message, 'saved!');
- assert.isFalse(element.editing);
- }).then(() => {
- MockInteractions.tap(element.shadowRoot
- .querySelector('.edit'));
- element._messageText = 'You’ll be delivering a package to Chapek 9, ' +
- 'a world where humans are killed on sight.';
- MockInteractions.tap(element.shadowRoot
- .querySelector('.save'));
- assert.isTrue(element.disabled,
- 'Element should be disabled when updating draft.');
-
- element._xhrPromise.then(draft => {
- assert.isFalse(element.disabled,
- 'Element should be enabled when done updating draft.');
- assert.equal(draft.message, 'saved!');
- assert.isFalse(element.editing);
- dispatchEventStub.restore();
- done();
- });
- });
- });
-
- test('draft prevent save when disabled', () => {
- const saveStub = sinon.stub(element, 'save').returns(Promise.resolve());
- element.showActions = true;
- element.draft = true;
- flush();
- MockInteractions.tap(element.$.header);
- MockInteractions.tap(element.shadowRoot
- .querySelector('.edit'));
- element._messageText = 'good news, everyone!';
- element.fireUpdateTask.flush();
- element.storeTask.flush();
-
- element.disabled = true;
- MockInteractions.tap(element.shadowRoot
- .querySelector('.save'));
- assert.isFalse(saveStub.called);
-
- element.disabled = false;
- MockInteractions.tap(element.shadowRoot
- .querySelector('.save'));
- assert.isTrue(saveStub.calledOnce);
- });
-
- test('proper event fires on resolve, comment is not saved', done => {
- const save = sinon.stub(element, 'save');
- element.addEventListener('comment-update', e => {
- assert.isTrue(e.detail.comment.unresolved);
- assert.isFalse(save.called);
- done();
- });
- MockInteractions.tap(element.shadowRoot
- .querySelector('.resolve input'));
- });
-
- test('resolved comment state indicated by checkbox', () => {
- sinon.stub(element, 'save');
- element.comment = {unresolved: false};
- assert.isTrue(element.shadowRoot
- .querySelector('.resolve input').checked);
- element.comment = {unresolved: true};
- assert.isFalse(element.shadowRoot
- .querySelector('.resolve input').checked);
- });
-
- test('resolved checkbox saves with tap when !editing', () => {
- element.editing = false;
- const save = sinon.stub(element, 'save');
-
- element.comment = {unresolved: false};
- assert.isTrue(element.shadowRoot
- .querySelector('.resolve input').checked);
- element.comment = {unresolved: true};
- assert.isFalse(element.shadowRoot
- .querySelector('.resolve input').checked);
- assert.isFalse(save.called);
- MockInteractions.tap(element.$.resolvedCheckbox);
- assert.isTrue(element.shadowRoot
- .querySelector('.resolve input').checked);
- assert.isTrue(save.called);
- });
-
- suite('draft saving messages', () => {
- test('_getSavingMessage', () => {
- assert.equal(element._getSavingMessage(0), 'All changes saved');
- assert.equal(element._getSavingMessage(1), 'Saving 1 draft...');
- assert.equal(element._getSavingMessage(2), 'Saving 2 drafts...');
- assert.equal(element._getSavingMessage(3), 'Saving 3 drafts...');
- });
-
- test('_show{Start,End}Request', () => {
- const updateStub = sinon.stub(element, '_updateRequestToast');
- element._numPendingDraftRequests.number = 1;
-
- element._showStartRequest();
- assert.isTrue(updateStub.calledOnce);
- assert.equal(updateStub.lastCall.args[0], 2);
- assert.equal(element._numPendingDraftRequests.number, 2);
-
- element._showEndRequest();
- assert.isTrue(updateStub.calledTwice);
- assert.equal(updateStub.lastCall.args[0], 1);
- assert.equal(element._numPendingDraftRequests.number, 1);
-
- element._showEndRequest();
- assert.isTrue(updateStub.calledThrice);
- assert.equal(updateStub.lastCall.args[0], 0);
- assert.equal(element._numPendingDraftRequests.number, 0);
- });
- });
-
- test('cancelling an unsaved draft discards, persists in storage', () => {
- const discardSpy = sinon.spy(element, '_fireDiscard');
- const storeStub = stubStorage('setDraftComment');
- const eraseStub = stubStorage('eraseDraftComment');
- element._messageText = 'test text';
- flush();
- element.storeTask.flush();
-
- assert.isTrue(storeStub.called);
- assert.equal(storeStub.lastCall.args[1], 'test text');
- element._handleCancel({preventDefault: () => {}});
- assert.isTrue(discardSpy.called);
- assert.isFalse(eraseStub.called);
- });
-
- test('cancelling edit on a saved draft does not store', () => {
- element.comment.id = 'foo';
- const discardSpy = sinon.spy(element, '_fireDiscard');
- const storeStub = stubStorage('setDraftComment');
- element._messageText = 'test text';
- flush();
- if (element.storeTask) element.storeTask.flush();
-
- assert.isFalse(storeStub.called);
- element._handleCancel({preventDefault: () => {}});
- assert.isTrue(discardSpy.called);
- });
-
- test('deleting text from saved draft and saving deletes the draft', () => {
- element.comment = {id: 'foo', message: 'test'};
- element._messageText = '';
- const discardStub = sinon.stub(element, '_discardDraft');
-
- element.save();
- assert.isTrue(discardStub.called);
- });
-
- test('_handleFix fires create-fix event', done => {
- element.addEventListener('create-fix-comment', e => {
- assert.deepEqual(e.detail, element._getEventPayload());
- done();
- });
- element.isRobotComment = true;
- element.comments = [element.comment];
- flush();
-
- MockInteractions.tap(element.shadowRoot
- .querySelector('.fix'));
- });
-
- test('do not show Please Fix button if human reply exists', () => {
- element.comments = [
- {
- robot_id: 'happy_robot_id',
- robot_run_id: '5838406743490560',
- fix_suggestions: [
- {
- fix_id: '478ff847_3bf47aaf',
- description: 'Make the smiley happier by giving it a nose.',
- replacements: [
- {
- path: 'Documentation/config-gerrit.txt',
- range: {
- start_line: 10,
- start_character: 7,
- end_line: 10,
- end_character: 9,
- },
- replacement: ':-)',
- },
- ],
- },
- ],
- author: {
- _account_id: 1030912,
- name: 'Alice Kober-Sotzek',
- email: 'aliceks@google.com',
- avatars: [
- {
- url: '/s32-p/photo.jpg',
- height: 32,
- },
- {
- url: '/AaAdOFzPlFI/s56-p/photo.jpg',
- height: 56,
- },
- {
- url: '/AaAdOFzPlFI/s100-p/photo.jpg',
- height: 100,
- },
- {
- url: '/AaAdOFzPlFI/s120-p/photo.jpg',
- height: 120,
- },
- ],
- },
- patch_set: 1,
- id: 'eb0d03fd_5e95904f',
- line: 10,
- updated: '2017-04-04 15:36:17.000000000',
- message: 'This is a robot comment with a fix.',
- unresolved: false,
- diffSide: Side.RIGHT,
- collapsed: false,
- },
- {
- __draft: true,
- __draftID: '0.wbrfbwj89sa',
- __date: '2019-12-04T13:41:03.689Z',
- path: 'Documentation/config-gerrit.txt',
- patchNum: 1,
- side: 'REVISION',
- diffSide: Side.RIGHT,
- line: 10,
- in_reply_to: 'eb0d03fd_5e95904f',
- message: '> This is a robot comment with a fix.\n\nPlease fix.',
- unresolved: true,
- },
- ];
- element.comment = element.comments[0];
- flush();
- assert.isNull(element.shadowRoot
- .querySelector('robotActions gr-button'));
- });
-
- test('show Please Fix if no human reply', () => {
- element.comments = [
- {
- robot_id: 'happy_robot_id',
- robot_run_id: '5838406743490560',
- fix_suggestions: [
- {
- fix_id: '478ff847_3bf47aaf',
- description: 'Make the smiley happier by giving it a nose.',
- replacements: [
- {
- path: 'Documentation/config-gerrit.txt',
- range: {
- start_line: 10,
- start_character: 7,
- end_line: 10,
- end_character: 9,
- },
- replacement: ':-)',
- },
- ],
- },
- ],
- author: {
- _account_id: 1030912,
- name: 'Alice Kober-Sotzek',
- email: 'aliceks@google.com',
- avatars: [
- {
- url: '/s32-p/photo.jpg',
- height: 32,
- },
- {
- url: '/AaAdOFzPlFI/s56-p/photo.jpg',
- height: 56,
- },
- {
- url: '/AaAdOFzPlFI/s100-p/photo.jpg',
- height: 100,
- },
- {
- url: '/AaAdOFzPlFI/s120-p/photo.jpg',
- height: 120,
- },
- ],
- },
- patch_set: 1,
- id: 'eb0d03fd_5e95904f',
- line: 10,
- updated: '2017-04-04 15:36:17.000000000',
- message: 'This is a robot comment with a fix.',
- unresolved: false,
- diffSide: Side.RIGHT,
- collapsed: false,
- },
- ];
- element.comment = element.comments[0];
- flush();
- assert.isNotNull(element.shadowRoot
- .querySelector('.robotActions gr-button'));
- });
-
- test('_handleShowFix fires open-fix-preview event', done => {
- element.addEventListener('open-fix-preview', e => {
- assert.deepEqual(e.detail, element._getEventPayload());
- done();
- });
- element.comment = {fix_suggestions: [{}]};
- element.isRobotComment = true;
- flush();
-
- MockInteractions.tap(element.shadowRoot
- .querySelector('.show-fix'));
- });
- });
-
- suite('respectful tips', () => {
- let element;
-
- let clock;
- setup(() => {
- stubRestApi('getAccount').returns(Promise.resolve(null));
- clock = sinon.useFakeTimers();
- });
-
- teardown(() => {
- clock.restore();
- sinon.restore();
- });
-
- test('show tip when no cached record', done => {
- element = draftFixture.instantiate();
- const respectfulGetStub =
- sinon.stub(element.storage, 'getRespectfulTipVisibility');
- const respectfulSetStub =
- sinon.stub(element.storage, 'setRespectfulTipVisibility');
- respectfulGetStub.returns(null);
- // fake random
- element.getRandomNum = () => 0;
- element.comment = {__editing: true, __draft: true};
- flush(() => {
- assert.isTrue(respectfulGetStub.called);
- assert.isTrue(respectfulSetStub.called);
- assert.isTrue(
- !!element.shadowRoot.querySelector('.respectfulReviewTip')
- );
- done();
- });
- });
-
- test('add 14-day delays once dismissed', done => {
- element = draftFixture.instantiate();
- const respectfulGetStub =
- sinon.stub(element.storage, 'getRespectfulTipVisibility');
- const respectfulSetStub =
- sinon.stub(element.storage, 'setRespectfulTipVisibility');
- respectfulGetStub.returns(null);
- // fake random
- element.getRandomNum = () => 0;
- element.comment = {__editing: true, __draft: true};
- flush(() => {
- assert.isTrue(respectfulGetStub.called);
- assert.isTrue(respectfulSetStub.called);
- assert.isTrue(respectfulSetStub.lastCall.args[0] === undefined);
- assert.isTrue(
- !!element.shadowRoot.querySelector('.respectfulReviewTip')
- );
-
- MockInteractions.tap(element.shadowRoot
- .querySelector('.respectfulReviewTip .close'));
- flush();
- assert.isTrue(respectfulSetStub.lastCall.args[0] === 14);
- done();
- });
- });
-
- test('do not show tip when fall out of probability', done => {
- element = draftFixture.instantiate();
- const respectfulGetStub =
- sinon.stub(element.storage, 'getRespectfulTipVisibility');
- const respectfulSetStub =
- sinon.stub(element.storage, 'setRespectfulTipVisibility');
- respectfulGetStub.returns(null);
- // fake random
- element.getRandomNum = () => 3;
- element.comment = {__editing: true, __draft: true};
- flush(() => {
- assert.isTrue(respectfulGetStub.called);
- assert.isFalse(respectfulSetStub.called);
- assert.isFalse(
- !!element.shadowRoot.querySelector('.respectfulReviewTip')
- );
- done();
- });
- });
-
- test('show tip when editing changed to true', done => {
- element = draftFixture.instantiate();
- const respectfulGetStub =
- sinon.stub(element.storage, 'getRespectfulTipVisibility');
- const respectfulSetStub =
- sinon.stub(element.storage, 'setRespectfulTipVisibility');
- respectfulGetStub.returns(null);
- // fake random
- element.getRandomNum = () => 0;
- element.comment = {__editing: false};
- flush(() => {
- assert.isFalse(respectfulGetStub.called);
- assert.isFalse(respectfulSetStub.called);
- assert.isFalse(
- !!element.shadowRoot.querySelector('.respectfulReviewTip')
- );
-
- element.editing = true;
- flush(() => {
- assert.isTrue(respectfulGetStub.called);
- assert.isTrue(respectfulSetStub.called);
- assert.isTrue(
- !!element.shadowRoot.querySelector('.respectfulReviewTip')
- );
- done();
- });
- });
- });
-
- test('no tip when cached record', done => {
- element = draftFixture.instantiate();
- const respectfulGetStub =
- sinon.stub(element.storage, 'getRespectfulTipVisibility');
- const respectfulSetStub =
- sinon.stub(element.storage, 'setRespectfulTipVisibility');
- respectfulGetStub.returns({});
- // fake random
- element.getRandomNum = () => 0;
- element.comment = {__editing: true, __draft: true};
- flush(() => {
- assert.isTrue(respectfulGetStub.called);
- assert.isFalse(respectfulSetStub.called);
- assert.isFalse(
- !!element.shadowRoot.querySelector('.respectfulReviewTip')
- );
- done();
- });
- });
- });
-});
-
diff --git a/polygerrit-ui/app/elements/shared/gr-comment/gr-comment_test.ts b/polygerrit-ui/app/elements/shared/gr-comment/gr-comment_test.ts
new file mode 100644
index 0000000..6d5cec7
--- /dev/null
+++ b/polygerrit-ui/app/elements/shared/gr-comment/gr-comment_test.ts
@@ -0,0 +1,1563 @@
+/**
+ * @license
+ * Copyright (C) 2015 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.
+ */
+
+import '../../../test/common-test-setup-karma';
+import './gr-comment';
+import {html} from '@polymer/polymer/lib/utils/html-tag';
+import {GrComment, __testOnly_UNSAVED_MESSAGE} from './gr-comment';
+import {SpecialFilePath, CommentSide} from '../../../constants/constants';
+import {
+ queryAndAssert,
+ stubRestApi,
+ stubStorage,
+ spyStorage,
+ query,
+ isVisible,
+} from '../../../test/test-utils';
+import {
+ AccountId,
+ EmailAddress,
+ FixId,
+ NumericChangeId,
+ ParsedJSON,
+ PatchSetNum,
+ RobotId,
+ RobotRunId,
+ Timestamp,
+ UrlEncodedCommentId,
+} from '../../../types/common';
+import {
+ pressAndReleaseKeyOn,
+ tap,
+} from '@polymer/iron-test-helpers/mock-interactions';
+import {
+ createComment,
+ createDraft,
+ createFixSuggestionInfo,
+} from '../../../test/test-data-generators';
+import {Timer} from '../../../services/gr-reporting/gr-reporting';
+import {SinonFakeTimers, SinonStubbedMember} from 'sinon/pkg/sinon-esm';
+import {CreateFixCommentEvent} from '../../../types/events';
+import {DraftInfo, UIRobot} from '../../../utils/comment-util';
+import {MockTimer} from '../../../services/gr-reporting/gr-reporting_mock';
+import {GrConfirmDeleteCommentDialog} from '../gr-confirm-delete-comment-dialog/gr-confirm-delete-comment-dialog';
+
+const basicFixture = fixtureFromElement('gr-comment');
+
+const draftFixture = fixtureFromTemplate(html`
+ <gr-comment draft="true"></gr-comment>
+`);
+
+suite('gr-comment tests', () => {
+ suite('basic tests', () => {
+ let element: GrComment;
+
+ let openOverlaySpy: sinon.SinonSpy;
+
+ setup(() => {
+ stubRestApi('getAccount').returns(
+ Promise.resolve({
+ email: 'dhruvsri@google.com' as EmailAddress,
+ name: 'Dhruv Srivastava',
+ _account_id: 1083225 as AccountId,
+ avatars: [{url: 'abc', height: 32, width: 32}],
+ registered_on: '123' as Timestamp,
+ })
+ );
+ element = basicFixture.instantiate();
+ element.comment = {
+ ...createComment(),
+ author: {
+ name: 'Mr. Peanutbutter',
+ email: 'tenn1sballchaser@aol.com' as EmailAddress,
+ },
+ id: 'baf0414d_60047215' as UrlEncodedCommentId,
+ line: 5,
+ message: 'is this a crossover episode!?',
+ updated: '2015-12-08 19:48:33.843000000' as Timestamp,
+ };
+
+ openOverlaySpy = sinon.spy(element, '_openOverlay');
+ });
+
+ teardown(() => {
+ openOverlaySpy.getCalls().forEach(call => {
+ call.args[0].remove();
+ });
+ });
+
+ test('collapsible comments', () => {
+ // When a comment (not draft) is loaded, it should be collapsed
+ assert.isTrue(element.collapsed);
+ assert.isFalse(
+ isVisible(queryAndAssert(element, 'gr-formatted-text')),
+ 'gr-formatted-text is not visible'
+ );
+ assert.isFalse(
+ isVisible(queryAndAssert(element, '.actions')),
+ 'actions are not visible'
+ );
+ assert.isNotOk(element.textarea, 'textarea is not visible');
+
+ // The header middle content is only visible when comments are collapsed.
+ // It shows the message in a condensed way, and limits to a single line.
+ assert.isTrue(
+ isVisible(queryAndAssert(element, '.collapsedContent')),
+ 'header middle content is visible'
+ );
+
+ // When the header row is clicked, the comment should expand
+ tap(element.$.header);
+ assert.isFalse(element.collapsed);
+ assert.isTrue(
+ isVisible(queryAndAssert(element, 'gr-formatted-text')),
+ 'gr-formatted-text is visible'
+ );
+ assert.isTrue(
+ isVisible(queryAndAssert(element, '.actions')),
+ 'actions are visible'
+ );
+ assert.isNotOk(element.textarea, 'textarea is not visible');
+ assert.isFalse(
+ isVisible(queryAndAssert(element, '.collapsedContent')),
+ 'header middle content is not visible'
+ );
+ });
+
+ test('clicking on date link fires event', () => {
+ element.side = 'PARENT';
+ const stub = sinon.stub();
+ element.addEventListener('comment-anchor-tap', stub);
+ flush();
+ const dateEl = queryAndAssert(element, '.date');
+ assert.ok(dateEl);
+ tap(dateEl);
+
+ assert.isTrue(stub.called);
+ assert.deepEqual(stub.lastCall.args[0].detail, {
+ side: element.side,
+ number: element.comment!.line,
+ });
+ });
+
+ test('message is not retrieved from storage when other edits', done => {
+ const storageStub = stubStorage('getDraftComment');
+ const loadSpy = sinon.spy(element, '_loadLocalDraft');
+
+ element.changeNum = 1 as NumericChangeId;
+ element.patchNum = 1 as PatchSetNum;
+ element.comment = {
+ author: {
+ name: 'Mr. Peanutbutter',
+ email: 'tenn1sballchaser@aol.com' as EmailAddress,
+ },
+ line: 5,
+ };
+ flush(() => {
+ assert.isTrue(loadSpy.called);
+ assert.isFalse(storageStub.called);
+ done();
+ });
+ });
+
+ test('message is retrieved from storage when no other edits', done => {
+ const storageStub = stubStorage('getDraftComment');
+ const loadSpy = sinon.spy(element, '_loadLocalDraft');
+
+ element.changeNum = 1 as NumericChangeId;
+ element.patchNum = 1 as PatchSetNum;
+ element.comment = {
+ author: {
+ name: 'Mr. Peanutbutter',
+ email: 'tenn1sballchaser@aol.com' as EmailAddress,
+ },
+ line: 5,
+ path: 'test',
+ };
+ flush(() => {
+ assert.isTrue(loadSpy.called);
+ assert.isTrue(storageStub.called);
+ done();
+ });
+ });
+
+ test('_getPatchNum', () => {
+ element.side = 'PARENT';
+ element.patchNum = 1 as PatchSetNum;
+ assert.equal(element._getPatchNum(), 'PARENT' as PatchSetNum);
+ element.side = 'REVISION';
+ assert.equal(element._getPatchNum(), 1 as PatchSetNum);
+ });
+
+ test('comment expand and collapse', () => {
+ element.collapsed = true;
+ assert.isFalse(
+ isVisible(queryAndAssert(element, 'gr-formatted-text')),
+ 'gr-formatted-text is not visible'
+ );
+ assert.isFalse(
+ isVisible(queryAndAssert(element, '.actions')),
+ 'actions are not visible'
+ );
+ assert.isNotOk(element.textarea, 'textarea is not visible');
+ assert.isTrue(
+ isVisible(queryAndAssert(element, '.collapsedContent')),
+ 'header middle content is visible'
+ );
+
+ element.collapsed = false;
+ assert.isFalse(element.collapsed);
+ assert.isTrue(
+ isVisible(queryAndAssert(element, 'gr-formatted-text')),
+ 'gr-formatted-text is visible'
+ );
+ assert.isTrue(
+ isVisible(queryAndAssert(element, '.actions')),
+ 'actions are visible'
+ );
+ assert.isNotOk(element.textarea, 'textarea is not visible');
+ assert.isFalse(
+ isVisible(queryAndAssert(element, '.collapsedContent')),
+ 'header middle content is is not visible'
+ );
+ });
+
+ suite('while editing', () => {
+ let handleCancelStub: sinon.SinonStub;
+ let handleSaveStub: sinon.SinonStub;
+ setup(() => {
+ element.editing = true;
+ element._messageText = 'test';
+ handleCancelStub = sinon.stub(element, '_handleCancel');
+ handleSaveStub = sinon.stub(element, '_handleSave');
+ flush();
+ });
+
+ suite('when text is empty', () => {
+ setup(() => {
+ element._messageText = '';
+ element.comment = {};
+ });
+
+ test('esc closes comment when text is empty', () => {
+ pressAndReleaseKeyOn(element.textarea!, 27); // esc
+ assert.isTrue(handleCancelStub.called);
+ });
+
+ test('ctrl+enter does not save', () => {
+ pressAndReleaseKeyOn(element.textarea!, 13, 'ctrl'); // ctrl + enter
+ assert.isFalse(handleSaveStub.called);
+ });
+
+ test('meta+enter does not save', () => {
+ pressAndReleaseKeyOn(element.textarea!, 13, 'meta'); // meta + enter
+ assert.isFalse(handleSaveStub.called);
+ });
+
+ test('ctrl+s does not save', () => {
+ pressAndReleaseKeyOn(element.textarea!, 83, 'ctrl'); // ctrl + s
+ assert.isFalse(handleSaveStub.called);
+ });
+ });
+
+ test('esc does not close comment that has content', () => {
+ pressAndReleaseKeyOn(element.textarea!, 27); // esc
+ assert.isFalse(handleCancelStub.called);
+ });
+
+ test('ctrl+enter saves', () => {
+ pressAndReleaseKeyOn(element.textarea!, 13, 'ctrl'); // ctrl + enter
+ assert.isTrue(handleSaveStub.called);
+ });
+
+ test('meta+enter saves', () => {
+ pressAndReleaseKeyOn(element.textarea!, 13, 'meta'); // meta + enter
+ assert.isTrue(handleSaveStub.called);
+ });
+
+ test('ctrl+s saves', () => {
+ pressAndReleaseKeyOn(element.textarea!, 83, 'ctrl'); // ctrl + s
+ assert.isTrue(handleSaveStub.called);
+ });
+ });
+
+ test('delete comment button for non-admins is hidden', () => {
+ element._isAdmin = false;
+ assert.isFalse(
+ queryAndAssert(element, '.action.delete').classList.contains(
+ 'showDeleteButtons'
+ )
+ );
+ });
+
+ test('delete comment button for admins with draft is hidden', () => {
+ element._isAdmin = false;
+ element.draft = true;
+ assert.isFalse(
+ queryAndAssert(element, '.action.delete').classList.contains(
+ 'showDeleteButtons'
+ )
+ );
+ });
+
+ test('delete comment', done => {
+ const stub = stubRestApi('deleteComment').returns(
+ Promise.resolve({
+ id: '1' as UrlEncodedCommentId,
+ updated: '1' as Timestamp,
+ ...createComment(),
+ })
+ );
+ const openSpy = sinon.spy(element.confirmDeleteOverlay!, 'open');
+ element.changeNum = 42 as NumericChangeId;
+ element.patchNum = 1 as PatchSetNum;
+ element._isAdmin = true;
+ assert.isTrue(
+ queryAndAssert(element, '.action.delete').classList.contains(
+ 'showDeleteButtons'
+ )
+ );
+ tap(queryAndAssert(element, '.action.delete'));
+ flush(() => {
+ openSpy.lastCall.returnValue.then(() => {
+ const dialog = element.confirmDeleteOverlay?.querySelector(
+ '#confirmDeleteComment'
+ ) as GrConfirmDeleteCommentDialog;
+ dialog.message = 'removal reason';
+ element._handleConfirmDeleteComment();
+ assert.isTrue(
+ stub.calledWith(
+ 42 as NumericChangeId,
+ 1 as PatchSetNum,
+ 'baf0414d_60047215' as UrlEncodedCommentId,
+ 'removal reason'
+ )
+ );
+ done();
+ });
+ });
+ });
+
+ suite('draft update reporting', () => {
+ let endStub: SinonStubbedMember<() => Timer>;
+ let getTimerStub: sinon.SinonStub;
+ const mockEvent = {...new Event('click'), preventDefault() {}};
+
+ setup(() => {
+ sinon.stub(element, 'save').returns(Promise.resolve({}));
+ sinon.stub(element, '_discardDraft').returns(Promise.resolve({}));
+ endStub = sinon.stub();
+ const mockTimer = new MockTimer();
+ mockTimer.end = endStub;
+ getTimerStub = sinon
+ .stub(element.reporting, 'getTimer')
+ .returns(mockTimer);
+ });
+
+ test('create', () => {
+ element.patchNum = 1 as PatchSetNum;
+ element.comment = {};
+ return element._handleSave(mockEvent)!.then(() => {
+ assert.equal(
+ (queryAndAssert(
+ element,
+ 'gr-account-label'
+ ).shadowRoot?.querySelector(
+ 'span.name'
+ ) as HTMLSpanElement).innerText.trim(),
+ 'Dhruv Srivastava'
+ );
+ assert.isTrue(endStub.calledOnce);
+ assert.isTrue(getTimerStub.calledOnce);
+ assert.equal(getTimerStub.lastCall.args[0], 'CreateDraftComment');
+ });
+ });
+
+ test('update', () => {
+ element.comment = {
+ ...createComment(),
+ id: ('abc_123' as UrlEncodedCommentId) as UrlEncodedCommentId,
+ };
+ return element._handleSave(mockEvent)!.then(() => {
+ assert.isTrue(endStub.calledOnce);
+ assert.isTrue(getTimerStub.calledOnce);
+ assert.equal(getTimerStub.lastCall.args[0], 'UpdateDraftComment');
+ });
+ });
+
+ test('discard', () => {
+ element.comment = {
+ ...createComment(),
+ id: ('abc_123' as UrlEncodedCommentId) as UrlEncodedCommentId,
+ };
+ sinon.stub(element, '_closeConfirmDiscardOverlay');
+ return element._handleConfirmDiscard(mockEvent).then(() => {
+ assert.isTrue(endStub.calledOnce);
+ assert.isTrue(getTimerStub.calledOnce);
+ assert.equal(getTimerStub.lastCall.args[0], 'DiscardDraftComment');
+ });
+ });
+ });
+
+ test('edit reports interaction', () => {
+ const reportStub = sinon.stub(
+ element.reporting,
+ 'recordDraftInteraction'
+ );
+ element.draft = true;
+ flush();
+ tap(queryAndAssert(element, '.edit'));
+ assert.isTrue(reportStub.calledOnce);
+ });
+
+ test('discard reports interaction', () => {
+ const reportStub = sinon.stub(
+ element.reporting,
+ 'recordDraftInteraction'
+ );
+ element.draft = true;
+ flush();
+ tap(queryAndAssert(element, '.discard'));
+ assert.isTrue(reportStub.calledOnce);
+ });
+
+ test('failed save draft request', done => {
+ element.draft = true;
+ element.changeNum = 1 as NumericChangeId;
+ element.patchNum = 1 as PatchSetNum;
+ const updateRequestStub = sinon.stub(element, '_updateRequestToast');
+ const diffDraftStub = stubRestApi('saveDiffDraft').returns(
+ Promise.resolve({...new Response(), ok: false})
+ );
+ element._saveDraft({
+ ...createComment(),
+ id: 'abc_123' as UrlEncodedCommentId,
+ });
+ flush(() => {
+ let args = updateRequestStub.lastCall.args;
+ assert.deepEqual(args, [0, true]);
+ assert.equal(
+ element._getSavingMessage(...args),
+ __testOnly_UNSAVED_MESSAGE
+ );
+ assert.equal(
+ (queryAndAssert(element, '.draftLabel') as HTMLSpanElement).innerText,
+ 'DRAFT(Failed to save)'
+ );
+ assert.isTrue(
+ isVisible(queryAndAssert(element, '.save')),
+ 'save is visible'
+ );
+ diffDraftStub.returns(Promise.resolve({...new Response(), ok: true}));
+ element._saveDraft({
+ ...createComment(),
+ id: 'abc_123' as UrlEncodedCommentId,
+ });
+ flush(() => {
+ args = updateRequestStub.lastCall.args;
+ assert.deepEqual(args, [0]);
+ assert.equal(element._getSavingMessage(...args), 'All changes saved');
+ assert.equal(
+ (queryAndAssert(element, '.draftLabel') as HTMLSpanElement)
+ .innerText,
+ 'DRAFT'
+ );
+ assert.isFalse(
+ isVisible(queryAndAssert(element, '.save')),
+ 'save is not visible'
+ );
+ assert.isFalse(element._unableToSave);
+ done();
+ });
+ });
+ });
+
+ test('failed save draft request with promise failure', done => {
+ element.draft = true;
+ element.changeNum = 1 as NumericChangeId;
+ element.patchNum = 1 as PatchSetNum;
+ const updateRequestStub = sinon.stub(element, '_updateRequestToast');
+ const diffDraftStub = stubRestApi('saveDiffDraft').returns(
+ Promise.reject(new Error())
+ );
+ element._saveDraft({
+ ...createComment(),
+ id: 'abc_123' as UrlEncodedCommentId,
+ });
+ flush(() => {
+ let args = updateRequestStub.lastCall.args;
+ assert.deepEqual(args, [0, true]);
+ assert.equal(
+ element._getSavingMessage(...args),
+ __testOnly_UNSAVED_MESSAGE
+ );
+ assert.equal(
+ (queryAndAssert(element, '.draftLabel') as HTMLSpanElement).innerText,
+ 'DRAFT(Failed to save)'
+ );
+ assert.isTrue(
+ isVisible(queryAndAssert(element, '.save')),
+ 'save is visible'
+ );
+ diffDraftStub.returns(Promise.resolve({...new Response(), ok: true}));
+ element._saveDraft({
+ ...createComment(),
+ id: 'abc_123' as UrlEncodedCommentId,
+ });
+ flush(() => {
+ args = updateRequestStub.lastCall.args;
+ assert.deepEqual(args, [0]);
+ assert.equal(element._getSavingMessage(...args), 'All changes saved');
+ assert.equal(
+ (queryAndAssert(element, '.draftLabel') as HTMLSpanElement)
+ .innerText,
+ 'DRAFT'
+ );
+ assert.isFalse(
+ isVisible(queryAndAssert(element, '.save')),
+ 'save is not visible'
+ );
+ assert.isFalse(element._unableToSave);
+ done();
+ });
+ });
+ });
+ });
+
+ suite('gr-comment draft tests', () => {
+ let element: GrComment;
+
+ setup(() => {
+ stubRestApi('getAccount').returns(Promise.resolve(undefined));
+ stubRestApi('saveDiffDraft').returns(
+ Promise.resolve({
+ ...new Response(),
+ ok: true,
+ text() {
+ return Promise.resolve(
+ ")]}'\n{" +
+ '"id": "baf0414d_40572e03",' +
+ '"path": "/path/to/file",' +
+ '"line": 5,' +
+ '"updated": "2015-12-08 21:52:36.177000000",' +
+ '"message": "saved!",' +
+ '"side": "REVISION",' +
+ '"unresolved": false,' +
+ '"patch_set": 1' +
+ '}'
+ );
+ },
+ })
+ );
+ stubRestApi('removeChangeReviewer').returns(
+ Promise.resolve({...new Response(), ok: true})
+ );
+ element = draftFixture.instantiate() as GrComment;
+ stubStorage('getDraftComment').returns(null);
+ element.changeNum = 42 as NumericChangeId;
+ element.patchNum = 1 as PatchSetNum;
+ element.editing = false;
+ element.comment = {
+ ...createComment(),
+ __draft: true,
+ __draftID: 'temp_draft_id',
+ path: '/path/to/file',
+ line: 5,
+ };
+ });
+
+ test('button visibility states', () => {
+ element.showActions = false;
+ assert.isTrue(
+ queryAndAssert(element, '.humanActions').hasAttribute('hidden')
+ );
+ assert.isTrue(
+ queryAndAssert(element, '.robotActions').hasAttribute('hidden')
+ );
+
+ element.showActions = true;
+ assert.isFalse(
+ queryAndAssert(element, '.humanActions').hasAttribute('hidden')
+ );
+ assert.isTrue(
+ queryAndAssert(element, '.robotActions').hasAttribute('hidden')
+ );
+
+ element.draft = true;
+ flush();
+ assert.isTrue(
+ isVisible(queryAndAssert(element, '.edit')),
+ 'edit is visible'
+ );
+ assert.isTrue(
+ isVisible(queryAndAssert(element, '.discard')),
+ 'discard is visible'
+ );
+ assert.isFalse(
+ isVisible(queryAndAssert(element, '.save')),
+ 'save is not visible'
+ );
+ assert.isFalse(
+ isVisible(queryAndAssert(element, '.cancel')),
+ 'cancel is not visible'
+ );
+ assert.isTrue(
+ isVisible(queryAndAssert(element, '.resolve')),
+ 'resolve is visible'
+ );
+ assert.isFalse(
+ queryAndAssert(element, '.humanActions').hasAttribute('hidden')
+ );
+ assert.isTrue(
+ queryAndAssert(element, '.robotActions').hasAttribute('hidden')
+ );
+
+ element.editing = true;
+ flush();
+ assert.isFalse(
+ isVisible(queryAndAssert(element, '.edit')),
+ 'edit is not visible'
+ );
+ assert.isFalse(
+ isVisible(queryAndAssert(element, '.discard')),
+ 'discard not visible'
+ );
+ assert.isTrue(
+ isVisible(queryAndAssert(element, '.save')),
+ 'save is visible'
+ );
+ assert.isTrue(
+ isVisible(queryAndAssert(element, '.cancel')),
+ 'cancel is visible'
+ );
+ assert.isTrue(
+ isVisible(queryAndAssert(element, '.resolve')),
+ 'resolve is visible'
+ );
+ assert.isFalse(
+ queryAndAssert(element, '.humanActions').hasAttribute('hidden')
+ );
+ assert.isTrue(
+ queryAndAssert(element, '.robotActions').hasAttribute('hidden')
+ );
+
+ element.draft = false;
+ element.editing = false;
+ flush();
+ assert.isFalse(
+ isVisible(queryAndAssert(element, '.edit')),
+ 'edit is not visible'
+ );
+ assert.isFalse(
+ isVisible(queryAndAssert(element, '.discard')),
+ 'discard is not visible'
+ );
+ assert.isFalse(
+ isVisible(queryAndAssert(element, '.save')),
+ 'save is not visible'
+ );
+ assert.isFalse(
+ isVisible(queryAndAssert(element, '.cancel')),
+ 'cancel is not visible'
+ );
+ assert.isFalse(
+ queryAndAssert(element, '.humanActions').hasAttribute('hidden')
+ );
+ assert.isTrue(
+ queryAndAssert(element, '.robotActions').hasAttribute('hidden')
+ );
+
+ element.comment!.id = 'foo' as UrlEncodedCommentId;
+ element.draft = true;
+ element.editing = true;
+ flush();
+ assert.isTrue(
+ isVisible(queryAndAssert(element, '.cancel')),
+ 'cancel is visible'
+ );
+ assert.isFalse(
+ queryAndAssert(element, '.humanActions').hasAttribute('hidden')
+ );
+ assert.isTrue(
+ queryAndAssert(element, '.robotActions').hasAttribute('hidden')
+ );
+
+ // Delete button is not hidden by default
+ assert.isFalse(
+ (queryAndAssert(element, '#deleteBtn') as HTMLElement).hidden
+ );
+
+ element.isRobotComment = true;
+ element.draft = true;
+ assert.isTrue(
+ queryAndAssert(element, '.humanActions').hasAttribute('hidden')
+ );
+ assert.isFalse(
+ queryAndAssert(element, '.robotActions').hasAttribute('hidden')
+ );
+
+ // It is not expected to see Robot comment drafts, but if they appear,
+ // they will behave the same as non-drafts.
+ element.draft = false;
+ assert.isTrue(
+ queryAndAssert(element, '.humanActions').hasAttribute('hidden')
+ );
+ assert.isFalse(
+ queryAndAssert(element, '.robotActions').hasAttribute('hidden')
+ );
+
+ // A robot comment with run ID should display plain text.
+ element.set(['comment', 'robot_run_id'], 'text');
+ element.editing = false;
+ element.collapsed = false;
+ flush();
+ assert.isTrue(
+ queryAndAssert(element, '.robotRun.link').textContent === 'Run Details'
+ );
+
+ // A robot comment with run ID and url should display a link.
+ element.set(['comment', 'url'], '/path/to/run');
+ flush();
+ assert.notEqual(
+ getComputedStyle(queryAndAssert(element, '.robotRun.link')).display,
+ 'none'
+ );
+
+ // Delete button is hidden for robot comments
+ assert.isTrue(
+ (queryAndAssert(element, '#deleteBtn') as HTMLElement).hidden
+ );
+ });
+
+ test('collapsible drafts', () => {
+ assert.isTrue(element.collapsed);
+ assert.isFalse(
+ isVisible(queryAndAssert(element, 'gr-formatted-text')),
+ 'gr-formatted-text is not visible'
+ );
+ assert.isFalse(
+ isVisible(queryAndAssert(element, '.actions')),
+ 'actions are not visible'
+ );
+ assert.isNotOk(element.textarea, 'textarea is not visible');
+ assert.isTrue(
+ isVisible(queryAndAssert(element, '.collapsedContent')),
+ 'header middle content is visible'
+ );
+
+ tap(element.$.header);
+ assert.isFalse(element.collapsed);
+ assert.isTrue(
+ isVisible(queryAndAssert(element, 'gr-formatted-text')),
+ 'gr-formatted-text is visible'
+ );
+ assert.isTrue(
+ isVisible(queryAndAssert(element, '.actions')),
+ 'actions are visible'
+ );
+ assert.isNotOk(element.textarea, 'textarea is not visible');
+ assert.isFalse(
+ isVisible(queryAndAssert(element, '.collapsedContent')),
+ 'header middle content is is not visible'
+ );
+
+ // When the edit button is pressed, should still see the actions
+ // and also textarea
+ element.draft = true;
+ flush();
+ tap(queryAndAssert(element, '.edit'));
+ flush();
+ assert.isFalse(element.collapsed);
+ assert.isFalse(
+ isVisible(queryAndAssert(element, 'gr-formatted-text')),
+ 'gr-formatted-text is not visible'
+ );
+ assert.isTrue(
+ isVisible(queryAndAssert(element, '.actions')),
+ 'actions are visible'
+ );
+ assert.isTrue(isVisible(element.textarea!), 'textarea is visible');
+ assert.isFalse(
+ isVisible(queryAndAssert(element, '.collapsedContent')),
+ 'header middle content is not visible'
+ );
+
+ // When toggle again, everything should be hidden except for textarea
+ // and header middle content should be visible
+ tap(element.$.header);
+ assert.isTrue(element.collapsed);
+ assert.isFalse(
+ isVisible(queryAndAssert(element, 'gr-formatted-text')),
+ 'gr-formatted-text is not visible'
+ );
+ assert.isFalse(
+ isVisible(queryAndAssert(element, '.actions')),
+ 'actions are not visible'
+ );
+ assert.isFalse(
+ isVisible(queryAndAssert(element, 'gr-textarea')),
+ 'textarea is not visible'
+ );
+ assert.isTrue(
+ isVisible(queryAndAssert(element, '.collapsedContent')),
+ 'header middle content is visible'
+ );
+
+ // When toggle again, textarea should remain open in the state it was
+ // before
+ tap(element.$.header);
+ assert.isFalse(
+ isVisible(queryAndAssert(element, 'gr-formatted-text')),
+ 'gr-formatted-text is not visible'
+ );
+ assert.isTrue(
+ isVisible(queryAndAssert(element, '.actions')),
+ 'actions are visible'
+ );
+ assert.isTrue(isVisible(element.textarea!), 'textarea is visible');
+ assert.isFalse(
+ isVisible(queryAndAssert(element, '.collapsedContent')),
+ 'header middle content is not visible'
+ );
+ });
+
+ test('robot comment layout', done => {
+ const comment = {
+ robot_id: 'happy_robot_id' as RobotId,
+ url: '/robot/comment',
+ author: {
+ name: 'Happy Robot',
+ display_name: 'Display name Robot',
+ },
+ ...element.comment,
+ };
+ element.comment = comment;
+ element.collapsed = false;
+ flush(() => {
+ let runIdMessage;
+ runIdMessage = queryAndAssert(element, '.runIdMessage') as HTMLElement;
+ assert.isFalse((runIdMessage as HTMLElement).hidden);
+
+ const runDetailsLink = queryAndAssert(
+ element,
+ '.robotRunLink'
+ ) as HTMLAnchorElement;
+ assert.isTrue(
+ runDetailsLink.href.indexOf((element.comment as UIRobot).url!) !== -1
+ );
+
+ const robotServiceName = queryAndAssert(element, '.robotName');
+ assert.equal(robotServiceName.textContent?.trim(), 'happy_robot_id');
+
+ const authorName = queryAndAssert(element, '.robotId');
+ assert.isTrue(
+ (authorName as HTMLDivElement).innerText === 'Happy Robot'
+ );
+
+ element.collapsed = true;
+ flush();
+ runIdMessage = queryAndAssert(element, '.runIdMessage');
+ assert.isTrue((runIdMessage as HTMLDivElement).hidden);
+ done();
+ });
+ });
+
+ test('author name fallback to email', done => {
+ const comment = {
+ url: '/robot/comment',
+ author: {
+ email: 'test@test.com' as EmailAddress,
+ },
+ ...element.comment,
+ };
+ element.comment = comment;
+ element.collapsed = false;
+ flush(() => {
+ const authorName = queryAndAssert(
+ queryAndAssert(element, 'gr-account-label'),
+ 'span.name'
+ ) as HTMLSpanElement;
+ assert.equal(authorName.innerText.trim(), 'test@test.com');
+ done();
+ });
+ });
+
+ test('patchset level comment', done => {
+ const comment = {
+ ...element.comment,
+ path: SpecialFilePath.PATCHSET_LEVEL_COMMENTS,
+ line: undefined,
+ range: undefined,
+ };
+ element.comment = comment;
+ flush();
+ tap(queryAndAssert(element, '.edit'));
+ assert.isTrue(element.editing);
+
+ element._messageText = 'hello world';
+ const eraseMessageDraftSpy = spyStorage('eraseDraftComment');
+ const mockEvent = {...new Event('click'), preventDefault: sinon.stub()};
+ element._handleSave(mockEvent);
+ flush(() => {
+ assert.isTrue(eraseMessageDraftSpy.called);
+ done();
+ });
+ });
+
+ test('draft creation/cancellation', done => {
+ assert.isFalse(element.editing);
+ element.draft = true;
+ flush();
+ tap(queryAndAssert(element, '.edit'));
+ assert.isTrue(element.editing);
+
+ element.comment!.message = '';
+ element._messageText = '';
+ const eraseMessageDraftSpy = sinon.spy(element, '_eraseDraftComment');
+
+ // Save should be disabled on an empty message.
+ let disabled = queryAndAssert(element, '.save').hasAttribute('disabled');
+ assert.isTrue(disabled, 'save button should be disabled.');
+ element._messageText = ' ';
+ disabled = queryAndAssert(element, '.save').hasAttribute('disabled');
+ assert.isTrue(disabled, 'save button should be disabled.');
+
+ const updateStub = sinon.stub();
+ element.addEventListener('comment-update', updateStub);
+
+ let numDiscardEvents = 0;
+ element.addEventListener('comment-discard', () => {
+ numDiscardEvents++;
+ assert.isFalse(eraseMessageDraftSpy.called);
+ if (numDiscardEvents === 2) {
+ assert.isFalse(updateStub.called);
+ done();
+ }
+ });
+ tap(queryAndAssert(element, '.cancel'));
+ flush();
+ element._messageText = '';
+ element.editing = true;
+ flush();
+ pressAndReleaseKeyOn(element.textarea!, 27); // esc
+ });
+
+ test('draft discard removes message from storage', done => {
+ element._messageText = '';
+ const eraseMessageDraftSpy = sinon.spy(element, '_eraseDraftComment');
+ sinon.stub(element, '_closeConfirmDiscardOverlay');
+
+ element.addEventListener('comment-discard', () => {
+ assert.isTrue(eraseMessageDraftSpy.called);
+ done();
+ });
+ element._handleConfirmDiscard({
+ ...new Event('click'),
+ preventDefault: sinon.stub(),
+ });
+ });
+
+ test('storage is cleared only after save success', () => {
+ element._messageText = 'test';
+ const eraseStub = sinon.stub(element, '_eraseDraftComment');
+ stubRestApi('getResponseObject').returns(
+ Promise.resolve({...(createDraft() as ParsedJSON)})
+ );
+ const saveDraftStub = sinon
+ .stub(element, '_saveDraft')
+ .returns(Promise.resolve({...new Response(), ok: false}));
+
+ const savePromise = element.save();
+ assert.isFalse(eraseStub.called);
+ return savePromise.then(() => {
+ assert.isFalse(eraseStub.called);
+
+ saveDraftStub.restore();
+ sinon
+ .stub(element, '_saveDraft')
+ .returns(Promise.resolve({...new Response(), ok: true}));
+ return element.save().then(() => {
+ assert.isTrue(eraseStub.called);
+ });
+ });
+ });
+
+ test('_computeSaveDisabled', () => {
+ const comment = {unresolved: true};
+ const msgComment = {message: 'test', unresolved: true};
+ assert.equal(element._computeSaveDisabled('', comment, false), true);
+ assert.equal(element._computeSaveDisabled('test', comment, false), false);
+ assert.equal(element._computeSaveDisabled('', msgComment, false), true);
+ assert.equal(
+ element._computeSaveDisabled('test', msgComment, false),
+ false
+ );
+ assert.equal(
+ element._computeSaveDisabled('test2', msgComment, false),
+ false
+ );
+ assert.equal(element._computeSaveDisabled('test', comment, true), false);
+ assert.equal(element._computeSaveDisabled('', comment, true), true);
+ assert.equal(element._computeSaveDisabled('', comment, false), true);
+ });
+
+ suite('confirm discard', () => {
+ let discardStub: sinon.SinonStub;
+ let overlayStub: sinon.SinonStub;
+ const mockEvent = {...new Event('click'), preventDefault: sinon.stub()};
+ setup(() => {
+ discardStub = sinon.stub(element, '_discardDraft');
+ overlayStub = sinon
+ .stub(element, '_openOverlay')
+ .returns(Promise.resolve());
+ });
+
+ test('confirms discard of comments with message text', () => {
+ element._messageText = 'test';
+ element._handleDiscard(mockEvent);
+ assert.isTrue(overlayStub.calledWith(element.confirmDiscardOverlay));
+ assert.isFalse(discardStub.called);
+ });
+
+ test('no confirmation for comments without message text', () => {
+ element._messageText = '';
+ element._handleDiscard(mockEvent);
+ assert.isFalse(overlayStub.called);
+ assert.isTrue(discardStub.calledOnce);
+ });
+ });
+
+ test('ctrl+s saves comment', done => {
+ const stub = sinon.stub(element, 'save').callsFake(() => {
+ assert.isTrue(stub.called);
+ stub.restore();
+ done();
+ return Promise.resolve();
+ });
+ element._messageText = 'is that the horse from horsing around??';
+ element.editing = true;
+ flush();
+ pressAndReleaseKeyOn(element.textarea!.$.textarea.textarea, 83, 'ctrl'); // 'ctrl + s'
+ });
+
+ test('draft saving/editing', done => {
+ const dispatchEventStub = sinon.stub(element, 'dispatchEvent');
+
+ const clock: SinonFakeTimers = sinon.useFakeTimers();
+ const tickAndFlush = async (repetitions: number) => {
+ for (let i = 1; i <= repetitions; i++) {
+ clock.tick(1000);
+ await flush();
+ }
+ };
+
+ element.draft = true;
+ flush();
+ tap(queryAndAssert(element, '.edit'));
+ tickAndFlush(1);
+ element._messageText = 'good news, everyone!';
+ tickAndFlush(1);
+ assert.equal(dispatchEventStub.lastCall.args[0].type, 'comment-update');
+ assert.isTrue(dispatchEventStub.calledTwice);
+
+ element._messageText = 'good news, everyone!';
+ flush();
+ assert.isTrue(dispatchEventStub.calledTwice);
+
+ tap(queryAndAssert(element, '.save'));
+
+ assert.isTrue(
+ element.disabled,
+ 'Element should be disabled when creating draft.'
+ );
+
+ element
+ ._xhrPromise!.then(draft => {
+ const evt = dispatchEventStub.lastCall.args[0] as CustomEvent<{
+ comment: DraftInfo;
+ }>;
+ assert.equal(evt.type, 'comment-save');
+
+ const expectedDetail = {
+ comment: {
+ ...createComment(),
+ __draft: true,
+ __draftID: 'temp_draft_id',
+ id: 'baf0414d_40572e03' as UrlEncodedCommentId,
+ line: 5,
+ message: 'saved!',
+ path: '/path/to/file',
+ updated: '2015-12-08 21:52:36.177000000' as Timestamp,
+ },
+ patchNum: 1 as PatchSetNum,
+ };
+
+ assert.deepEqual(evt.detail, expectedDetail);
+ assert.isFalse(
+ element.disabled,
+ 'Element should be enabled when done creating draft.'
+ );
+ assert.equal(draft.message, 'saved!');
+ assert.isFalse(element.editing);
+ })
+ .then(() => {
+ tap(queryAndAssert(element, '.edit'));
+ element._messageText =
+ 'You’ll be delivering a package to Chapek 9, ' +
+ 'a world where humans are killed on sight.';
+ tap(queryAndAssert(element, '.save'));
+ assert.isTrue(
+ element.disabled,
+ 'Element should be disabled when updating draft.'
+ );
+
+ element._xhrPromise!.then(draft => {
+ assert.isFalse(
+ element.disabled,
+ 'Element should be enabled when done updating draft.'
+ );
+ assert.equal(draft.message, 'saved!');
+ assert.isFalse(element.editing);
+ dispatchEventStub.restore();
+ done();
+ });
+ });
+ });
+
+ test('draft prevent save when disabled', () => {
+ const saveStub = sinon.stub(element, 'save').returns(Promise.resolve());
+ element.showActions = true;
+ element.draft = true;
+ flush();
+ tap(element.$.header);
+ tap(queryAndAssert(element, '.edit'));
+ element._messageText = 'good news, everyone!';
+ flush();
+
+ element.disabled = true;
+ tap(queryAndAssert(element, '.save'));
+ assert.isFalse(saveStub.called);
+
+ element.disabled = false;
+ tap(queryAndAssert(element, '.save'));
+ assert.isTrue(saveStub.calledOnce);
+ });
+
+ test('proper event fires on resolve, comment is not saved', done => {
+ const save = sinon.stub(element, 'save');
+ element.addEventListener('comment-update', e => {
+ assert.isTrue(e.detail.comment.unresolved);
+ assert.isFalse(save.called);
+ done();
+ });
+ tap(queryAndAssert(element, '.resolve input'));
+ });
+
+ test('resolved comment state indicated by checkbox', () => {
+ sinon.stub(element, 'save');
+ element.comment = {unresolved: false};
+ assert.isTrue(
+ (queryAndAssert(element, '.resolve input') as HTMLInputElement).checked
+ );
+ element.comment = {unresolved: true};
+ assert.isFalse(
+ (queryAndAssert(element, '.resolve input') as HTMLInputElement).checked
+ );
+ });
+
+ test('resolved checkbox saves with tap when !editing', () => {
+ element.editing = false;
+ const save = sinon.stub(element, 'save');
+
+ element.comment = {unresolved: false};
+ assert.isTrue(
+ (queryAndAssert(element, '.resolve input') as HTMLInputElement).checked
+ );
+ element.comment = {unresolved: true};
+ assert.isFalse(
+ (queryAndAssert(element, '.resolve input') as HTMLInputElement).checked
+ );
+ assert.isFalse(save.called);
+ tap(element.$.resolvedCheckbox);
+ assert.isTrue(
+ (queryAndAssert(element, '.resolve input') as HTMLInputElement).checked
+ );
+ assert.isTrue(save.called);
+ });
+
+ suite('draft saving messages', () => {
+ test('_getSavingMessage', () => {
+ assert.equal(element._getSavingMessage(0), 'All changes saved');
+ assert.equal(element._getSavingMessage(1), 'Saving 1 draft...');
+ assert.equal(element._getSavingMessage(2), 'Saving 2 drafts...');
+ assert.equal(element._getSavingMessage(3), 'Saving 3 drafts...');
+ });
+
+ test('_show{Start,End}Request', () => {
+ const updateStub = sinon.stub(element, '_updateRequestToast');
+ element._numPendingDraftRequests.number = 1;
+
+ element._showStartRequest();
+ assert.isTrue(updateStub.calledOnce);
+ assert.equal(updateStub.lastCall.args[0], 2);
+ assert.equal(element._numPendingDraftRequests.number, 2);
+
+ element._showEndRequest();
+ assert.isTrue(updateStub.calledTwice);
+ assert.equal(updateStub.lastCall.args[0], 1);
+ assert.equal(element._numPendingDraftRequests.number, 1);
+
+ element._showEndRequest();
+ assert.isTrue(updateStub.calledThrice);
+ assert.equal(updateStub.lastCall.args[0], 0);
+ assert.equal(element._numPendingDraftRequests.number, 0);
+ });
+ });
+
+ test('cancelling an unsaved draft discards, persists in storage', () => {
+ const clock: SinonFakeTimers = sinon.useFakeTimers();
+ const tickAndFlush = async (repetitions: number) => {
+ for (let i = 1; i <= repetitions; i++) {
+ clock.tick(1000);
+ await flush();
+ }
+ };
+ const discardSpy = sinon.spy(element, '_fireDiscard');
+ const storeStub = stubStorage('setDraftComment');
+ const eraseStub = stubStorage('eraseDraftComment');
+ element.comment!.id = undefined; // set id undefined for draft
+ element._messageText = 'test text';
+ tickAndFlush(1);
+
+ assert.isTrue(storeStub.called);
+ assert.equal(storeStub.lastCall.args[1], 'test text');
+ element._handleCancel({
+ ...new Event('click'),
+ preventDefault: sinon.stub(),
+ });
+ flush();
+ assert.isTrue(discardSpy.called);
+ assert.isFalse(eraseStub.called);
+ });
+
+ test('cancelling edit on a saved draft does not store', () => {
+ element.comment!.id = 'foo' as UrlEncodedCommentId;
+ const discardSpy = sinon.spy(element, '_fireDiscard');
+ const storeStub = stubStorage('setDraftComment');
+ element.comment!.id = undefined; // set id undefined for draft
+ element._messageText = 'test text';
+ flush();
+
+ assert.isFalse(storeStub.called);
+ element._handleCancel({...new Event('click'), preventDefault: () => {}});
+ assert.isTrue(discardSpy.called);
+ });
+
+ test('deleting text from saved draft and saving deletes the draft', () => {
+ element.comment = {
+ ...createComment(),
+ id: 'foo' as UrlEncodedCommentId,
+ message: 'test',
+ };
+ element._messageText = '';
+ const discardStub = sinon.stub(element, '_discardDraft');
+
+ element.save();
+ assert.isTrue(discardStub.called);
+ });
+
+ test('_handleFix fires create-fix event', done => {
+ element.addEventListener(
+ 'create-fix-comment',
+ (e: CreateFixCommentEvent) => {
+ assert.deepEqual(e.detail, element._getEventPayload());
+ done();
+ }
+ );
+ element.isRobotComment = true;
+ element.comments = [element.comment!];
+ flush();
+
+ tap(queryAndAssert(element, '.fix'));
+ });
+
+ test('do not show Please Fix button if human reply exists', () => {
+ element.comments = [
+ {
+ robot_id: 'happy_robot_id' as RobotId,
+ robot_run_id: '5838406743490560' as RobotRunId,
+ fix_suggestions: [
+ {
+ fix_id: '478ff847_3bf47aaf' as FixId,
+ description: 'Make the smiley happier by giving it a nose.',
+ replacements: [
+ {
+ path: 'Documentation/config-gerrit.txt',
+ range: {
+ start_line: 10,
+ start_character: 7,
+ end_line: 10,
+ end_character: 9,
+ },
+ replacement: ':-)',
+ },
+ ],
+ },
+ ],
+ author: {
+ _account_id: 1030912 as AccountId,
+ name: 'Alice Kober-Sotzek',
+ email: 'aliceks@google.com' as EmailAddress,
+ avatars: [
+ {
+ url: '/s32-p/photo.jpg',
+ height: 32,
+ width: 32,
+ },
+ {
+ url: '/AaAdOFzPlFI/s56-p/photo.jpg',
+ height: 56,
+ width: 32,
+ },
+ {
+ url: '/AaAdOFzPlFI/s100-p/photo.jpg',
+ height: 100,
+ width: 32,
+ },
+ {
+ url: '/AaAdOFzPlFI/s120-p/photo.jpg',
+ height: 120,
+ width: 32,
+ },
+ ],
+ },
+ patch_set: 1 as PatchSetNum,
+ ...createComment(),
+ id: 'eb0d03fd_5e95904f' as UrlEncodedCommentId,
+ line: 10,
+ updated: '2017-04-04 15:36:17.000000000' as Timestamp,
+ message: 'This is a robot comment with a fix.',
+ unresolved: false,
+ collapsed: false,
+ },
+ {
+ __draft: true,
+ __draftID: '0.wbrfbwj89sa',
+ __date: new Date(),
+ path: 'Documentation/config-gerrit.txt',
+ side: CommentSide.REVISION,
+ line: 10,
+ in_reply_to: 'eb0d03fd_5e95904f' as UrlEncodedCommentId,
+ message: '> This is a robot comment with a fix.\n\nPlease fix.',
+ unresolved: true,
+ },
+ ];
+ element.comment = element.comments[0];
+ flush();
+ assert.isNull(
+ element.shadowRoot?.querySelector('robotActions gr-button')
+ );
+ });
+
+ test('show Please Fix if no human reply', () => {
+ element.comments = [
+ {
+ robot_id: 'happy_robot_id' as RobotId,
+ robot_run_id: '5838406743490560' as RobotRunId,
+ fix_suggestions: [
+ {
+ fix_id: '478ff847_3bf47aaf' as FixId,
+ description: 'Make the smiley happier by giving it a nose.',
+ replacements: [
+ {
+ path: 'Documentation/config-gerrit.txt',
+ range: {
+ start_line: 10,
+ start_character: 7,
+ end_line: 10,
+ end_character: 9,
+ },
+ replacement: ':-)',
+ },
+ ],
+ },
+ ],
+ author: {
+ _account_id: 1030912 as AccountId,
+ name: 'Alice Kober-Sotzek',
+ email: 'aliceks@google.com' as EmailAddress,
+ avatars: [
+ {
+ url: '/s32-p/photo.jpg',
+ height: 32,
+ width: 32,
+ },
+ {
+ url: '/AaAdOFzPlFI/s56-p/photo.jpg',
+ height: 56,
+ width: 32,
+ },
+ {
+ url: '/AaAdOFzPlFI/s100-p/photo.jpg',
+ height: 100,
+ width: 32,
+ },
+ {
+ url: '/AaAdOFzPlFI/s120-p/photo.jpg',
+ height: 120,
+ width: 32,
+ },
+ ],
+ },
+ patch_set: 1 as PatchSetNum,
+ ...createComment(),
+ id: 'eb0d03fd_5e95904f' as UrlEncodedCommentId,
+ line: 10,
+ updated: '2017-04-04 15:36:17.000000000' as Timestamp,
+ message: 'This is a robot comment with a fix.',
+ unresolved: false,
+ collapsed: false,
+ },
+ ];
+ element.comment = element.comments[0];
+ flush();
+ queryAndAssert(element, '.robotActions gr-button');
+ });
+
+ test('_handleShowFix fires open-fix-preview event', done => {
+ element.addEventListener('open-fix-preview', e => {
+ assert.deepEqual(e.detail, element._getEventPayload());
+ done();
+ });
+ element.comment = {
+ ...createComment(),
+ fix_suggestions: [{...createFixSuggestionInfo()}],
+ };
+ element.isRobotComment = true;
+ flush();
+
+ tap(queryAndAssert(element, '.show-fix'));
+ });
+ });
+
+ suite('respectful tips', () => {
+ let element: GrComment;
+
+ let clock: sinon.SinonFakeTimers;
+ setup(() => {
+ stubRestApi('getAccount').returns(Promise.resolve(undefined));
+ clock = sinon.useFakeTimers();
+ });
+
+ teardown(() => {
+ clock.restore();
+ sinon.restore();
+ });
+
+ test('show tip when no cached record', done => {
+ element = draftFixture.instantiate() as GrComment;
+ const respectfulGetStub = stubStorage('getRespectfulTipVisibility');
+ const respectfulSetStub = stubStorage('setRespectfulTipVisibility');
+ respectfulGetStub.returns(null);
+ // fake random
+ element.getRandomNum = () => 0;
+ element.comment = {__editing: true, __draft: true};
+ flush(() => {
+ assert.isTrue(respectfulGetStub.called);
+ assert.isTrue(respectfulSetStub.called);
+ assert.isTrue(!!queryAndAssert(element, '.respectfulReviewTip'));
+ done();
+ });
+ });
+
+ test('add 14-day delays once dismissed', done => {
+ element = draftFixture.instantiate() as GrComment;
+ const respectfulGetStub = stubStorage('getRespectfulTipVisibility');
+ const respectfulSetStub = stubStorage('setRespectfulTipVisibility');
+ respectfulGetStub.returns(null);
+ // fake random
+ element.getRandomNum = () => 0;
+ element.comment = {__editing: true, __draft: true};
+ flush(() => {
+ assert.isTrue(respectfulGetStub.called);
+ assert.isTrue(respectfulSetStub.called);
+ assert.isTrue(respectfulSetStub.lastCall.args[0] === undefined);
+ assert.isTrue(!!queryAndAssert(element, '.respectfulReviewTip'));
+
+ tap(queryAndAssert(element, '.respectfulReviewTip .close'));
+ flush();
+ assert.isTrue(respectfulSetStub.lastCall.args[0] === 14);
+ done();
+ });
+ });
+
+ test('do not show tip when fall out of probability', done => {
+ element = draftFixture.instantiate() as GrComment;
+ const respectfulGetStub = stubStorage('getRespectfulTipVisibility');
+ const respectfulSetStub = stubStorage('setRespectfulTipVisibility');
+ respectfulGetStub.returns(null);
+ // fake random
+ element.getRandomNum = () => 3;
+ element.comment = {__editing: true, __draft: true};
+ flush(() => {
+ assert.isTrue(respectfulGetStub.called);
+ assert.isFalse(respectfulSetStub.called);
+ assert.isNotOk(query(element, '.respectfulReviewTip'));
+ done();
+ });
+ });
+
+ test('show tip when editing changed to true', done => {
+ element = draftFixture.instantiate() as GrComment;
+ const respectfulGetStub = stubStorage('getRespectfulTipVisibility');
+ const respectfulSetStub = stubStorage('setRespectfulTipVisibility');
+ respectfulGetStub.returns(null);
+ // fake random
+ element.getRandomNum = () => 0;
+ element.comment = {__editing: false};
+ flush(() => {
+ assert.isFalse(respectfulGetStub.called);
+ assert.isFalse(respectfulSetStub.called);
+ assert.isNotOk(query(element, '.respectfulReviewTip'));
+
+ element.editing = true;
+ flush(() => {
+ assert.isTrue(respectfulGetStub.called);
+ assert.isTrue(respectfulSetStub.called);
+ assert.isTrue(!!queryAndAssert(element, '.respectfulReviewTip'));
+ done();
+ });
+ });
+ });
+
+ test('no tip when cached record', done => {
+ element = draftFixture.instantiate() as GrComment;
+ const respectfulGetStub = stubStorage('getRespectfulTipVisibility');
+ const respectfulSetStub = stubStorage('setRespectfulTipVisibility');
+ respectfulGetStub.returns({updated: 0});
+ // fake random
+ element.getRandomNum = () => 0;
+ element.comment = {__editing: true, __draft: true};
+ flush(() => {
+ assert.isTrue(respectfulGetStub.called);
+ assert.isFalse(respectfulSetStub.called);
+ assert.isNotOk(query(element, '.respectfulReviewTip'));
+ done();
+ });
+ });
+ });
+});
diff --git a/polygerrit-ui/app/elements/shared/gr-hovercard-account/gr-hovercard-account.ts b/polygerrit-ui/app/elements/shared/gr-hovercard-account/gr-hovercard-account.ts
index abd4469..d0a440a 100644
--- a/polygerrit-ui/app/elements/shared/gr-hovercard-account/gr-hovercard-account.ts
+++ b/polygerrit-ui/app/elements/shared/gr-hovercard-account/gr-hovercard-account.ts
@@ -38,7 +38,6 @@
getLastUpdate,
getReason,
hasAttention,
- isAttentionSetEnabled,
} from '../../../utils/attention-set-util';
import {ReviewerState} from '../../../constants/constants';
import {CURRENT} from '../../../utils/patch-set-util';
@@ -109,7 +108,6 @@
get isAttentionEnabled() {
return (
- isAttentionSetEnabled(this._config) &&
!!this.highlightAttention &&
!!this.change &&
canHaveAttention(this.account)
@@ -117,7 +115,7 @@
}
get hasUserAttention() {
- return hasAttention(this._config, this.account, this.change);
+ return hasAttention(this.account, this.change);
}
_computeReason(change?: ChangeInfo) {
diff --git a/polygerrit-ui/app/elements/shared/gr-hovercard-account/gr-hovercard-account_test.js b/polygerrit-ui/app/elements/shared/gr-hovercard-account/gr-hovercard-account_test.js
index 1c67e13..07969bd 100644
--- a/polygerrit-ui/app/elements/shared/gr-hovercard-account/gr-hovercard-account_test.js
+++ b/polygerrit-ui/app/elements/shared/gr-hovercard-account/gr-hovercard-account_test.js
@@ -37,9 +37,6 @@
setup(async () => {
stubRestApi('getAccount').returns(Promise.resolve({...ACCOUNT}));
- stubRestApi('getConfig').returns(
- Promise.resolve({change: {enable_attention_set: true}})
- );
element = basicFixture.instantiate();
element.account = {...ACCOUNT};
element.change = {
diff --git a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.ts b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.ts
index 6fb4cee..852f0b6 100644
--- a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.ts
+++ b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.ts
@@ -1036,63 +1036,58 @@
offset?: 'n,z' | number,
options?: string
): Promise<ChangeInfo[] | ChangeInfo[][] | undefined> {
- return this.getConfig(false)
- .then(config => {
- // TODO(TS): config can be null/undefined. Need some checks
- options = options || this._getChangesOptionsHex(config);
- // Issue 4524: respect legacy token with max sortkey.
- if (offset === 'n,z') {
- offset = 0;
+ options = options || this._getChangesOptionsHex();
+ // Issue 4524: respect legacy token with max sortkey.
+ if (offset === 'n,z') {
+ offset = 0;
+ }
+ const params: QueryChangesParams = {
+ O: options,
+ S: offset || 0,
+ };
+ if (changesPerPage) {
+ params.n = changesPerPage;
+ }
+ if (query && query.length > 0) {
+ params.q = query;
+ }
+ const request = {
+ url: '/changes/',
+ params,
+ reportUrlAsIs: true,
+ };
+
+ return Promise.resolve(
+ this._restApiHelper.fetchJSON(request, true) as Promise<
+ ChangeInfo[] | ChangeInfo[][] | undefined
+ >
+ ).then(response => {
+ if (!response) {
+ return;
+ }
+ const iterateOverChanges = (arr: ChangeInfo[]) => {
+ for (const change of arr) {
+ this._maybeInsertInLookup(change);
}
- const params: QueryChangesParams = {
- O: options,
- S: offset || 0,
- };
- if (changesPerPage) {
- params.n = changesPerPage;
+ };
+ // Response may be an array of changes OR an array of arrays of
+ // changes.
+ if (query instanceof Array) {
+ // Normalize the response to look like a multi-query response
+ // when there is only one query.
+ const responseArray: Array<ChangeInfo[]> =
+ query.length === 1
+ ? [response as ChangeInfo[]]
+ : (response as ChangeInfo[][]);
+ for (const arr of responseArray) {
+ iterateOverChanges(arr);
}
- if (query && query.length > 0) {
- params.q = query;
- }
- return {
- url: '/changes/',
- params,
- reportUrlAsIs: true,
- };
- })
- .then(
- req =>
- this._restApiHelper.fetchJSON(req, true) as Promise<
- ChangeInfo[] | ChangeInfo[][] | undefined
- >
- )
- .then(response => {
- if (!response) {
- return;
- }
- const iterateOverChanges = (arr: ChangeInfo[]) => {
- for (const change of arr) {
- this._maybeInsertInLookup(change);
- }
- };
- // Response may be an array of changes OR an array of arrays of
- // changes.
- if (query instanceof Array) {
- // Normalize the response to look like a multi-query response
- // when there is only one query.
- const responseArray: Array<ChangeInfo[]> =
- query.length === 1
- ? [response as ChangeInfo[]]
- : (response as ChangeInfo[][]);
- for (const arr of responseArray) {
- iterateOverChanges(arr);
- }
- return responseArray;
- } else {
- iterateOverChanges(response as ChangeInfo[]);
- return response as ChangeInfo[];
- }
- });
+ return responseArray;
+ } else {
+ iterateOverChanges(response as ChangeInfo[]);
+ return response as ChangeInfo[];
+ }
+ });
}
/**
@@ -1134,7 +1129,7 @@
});
}
- _getChangesOptionsHex(config?: ServerInfo) {
+ _getChangesOptionsHex() {
if (
window.DEFAULT_DETAIL_HEXES &&
window.DEFAULT_DETAIL_HEXES.dashboardPage
@@ -1145,9 +1140,6 @@
ListChangesOption.LABELS,
ListChangesOption.DETAILED_ACCOUNTS,
];
- if (!config?.change?.enable_attention_set) {
- options.push(ListChangesOption.REVIEWED);
- }
return listChangesOptionsToHex(...options);
}
@@ -2123,22 +2115,6 @@
});
}
- saveChangeReviewed(
- changeNum: NumericChangeId,
- reviewed: boolean
- ): Promise<Response | undefined> {
- return this.getConfig().then(config => {
- const isAttentionSetEnabled =
- !!config && !!config.change && config.change.enable_attention_set;
- if (isAttentionSetEnabled) return;
- return this._getChangeURLAndSend({
- changeNum,
- method: HttpMethod.PUT,
- endpoint: reviewed ? '/reviewed' : '/unreviewed',
- });
- });
- }
-
send(
method: HttpMethod,
url: string,
diff --git a/polygerrit-ui/app/mixins/gr-change-table-mixin/gr-change-table-mixin.ts b/polygerrit-ui/app/mixins/gr-change-table-mixin/gr-change-table-mixin.ts
index 28b7a50..e3b75de 100644
--- a/polygerrit-ui/app/mixins/gr-change-table-mixin/gr-change-table-mixin.ts
+++ b/polygerrit-ui/app/mixins/gr-change-table-mixin/gr-change-table-mixin.ts
@@ -70,7 +70,6 @@
if (column === 'Assignee') return !!config.change.enable_assignee;
if (column === 'Comments')
return experiments.includes('comments-column');
- if (column === 'Reviewers') return !!config.change.enable_attention_set;
return true;
}
diff --git a/polygerrit-ui/app/mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin.ts b/polygerrit-ui/app/mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin.ts
index 837a795..62589f8 100644
--- a/polygerrit-ui/app/mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin.ts
+++ b/polygerrit-ui/app/mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin.ts
@@ -102,7 +102,7 @@
import {dedupingMixin} from '@polymer/polymer/lib/utils/mixin';
import {property} from '@polymer/decorators';
import {PolymerElement} from '@polymer/polymer';
-import {Constructor} from '../../utils/common-util';
+import {check, Constructor} from '../../utils/common-util';
import {getKeyboardEvent, isModifierPressed} from '../../utils/dom-util';
import {
CustomKeyboardEvent,
@@ -222,11 +222,6 @@
viewMap?: Map<ShortcutSection, SectionView>
) => void;
-interface ShortcutEnabledElement extends PolymerElement {
- // TODO: should replace with Map so we can have proper type here
- keyboardShortcuts(): {[shortcut: string]: string};
-}
-
interface ShortcutHelpItem {
shortcut: Shortcut;
text: string;
@@ -558,14 +553,9 @@
return this.bindings.get(shortcut);
}
- attachHost(host: PolymerElement | ShortcutEnabledElement) {
- if (!('keyboardShortcuts' in host)) {
- return;
- }
- const shortcuts = host.keyboardShortcuts();
- this.activeHosts.set(host, new Map(Object.entries(shortcuts)));
+ attachHost(host: PolymerElement, shortcuts: Map<string, string>) {
+ this.activeHosts.set(host, shortcuts);
this.notifyListeners();
- return shortcuts;
}
detachHost(host: PolymerElement) {
@@ -788,6 +778,12 @@
private readonly restApiService = appContext.restApiService;
+ /** Used to disable shortcuts when the element is not visible. */
+ private observer?: IntersectionObserver;
+
+ /** Are shortcuts currently enabled? True only when element is visible. */
+ private bindingsEnabled = false;
+
modifierPressed(event: CustomKeyboardEvent) {
/* We are checking for g/v as modifiers pressed. There are cases such as
* pressing v and then /, where we want the handler for / to be triggered.
@@ -902,21 +898,62 @@
/** @override */
connectedCallback() {
super.connectedCallback();
-
this.restApiService.getPreferences().then(prefs => {
if (prefs?.disable_keyboard_shortcuts) {
this._disableKeyboardShortcuts = true;
}
});
+ this.createVisibilityObserver();
+ this.enableBindings();
+ }
- const shortcuts = shortcutManager.attachHost(this);
- if (!shortcuts) {
- return;
- }
+ /** @override */
+ disconnectedCallback() {
+ this.destroyVisibilityObserver();
+ this.disableBindings();
+ super.disconnectedCallback();
+ }
- for (const key of Object.keys(shortcuts)) {
- // TODO(TS): not needed if convert shortcuts to Map
- this._addOwnKeyBindings(key as Shortcut, shortcuts[key]);
+ /**
+ * Creates an intersection observer that enables bindings when the
+ * element is visible and disables them when the element is hidden.
+ */
+ private createVisibilityObserver() {
+ if (!this.hasKeyboardShortcuts()) return;
+ if (this.observer) return;
+ this.observer = new IntersectionObserver(entries => {
+ check(entries.length === 1, 'Expected one observer entry.');
+ const isVisible = entries[0].isIntersecting;
+ if (isVisible) {
+ this.enableBindings();
+ } else {
+ this.disableBindings();
+ }
+ });
+ this.observer.observe(this);
+ }
+
+ private destroyVisibilityObserver() {
+ if (this.observer) this.observer.unobserve(this);
+ }
+
+ /**
+ * Enables all the shortcuts returned by keyboardShortcuts().
+ * This is a private method being called when the element becomes
+ * connected or visible.
+ */
+ private enableBindings() {
+ if (!this.hasKeyboardShortcuts()) return;
+ if (this.bindingsEnabled) return;
+ this.bindingsEnabled = true;
+
+ const shortcuts = new Map<string, string>(
+ Object.entries(this.keyboardShortcuts())
+ );
+ shortcutManager.attachHost(this, shortcuts);
+
+ for (const [key, value] of shortcuts.entries()) {
+ this._addOwnKeyBindings(key as Shortcut, value);
}
// each component that uses this behaviour must be aware if go key is
@@ -941,12 +978,21 @@
}
}
- /** @override */
- disconnectedCallback() {
+ /**
+ * Disables all the shortcuts returned by keyboardShortcuts().
+ * This is a private method being called when the element becomes
+ * disconnected or invisible.
+ */
+ private disableBindings() {
+ if (!this.bindingsEnabled) return;
+ this.bindingsEnabled = false;
if (shortcutManager.detachHost(this)) {
this.removeOwnKeyBindings();
}
- super.disconnectedCallback();
+ }
+
+ private hasKeyboardShortcuts() {
+ return Object.entries(this.keyboardShortcuts()).length > 0;
}
keyboardShortcuts() {
diff --git a/polygerrit-ui/app/mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin_test.js b/polygerrit-ui/app/mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin_test.js
index b22b8d8..d5e7fe7 100644
--- a/polygerrit-ui/app/mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin_test.js
+++ b/polygerrit-ui/app/mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin_test.js
@@ -181,13 +181,7 @@
mapToObject(mgr.activeShortcutsBySection()),
{});
- mgr.attachHost({
- keyboardShortcuts() {
- return {
- [Shortcut.NEXT_FILE]: null,
- };
- },
- });
+ mgr.attachHost({}, new Map([[Shortcut.NEXT_FILE, null]]));
assert.deepEqual(
mapToObject(mgr.activeShortcutsBySection()),
{
@@ -196,13 +190,7 @@
],
});
- mgr.attachHost({
- keyboardShortcuts() {
- return {
- [Shortcut.NEXT_LINE]: null,
- };
- },
- });
+ mgr.attachHost({}, new Map([[Shortcut.NEXT_LINE, null]]));
assert.deepEqual(
mapToObject(mgr.activeShortcutsBySection()),
{
@@ -214,14 +202,10 @@
],
});
- mgr.attachHost({
- keyboardShortcuts() {
- return {
- [Shortcut.SEARCH]: null,
- [Shortcut.GO_TO_OPENED_CHANGES]: null,
- };
- },
- });
+ mgr.attachHost({}, new Map([
+ [Shortcut.SEARCH, null],
+ [Shortcut.GO_TO_OPENED_CHANGES, null],
+ ]));
assert.deepEqual(
mapToObject(mgr.activeShortcutsBySection()),
{
@@ -254,17 +238,13 @@
assert.deepEqual(mapToObject(mgr.directoryView()), {});
- mgr.attachHost({
- keyboardShortcuts() {
- return {
- [Shortcut.GO_TO_OPENED_CHANGES]: null,
- [Shortcut.NEXT_FILE]: null,
- [Shortcut.NEXT_LINE]: null,
- [Shortcut.SAVE_COMMENT]: null,
- [Shortcut.SEARCH]: null,
- };
- },
- });
+ mgr.attachHost({}, new Map([
+ [Shortcut.GO_TO_OPENED_CHANGES, null],
+ [Shortcut.NEXT_FILE, null],
+ [Shortcut.NEXT_LINE, null],
+ [Shortcut.SAVE_COMMENT, null],
+ [Shortcut.SEARCH, null],
+ ]));
assert.deepEqual(
mapToObject(mgr.directoryView()),
{
diff --git a/polygerrit-ui/app/node_modules_licenses/licenses.ts b/polygerrit-ui/app/node_modules_licenses/licenses.ts
index 33e1afef..ac49388 100644
--- a/polygerrit-ui/app/node_modules_licenses/licenses.ts
+++ b/polygerrit-ui/app/node_modules_licenses/licenses.ts
@@ -312,6 +312,14 @@
}
},
{
+ name: "codemirror-minified",
+ license: {
+ name: "codemirror-minified",
+ type: LicenseTypes.Mit,
+ packageLicenseFile: "LICENSE",
+ }
+ },
+ {
name: "isarray",
license: SharedLicenses.IsArray
},
diff --git a/polygerrit-ui/app/package.json b/polygerrit-ui/app/package.json
index bd0ee89..6d5e475 100644
--- a/polygerrit-ui/app/package.json
+++ b/polygerrit-ui/app/package.json
@@ -35,7 +35,8 @@
"@webcomponents/shadycss": "^1.10.2",
"@webcomponents/webcomponentsjs": "^1.3.3",
"ba-linkify": "file:../../lib/ba-linkify/src/",
- "lit-element": "^2.4.0",
+ "codemirror-minified": "^5.60.0",
+ "lit-element": "^2.5.1",
"page": "^1.11.6",
"polymer-bridges": "file:../../polymer-bridges/",
"polymer-resin": "^2.0.1",
diff --git a/polygerrit-ui/app/samples/add-from-favorite-reviewers.js b/polygerrit-ui/app/samples/add-from-favorite-reviewers.js
index 76b2787..1616ef3 100644
--- a/polygerrit-ui/app/samples/add-from-favorite-reviewers.js
+++ b/polygerrit-ui/app/samples/add-from-favorite-reviewers.js
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
/**
* This plugin will a button to quickly add favorite reviewers to
* reviewers in reply dialog.
@@ -142,4 +143,4 @@
'reply-reviewers', ReviewerShortcut.is, {slot: 'right'});
plugin.registerCustomComponent(
'reply-reviewers', ReviewerShortcutContent.is, {slot: 'below'});
-});
\ No newline at end of file
+});
diff --git a/polygerrit-ui/app/samples/bind-parameters.js b/polygerrit-ui/app/samples/bind-parameters.js
index 30c7c3d..4527a80 100644
--- a/polygerrit-ui/app/samples/bind-parameters.js
+++ b/polygerrit-ui/app/samples/bind-parameters.js
@@ -14,15 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-// Element class exists in all browsers:
-// https://developer.mozilla.org/en-US/docs/Web/API/Element
-// Rename it to PolymerElement to avoid conflicts. Also,
-// typescript reports the following error:
-// error TS2451: Cannot redeclare block-scoped variable 'Element'.
-const {html, Element: PolymerElement} = Polymer;
-
-class MyBindSample extends PolymerElement {
+class MyBindSample extends Polymer.Element {
static get is() { return 'my-bind-sample'; }
static get properties() {
@@ -39,7 +31,7 @@
}
static get template() {
- return html`
+ return Polymer.html`
Template example: Patchset number [[revision._number]]. <br/>
Computed example: [[computedExample]].
`;
diff --git a/polygerrit-ui/app/samples/coverage-plugin.js b/polygerrit-ui/app/samples/coverage-plugin.js
deleted file mode 100644
index 8d321c7..0000000
--- a/polygerrit-ui/app/samples/coverage-plugin.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * @license
- * Copyright (C) 2020 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.
- */
-function populateWithDummyData(coverageData) {
- coverageData['/COMMIT_MSG'] = {
- linesMissingCoverage: [3, 4, 7, 14],
- totalLines: 14,
- changeNum: 94,
- patchNum: 2,
- };
-
- // more coverage info on other files
-}
-
-/**
- * This plugin will add a toggler on file diff page to
- * display fake coverage data.
- *
- * As the fake coverage data only provided for COMMIT_MSG file,
- * so it will only work for COMMIT_MSG file diff.
- */
-Gerrit.install(plugin => {
- const coverageData = {};
- let displayCoverage = false;
- const annotationApi = plugin.annotationApi();
- const styleApi = plugin.styles();
-
- const coverageStyle = styleApi.css('background-color: #EF9B9B !important');
- const emptyStyle = styleApi.css('');
-
- annotationApi.setLayer(context => {
- if (Object.keys(coverageData).length === 0) {
- // Coverage data is not ready yet.
- return;
- }
- const path = context.path;
- const line = context.line;
- // Highlight lines missing coverage with this background color if
- // coverage should be displayed, else do nothing.
- const annotationStyle = displayCoverage
- ? coverageStyle
- : emptyStyle;
-
- // ideally should check to make sure its the same patch for same change
- // for demo purpose, this is only checking to make sure we have fake data
- if (coverageData[path]) {
- const linesMissingCoverage = coverageData[path].linesMissingCoverage;
- if (linesMissingCoverage.includes(line.afterNumber)) {
- context.annotateRange(0, line.text.length, annotationStyle, 'right');
- context.annotateLineNumber(annotationStyle, 'right');
- }
- }
- }).enableToggleCheckbox('Display Coverage', checkbox => {
- populateWithDummyData(coverageData);
- checkbox.disabled = false;
- checkbox.onclick = e => {
- displayCoverage = e.target.checked;
- Object.keys(coverageData).forEach(file => {
- annotationApi.notify(file, 0, coverageData[file].totalLines, 'right');
- });
- };
- });
-});
diff --git a/polygerrit-ui/app/samples/extra-column-on-file-list.js b/polygerrit-ui/app/samples/extra-column-on-file-list.js
index 2e37c01..c64bcd4 100644
--- a/polygerrit-ui/app/samples/extra-column-on-file-list.js
+++ b/polygerrit-ui/app/samples/extra-column-on-file-list.js
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
/**
* This plugin will an extra column to file list on change page to show
* the first character of the path.
@@ -74,4 +75,4 @@
'change-view-file-list-header-prepend', ColumnHeader.is);
plugin.registerDynamicCustomComponent(
'change-view-file-list-content-prepend', ColumnContent.is);
-});
\ No newline at end of file
+});
diff --git a/polygerrit-ui/app/samples/lgtm-plugin.js b/polygerrit-ui/app/samples/lgtm-plugin.js
index 9de1496..537b1fa 100644
--- a/polygerrit-ui/app/samples/lgtm-plugin.js
+++ b/polygerrit-ui/app/samples/lgtm-plugin.js
@@ -14,8 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
/**
- * This plugin will +1 on Code-Review label if detect that you have
+ * This plugin will +1 on Code-Review label if it detects that you have
* LGTM as start of your reply.
*/
Gerrit.install(plugin => {
@@ -29,4 +30,4 @@
replyApi.setLabelValue(label, '+1');
}
});
-});
\ No newline at end of file
+});
diff --git a/polygerrit-ui/app/samples/repo-command.js b/polygerrit-ui/app/samples/repo-command.js
index 4f64059..acecd7d 100644
--- a/polygerrit-ui/app/samples/repo-command.js
+++ b/polygerrit-ui/app/samples/repo-command.js
@@ -15,14 +15,7 @@
* limitations under the License.
*/
-// Element class exists in all browsers:
-// https://developer.mozilla.org/en-US/docs/Web/API/Element
-// Rename it to PolymerElement to avoid conflicts. Also,
-// typescript reports the following error:
-// error TS2451: Cannot redeclare block-scoped variable 'Element'.
-const {html, Element: PolymerElement} = Polymer;
-
-class RepoCommandLow extends PolymerElement {
+class RepoCommandLow extends Polymer.Element {
static get is() { return 'repo-command-low'; }
static get properties() {
@@ -32,20 +25,16 @@
}
static get template() {
- return html`
- <style include="shared-styles">
- :host {
- display: block;
- margin-bottom: var(--spacing-xxl);
- }
- </style>
- <h3>Low-level bork</h3>
- <gr-button
- on-click="_handleCommandTap"
- >
- Low-level bork
- </gr-button>
- `;
+ return Polymer.html`
+ <style include="shared-styles">
+ :host {
+ display: block;
+ margin-bottom: var(--spacing-xxl);
+ }
+ </style>
+ <h3>Plugin Bork</h3>
+ <gr-button on-click="_handleCommandTap">Bork</gr-button>
+ `;
}
connectedCallback() {
@@ -56,32 +45,16 @@
}
_handleCommandTap() {
- alert('(softly) bork, bork.');
+ alert('bork');
}
}
-// register the custom component
customElements.define(RepoCommandLow.is, RepoCommandLow);
/**
- * This plugin will add two new commands in command page for
- * All-Projects.
- *
- * The added commands will simply alert you when click.
+ * This plugin adds a new command to the command page of the repo All-Projects.
*/
Gerrit.install(plugin => {
- // High-level API
- plugin.project()
- .createCommand('Bork', (repoName, projectConfig) => {
- if (repoName !== 'All-Projects') {
- return false;
- }
- })
- .onTap(() => {
- alert('Bork, bork!');
- });
-
- // Low-level API
plugin.registerCustomComponent(
'repo-command', 'repo-command-low');
});
diff --git a/polygerrit-ui/app/samples/some-screen.js b/polygerrit-ui/app/samples/some-screen.js
index c600fe4..8edaaa9 100644
--- a/polygerrit-ui/app/samples/some-screen.js
+++ b/polygerrit-ui/app/samples/some-screen.js
@@ -15,14 +15,7 @@
* limitations under the License.
*/
-// Element class exists in all browsers:
-// https://developer.mozilla.org/en-US/docs/Web/API/Element
-// Rename it to PolymerElement to avoid conflicts. Also,
-// typescript reports the following error:
-// error TS2451: Cannot redeclare block-scoped variable 'Element'.
-const {html, Element: PolymerElement} = Polymer;
-
-class SomeScreenMain extends PolymerElement {
+class SomeScreenMain extends Polymer.Element {
static get is() { return 'some-screen-main'; }
static get properties() {
@@ -32,7 +25,7 @@
}
static get template() {
- return html`
+ return Polymer.html`
This is the <b>main</b> plugin screen at [[token]]
<ul>
<li><a href$="[[rootUrl]]/bar">without component</a></li>
@@ -46,7 +39,6 @@
}
}
-// register the custom component
customElements.define(SomeScreenMain.is, SomeScreenMain);
/**
diff --git a/polygerrit-ui/app/samples/suggest-vote.js b/polygerrit-ui/app/samples/suggest-vote.js
index b3c3046..10d0d4a 100644
--- a/polygerrit-ui/app/samples/suggest-vote.js
+++ b/polygerrit-ui/app/samples/suggest-vote.js
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
/**
* This plugin will upgrade your +1 on Code-Review label
* to +2 and show a message below the voting labels.
@@ -29,8 +30,7 @@
if (wasSuggested && name === CODE_REVIEW) {
replyApi.showMessage('');
wasSuggested = false;
- } else if (replyApi.getLabelValue(CODE_REVIEW) === '+1' &&
- !wasSuggested) {
+ } else if (replyApi.getLabelValue(CODE_REVIEW) === '+1' && !wasSuggested) {
replyApi.setLabelValue(CODE_REVIEW, '+2');
replyApi.showMessage(`Suggested ${CODE_REVIEW} upgrade: +2`);
wasSuggested = true;
diff --git a/polygerrit-ui/app/services/app-context-init.ts b/polygerrit-ui/app/services/app-context-init.ts
index dab894e..9af86d2 100644
--- a/polygerrit-ui/app/services/app-context-init.ts
+++ b/polygerrit-ui/app/services/app-context-init.ts
@@ -73,7 +73,7 @@
authService: () => new Auth(appContext.eventEmitter),
restApiService: () => new GrRestApiInterface(appContext.authService),
changeService: () => new ChangeService(),
- checksService: () => new ChecksService(),
+ checksService: () => new ChecksService(appContext.reportingService),
jsApiService: () => new GrJsApiInterface(),
storageService: () => new GrStorageService(),
configService: () => new ConfigService(),
diff --git a/polygerrit-ui/app/services/checks/checks-service.ts b/polygerrit-ui/app/services/checks/checks-service.ts
index 250cea5..40a1596 100644
--- a/polygerrit-ui/app/services/checks/checks-service.ts
+++ b/polygerrit-ui/app/services/checks/checks-service.ts
@@ -54,6 +54,7 @@
import {getCurrentRevision} from '../../utils/change-util';
import {getShaByPatchNum} from '../../utils/patch-set-util';
import {assertIsDefined} from '../../utils/common-util';
+import {ReportingService} from '../gr-reporting/gr-reporting';
export class ChecksService {
private readonly providers: {[name: string]: ChecksProvider} = {};
@@ -64,7 +65,7 @@
private readonly documentVisibilityChange$ = new BehaviorSubject(undefined);
- constructor() {
+ constructor(readonly reporting: ReportingService) {
checkToPluginMap$.subscribe(map => {
this.checkToPluginMap = map;
});
@@ -74,6 +75,9 @@
document.addEventListener('visibilitychange', () => {
this.documentVisibilityChange$.next(undefined);
});
+ document.addEventListener('reload', () => {
+ this.reloadAll();
+ });
}
setPatchset(num: PatchSetNumber) {
@@ -150,8 +154,7 @@
commmitMessage: getCurrentRevision(change)?.commit?.message,
changeInfo: change,
};
- updateStateSetLoading(pluginName);
- return from(this.providers[pluginName].fetch(data));
+ return this.fetchResults(pluginName, data);
}
),
catchError(e => {
@@ -183,4 +186,16 @@
}
});
}
+
+ private fetchResults(pluginName: string, data: ChangeData) {
+ updateStateSetLoading(pluginName);
+ const timer = this.reporting.getTimer('ChecksPluginFetch');
+ const fetchPromise = this.providers[pluginName]
+ .fetch(data)
+ .then(response => {
+ timer.end({pluginName});
+ return response;
+ });
+ return from(fetchPromise);
+ }
}
diff --git a/polygerrit-ui/app/services/checks/checks-util.ts b/polygerrit-ui/app/services/checks/checks-util.ts
index 15841f3..0a0881b 100644
--- a/polygerrit-ui/app/services/checks/checks-util.ts
+++ b/polygerrit-ui/app/services/checks/checks-util.ts
@@ -79,10 +79,11 @@
if (hasResultsOf(run, Category.ERROR)) return Category.ERROR;
if (hasResultsOf(run, Category.WARNING)) return Category.WARNING;
if (hasResultsOf(run, Category.INFO)) return Category.INFO;
+ if (hasResultsOf(run, Category.SUCCESS)) return Category.SUCCESS;
return undefined;
}
-export function iconForCategory(category: Category | 'SUCCESS') {
+export function iconForCategory(category: Category) {
switch (category) {
case Category.ERROR:
return 'error';
@@ -90,7 +91,7 @@
return 'info-outline';
case Category.WARNING:
return 'warning';
- case 'SUCCESS':
+ case Category.SUCCESS:
return 'check-circle-outline';
default:
assertNever(category, `Unsupported category: ${category}`);
@@ -210,12 +211,14 @@
export function level(cat?: Category) {
if (!cat) return -1;
switch (cat) {
- case Category.INFO:
+ case Category.SUCCESS:
return 0;
- case Category.WARNING:
+ case Category.INFO:
return 1;
- case Category.ERROR:
+ case Category.WARNING:
return 2;
+ case Category.ERROR:
+ return 3;
}
}
diff --git a/polygerrit-ui/app/services/gr-reporting/gr-reporting.ts b/polygerrit-ui/app/services/gr-reporting/gr-reporting.ts
index d7081ce..bbdb02a 100644
--- a/polygerrit-ui/app/services/gr-reporting/gr-reporting.ts
+++ b/polygerrit-ui/app/services/gr-reporting/gr-reporting.ts
@@ -24,7 +24,7 @@
export interface Timer {
reset(): this;
- end(): this;
+ end(eventDetails?: EventDetails): this;
withMaximum(maximum: number): this;
}
diff --git a/polygerrit-ui/app/services/gr-reporting/gr-reporting_impl.ts b/polygerrit-ui/app/services/gr-reporting/gr-reporting_impl.ts
index 5fd4234..4e6ece2 100644
--- a/polygerrit-ui/app/services/gr-reporting/gr-reporting_impl.ts
+++ b/polygerrit-ui/app/services/gr-reporting/gr-reporting_impl.ts
@@ -713,7 +713,7 @@
},
// Stop the timer and report the intervening time.
- end: () => {
+ end: (eventDetails?: EventDetails) => {
if (called) {
throw new Error(`Timer for "${name}" already ended.`);
}
@@ -725,7 +725,7 @@
return timer;
}
- this._reportTiming(name, time);
+ this._reportTiming(name, time, eventDetails);
return timer;
},
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 2d5242e..3a890d9 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
@@ -710,11 +710,6 @@
addAccountEmail(email: string): Promise<Response>;
- saveChangeReviewed(
- changeNum: NumericChangeId,
- reviewed: boolean
- ): Promise<Response | undefined>;
-
saveChangeStarred(
changeNum: NumericChangeId,
starred: boolean
diff --git a/polygerrit-ui/app/test/mocks/gr-rest-api_mock.ts b/polygerrit-ui/app/test/mocks/gr-rest-api_mock.ts
index 395c9f67..3971fa5 100644
--- a/polygerrit-ui/app/test/mocks/gr-rest-api_mock.ts
+++ b/polygerrit-ui/app/test/mocks/gr-rest-api_mock.ts
@@ -444,9 +444,6 @@
saveChangeReview() {
return Promise.resolve(new Response());
},
- saveChangeReviewed(): Promise<Response | undefined> {
- return Promise.resolve(new Response());
- },
saveChangeStarred(): Promise<Response> {
return Promise.resolve(new Response());
},
diff --git a/polygerrit-ui/app/test/test-data-generators.ts b/polygerrit-ui/app/test/test-data-generators.ts
index 778e58d..fa40529 100644
--- a/polygerrit-ui/app/test/test-data-generators.ts
+++ b/polygerrit-ui/app/test/test-data-generators.ts
@@ -348,7 +348,6 @@
update_delay: 0,
mergeability_computation_behavior:
MergeabilityComputationBehavior.REF_UPDATED_AND_CHANGE_REINDEX,
- enable_attention_set: false,
enable_assignee: false,
};
}
diff --git a/polygerrit-ui/app/test/test-utils.ts b/polygerrit-ui/app/test/test-utils.ts
index 26b99ac..34f7fe4 100644
--- a/polygerrit-ui/app/test/test-utils.ts
+++ b/polygerrit-ui/app/test/test-utils.ts
@@ -71,6 +71,11 @@
return found;
}
+export function isVisible(el: Element) {
+ assert.ok(el);
+ return getComputedStyle(el).getPropertyValue('display') !== 'none';
+}
+
// Some tests/elements can define its own binding. We want to restore bindings
// at the end of the test. The TestKeyboardShortcutBinder store bindings in
// stack, so it is possible to override bindings in nested suites.
@@ -170,6 +175,10 @@
return sinon.stub(appContext.storageService, method);
}
+export function spyStorage<K extends keyof StorageService>(method: K) {
+ return sinon.spy(appContext.storageService, method);
+}
+
export type SinonSpyMember<F extends (...args: any) => any> = SinonSpy<
Parameters<F>,
ReturnType<F>
diff --git a/polygerrit-ui/app/types/common.ts b/polygerrit-ui/app/types/common.ts
index 223300b..30eb658 100644
--- a/polygerrit-ui/app/types/common.ts
+++ b/polygerrit-ui/app/types/common.ts
@@ -529,7 +529,7 @@
real_author?: AccountInfo;
date: Timestamp;
message: string;
- accountsInMessage?: AccountInfo[];
+ accounts_in_message?: AccountInfo[];
tag?: ReviewInputTag;
_revision_number?: PatchSetNum;
}
@@ -638,6 +638,7 @@
subject: string;
message: string;
web_links?: WebLinkInfo[];
+ resolve_conflicts_web_links?: WebLinkInfo[];
}
export interface CommitInfoWithRequiredCommit extends CommitInfo {
@@ -810,7 +811,6 @@
submit_whole_topic?: boolean;
disable_private_changes?: boolean;
mergeability_computation_behavior: MergeabilityComputationBehavior;
- enable_attention_set: boolean;
enable_assignee: boolean;
}
diff --git a/polygerrit-ui/app/types/diff.ts b/polygerrit-ui/app/types/diff.ts
index c3b38c6..35c5726 100644
--- a/polygerrit-ui/app/types/diff.ts
+++ b/polygerrit-ui/app/types/diff.ts
@@ -51,6 +51,12 @@
* entries.
*/
web_links?: DiffWebLinkInfo[];
+
+ /**
+ * Links to edit the file in external sites as a list of WebLinkInfo
+ * entries.
+ */
+ edit_web_links?: WebLinkInfo[];
}
/**
diff --git a/polygerrit-ui/app/types/events.ts b/polygerrit-ui/app/types/events.ts
index ff08c57..3a61437 100644
--- a/polygerrit-ui/app/types/events.ts
+++ b/polygerrit-ui/app/types/events.ts
@@ -34,6 +34,8 @@
OPEN_FIX_PREVIEW = 'open-fix-preview',
CLOSE_FIX_PREVIEW = 'close-fix-preview',
PAGE_ERROR = 'page-error',
+ RECREATE_CHANGE_VIEW = 'recreate-change-view',
+ RECREATE_DIFF_VIEW = 'recreate-diff-view',
RELOAD = 'reload',
REPLY = 'reply',
SERVER_ERROR = 'server-error',
@@ -56,6 +58,7 @@
'moved-link-clicked': MovedLinkClickedEvent;
'open-fix-preview': OpenFixPreviewEvent;
'close-fix-preview': CloseFixPreviewEvent;
+ 'create-fix-comment': CreateFixCommentEvent;
/* prettier-ignore */
'reload': ReloadEvent;
/* prettier-ignore */
@@ -75,6 +78,8 @@
'gr-rpc-log': RpcLogEvent;
'network-error': NetworkErrorEvent;
'page-error': PageErrorEvent;
+ /* prettier-ignore */
+ 'reload': ReloadEvent;
'server-error': ServerErrorEvent;
'show-alert': ShowAlertEvent;
'show-error': ShowErrorEvent;
@@ -135,6 +140,11 @@
fixApplied: boolean;
}
export type CloseFixPreviewEvent = CustomEvent<CloseFixPreviewEventDetail>;
+export interface CreateFixCommentEventDetail {
+ patchNum?: PatchSetNum;
+ comment?: UIComment;
+}
+export type CreateFixCommentEvent = CustomEvent<CreateFixCommentEventDetail>;
export interface PageErrorEventDetail {
response?: Response;
diff --git a/polygerrit-ui/app/utils/account-util.ts b/polygerrit-ui/app/utils/account-util.ts
index bb9f328..ff37608 100644
--- a/polygerrit-ui/app/utils/account-util.ts
+++ b/polygerrit-ui/app/utils/account-util.ts
@@ -15,8 +15,16 @@
* limitations under the License.
*/
-import {AccountId, AccountInfo, EmailAddress} from '../types/common';
+import {
+ AccountId,
+ AccountInfo,
+ EmailAddress,
+ GroupInfo,
+ isAccount,
+ isGroup,
+} from '../types/common';
import {AccountTag} from '../constants/constants';
+import {assertNever} from './common-util';
export function accountKey(account: AccountInfo): AccountId | EmailAddress {
if (account._account_id) return account._account_id;
@@ -40,6 +48,12 @@
return account?.avatars?.[0]?.url === other?.avatars?.[0]?.url;
}
+export function accountOrGroupKey(entry: AccountInfo | GroupInfo) {
+ if (isAccount(entry)) return accountKey(entry);
+ if (isGroup(entry)) return entry.id;
+ assertNever(entry, 'entry must be account or group');
+}
+
export function uniqueDefinedAvatar(
account: AccountInfo,
index: number,
diff --git a/polygerrit-ui/app/utils/attention-set-util.ts b/polygerrit-ui/app/utils/attention-set-util.ts
index 5b2762c..d39553a 100644
--- a/polygerrit-ui/app/utils/attention-set-util.ts
+++ b/polygerrit-ui/app/utils/attention-set-util.ts
@@ -19,33 +19,15 @@
import {isServiceUser} from './account-util';
import {hasOwnProperty} from './common-util';
-// You would typically use a ServerInfo here, but this utility does not care
-// about all the other parameters in that object.
-interface SimpleServerInfo {
- change?: {
- enable_attention_set?: boolean;
- };
-}
-
-const CONFIG_ENABLED: SimpleServerInfo = {
- change: {enable_attention_set: true},
-};
-
-export function isAttentionSetEnabled(config?: SimpleServerInfo): boolean {
- return !!config?.change?.enable_attention_set;
-}
-
export function canHaveAttention(account?: AccountInfo): boolean {
return !!account?._account_id && !isServiceUser(account);
}
export function hasAttention(
- config?: SimpleServerInfo,
account?: AccountInfo,
change?: ChangeInfo
): boolean {
return (
- isAttentionSetEnabled(config) &&
canHaveAttention(account) &&
!!change?.attention_set &&
hasOwnProperty(change?.attention_set, account!._account_id!)
@@ -53,13 +35,13 @@
}
export function getReason(account?: AccountInfo, change?: ChangeInfo) {
- if (!hasAttention(CONFIG_ENABLED, account, change)) return '';
+ if (!hasAttention(account, change)) return '';
const entry = change!.attention_set![account!._account_id!];
return entry?.reason ? entry.reason : '';
}
export function getLastUpdate(account?: AccountInfo, change?: ChangeInfo) {
- if (!hasAttention(CONFIG_ENABLED, account, change)) return '';
+ if (!hasAttention(account, change)) return '';
const entry = change!.attention_set![account!._account_id!];
return entry?.last_update ? entry.last_update : '';
}
diff --git a/polygerrit-ui/app/utils/attention-set-util_test.js b/polygerrit-ui/app/utils/attention-set-util_test.js
index 71735d5..9d8c086 100644
--- a/polygerrit-ui/app/utils/attention-set-util_test.js
+++ b/polygerrit-ui/app/utils/attention-set-util_test.js
@@ -29,9 +29,6 @@
suite('attention-set-util', () => {
test('hasAttention', () => {
- const config = {
- change: {enable_attention_set: true},
- };
const change = {
attention_set: {
31415926535: {
@@ -40,7 +37,7 @@
},
};
- assert.isTrue(hasAttention(config, KERMIT, change));
+ assert.isTrue(hasAttention(KERMIT, change));
});
test('getReason', () => {
diff --git a/polygerrit-ui/app/utils/event-util.ts b/polygerrit-ui/app/utils/event-util.ts
index da075f1..4ba27bc 100644
--- a/polygerrit-ui/app/utils/event-util.ts
+++ b/polygerrit-ui/app/utils/event-util.ts
@@ -133,6 +133,10 @@
fire(target, EventType.CLOSE_FIX_PREVIEW, {fixApplied});
}
+export function fireReload(target: EventTarget, clearPatchset?: boolean) {
+ fire(target, EventType.RELOAD, {clearPatchset: !!clearPatchset});
+}
+
export function waitForEventOnce<K extends keyof HTMLElementEventMap>(
el: EventTarget,
eventName: K
diff --git a/polygerrit-ui/app/utils/path-list-util.ts b/polygerrit-ui/app/utils/path-list-util.ts
index dda6031..fd922fc 100644
--- a/polygerrit-ui/app/utils/path-list-util.ts
+++ b/polygerrit-ui/app/utils/path-list-util.ts
@@ -64,6 +64,8 @@
return file === SpecialFilePath.PATCHSET_LEVEL_COMMENTS;
}
+// In case there are files with comments on them but they are unchanged, then
+// we explicitly displays the file to render the comments with Unchanged status
export function addUnmodifiedFiles(
files: {[filename: string]: FileInfo},
commentedPaths: {[fileName: string]: boolean}
@@ -73,6 +75,18 @@
if (hasOwnProperty(files, commentedPath) || shouldHideFile(commentedPath)) {
return;
}
+
+ // if file is Renamed but has comments, then do not show the entry for the
+ // old file path name
+ if (
+ Object.values(files).some(
+ file =>
+ file.status === FileInfoStatus.RENAMED &&
+ file.old_path === commentedPath
+ )
+ ) {
+ return;
+ }
// TODO(TS): either change FileInfo to mark delta and size optional
// or fill in 0 here
files[commentedPath] = {
diff --git a/polygerrit-ui/app/yarn.lock b/polygerrit-ui/app/yarn.lock
index 5240c8c..543017a 100644
--- a/polygerrit-ui/app/yarn.lock
+++ b/polygerrit-ui/app/yarn.lock
@@ -418,22 +418,27 @@
"ba-linkify@file:../../lib/ba-linkify/src":
version "1.0.0"
+codemirror-minified@^5.60.0:
+ version "5.60.0"
+ resolved "https://registry.yarnpkg.com/codemirror-minified/-/codemirror-minified-5.60.0.tgz#d0d8b62ab6d50864903f812cd203b97193b1fb75"
+ integrity sha512-Ru9aChh07DwYrUEfI+LznD3l8GxOPlYKAqcG8qxIlxRZTyw4BPfZsV5m1oUz1y6knxaPxa23FwM/R5rWggRnKg==
+
isarray@0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-lit-element@^2.4.0:
- version "2.4.0"
- resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-2.4.0.tgz#b22607a037a8fc08f5a80736dddf7f3f5d401452"
- integrity sha512-pBGLglxyhq/Prk2H91nA0KByq/hx/wssJBQFiYqXhGDvEnY31PRGYf1RglVzyLeRysu0IHm2K0P196uLLWmwFg==
+lit-element@^2.5.1:
+ version "2.5.1"
+ resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-2.5.1.tgz#3fa74b121a6cd22902409ae3859b7847d01aa6b6"
+ integrity sha512-ogu7PiJTA33bEK0xGu1dmaX5vhcRjBXCFexPja0e7P7jqLhTpNKYRPmE+GmiCaRVAbiQKGkUgkh/i6+bh++dPQ==
dependencies:
lit-html "^1.1.1"
lit-html@^1.1.1:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-1.3.0.tgz#c80f3cc5793a6dea6c07172be90a70ab20e56034"
- integrity sha512-0Q1bwmaFH9O14vycPHw8C/IeHMk/uSDldVLIefu/kfbTBGIc44KGH6A8p1bDfxUfHdc8q6Ct7kQklWoHgr4t1Q==
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-1.4.1.tgz#0c6f3ee4ad4eb610a49831787f0478ad8e9ae5e0"
+ integrity sha512-B9btcSgPYb1q4oSOb/PrOT6Z/H+r6xuNzfH4lFli/AWhYwdtrgQkQWBbIc6mdnf6E2IL3gDXdkkqNktpU0OZQA==
page@^1.11.6:
version "1.11.6"
diff --git a/polygerrit-ui/edit-walkthrough/edit-walkthrough.md b/polygerrit-ui/edit-walkthrough/edit-walkthrough.md
deleted file mode 100644
index 717f683..0000000
--- a/polygerrit-ui/edit-walkthrough/edit-walkthrough.md
+++ /dev/null
@@ -1,80 +0,0 @@
-# In-browser Editing in Gerrit
-
-### What's going on?
-
-Until Q1 of 2018, editing a file in the browser was not supported by Gerrit's
-new UI. This feature is now done and ready for use.
-
-Read on for a walkthrough of the feature!
-
-### Creating an edit
-
-Click on the "Edit" button to begin.
-
-One may also go to the project mmanagement page (Browse => Repository =>
-Commands => Create Change) to create a new change.
-
-
-
-### Performing an action
-
-The buttons in the file list header open dialogs to perform actions on any file
-in the repo.
-
-* Open - opens an existing or new file from the repo in an editor.
-* Delete - deletes an existing file from the repo.
-* Rename - renames an existing file in the repo.
-
-To leave edit mode and restore the normal buttons to the file list, click "Stop
-editing".
-
-
-
-### Performing an action on a file
-
-The "Actions" dropdown appears on each file, and is used to perform actions on
-that specific file.
-
-* Open - opens this file in the editor.
-* Delete - deletes this file from the repo.
-* Rename - renames this file in the repo.
-* Restore - restores this file to the state it existed in at the patch the
-edit was created on.
-
-
-
-### Modifying the file
-
-This is the editor view.
-
-Clicking on the file path allows you to rename the file, You can edit code in
-the textarea, and "Close" will discard any unsaved changes and navigate back to
-the previous view.
-
-
-
-### Saving the edit
-
-You can save changes to the code with `cmd+s`, `ctrl+s`, or by clicking the
-"Save" button.
-
-
-
-### Publishing the edit
-
-You may publish or delete the edit by clicking the buttons in the header.
-
-
-
-
-
-### What if I have questions not answered here?
-
-Gerrit's [official docs](https://gerrit-review.googlesource.com/Documentation/user-inline-edit.html)
-are in the process of being updated and largely refer to the old UI, but the
-user experience is largely the same.
-
-Otherwise, please email
-[the repo-discuss mailing list](mailto:repo-discuss@google.com) or file a bug
-on Gerrit's official bug tracker,
-[Monorail](https://bugs.chromium.org/p/gerrit/issues/entry?template=PolyGerrit+Issue).
\ No newline at end of file
diff --git a/polygerrit-ui/edit-walkthrough/img/actions_overflow.png b/polygerrit-ui/edit-walkthrough/img/actions_overflow.png
deleted file mode 100644
index bf39763..0000000
--- a/polygerrit-ui/edit-walkthrough/img/actions_overflow.png
+++ /dev/null
Binary files differ
diff --git a/polygerrit-ui/edit-walkthrough/img/edit_made.png b/polygerrit-ui/edit-walkthrough/img/edit_made.png
deleted file mode 100644
index 658245d..0000000
--- a/polygerrit-ui/edit-walkthrough/img/edit_made.png
+++ /dev/null
Binary files differ
diff --git a/polygerrit-ui/edit-walkthrough/img/edit_pending.png b/polygerrit-ui/edit-walkthrough/img/edit_pending.png
deleted file mode 100644
index a63f6ee..0000000
--- a/polygerrit-ui/edit-walkthrough/img/edit_pending.png
+++ /dev/null
Binary files differ
diff --git a/polygerrit-ui/edit-walkthrough/img/in_edit_mode.png b/polygerrit-ui/edit-walkthrough/img/in_edit_mode.png
deleted file mode 100644
index 582ed66..0000000
--- a/polygerrit-ui/edit-walkthrough/img/in_edit_mode.png
+++ /dev/null
Binary files differ
diff --git a/polygerrit-ui/edit-walkthrough/img/in_editor.png b/polygerrit-ui/edit-walkthrough/img/in_editor.png
deleted file mode 100644
index 228d020..0000000
--- a/polygerrit-ui/edit-walkthrough/img/in_editor.png
+++ /dev/null
Binary files differ
diff --git a/polygerrit-ui/edit-walkthrough/img/into_edit.png b/polygerrit-ui/edit-walkthrough/img/into_edit.png
deleted file mode 100644
index b6c14ed..0000000
--- a/polygerrit-ui/edit-walkthrough/img/into_edit.png
+++ /dev/null
Binary files differ
diff --git a/polygerrit-ui/server.go b/polygerrit-ui/server.go
index 9b9d752..e030878 100644
--- a/polygerrit-ui/server.go
+++ b/polygerrit-ui/server.go
@@ -41,11 +41,11 @@
)
var (
- plugins = flag.String("plugins", "", "comma seperated plugin paths to serve")
- port = flag.String("port", "localhost:8081", "address to serve HTTP requests on")
- host = flag.String("host", "gerrit-review.googlesource.com", "Host to proxy requests to")
- scheme = flag.String("scheme", "https", "URL scheme")
- cdnPattern = regexp.MustCompile("https://cdn.googlesource.com/polygerrit_ui/[0-9.]*")
+ plugins = flag.String("plugins", "", "comma seperated plugin paths to serve")
+ port = flag.String("port", "localhost:8081", "address to serve HTTP requests on")
+ host = flag.String("host", "gerrit-review.googlesource.com", "Host to proxy requests to")
+ scheme = flag.String("scheme", "https", "URL scheme")
+ cdnPattern = regexp.MustCompile("https://cdn.googlesource.com/polygerrit_ui/[0-9.]*")
)
func main() {
@@ -120,8 +120,8 @@
func addDevHeaders(writer http.ResponseWriter) {
writer.Header().Set("Access-Control-Allow-Origin", "*")
+ writer.Header().Set("Access-Control-Allow-Headers", "cache-control,x-test-origin")
writer.Header().Set("Cache-Control", "public, max-age=10, must-revalidate")
-
}
func handleSrcRequest(compiledSrcPath string, dirListingMux *http.ServeMux, writer http.ResponseWriter, originalRequest *http.Request) {
diff --git a/polygerrit-ui/wct.conf.js b/polygerrit-ui/wct.conf.js
deleted file mode 100644
index 2096e60..0000000
--- a/polygerrit-ui/wct.conf.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @license
- * Copyright (C) 2020 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.
- */
-
-var path = require('path');
-
-var ret = {
- suites: ['app/test'],
- webserver: {
- pathMappings: []
- }
-};
-
-var mapping = {};
-var rootPath = (__dirname).split(path.sep).slice(-1)[0];
-
-mapping['/components/' + rootPath + '/app/bower_components'] = 'bower_components';
-
-ret.webserver.pathMappings.push(mapping);
-
-module.exports = ret;
diff --git a/resources/com/google/gerrit/server/mail/InboundEmailRejection.soy b/resources/com/google/gerrit/server/mail/InboundEmailRejection.soy
index 1241665..a9e0a44 100644
--- a/resources/com/google/gerrit/server/mail/InboundEmailRejection.soy
+++ b/resources/com/google/gerrit/server/mail/InboundEmailRejection.soy
@@ -65,6 +65,14 @@
{call InboundEmailRejectionFooter /}
{/template}
+{template InboundEmailRejection_CHANGE_NOT_FOUND kind="text"}
+ Gerrit Code Review was unable to process your email because the change was not found.
+ {\n}
+ Maybe the project doesn't exist or is not visible? Maybe the change is not visible or got
+ deleted?
+ {call InboundEmailRejectionFooter /}
+{/template}
+
{template InboundEmailRejection_COMMENT_REJECTED kind="text"}
Gerrit Code Review rejected one or more comments because they did not pass validation, or
because the maximum number of comments per change would be exceeded.
diff --git a/resources/com/google/gerrit/server/mail/InboundEmailRejectionHtml.soy b/resources/com/google/gerrit/server/mail/InboundEmailRejectionHtml.soy
index 6937d13..3444b7f 100644
--- a/resources/com/google/gerrit/server/mail/InboundEmailRejectionHtml.soy
+++ b/resources/com/google/gerrit/server/mail/InboundEmailRejectionHtml.soy
@@ -82,6 +82,17 @@
{call InboundEmailRejectionFooterHtml /}
{/template}
+{template InboundEmailRejectionHtml_CHANGE_NOT_FOUND}
+ <p>
+ Gerrit Code Review was unable to process your email because the change was not found.
+ </p>
+ <p>
+ Maybe the project doesn't exist or is not visible? Maybe the change is not visible or got
+ deleted?
+ <p>
+ {call InboundEmailRejectionFooterHtml /}
+{/template}
+
{template InboundEmailRejectionHtml_COMMENT_REJECTED}
<p>
Gerrit Code Review rejected one or more comments because they did not pass validation, or
diff --git a/tools/bzl/js.bzl b/tools/bzl/js.bzl
index ad7a96d..03a29da 100644
--- a/tools/bzl/js.bzl
+++ b/tools/bzl/js.bzl
@@ -1,167 +1,9 @@
load("@npm//@bazel/rollup:index.bzl", "rollup_bundle")
load("@npm//@bazel/terser:index.bzl", "terser_minified")
-load("//lib/js:npm.bzl", "NPM_SHA1S", "NPM_VERSIONS")
load("//tools/bzl:genrule2.bzl", "genrule2")
-NPMJS = "NPMJS"
-
-GERRIT = "GERRIT:"
-
-def _npm_tarball(name):
- return "%s@%s.npm_binary.tgz" % (name, NPM_VERSIONS[name])
-
-def _npm_binary_impl(ctx):
- """rule to download a NPM archive."""
- name = ctx.name
- version = NPM_VERSIONS[name]
- sha1 = NPM_SHA1S[name]
-
- dir = "%s-%s" % (name, version)
- filename = "%s.tgz" % dir
- base = "%s@%s.npm_binary.tgz" % (name, version)
- dest = ctx.path(base)
- repository = ctx.attr.repository
- if repository == GERRIT:
- url = "https://gerrit-maven.storage.googleapis.com/npm-packages/%s" % filename
- elif repository == NPMJS:
- url = "https://registry.npmjs.org/%s/-/%s" % (name, filename)
- else:
- fail("repository %s not in {%s,%s}" % (repository, GERRIT, NPMJS))
-
- python = ctx.which("python")
- script = ctx.path(ctx.attr._download_script)
-
- args = [python, script, "-o", dest, "-u", url, "-v", sha1]
- out = ctx.execute(args)
- if out.return_code:
- fail("failed %s: %s" % (args, out.stderr))
- ctx.file("BUILD", "package(default_visibility=['//visibility:public'])\nfilegroup(name='tarball', srcs=['%s'])" % base, False)
-
-npm_binary = repository_rule(
- attrs = {
- "repository": attr.string(default = NPMJS),
- # Label resolves within repo of the .bzl file.
- "_download_script": attr.label(default = Label("//tools:download_file.py")),
- },
- local = True,
- implementation = _npm_binary_impl,
-)
-
ComponentInfo = provider()
-# for use in repo rules.
-def _run_npm_binary_str(ctx, tarball, args):
- python_bin = ctx.which("python")
- return " ".join([
- str(python_bin),
- str(ctx.path(ctx.attr._run_npm)),
- str(ctx.path(tarball)),
- ] + args)
-
-def _bower_archive(ctx):
- """Download a bower package."""
- download_name = "%s__download_bower.zip" % ctx.name
- renamed_name = "%s__renamed.zip" % ctx.name
- version_name = "%s__version.json" % ctx.name
-
- cmd = [
- ctx.which("python"),
- ctx.path(ctx.attr._download_bower),
- "-b",
- "%s" % _run_npm_binary_str(ctx, ctx.attr._bower_archive, []),
- "-n",
- ctx.name,
- "-p",
- ctx.attr.package,
- "-v",
- ctx.attr.version,
- "-s",
- ctx.attr.sha1,
- "-o",
- download_name,
- ]
-
- out = ctx.execute(cmd)
- if out.return_code:
- fail("failed %s: %s" % (cmd, out.stderr))
-
- _bash(ctx, " && ".join([
- "TMP=$(mktemp -d || mktemp -d -t bazel-tmp)",
- "TZ=UTC",
- "export UTC",
- "cd $TMP",
- "mkdir bower_components",
- "cd bower_components",
- "unzip %s" % ctx.path(download_name),
- "cd ..",
- "find . -exec touch -t 198001010000 '{}' ';'",
- "zip -Xr %s bower_components" % renamed_name,
- "cd ..",
- "rm -rf ${TMP}",
- ]))
-
- dep_version = ctx.attr.semver if ctx.attr.semver else ctx.attr.version
- ctx.file(
- version_name,
- '"%s":"%s#%s"' % (ctx.name, ctx.attr.package, dep_version),
- )
- ctx.file(
- "BUILD",
- "\n".join([
- "package(default_visibility=['//visibility:public'])",
- "filegroup(name = 'zipfile', srcs = ['%s'], )" % download_name,
- "filegroup(name = 'version_json', srcs = ['%s'], visibility=['//visibility:public'])" % version_name,
- ]),
- False,
- )
-
-def _bash(ctx, cmd):
- cmd_list = ["bash", "-c", cmd]
- out = ctx.execute(cmd_list)
- if out.return_code:
- fail("failed %s: %s" % (cmd_list, out.stderr))
-
-bower_archive = repository_rule(
- _bower_archive,
- attrs = {
- "package": attr.string(mandatory = True),
- "semver": attr.string(),
- "sha1": attr.string(mandatory = True),
- "version": attr.string(mandatory = True),
- "_bower_archive": attr.label(default = Label("@bower//:%s" % _npm_tarball("bower"))),
- "_download_bower": attr.label(default = Label("//tools/js:download_bower.py")),
- "_run_npm": attr.label(default = Label("//tools/js:run_npm_binary.py")),
- },
-)
-
-def _bower_component_impl(ctx):
- transitive_zipfiles = depset(
- direct = [ctx.file.zipfile],
- transitive = [d[ComponentInfo].transitive_zipfiles for d in ctx.attr.deps],
- )
-
- transitive_licenses = depset(
- direct = [ctx.file.license],
- transitive = [d[ComponentInfo].transitive_licenses for d in ctx.attr.deps],
- )
-
- transitive_versions = depset(
- direct = ctx.files.version_json,
- transitive = [d[ComponentInfo].transitive_versions for d in ctx.attr.deps],
- )
-
- return [
- ComponentInfo(
- transitive_licenses = transitive_licenses,
- transitive_versions = transitive_versions,
- transitive_zipfiles = transitive_zipfiles,
- ),
- ]
-
-_common_attrs = {
- "deps": attr.label_list(providers = [ComponentInfo]),
-}
-
def _js_component(ctx):
dir = ctx.outputs.zip.path + ".dir"
name = ctx.outputs.zip.basename
@@ -182,7 +24,7 @@
inputs = ctx.files.srcs,
outputs = [ctx.outputs.zip],
command = cmd,
- mnemonic = "GenBowerZip",
+ mnemonic = "GenJsComponentZip",
)
licenses = []
@@ -199,248 +41,15 @@
js_component = rule(
_js_component,
- attrs = dict(_common_attrs.items() + {
+ attrs = {
"srcs": attr.label_list(allow_files = [".js"]),
"license": attr.label(allow_single_file = True),
- }.items()),
+ },
outputs = {
"zip": "%{name}.zip",
},
)
-_bower_component = rule(
- _bower_component_impl,
- attrs = dict(_common_attrs.items() + {
- "license": attr.label(allow_single_file = True),
-
- # If set, define by hand, and don't regenerate this entry in bower2bazel.
- "seed": attr.bool(default = False),
- "version_json": attr.label(allow_files = [".json"]),
- "zipfile": attr.label(allow_single_file = [".zip"]),
- }.items()),
-)
-
-# TODO(hanwen): make license mandatory.
-def bower_component(name, license = None, **kwargs):
- prefix = "//lib:LICENSE-"
- if license and not license.startswith(prefix):
- license = prefix + license
- _bower_component(
- name = name,
- license = license,
- zipfile = "@%s//:zipfile" % name,
- version_json = "@%s//:version_json" % name,
- **kwargs
- )
-
-def _bower_component_bundle_impl(ctx):
- """A bunch of bower components zipped up."""
- zips = depset()
- for d in ctx.attr.deps:
- files = d[ComponentInfo].transitive_zipfiles
-
- # TODO(davido): Make sure the field always contains a depset
- if type(files) == "list":
- files = depset(files)
- zips = depset(transitive = [zips, files])
-
- versions = depset(transitive = [d[ComponentInfo].transitive_versions for d in ctx.attr.deps])
-
- licenses = depset(transitive = [d[ComponentInfo].transitive_versions for d in ctx.attr.deps])
-
- out_zip = ctx.outputs.zip
- out_versions = ctx.outputs.version_json
-
- ctx.actions.run_shell(
- inputs = zips.to_list(),
- outputs = [out_zip],
- command = " && ".join([
- "p=$PWD",
- "TZ=UTC",
- "export TZ",
- "rm -rf %s.dir" % out_zip.path,
- "mkdir -p %s.dir/bower_components" % out_zip.path,
- "cd %s.dir/bower_components" % out_zip.path,
- "for z in %s; do unzip -q $p/$z ; done" % " ".join(sorted([z.path for z in zips.to_list()])),
- "cd ..",
- "find . -exec touch -t 198001010000 '{}' ';'",
- "zip -Xqr $p/%s bower_components/*" % out_zip.path,
- ]),
- mnemonic = "BowerCombine",
- )
-
- ctx.actions.run_shell(
- inputs = versions.to_list(),
- outputs = [out_versions],
- mnemonic = "BowerVersions",
- command = "(echo '{' ; for j in %s ; do cat $j; echo ',' ; done ; echo \\\"\\\":\\\"\\\"; echo '}') > %s" % (" ".join([v.path for v in versions.to_list()]), out_versions.path),
- )
-
- return [
- ComponentInfo(
- transitive_licenses = licenses,
- transitive_versions = versions,
- transitive_zipfiles = zips,
- ),
- ]
-
-bower_component_bundle = rule(
- _bower_component_bundle_impl,
- attrs = _common_attrs,
- outputs = {
- "version_json": "%{name}-versions.json",
- "zip": "%{name}.zip",
- },
-)
-
-def _bundle_impl(ctx):
- """Groups a set of .html and .js together in a zip file.
-
- Outputs:
- NAME-versions.json:
- a JSON file containing a PKG-NAME => PKG-NAME#VERSION mapping for the
- transitive dependencies.
- NAME.zip:
- a zip file containing the transitive dependencies for this bundle.
- """
-
- # intermediate artifact if split is wanted.
- if ctx.attr.split:
- bundled = ctx.actions.declare_file(ctx.outputs.html.path + ".bundled.html")
- else:
- bundled = ctx.outputs.html
- destdir = ctx.outputs.html.path + ".dir"
- zips = [z for d in ctx.attr.deps for z in d[ComponentInfo].transitive_zipfiles.to_list()]
-
- # We are splitting off the package dir from the app.path such that
- # we can set the package dir as the root for the bundler, which means
- # that absolute imports are interpreted relative to that root.
- pkg_dir = ctx.attr.pkg.lstrip("/")
- app_path = ctx.file.app.path
- app_path = app_path[app_path.index(pkg_dir) + len(pkg_dir):]
-
- hermetic_npm_binary = " ".join([
- "python",
- "$p/" + ctx.file._run_npm.path,
- "$p/" + ctx.file._bundler_archive.path,
- "--inline-scripts",
- "--inline-css",
- "--sourcemaps",
- "--strip-comments",
- "--out-file",
- "$p/" + bundled.path,
- "--root",
- pkg_dir,
- app_path,
- ])
-
- cmd = " && ".join([
- # unpack dependencies.
- "export PATH",
- "p=$PWD",
- "rm -rf %s" % destdir,
- "mkdir -p %s/%s/bower_components" % (destdir, pkg_dir),
- "for z in %s; do unzip -qd %s/%s/bower_components/ $z; done" % (
- " ".join([z.path for z in zips]),
- destdir,
- pkg_dir,
- ),
- "tar -cf - %s | tar -C %s -xf -" % (" ".join([s.path for s in ctx.files.srcs]), destdir),
- "cd %s" % destdir,
- hermetic_npm_binary,
- ])
-
- # Node/NPM is not (yet) hermeticized, so we have to get the binary
- # from the environment, and it may be under $HOME, so we can't run
- # in the sandbox.
- node_tweaks = dict(
- execution_requirements = {"local": "1"},
- use_default_shell_env = True,
- )
- ctx.actions.run_shell(
- mnemonic = "Bundle",
- inputs = [
- ctx.file._run_npm,
- ctx.file.app,
- ctx.file._bundler_archive,
- ] + list(zips) + ctx.files.srcs,
- outputs = [bundled],
- command = cmd,
- **node_tweaks
- )
-
- if ctx.attr.split:
- hermetic_npm_command = "export PATH && " + " ".join([
- "python",
- ctx.file._run_npm.path,
- ctx.file._crisper_archive.path,
- "--script-in-head=false",
- "--always-write-script",
- "--source",
- bundled.path,
- "--html",
- ctx.outputs.html.path,
- "--js",
- ctx.outputs.js.path,
- ])
-
- ctx.actions.run_shell(
- mnemonic = "Crisper",
- inputs = [
- ctx.file._run_npm,
- ctx.file.app,
- ctx.file._crisper_archive,
- bundled,
- ],
- outputs = [ctx.outputs.js, ctx.outputs.html],
- command = hermetic_npm_command,
- **node_tweaks
- )
-
-def _bundle_output_func(name, split):
- _ignore = [name] # unused.
- out = {"html": "%{name}.html"}
- if split:
- out["js"] = "%{name}.js"
- return out
-
-_bundle_rule = rule(
- _bundle_impl,
- attrs = {
- "srcs": attr.label_list(allow_files = [
- ".js",
- ".html",
- ".txt",
- ".css",
- ".ico",
- ]),
- "app": attr.label(
- mandatory = True,
- allow_single_file = True,
- ),
- "pkg": attr.string(mandatory = True),
- "split": attr.bool(default = True),
- "deps": attr.label_list(providers = [ComponentInfo]),
- "_bundler_archive": attr.label(
- default = Label("@polymer-bundler//:%s" % _npm_tarball("polymer-bundler")),
- allow_single_file = True,
- ),
- "_crisper_archive": attr.label(
- default = Label("@crisper//:%s" % _npm_tarball("crisper")),
- allow_single_file = True,
- ),
- "_run_npm": attr.label(
- default = Label("//tools/js:run_npm_binary.py"),
- allow_single_file = True,
- ),
- },
- outputs = _bundle_output_func,
-)
-
-def bundle_assets(*args, **kwargs):
- """Combine html, js, css files and optionally split into js and html bundles."""
- _bundle_rule(pkg = native.package_name(), *args, **kwargs)
-
def polygerrit_plugin(name, app, plugin_name = None):
"""Produces plugin file set with minified javascript.
@@ -474,13 +83,13 @@
srcs = [plugin_name + ".js"],
)
-def gerrit_js_bundle(name, srcs, entry_point):
+def gerrit_js_bundle(name, entry_point, srcs = []):
"""Produces a Gerrit JavaScript bundle archive.
This rule bundles and minifies the javascript files of a frontend plugin and
produces a file archive.
Output of this rule is an archive with "${name}.jar" with specific layout for
- Gerrit frontentd plugins. That archive should be provided to gerrit_plugin
+ Gerrit frontend plugins. That archive should be provided to gerrit_plugin
rule as resource_jars attribute.
Args:
@@ -488,8 +97,13 @@
srcs: Plugin sources.
entry_point: Plugin entry_point.
"""
+
+ bundle = name + "-bundle"
+ minified = name + ".min"
+ main = name + ".js"
+
rollup_bundle(
- name = name + "-bundle",
+ name = bundle,
srcs = srcs,
entry_point = entry_point,
format = "iife",
@@ -501,22 +115,22 @@
)
terser_minified(
- name = name + ".min",
+ name = minified,
sourcemap = False,
- src = name + "-bundle.js",
+ src = bundle,
)
native.genrule(
name = name + "_rename_js",
- srcs = [name + ".min"],
- outs = [name + ".js"],
+ srcs = [minified],
+ outs = [main],
cmd = "cp $< $@",
output_to_bindir = True,
)
genrule2(
name = name,
- srcs = [name + ".js"],
+ srcs = [main],
outs = [name + ".jar"],
cmd = " && ".join([
"mkdir $$TMP/static",
diff --git a/tools/bzl/license-map.py b/tools/bzl/license-map.py
index 221ae2f..555aa17 100644
--- a/tools/bzl/license-map.py
+++ b/tools/bzl/license-map.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# reads bazel query XML files, to join target names with their licenses.
diff --git a/tools/bzl/license.bzl b/tools/bzl/license.bzl
index cdb13d0..7b1375a 100644
--- a/tools/bzl/license.bzl
+++ b/tools/bzl/license.bzl
@@ -50,7 +50,7 @@
# post process the XML into our favorite format.
native.genrule(
name = "gen_license_txt_" + name,
- cmd = "python $(location //tools/bzl:license-map.py) %s %s %s > $@" % (" ".join(opts), " ".join(json_maps_locations), " ".join(xmls)),
+ cmd = "python3 $(location //tools/bzl:license-map.py) %s %s %s > $@" % (" ".join(opts), " ".join(json_maps_locations), " ".join(xmls)),
outs = [name + ".gen.txt"],
tools = tools,
**kwargs
diff --git a/tools/bzl/maven_jar.bzl b/tools/bzl/maven_jar.bzl
index d96ffc2..adea89e 100644
--- a/tools/bzl/maven_jar.bzl
+++ b/tools/bzl/maven_jar.bzl
@@ -141,7 +141,7 @@
binjar_path = ctx.path("/".join(["jar", binjar]))
binurl = url + ".jar"
- python = ctx.which("python")
+ python = ctx.which("python3")
script = ctx.path(ctx.attr._download_script)
args = [python, script, "-o", binjar_path, "-u", binurl]
diff --git a/tools/download_file.py b/tools/download_file.py
index f86fd3e..2af2c07 100755
--- a/tools/download_file.py
+++ b/tools/download_file.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2013 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,7 @@
import argparse
from hashlib import sha1
-from os import link, makedirs, path, remove
+from os import environ, link, makedirs, path, remove
import shutil
from subprocess import check_call, CalledProcessError
from sys import stderr
@@ -25,7 +25,10 @@
from zipfile import ZipFile, BadZipfile, LargeZipFile
GERRIT_HOME = path.expanduser('~/.gerritcodereview')
-CACHE_DIR = path.join(GERRIT_HOME, 'bazel-cache', 'downloaded-artifacts')
+CACHE_DIR = environ.get(
+ 'GERRIT_CACHE_HOME',
+ path.join(GERRIT_HOME, 'bazel-cache', 'downloaded-artifacts'))
+
LOCAL_PROPERTIES = 'local.properties'
diff --git a/tools/eclipse/project.py b/tools/eclipse/project.py
index c7398a8..ef20ace 100755
--- a/tools/eclipse/project.py
+++ b/tools/eclipse/project.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2016 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tools/js/BUILD b/tools/js/BUILD
index 1a272e2..d696496 100644
--- a/tools/js/BUILD
+++ b/tools/js/BUILD
@@ -1 +1 @@
-exports_files(["run_npm_binary.py", "eslint-chdir.js"])
+exports_files(["eslint-chdir.js"])
diff --git a/tools/js/bowerutil.py b/tools/js/bowerutil.py
deleted file mode 100644
index 9fb82af..0000000
--- a/tools/js/bowerutil.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (C) 2013 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.
-
-import os
-
-
-def hash_bower_component(hash_obj, path):
- """Hash the contents of a bower component directory.
-
- This is a stable hash of a directory downloaded with `bower install`, minus
- the .bower.json file, which is autogenerated each time by bower. Used in
- lieu of hashing a zipfile of the contents, since zipfiles are difficult to
- hash in a stable manner.
-
- Args:
- hash_obj: an open hash object, e.g. hashlib.sha1().
- path: path to the directory to hash.
-
- Returns:
- The passed-in hash_obj.
- """
- if not os.path.isdir(path):
- raise ValueError('Not a directory: %s' % path)
-
- path = os.path.abspath(path)
- for root, dirs, files in os.walk(path):
- dirs.sort()
- for f in sorted(files):
- if f == '.bower.json':
- continue
- p = os.path.join(root, f)
- hash_obj.update(p[len(path)+1:].encode("utf-8"))
- hash_obj.update(open(p, "rb").read())
-
- return hash_obj
diff --git a/tools/js/download_bower.py b/tools/js/download_bower.py
deleted file mode 100755
index 1df4b82..0000000
--- a/tools/js/download_bower.py
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/usr/bin/env python
-# Copyright (C) 2015 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.
-
-from __future__ import print_function
-
-import argparse
-import hashlib
-import json
-import os
-import shutil
-import subprocess
-import sys
-
-import bowerutil
-
-CACHE_DIR = os.path.expanduser(os.path.join(
- '~', '.gerritcodereview', 'bazel-cache', 'downloaded-artifacts'))
-
-
-def bower_cmd(bower, *args):
- cmd = bower.split(' ')
- cmd.extend(args)
- return cmd
-
-
-def bower_info(bower, name, package, version):
- cmd = bower_cmd(bower, '-l=error', '-j',
- 'info', '%s#%s' % (package, version))
- try:
- p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
- stderr=subprocess.PIPE)
- except:
- sys.stderr.write("error executing: %s\n" % ' '.join(cmd))
- raise
- out, err = p.communicate()
- if p.returncode:
- # For python3 support we wrap str around err.
- sys.stderr.write(str(err))
- raise OSError('Command failed: %s' % ' '.join(cmd))
-
- try:
- info = json.loads(out)
- except ValueError:
- raise ValueError('invalid JSON from %s:\n%s' % (" ".join(cmd), out))
- info_name = info.get('name')
- if info_name != name:
- raise ValueError(
- 'expected package name %s, got: %s' % (name, info_name))
- return info
-
-
-def ignore_deps(info):
- # Tell bower to ignore dependencies so we just download this component.
- # This is just an optimization, since we only pick out the component we
- # need, but it's important when downloading sizable dependency trees.
- #
- # As of 1.6.5 I don't think ignoredDependencies can be specified on the
- # command line with --config, so we have to create .bowerrc.
- deps = info.get('dependencies')
- if deps:
- with open(os.path.join('.bowerrc'), 'w') as f:
- json.dump({'ignoredDependencies': list(deps.keys())}, f)
-
-
-def cache_entry(name, package, version, sha1):
- if not sha1:
- sha1 = hashlib.sha1('%s#%s' % (package, version)).hexdigest()
- return os.path.join(CACHE_DIR, '%s-%s.zip-%s' % (name, version, sha1))
-
-
-def main():
- parser = argparse.ArgumentParser()
- parser.add_argument('-n', help='short name of component')
- parser.add_argument('-b', help='bower command')
- parser.add_argument('-p', help='full package name of component')
- parser.add_argument('-v', help='version number')
- parser.add_argument('-s', help='expected content sha1')
- parser.add_argument('-o', help='output file location')
- args = parser.parse_args()
-
- assert args.p
- assert args.v
- assert args.n
-
- cwd = os.getcwd()
- outzip = os.path.join(cwd, args.o)
- cached = cache_entry(args.n, args.p, args.v, args.s)
-
- if not os.path.exists(cached):
- info = bower_info(args.b, args.n, args.p, args.v)
- ignore_deps(info)
- subprocess.check_call(
- bower_cmd(
- args.b, '--quiet', 'install', '%s#%s' % (args.p, args.v)))
- bc = os.path.join(cwd, 'bower_components')
- subprocess.check_call(
- ['zip', '-q', '--exclude', '.bower.json', '-r', cached, args.n],
- cwd=bc)
-
- if args.s:
- path = os.path.join(bc, args.n)
- sha1 = bowerutil.hash_bower_component(
- hashlib.sha1(), path).hexdigest()
- if args.s != sha1:
- print((
- '%s#%s:\n'
- 'expected %s\n'
- 'received %s\n') % (args.p, args.v, args.s, sha1),
- file=sys.stderr)
- try:
- os.remove(cached)
- except OSError as err:
- if path.exists(cached):
- print('error removing %s: %s' % (cached, err),
- file=sys.stderr)
- return 1
-
- shutil.copyfile(cached, outzip)
- return 0
-
-
-if __name__ == '__main__':
- sys.exit(main())
diff --git a/tools/js/npm_pack.py b/tools/js/npm_pack.py
index 57f3166..33b38a0 100755
--- a/tools/js/npm_pack.py
+++ b/tools/js/npm_pack.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2015 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tools/js/run_npm_binary.py b/tools/js/run_npm_binary.py
deleted file mode 100644
index bdee5ab..0000000
--- a/tools/js/run_npm_binary.py
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/env python
-# Copyright (C) 2015 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.
-
-from __future__ import print_function
-
-import atexit
-from distutils import spawn
-import hashlib
-import os
-import shutil
-import subprocess
-import sys
-import tarfile
-import tempfile
-
-
-def extract(path, outdir, bin):
- if os.path.exists(os.path.join(outdir, bin)):
- return # Another process finished extracting, ignore.
-
- # Use a temp directory adjacent to outdir so shutil.move can use the same
- # device atomically.
- tmpdir = tempfile.mkdtemp(dir=os.path.dirname(outdir))
-
- def cleanup():
- try:
- shutil.rmtree(tmpdir)
- except OSError:
- pass # Too late now
- atexit.register(cleanup)
-
- def extract_one(mem):
- dest = os.path.join(outdir, mem.name)
- tar.extract(mem, path=tmpdir)
- try:
- os.makedirs(os.path.dirname(dest))
- except OSError:
- pass # Either exists, or will fail on the next line.
- shutil.move(os.path.join(tmpdir, mem.name), dest)
-
- with tarfile.open(path, 'r:gz') as tar:
- for mem in tar.getmembers():
- if mem.name != bin:
- extract_one(mem)
- # Extract bin last so other processes only short circuit when
- # extraction is finished.
- if bin in tar.getnames():
- extract_one(tar.getmember(bin))
-
-
-def main(args):
- path = args[0]
- suffix = '.npm_binary.tgz'
- tgz = os.path.basename(path)
-
- parts = tgz[:-len(suffix)].split('@')
-
- if not tgz.endswith(suffix) or len(parts) != 2:
- print('usage: %s <path/to/npm_binary>' % sys.argv[0], file=sys.stderr)
- return 1
-
- name, _ = parts
-
- # Avoid importing from gerrit because we don't want to depend on the right
- # working directory
- sha1 = hashlib.sha1(open(path, 'rb').read()).hexdigest()
- outdir = '%s-%s' % (path[:-len(suffix)], sha1)
- rel_bin = os.path.join('package', 'bin', name)
- rel_lib_bin = os.path.join('package', 'lib', 'bin', name + '.js')
- bin = os.path.join(outdir, rel_bin)
- libbin = os.path.join(outdir, rel_lib_bin)
- if not os.path.isfile(bin):
- extract(path, outdir, rel_bin)
-
- nodejs = spawn.find_executable('nodejs')
- if nodejs:
- # Debian installs Node.js as 'nodejs', due to a conflict with another
- # package.
- if not os.path.isfile(bin) and os.path.isfile(libbin):
- subprocess.check_call([nodejs, libbin] + args[1:])
- else:
- subprocess.check_call([nodejs, bin] + args[1:])
- elif not os.path.isfile(bin) and os.path.isfile(libbin):
- subprocess.check_call([libbin] + args[1:])
- else:
- subprocess.check_call([bin] + args[1:])
-
-
-if __name__ == '__main__':
- sys.exit(main(sys.argv[1:]))
diff --git a/tools/maven/mvn.py b/tools/maven/mvn.py
index 60e9f15..4ed5bf9 100755
--- a/tools/maven/mvn.py
+++ b/tools/maven/mvn.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2013 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tools/node_tools/legacy/BUILD b/tools/node_tools/legacy/BUILD
deleted file mode 100644
index ed0946e..0000000
--- a/tools/node_tools/legacy/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
-
-package(default_visibility = ["//visibility:public"])
-
-nodejs_binary(
- name = "polymer-bundler-bin",
- data = ["@tools_npm//:node_modules"],
- entry_point = "@tools_npm//:node_modules/polymer-bundler/lib/bin/polymer-bundler.js",
-)
-
-nodejs_binary(
- name = "crisper-bin",
- data = ["@tools_npm//:node_modules"],
- entry_point = "@tools_npm//:node_modules/crisper/bin/crisper",
-)
diff --git a/tools/node_tools/legacy/index.bzl b/tools/node_tools/legacy/index.bzl
deleted file mode 100644
index fe66bf8..0000000
--- a/tools/node_tools/legacy/index.bzl
+++ /dev/null
@@ -1,66 +0,0 @@
-""" File contains a wrapper for legacy polymer-bundler and crisper tools. """
-
-# File must be removed after get rid of HTML imports
-
-def _polymer_bundler_tool_impl(ctx):
- """Wrapper for the polymer-bundler and crisper command-line tools"""
-
- html_bundled_file = ctx.actions.declare_file(ctx.label.name + "_tmp.html")
- ctx.actions.run(
- executable = ctx.executable._bundler,
- outputs = [html_bundled_file],
- inputs = ctx.files.srcs,
- arguments = [
- "--inline-css",
- "--sourcemaps",
- "--strip-comments",
- "--root",
- ctx.file.entry_point.dirname,
- "--out-file",
- html_bundled_file.path,
- "--in-file",
- ctx.file.entry_point.basename,
- ],
- )
-
- output_js_file = ctx.outputs.js
- if ctx.attr.script_src_value:
- output_js_file = ctx.actions.declare_file(ctx.attr.script_src_value, sibling = ctx.outputs.html)
- script_src_value = ctx.attr.script_src_value if ctx.attr.script_src_value else ctx.outputs.js.path
-
- ctx.actions.run(
- executable = ctx.executable._crisper,
- outputs = [ctx.outputs.html, output_js_file],
- inputs = [html_bundled_file],
- arguments = ["-s", html_bundled_file.path, "-h", ctx.outputs.html.path, "-j", output_js_file.path, "--always-write-script", "--script-in-head=false"],
- )
-
- if ctx.attr.script_src_value:
- ctx.actions.expand_template(
- template = output_js_file,
- output = ctx.outputs.js,
- substitutions = {},
- )
-
-polymer_bundler_tool = rule(
- implementation = _polymer_bundler_tool_impl,
- attrs = {
- "entry_point": attr.label(allow_single_file = True, mandatory = True),
- "srcs": attr.label_list(allow_files = True),
- "script_src_value": attr.string(),
- "_bundler": attr.label(
- default = ":polymer-bundler-bin",
- executable = True,
- cfg = "host",
- ),
- "_crisper": attr.label(
- default = ":crisper-bin",
- executable = True,
- cfg = "host",
- ),
- },
- outputs = {
- "html": "%{name}.html",
- "js": "%{name}.js",
- },
-)
diff --git a/tools/release_noter/release_noter.py b/tools/release_noter/release_noter.py
index 05fa023..73c1a05 100644
--- a/tools/release_noter/release_noter.py
+++ b/tools/release_noter/release_noter.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import argparse
import os
diff --git a/tools/util_test.py b/tools/util_test.py
index 1a389f5..ab1133b2 100644
--- a/tools/util_test.py
+++ b/tools/util_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2013 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tools/version.py b/tools/version.py
index 2326757..d02fc26 100755
--- a/tools/version.py
+++ b/tools/version.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2014 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tools/workspace_status.py b/tools/workspace_status.py
index 443c2f0..bedc051 100644
--- a/tools/workspace_status.py
+++ b/tools/workspace_status.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# This script will be run by bazel when the build process starts to
# generate key-value information that represents the status of the
diff --git a/tools/workspace_status_release.py b/tools/workspace_status_release.py
index 36535fb..b3e72ff 100644
--- a/tools/workspace_status_release.py
+++ b/tools/workspace_status_release.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# This is a variant of the `workspace_status.py` script that in addition to
# plain `git describe` implements a few heuristics to arrive at more to the
@@ -9,7 +9,7 @@
#
# To use it, simply add
#
-# --workspace_status_command="python ./tools/workspace_status_release.py"
+# --workspace_status_command="python3 ./tools/workspace_status_release.py"
#
# to your bazel command. So for example instead of
#
@@ -17,11 +17,11 @@
#
# use
#
-# bazel build --workspace_status_command="python ./tools/workspace_status_release.py" release.war
+# bazel build --workspace_status_command="python3 ./tools/workspace_status_release.py" release.war
#
# Alternatively, you can add
#
-# build --workspace_status_command="python ./tools/workspace_status_release.py"
+# build --workspace_status_command="python3 ./tools/workspace_status_release.py"
#
# to `.bazelrc` in your home directory.
#
@@ -150,7 +150,7 @@
'tools', 'workspace_status_release.py')
if os.path.isfile(workspace_status_script):
# directory has own workspace_status_command, so we use stamps from that
- for line in run(["python", workspace_status_script]).split('\n'):
+ for line in run(["python3", workspace_status_script]).split('\n'):
if re.search("^STABLE_[a-zA-Z0-9().:@/_ -]*$", line):
print(line)
else:
