Merge branch 'stable-2.13'

* stable-2.13:
  Update build/release documentation with new API/WAR commands
  Clarify the submodule host check
  AccountManager: Don't try to change username that is already set
  Update 2.13 release notes
  Split push change options into distinct documentation subsection
  Expand description of limitations in submodule subscription
  Improve submodule subscription documentation
  Prevent limit of search outbounding max int value
  Fix NullPointerException on computing task name
  Double-check change data in cleaning up task

Change I09f012d3f ("Double-check change data in cleaning up task") is
reverted by this merge because it is incompatible with change I9d89b58d4
("Add batch mode to Abandon") which was done on master in the meantime.

If I09f012d3f is still necessary, it should be re-applied in a follow-up
commit.

This reverts commit 5137e0c06b.

Change-Id: I675228b3489c1d4c28d8b113a323ed5bcfec8f82
This commit is contained in:
David Pursehouse
2016-09-01 19:54:30 +09:00
6 changed files with 46 additions and 14 deletions

View File

@@ -36,7 +36,7 @@ Plugin's `pom.xml` references snapshot version of plugin API:
* build and install `SNAPSHOT` version of plugin API in local Maven repository:
----
buck build api_install
./tools/maven/api.sh install
----
=== Exception 2:

View File

@@ -153,7 +153,7 @@ Tag the plugins:
----
buck clean
buck build --no-cache release docs
buck build api_install
./tools/maven/api.sh install
----
* Sanity check WAR
@@ -185,13 +185,13 @@ Versions and Create Release Tag] section.
* Push the WAR to Maven Central:
+
----
sh tools/maven/api.sh war_deploy
./tools/maven/api.sh war_deploy
----
* Push the plugin artifacts to Maven Central:
+
----
sh tools/maven/api.sh deploy
./tools/maven/api.sh deploy
----
+
If no artifacts are uploaded, clean the `buck-out` folder and retry:

View File

@@ -189,18 +189,24 @@ the superproject:
Gerrit will only automatically update superprojects where the
submodules are hosted on the same Gerrit instance as the
superproject. Gerrit determines this by checking the hostname of the
submodule specified in the .gitmodules file and comparing it to the
hostname from the link:config-gerrit.html#gerrit.canonicalWebUrl[`gerrit.canonicalWebUrl`].
superproject. Gerrit determines this by checking that the URL of the
submodule specified in the .gitmodules file starts with
link:config-gerrit.html#gerrit.canonicalWebUrl[`gerrit.canonicalWebUrl`].
The protocol part is ignored in this check.
It is currently not possible to use the submodule subscription feature
with a canonical web URL hostname that differs from the hostname of
the submodule. Instead relative submodules should be used.
with a canonical web URL that differs from the first part of
the submodule URL. Instead relative submodules should be used.
The Gerrit instance administrator group should always certify to
provide the canonical web URL value in its configuration file. Users
should certify to use the correct hostname of the running Gerrit
instance to add/subscribe submodules.
The Gerrit instance administrator should ensure that the canonical web
URL value is specified in its configuration file. Users should ensure
that they use the correct hostname of the running Gerrit instance when
adding submodule subscriptions.
When converting an existing submodule to use subscription by adding
a `branch` field into the .gitmodules file, Gerrit does not make any
change to the submodule's current revision until subsequent updates
occur on the submodule.
=== Relative submodules

View File

@@ -144,7 +144,13 @@ Other users (e.g. project owners) who have configured Gerrit to
notify them of new changes will be automatically sent an email
message when the push is completed.
[[push_options]]
=== Push Options
Additional options may be specified when pushing changes.
[[notify]]
==== Email Notifications
Uploaders can control to whom email notifications are sent by setting
the `notify` option:
@@ -166,6 +172,8 @@ By default all email notifications are sent.
----
[[topic]]
==== Topic
To include a short tag associated with all of the changes in the
same group, such as the local topic branch name, append it after
the destination branch name or add it with the command line flag
@@ -181,6 +189,8 @@ updates:
----
[[message]]
==== Message
A comment message can be applied to the change by using the `message` (or `m`)
option:
@@ -193,6 +203,8 @@ git push refs parameter does not allow spaces. Use the '_' character instead,
it will then be applied as "This is a rebase on master".
[[review_labels]]
==== Review Labels
Review labels can be applied to the change by using the `label` (or `l`)
option in the reference:
@@ -211,6 +223,8 @@ The value is optional. If not specified, it defaults to +1 (if
the label range allows it).
[[change_edit]]
==== Change Edits
A change edit can be pushed by specifying the `edit` (or `e`) option on
the reference:
@@ -243,6 +257,9 @@ shorter URLs on the command line, such as:
$ git push tr:kernel/common HEAD:refs/for/experimental
----
[[reviewers]]
==== Reviewers
Specific reviewers can be requested and/or additional 'carbon
copies' of the notification message may be sent by including the
`reviewer` (or `r`) and `cc` options in the reference:

View File

@@ -300,7 +300,13 @@ Add Patch Set capability] to control who is allowed to upload a new patch
set to an existing change.
* link:https://bugs.chromium.org/p/gerrit/issues/detail?id=4015[Issue 4015]:
Allow setting a comment message when uploading a change.
Allow setting a
link:https://gerrit-documentation.storage.googleapis.com/Documentation/2.13/user-upload.html#message[
comment message] when uploading a change.
* Allow to specify
link:https://gerrit-documentation.storage.googleapis.com/Documentation/2.13/user-upload.html#notify[
who should be notified by email] when uploading a change.
* link:https://bugs.chromium.org/p/gerrit/issues/detail?id=3220[Issue 3220]:
Append approval info to every comment-added stream event and hook.

View File

@@ -322,6 +322,9 @@ public class LuceneChangeIndex implements ChangeIndex {
IndexSearcher[] searchers = new IndexSearcher[indexes.size()];
try {
int realLimit = opts.start() + opts.limit();
if (Integer.MAX_VALUE - opts.limit() < opts.start()) {
realLimit = Integer.MAX_VALUE;
}
TopFieldDocs[] hits = new TopFieldDocs[indexes.size()];
for (int i = 0; i < indexes.size(); i++) {
searchers[i] = indexes.get(i).acquire();