Merge "Delete corrupt cache entries from ~/.gerritcodereview/buck-cache"
diff --git a/.buckversion b/.buckversion
index dcaab35..582e61d 100644
--- a/.buckversion
+++ b/.buckversion
@@ -1 +1 @@
-c4df74bef4e101a7e5d0176831825b7946ea64a3
+b01f03b82e23614965c2ddc13900ccc6dc4d8361
diff --git a/Documentation/config-labels.txt b/Documentation/config-labels.txt
index 9d7c469..1ff7e24 100644
--- a/Documentation/config-labels.txt
+++ b/Documentation/config-labels.txt
@@ -175,8 +175,8 @@
optional leading `+`.
-[[label_abbreviatedName]]
-`label.Label-Name.abbreviatedName`
+[[label_abbreviation]]
+`label.Label-Name.abbreviation`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
An abbreviated name for a label shown as a compact column header, for
diff --git a/ReleaseNotes/ReleaseNotes-2.6.txt b/ReleaseNotes/ReleaseNotes-2.6.txt
index 85f2844..ef481c5 100644
--- a/ReleaseNotes/ReleaseNotes-2.6.txt
+++ b/ReleaseNotes/ReleaseNotes-2.6.txt
@@ -6,8 +6,10 @@
link:http://code.google.com/p/gerrit/downloads/detail?name=gerrit-2.6.war[http://code.google.com/p/gerrit/downloads/detail?name=gerrit-2.6.war]
Gerrit 2.6 includes the bug fixes done with
-link:ReleaseNotes-2.5.1.html[Gerrit 2.5.1] and
-link:ReleaseNotes-2.5.2.html[Gerrit 2.5.2]. These bug fixes are *not*
+link:ReleaseNotes-2.5.1.html[Gerrit 2.5.1],
+link:ReleaseNotes-2.5.2.html[Gerrit 2.5.2],
+link:ReleaseNotes-2.5.3.html[Gerrit 2.5.3], and
+link:ReleaseNotes-2.5.4.html[Gerrit 2.5.4]. These bug fixes are *not*
listed in these release notes.
Schema Change
@@ -78,6 +80,8 @@
* Mark all CSS classes as external so users can rely on them.
+* Add a link to the REST API documentation in the top menu.
+
Search
^^^^^^
* Animate search bar by expanding & unexpanding
@@ -146,7 +150,7 @@
* Voting on draft changes is now possible.
-* Recommend rebase on Path Conflict
+* Recommend rebase on Path Conflict.
* link:https://code.google.com/p/gerrit/issues/detail?id=1685[Issue 1685]:
After 'Up to change' expand the patch set that was just reviewed
@@ -166,10 +170,12 @@
subject is descriptive and unique enough to identify the correct
change.
-* Do not wrap project/branch/owner fields in change table
+* Do not wrap project/branch/owner fields in change table.
+
This makes it easier to use Gerrit on narrow screens.
+* Rename "Old Version History" to "Reference Version".
+
Patch Screens
^^^^^^^^^^^^^
@@ -189,6 +195,10 @@
+
This avoids alignment errors when syntax highlighting is enabled.
+* Distinguish between error and timeout in intraline diff error message.
+
+* Enable expanding skipped lines even if 'Syntax Coloring' is off.
+
Project Screens
^^^^^^^^^^^^^^^
@@ -787,6 +797,25 @@
* Exclude all `pom.xml` files that are archetype resources in `version.sh`
+* Source files generated by Prolog are now correctly included in the Eclipse
+project.
+
+* Core plugins are now included as git submodules.
+
+* `mvn package` now generates the documentation by default.
++
+The documentation will always be generated unless `-Dgerrit.documentation.skip`
+is given on the command line.
+
+* `mvn verify` now runs acceptance tests by default.
++
+The `acceptance` profile is no longer used. Acceptance tests will always
+be run unless `-Dgerrit.acceptance-tests.skip=True` is given on the command line.
+
+* Vertically align the "Choose:" header on the Become Any Account page.
+* "Become Any Account" can be used for accounts whose full name is an empty string.
+
+
Performance
~~~~~~~~~~~
* Bitmap Optimizations
@@ -996,7 +1025,7 @@
Embedded Jetty is now 8.1.7.v20120910.
* ASM bytecode library is now 4.0.
-* JGit is now 2.3.1.201302201838-r.78-g8fcde4b.
+* JGit is now 2.3.1.201302201838-r.208-g75e1bdb.
* asciidoc 8.6.3 is now required to build the documentation.
* link:https://code.google.com/p/gerrit/issues/detail?id=1155[Issue 1155]:
prettify is now r225
@@ -1183,6 +1212,16 @@
+
", however the current patch set is Y." is now skipped if Y == X.
+* link:https://code.google.com/p/gerrit/issues/detail?id=1843[Issue 1843]:
+ Enable the "Create Project" and "Create Group" buttons when pasting the name
+ into the text box.
+
+* link:https://code.google.com/p/gerrit/issues/detail?id=1370[Issue 1370]:
+ Fix PatchScreen leak when moving between files.
+
+* Prevent account's full name from being set to empty string. Set it to
+ null instead.
+
REST API
~~~~~~~~
* Fix returning of 'Email Reviewers' capability via REST
@@ -1326,6 +1365,8 @@
`Forge Author` permissions), trying to abandon that change over SSH
failed with an NPE.
+* Fix setting account's full name via ssh.
+
Query
~~~~~
* link:https://code.google.com/p/gerrit/issues/detail?id=1729[Issue 1729]:
@@ -1393,6 +1434,10 @@
Listing plugins requires being an administrator. This was missed in the
REST API.
+* link:https://code.google.com/p/gerrit/issues/detail?id=1827[Issue 1827]:
+ Allow InternalUser (aka plugins) to see any internal group, and run
+ plugin startup and shutdown as PluginUser.
+
Email
~~~~~
* Merge failure emails are only sent once per day.
@@ -1576,6 +1621,10 @@
Documentation
-------------
+The link:http://gerrit-documentation.googlecode.com/svn/Documentation/2.6/index.html[
+documentation index] is restructured to make it easier to use for different kinds of
+users.
+
User Documentation
~~~~~~~~~~~~~~~~~~
* Split link:http://gerrit-documentation.googlecode.com/svn/Documentation/2.6/rest-api.html[
@@ -1663,6 +1712,23 @@
link:http://gerrit-documentation.googlecode.com/svn/Documentation/2.6/config-gerrit.html#ldap.groupName[
LDAP group name setting]
+* Improve the documentation of
+ link:http://gerrit-documentation.googlecode.com/svn/Documentation/2.6/user-submodule.html[
+ git submodule subscription handling]
+
+* Clarify the documentation of change cache setup.
+
+* Improve the explanation of path conflicts in the
+ link:http://gerrit-documentation.googlecode.com/svn/Documentation/2.6/project-setup.html[
+ project setup documentation].
+
+* Add explanations of special/magic refs in the
+ link:http://gerrit-documentation.googlecode.com/svn/Documentation/2.6/access-control.html#references[
+ access control documentation].
+
+* Clarify how to set Global Capabilities.
+* Correct documentation of the `create-account` ssh command.
+* Add documentation of the `database.connectionPool` setting.
* Adapt documentation to having 'Projects' as top level menu
* Added missing documentation of mail templates.
* Added documentation of contributor agreements.
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelType.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelType.java
index 8a9a508..db8bde9 100644
--- a/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelType.java
+++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelType.java
@@ -93,7 +93,7 @@
protected String name;
- protected String abbreviatedName;
+ protected String abbreviation;
protected String functionName;
protected boolean copyMinScore;
protected boolean copyMaxScore;
@@ -114,7 +114,7 @@
canOverride = true;
values = sortValues(valueList);
- abbreviatedName = defaultAbbreviation(name);
+ abbreviation = defaultAbbreviation(name);
functionName = "MaxWithBlock";
maxNegative = Short.MIN_VALUE;
@@ -137,12 +137,12 @@
return psa.getLabelId().get().equalsIgnoreCase(name);
}
- public String getAbbreviatedName() {
- return abbreviatedName;
+ public String getAbbreviation() {
+ return abbreviation;
}
- public void setAbbreviatedName(String abbreviatedName) {
- this.abbreviatedName = abbreviatedName;
+ public void setAbbreviation(String abbreviation) {
+ this.abbreviation = abbreviation;
}
public String getFunctionName() {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java
index db70b29..0f72aa0 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java
@@ -620,7 +620,7 @@
}
String abbr = rc.getString(LABEL, name, KEY_ABBREVIATION);
if (abbr != null) {
- label.setAbbreviatedName(abbr);
+ label.setAbbreviation(abbr);
}
String functionName = Objects.firstNonNull(
@@ -912,9 +912,9 @@
rc.setString(LABEL, name, KEY_FUNCTION, label.getFunctionName());
if (!LabelType.defaultAbbreviation(name)
- .equals(label.getAbbreviatedName())) {
+ .equals(label.getAbbreviation())) {
rc.setString(
- LABEL, name, KEY_ABBREVIATION, label.getAbbreviatedName());
+ LABEL, name, KEY_ABBREVIATION, label.getAbbreviation());
} else {
rc.unset(LABEL, name, KEY_ABBREVIATION);
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LabelPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LabelPredicate.java
index 936a47d..b0d02f8 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LabelPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LabelPredicate.java
@@ -71,7 +71,7 @@
}
for (LabelType lt : types.getLabelTypes()) {
- if (toFind.equalsIgnoreCase(lt.getAbbreviatedName())) {
+ if (toFind.equalsIgnoreCase(lt.getAbbreviation())) {
return lt;
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllProjectsCreator.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllProjectsCreator.java
index ef8f807..93238a8 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllProjectsCreator.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllProjectsCreator.java
@@ -216,7 +216,7 @@
new LabelValue((short) 0, "No score"),
new LabelValue((short) -1, "I would prefer that you didn't submit this"),
new LabelValue((short) -2, "Do not submit")));
- type.setAbbreviatedName("CR");
+ type.setAbbreviation("CR");
type.setCopyMinScore(true);
c.getLabelSections().put(type.getName(), type);
return type;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_77.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_77.java
index b86e5a7..472bc25 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_77.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_77.java
@@ -229,7 +229,7 @@
LegacyLabelType type =
new LegacyLabelType(getLabelName(catRs.getString("name")), values);
type.setId(id);
- type.setAbbreviatedName(catRs.getString("abbreviated_name"));
+ type.setAbbreviation(catRs.getString("abbreviated_name"));
type.setFunctionName(catRs.getString("function_name"));
type.setCopyMinScore("Y".equals(catRs.getString("copy_min_score")));
types.add(type);
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaCreatorTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaCreatorTest.java
index 18eddc9..b376d11 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaCreatorTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaCreatorTest.java
@@ -114,7 +114,7 @@
LabelType codeReview = getLabelTypes().byLabel("Code-Review");
assertNotNull(codeReview);
assertEquals("Code-Review", codeReview.getName());
- assertEquals("CR", codeReview.getAbbreviatedName());
+ assertEquals("CR", codeReview.getAbbreviation());
assertEquals("MaxWithBlock", codeReview.getFunctionName());
assertTrue(codeReview.isCopyMinScore());
assertValueRange(codeReview, 2, 1, 0, -1, -2);
