Merge "Introduce ref operation validation"
diff --git a/Documentation/cmd-index.txt b/Documentation/cmd-index.txt
index d4d6a579..a876aa9 100644
--- a/Documentation/cmd-index.txt
+++ b/Documentation/cmd-index.txt
@@ -138,6 +138,12 @@
link:cmd-show-queue.html[gerrit show-queue]::
Display the background work queues, including replication.
+link:cmd-logging-ls-level.html[gerrit logging ls-level]::
+ List loggers and their logging level.
+
+link:cmd-logging-set-level.html[gerrit logging set-level]::
+ Set the logging level of loggers.
+
link:cmd-plugin-install.html[gerrit plugin add]::
Alias for 'gerrit plugin install'.
diff --git a/Documentation/cmd-logging-ls-level.txt b/Documentation/cmd-logging-ls-level.txt
new file mode 100644
index 0000000..c59dc3f
--- /dev/null
+++ b/Documentation/cmd-logging-ls-level.txt
@@ -0,0 +1,43 @@
+= gerrit logging ls-level
+
+== NAME
+gerrit logging ls-level - view the logging level
+
+gerrit logging ls - view the logging level
+
+== SYNOPSIS
+--
+'ssh' -p <port> <host> 'gerrit logging ls-level | ls'
+ <NAME>
+--
+
+== DESCRIPTION
+View the logging level of specified loggers.
+
+== Options
+<NAME>::
+ Display the loggers which contain the input argument in their name. If this
+ argument is not provided, all loggers will be printed.
+
+== ACCESS
+Caller must have the ADMINISTRATE_SERVER capability.
+
+== Examples
+
+View the logging level of the loggers in the package com.google:
+=====
+ $ssh -p 29418 review.example.com gerrit logging ls-level \
+ com.google.
+=====
+
+View the logging level of every logger
+=====
+ $ssh -p 29418 review.example.com gerrit logging ls-level
+=====
+
+GERRIT
+------
+Part of link:index.html[Gerrit Code Review]
+
+SEARCHBOX
+---------
diff --git a/Documentation/cmd-logging-set-level.txt b/Documentation/cmd-logging-set-level.txt
new file mode 100644
index 0000000..38062cb
--- /dev/null
+++ b/Documentation/cmd-logging-set-level.txt
@@ -0,0 +1,51 @@
+= gerrit logging set-level
+
+== NAME
+gerrit logging set-level - set the logging level
+
+gerrit logging set - set the logging level
+
+== SYNOPSIS
+--
+'ssh' -p <port> <host> 'gerrit logging set-level | set'
+ <LEVEL>
+ <NAME>
+--
+
+== DESCRIPTION
+Set the logging level of specified loggers.
+
+== Options
+<LEVEL>::
+ Required; logging level for which the loggers should be set.
+ 'reset' can be used to revert all loggers back to their level
+ at deployment time.
+
+<NAME>::
+ Set the level of the loggers which contain the input argument in their name.
+ If this argument is not provided, all loggers will have their level changed.
+ Note that this argument has no effect if 'reset' is passed in LEVEL.
+
+== ACCESS
+Caller must have the ADMINISTRATE_SERVER capability.
+
+== Examples
+
+Change the logging level of the loggers in the package com.google to DEBUG.
+=====
+ $ssh -p 29418 review.example.com gerrit logging set-level \
+ debug com.google.
+=====
+
+Reset the logging level of every logger to what they were at deployment time.
+=====
+ $ssh -p 29418 review.example.com gerrit logging set-level \
+ reset
+=====
+
+GERRIT
+------
+Part of link:index.html[Gerrit Code Review]
+
+SEARCHBOX
+---------
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index ed44db8..7ebbbbe 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -1750,6 +1750,24 @@
This property is honored only if the password does not
appear in the http.proxy property above.
+[[http.addUserAsRequestAttribute]]http.addUserAsRequestAttribute::
++
+If true, 'User' attribute will be added to the request attributes so it
+can be accessed outside the request scope (will be set to username or id
+if username not configured).
++
+This attribute can be used by the servlet container to log user in the
+http access log.
++
+When running the embedded servlet container, this attribute is used to
+print user in the httpd_log.
++
+* `%{User}r`
++
+Pattern to print user in Tomcat AccessLog.
+
++
+Default value is true.
[[httpd]]
=== Section httpd
diff --git a/Documentation/dev-buck.txt b/Documentation/dev-buck.txt
index 8121a63..0bf44d0 100644
--- a/Documentation/dev-buck.txt
+++ b/Documentation/dev-buck.txt
@@ -467,6 +467,15 @@
To use `buckd` the additional
link:https://facebook.github.io/watchman[watchman] program must be installed.
+To disable `buckd`, the environment variable `NO_BUCKD` must be set. It's not
+recommended to put it in the shell config, as it can be forgotten about it and
+then assumed Buck was working as it should when it should be using buckd.
+Prepend the variable to Buck invocation instead:
+
+----
+ $ NO_BUCKD=1 buck build gerrit
+----
+
[[watchman]]
=== Installing watchman
diff --git a/Documentation/dev-eclipse.txt b/Documentation/dev-eclipse.txt
index 3063882..adc62b2 100644
--- a/Documentation/dev-eclipse.txt
+++ b/Documentation/dev-eclipse.txt
@@ -49,7 +49,7 @@
=== Running GWT Debug Mode
-The gerrit_gwt_debug launch configuration uses GWT's
+The gerrit_gwt_debug launch configuration uses GWT's
link:http://www.gwtproject.org/articles/superdevmode.html[Super Dev Mode].
Due to a problem where the codeserver does not correctly identify the connected
@@ -58,7 +58,7 @@
[source,xml]
----
- <set-property name="user.agent" value="geko1_8" />
+ <set-property name="user.agent" value="gecko1_8" />
----
or
diff --git a/Documentation/images/user-review-ui-side-by-side-diff-screen-preferences-popup.png b/Documentation/images/user-review-ui-side-by-side-diff-screen-preferences-popup.png
index 35e29a3..043c1ff 100644
--- a/Documentation/images/user-review-ui-side-by-side-diff-screen-preferences-popup.png
+++ b/Documentation/images/user-review-ui-side-by-side-diff-screen-preferences-popup.png
Binary files differ
diff --git a/Documentation/js-api.txt b/Documentation/js-api.txt
index e41eb15..fcda916c 100644
--- a/Documentation/js-api.txt
+++ b/Documentation/js-api.txt
@@ -60,6 +60,11 @@
a string, otherwise the result is a JavaScript object or array,
as described in the relevant REST API documentation.
+[[self_getCurrentUser]]
+=== self.getCurrentUser()
+Returns the currently signed in user's AccountInfo data; empty account
+data if no user is currently signed in.
+
[[self_getPluginName]]
=== self.getPluginName()
Returns the name this plugin was installed as by the server
@@ -625,6 +630,11 @@
});
----
+[[Gerrit_getCurrentUser]]
+=== Gerrit.getCurrentUser()
+Returns the currently signed in user's AccountInfo data; empty account
+data if no user is currently signed in.
+
[[Gerrit_getPluginName]]
=== Gerrit.getPluginName()
Returns the name this plugin was installed as by the server
diff --git a/Documentation/rest-api-accounts.txt b/Documentation/rest-api-accounts.txt
index 11a482f..b1f6bcc 100644
--- a/Documentation/rest-api-accounts.txt
+++ b/Documentation/rest-api-accounts.txt
@@ -1417,48 +1417,51 @@
preferences of a user.
[options="header",width="50%",cols="1,^1,5"]
-|=====================================
-|Field Name ||Description
-|`context` ||
+|===========================================
+|Field Name ||Description
+|`context` ||
The number of lines of context when viewing a patch.
-|`expand_all_comments` |not set if `false`|
+|`expand_all_comments` |not set if `false`|
Whether all inline comments should be automatically expanded.
-|`ignore_whitespace` ||
+|`ignore_whitespace` ||
Whether whitespace changes should be ignored and if yes, which
whitespace changes should be ignored. +
Allowed values are `IGNORE_NONE`, `IGNORE_SPACE_AT_EOL`,
`IGNORE_SPACE_CHANGE`, `IGNORE_ALL_SPACE`.
-|`intraline_difference` |not set if `false`|
+|`intraline_difference` |not set if `false`|
Whether intraline differences should be highlighted.
-|`line_length` ||
+|`line_length` ||
Number of characters that should be displayed in one line.
-|`manual_review` |not set if `false`|
+|`manual_review` |not set if `false`|
Whether the 'Reviewed' flag should not be set automatically on a patch
when it is viewed.
-|`retain_header` |not set if `false`|
+|`retain_header` |not set if `false`|
Whether the header that is displayed above the patch (that either shows
the commit message, the diff preferences, the patch sets or the files)
should be retained on file switch.
-|`show_line_endings` |not set if `false`|
+|`show_line_endings` |not set if `false`|
Whether Windows EOL/Cr-Lf should be displayed as '\r' in a dotted-line
box.
-|`show_tabs` |not set if `false`|
+|`show_tabs` |not set if `false`|
Whether tabs should be shown.
-|`show_whitespace_errors`|not set if `false`|
+|`show_whitespace_errors` |not set if `false`|
Whether whitespace errors should be shown.
-|`skip_deleted` |not set if `false`|
+|`skip_deleted` |not set if `false`|
Whether deleted files should be skipped on file switch.
-|`skip_uncommented` |not set if `false`|
+|`skip_uncommented` |not set if `false`|
Whether uncommented files should be skipped on file switch.
-|`syntax_highlighting` |not set if `false`|
+|`syntax_highlighting` |not set if `false`|
Whether syntax highlighting should be enabled.
-|`hide_top_menu` |not set if `false`|
+|`hide_top_menu` |not set if `false`|
If true the top menu header and site header is hidden.
-|`hide_line_numbers` |not set if `false`|
+|`auto_hide_diff_table_header` |not set if `false`|
+If true the diff table header is automatically hidden when
+scrolling down more than half of a page.
+|`hide_line_numbers` |not set if `false`|
If true the line numbers are hidden.
-|`tab_size` ||
+|`tab_size` ||
Number of spaces that should be used to display one tab.
-|=====================================
+|===========================================
[[diff-preferences-input]]
=== DiffPreferencesInput
@@ -1467,48 +1470,51 @@
updated.
[options="header",width="50%",cols="1,^1,5"]
-|=====================================
-|Field Name ||Description
-|`context` |optional|
+|===========================================
+|Field Name ||Description
+|`context` |optional|
The number of lines of context when viewing a patch.
-|`expand_all_comments` |optional|
+|`expand_all_comments` |optional|
Whether all inline comments should be automatically expanded.
-|`ignore_whitespace` |optional|
+|`ignore_whitespace` |optional|
Whether whitespace changes should be ignored and if yes, which
whitespace changes should be ignored. +
Allowed values are `IGNORE_NONE`, `IGNORE_SPACE_AT_EOL`,
`IGNORE_SPACE_CHANGE`, `IGNORE_ALL_SPACE`.
-|`intraline_difference` |optional|
+|`intraline_difference` |optional|
Whether intraline differences should be highlighted.
-|`line_length` |optional|
+|`line_length` |optional|
Number of characters that should be displayed in one line.
-|`manual_review` |optional|
+|`manual_review` |optional|
Whether the 'Reviewed' flag should not be set automatically on a patch
when it is viewed.
-|`retain_header` |optional|
+|`retain_header` |optional|
Whether the header that is displayed above the patch (that either shows
the commit message, the diff preferences, the patch sets or the files)
should be retained on file switch.
-|`show_line_endings` |optional|
+|`show_line_endings` |optional|
Whether Windows EOL/Cr-Lf should be displayed as '\r' in a dotted-line
box.
-|`show_tabs` |optional|
+|`show_tabs` |optional|
Whether tabs should be shown.
-|`show_whitespace_errors`|optional|
+|`show_whitespace_errors` |optional|
Whether whitespace errors should be shown.
-|`skip_deleted` |optional|
+|`skip_deleted` |optional|
Whether deleted files should be skipped on file switch.
-|`skip_uncommented` |optional|
+|`skip_uncommented` |optional|
Whether uncommented files should be skipped on file switch.
-|`syntax_highlighting` |optional|
+|`syntax_highlighting` |optional|
Whether syntax highlighting should be enabled.
-|`hide_top_menu` |optional|
+|`hide_top_menu` |optional|
True if the top menu header and site header should be hidden.
-|`hide_line_numbers` |optional|
+|`auto_hide_diff_table_header` |optional|
+True if the diff table header is automatically hidden when
+scrolling down more than half of a page.
+|`hide_line_numbers` |optional|
True if the line numbers should be hidden.
-|`tab_size` |optional|
+|`tab_size` |optional|
Number of spaces that should be used to display one tab.
-|=====================================
+|===========================================
[[email-info]]
=== EmailInfo
diff --git a/Documentation/rest-api-changes.txt b/Documentation/rest-api-changes.txt
index 71fc175..d08e894 100644
--- a/Documentation/rest-api-changes.txt
+++ b/Documentation/rest-api-changes.txt
@@ -295,9 +295,9 @@
authenticated and has commented on the current revision.
--
-[[patch-set-links]]
+[[web-links]]
--
-* `PATCHSET_LINKS`: include the `web_links` field.
+* `WEB_LINKS`: include the `web_links` field.
--
.Request
@@ -3660,6 +3660,9 @@
[[revision-info]]
=== RevisionInfo
The `RevisionInfo` entity contains information about a patch set.
+Not all fields are returned by default. Additional fields can
+be obtained by adding `o` parameters as described in
+link:#list-changes[Query Changes].
[options="header",width="50%",cols="1,^1,5"]
|===========================
@@ -3667,24 +3670,33 @@
|`draft` |not set if `false`|Whether the patch set is a draft.
|`has_draft_comments` |not set if `false`|Whether the patch
set has one or more draft comments by the calling user. Only set if
-link:#draft_comments[draft comments] is requested.
+link:#draft_comments[DRAFT_COMMENTS] option is requested.
|`_number` ||The patch set number.
|`fetch` ||
Information about how to fetch this patch set. The fetch information is
provided as a map that maps the protocol name ("`git`", "`http`",
-"`ssh`") to link:#fetch-info[FetchInfo] entities.
+"`ssh`") to link:#fetch-info[FetchInfo] entities. This information is
+only included if a plugin implementing the
+link:intro-project-owner.html#download-commands[download commands]
+interface is installed.
|`commit` |optional|The commit of the patch set as
link:#commit-info[CommitInfo] entity.
|`files` |optional|
The files of the patch set as a map that maps the file names to
-link:#file-info[FileInfo] entities.
+link:#file-info[FileInfo] entities. Only set if
+link:#current-files[CURRENT_FILES] or link:#all-files[ALL_FILES]
+option is requested.
|`actions` |optional|
Actions the caller might be able to perform on this revision. The
information is a map of view name to link:#action-info[ActionInfo]
entities.
+|`reviewed` |optional|
+Indicates whether the caller is authenticated and has commented on the
+current revision. Only set if link:#reviewed[REVIEWED] option is requested.
|'web_links' |optional|
Links to the patch set in external sites as a list of
-link:#web-link-info[WebLinkInfo] entities.
+link:#web-link-info[WebLinkInfo] entities. Only set if
+link:#web-links[WEB_LINKS] option is requested.
|===========================
[[rule-input]]
diff --git a/Documentation/user-review-ui.txt b/Documentation/user-review-ui.txt
index bb1aeef..3d5e418 100644
--- a/Documentation/user-review-ui.txt
+++ b/Documentation/user-review-ui.txt
@@ -1046,6 +1046,11 @@
+
Controls whether the top menu is shown.
+- `Auto Hide Diff Table Header`:
++
+Controls whether the diff table header should be automatically hidden
+when scrolling down more than half of a page.
+
[[mark-reviewed]]
- `Mark Reviewed`:
+
diff --git a/bucklets/gerrit_plugin.bucklet b/bucklets/gerrit_plugin.bucklet
index eb10456..f3e9830 100644
--- a/bucklets/gerrit_plugin.bucklet
+++ b/bucklets/gerrit_plugin.bucklet
@@ -13,3 +13,6 @@
#
# When compiling from standalone cookbook-plugin, bucklets directory points
# to cloned bucklets library that includes real gerrit_plugin.bucklet code.
+
+GERRIT_PLUGIN_API = ['//gerrit-plugin-api:lib']
+GERRIT_GWT_API = ['//gerrit-plugin-gwtui/gerrit:gwtui-api']
diff --git a/gerrit-acceptance-tests/BUCK b/gerrit-acceptance-tests/BUCK
index 4549c47..d93b25c 100644
--- a/gerrit-acceptance-tests/BUCK
+++ b/gerrit-acceptance-tests/BUCK
@@ -26,8 +26,10 @@
'//lib:junit',
'//lib:servlet-api-3_1',
- '//lib/commons:httpclient',
- '//lib/commons:httpcore',
+ '//lib/hamcrest:hamcrest-core',
+ '//lib/hamcrest:hamcrest-library',
+ '//lib/httpcomponents:httpclient',
+ '//lib/httpcomponents:httpcore',
'//lib/log:impl_log4j',
'//lib/log:log4j',
'//lib/guice:guice',
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/HttpSession.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/HttpSession.java
index 5d81900..f765e7a 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/HttpSession.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/HttpSession.java
@@ -52,7 +52,7 @@
client = HttpClientBuilder
.create()
.setDefaultCredentialsProvider(creds)
- .setMaxConnPerRoute(10)
+ .setMaxConnPerRoute(512)
.setMaxConnTotal(1024)
.build();
}
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java
index 5b3795e..a96e721 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java
@@ -15,8 +15,11 @@
package com.google.gerrit.acceptance.git;
import static com.google.gerrit.acceptance.GitUtil.cloneProject;
+import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeThat;
+import com.google.common.collect.ImmutableSet;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.acceptance.TestAccount;
@@ -24,17 +27,30 @@
import com.google.gerrit.extensions.common.LabelInfo;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.reviewdb.client.Change;
+import com.google.gerrit.server.notedb.NotesMigration;
+import com.google.gerrit.testutil.ConfigSuite;
import com.google.gwtorm.server.OrmException;
+import com.google.inject.Inject;
import com.jcraft.jsch.JSchException;
import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.lib.Config;
import org.junit.Before;
import org.junit.Test;
import java.io.IOException;
+import java.util.Set;
public abstract class AbstractPushForReview extends AbstractDaemonTest {
+ @ConfigSuite.Config
+ public static Config noteDbEnabled() {
+ return NotesMigration.allEnabledConfig();
+ }
+
+ @Inject
+ private NotesMigration notesMigration;
+
protected enum Protocol {
SSH, HTTP
}
@@ -192,6 +208,77 @@
r.assertErrorStatus("branch " + branchName + " not found");
}
+ @Test
+ public void testPushForMasterWithHashtags() throws GitAPIException,
+ OrmException, IOException, RestApiException {
+
+ // Hashtags currently only work when noteDB is enabled
+ assumeThat(notesMigration.enabled(), is(true));
+
+ // specify a single hashtag as option
+ String hashtag1 = "tag1";
+ Set<String> expected = ImmutableSet.of(hashtag1);
+ PushOneCommit.Result r = pushTo("refs/for/master%hashtag=#" + hashtag1);
+ r.assertOkStatus();
+ r.assertChange(Change.Status.NEW, null);
+
+ Set<String> hashtags = gApi.changes().id(r.getChangeId()).getHashtags();
+ assertEquals(expected, hashtags);
+
+ // specify a single hashtag as option in new patch set
+ String hashtag2 = "tag2";
+ PushOneCommit push =
+ pushFactory.create(db, admin.getIdent(), PushOneCommit.SUBJECT,
+ "b.txt", "anotherContent", r.getChangeId());
+ r = push.to(git, "refs/for/master/%hashtag=" + hashtag2);
+ r.assertOkStatus();
+ expected = ImmutableSet.of(hashtag1, hashtag2);
+ hashtags = gApi.changes().id(r.getChangeId()).getHashtags();
+ assertEquals(expected, hashtags);
+ }
+
+ @Test
+ public void testPushForMasterWithMultipleHashtags() throws GitAPIException,
+ OrmException, IOException, RestApiException {
+
+ // Hashtags currently only work when noteDB is enabled
+ assumeThat(notesMigration.enabled(), is(true));
+
+ // specify multiple hashtags as options
+ String hashtag1 = "tag1";
+ String hashtag2 = "tag2";
+ Set<String> expected = ImmutableSet.of(hashtag1, hashtag2);
+ PushOneCommit.Result r = pushTo("refs/for/master%hashtag=#" + hashtag1
+ + ",hashtag=##" + hashtag2);
+ r.assertOkStatus();
+ r.assertChange(Change.Status.NEW, null);
+
+ Set<String> hashtags = gApi.changes().id(r.getChangeId()).getHashtags();
+ assertEquals(expected, hashtags);
+
+ // specify multiple hashtags as options in new patch set
+ String hashtag3 = "tag3";
+ String hashtag4 = "tag4";
+ PushOneCommit push =
+ pushFactory.create(db, admin.getIdent(), PushOneCommit.SUBJECT,
+ "b.txt", "anotherContent", r.getChangeId());
+ r = push.to(git,
+ "refs/for/master%hashtag=" + hashtag3 + ",hashtag=" + hashtag4);
+ r.assertOkStatus();
+ expected = ImmutableSet.of(hashtag1, hashtag2, hashtag3, hashtag4);
+ hashtags = gApi.changes().id(r.getChangeId()).getHashtags();
+ assertEquals(expected, hashtags);
+ }
+
+ @Test
+ public void testPushForMasterWithHashtagsNoteDbDisabled() throws GitAPIException,
+ IOException {
+ // push with hashtags should fail when noteDb is disabled
+ assumeThat(notesMigration.enabled(), is(false));
+ PushOneCommit.Result r = pushTo("refs/for/master%hashtag=tag1");
+ r.assertErrorStatus("cannot add hashtags; noteDb is disabled");
+ }
+
private PushOneCommit.Result pushTo(String ref) throws GitAPIException,
IOException {
PushOneCommit push = pushFactory.create(db, admin.getIdent());
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/HashtagsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/HashtagsIT.java
index 9020985..a9112cb 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/HashtagsIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/HashtagsIT.java
@@ -15,7 +15,6 @@
package com.google.gerrit.acceptance.rest.change;
import static org.junit.Assert.assertEquals;
-import static com.google.gerrit.server.change.PostHashtags.Input;
import com.google.common.base.CharMatcher;
import com.google.common.base.Splitter;
@@ -23,6 +22,7 @@
import com.google.common.collect.Lists;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.RestResponse;
+import com.google.gerrit.extensions.api.changes.HashtagsInput;
import com.google.gerrit.server.notedb.NotesMigration;
import com.google.gerrit.testutil.ConfigSuite;
import com.google.gson.reflect.TypeToken;
@@ -33,6 +33,7 @@
import java.io.IOException;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@@ -104,6 +105,46 @@
}
@Test
+ public void testHashtagsWithPrefix() throws Exception {
+ String changeId = createChange().getChangeId();
+
+ // Leading # is stripped from added tag
+ List<String> expected = Arrays.asList("tag1");
+ assertResult(POST(changeId, "#tag1", null), expected);
+ assertResult(GET(changeId), expected);
+
+ // Leading # is stripped from multiple added tags
+ expected = Arrays.asList("tag1", "tag2", "tag3");
+ assertResult(POST(changeId, "#tag2, #tag3", null), expected);
+ assertResult(GET(changeId), expected);
+
+ // Leading # is stripped from removed tag
+ expected = Arrays.asList("tag1", "tag3");
+ assertResult(POST(changeId, null, "#tag2"), expected);
+ assertResult(GET(changeId), expected);
+
+ // Leading # is stripped from multiple removed tags
+ expected = Collections.emptyList();
+ assertResult(POST(changeId, null, "#tag1, #tag3"), expected);
+ assertResult(GET(changeId), expected);
+
+ // Leading # and space are stripped from added tag
+ expected = Arrays.asList("tag1");
+ assertResult(POST(changeId, "# tag1", null), expected);
+ assertResult(GET(changeId), expected);
+
+ // Multiple leading # are stripped from added tag
+ expected = Arrays.asList("tag1", "tag2");
+ assertResult(POST(changeId, "##tag2", null), expected);
+ assertResult(GET(changeId), expected);
+
+ // Multiple leading spaces and # are stripped from added tag
+ expected = Arrays.asList("tag1", "tag2", "tag3");
+ assertResult(POST(changeId, " # # tag3", null), expected);
+ assertResult(GET(changeId), expected);
+ }
+
+ @Test
public void testRemoveSingleHashtag() throws Exception {
// POST removing a single tag from a change that only has that tag
// returns an empty list
@@ -170,7 +211,7 @@
private RestResponse POST(String changeId, String toAdd, String toRemove)
throws IOException {
- Input input = new Input();
+ HashtagsInput input = new HashtagsInput();
if (toAdd != null) {
input.add = new HashSet<String>(
Lists.newArrayList(Splitter.on(CharMatcher.anyOf(",")).split(toAdd)));
diff --git a/gerrit-antlr/src/main/antlr3/com/google/gerrit/server/query/Query.g b/gerrit-antlr/src/main/antlr3/com/google/gerrit/server/query/Query.g
index 423acb4..4be4ab6 100644
--- a/gerrit-antlr/src/main/antlr3/com/google/gerrit/server/query/Query.g
+++ b/gerrit-antlr/src/main/antlr3/com/google/gerrit/server/query/Query.g
@@ -168,7 +168,7 @@
: ( '\u0000'..' '
| '!'
| '"'
- | '#'
+ // '#' permit
| '$'
| '%'
| '&'
diff --git a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java
index 85e4599..65bb034 100644
--- a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java
+++ b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java
@@ -161,7 +161,8 @@
return defaultFactory.build(def);
}
- SqlStore<K, V> store = newSqlStore(def.name(), def.keyType(), limit);
+ SqlStore<K, V> store = newSqlStore(def.name(), def.keyType(), limit,
+ def.expireAfterWrite(TimeUnit.SECONDS));
H2CacheImpl<K, V> cache = new H2CacheImpl<K, V>(
executor, store, def.keyType(),
(Cache<K, ValueHolder<V>>) defaultFactory.create(def, true).build());
@@ -182,7 +183,8 @@
return defaultFactory.build(def, loader);
}
- SqlStore<K, V> store = newSqlStore(def.name(), def.keyType(), limit);
+ SqlStore<K, V> store = newSqlStore(def.name(), def.keyType(), limit,
+ def.expireAfterWrite(TimeUnit.SECONDS));
Cache<K, ValueHolder<V>> mem = (Cache<K, ValueHolder<V>>)
defaultFactory.create(def, true)
.build((CacheLoader<K, V>) new H2CacheImpl.Loader<K, V>(
@@ -209,9 +211,11 @@
private <V, K> SqlStore<K, V> newSqlStore(
String name,
TypeLiteral<K> keyType,
- long maxSize) {
+ long maxSize,
+ Long expireAfterWrite) {
File db = new File(cacheDir, name).getAbsoluteFile();
String url = "jdbc:h2:" + db.toURI().toString();
- return new SqlStore<>(url, keyType, maxSize);
+ return new SqlStore<>(url, keyType, maxSize,
+ expireAfterWrite == null ? 0 : expireAfterWrite.longValue());
}
}
diff --git a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java
index 652ed30..5563988 100644
--- a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java
+++ b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java
@@ -313,16 +313,19 @@
private final String url;
private final KeyType<K> keyType;
private final long maxSize;
+ private final long expireAfterWrite;
private final BlockingQueue<SqlHandle> handles;
private final AtomicLong hitCount = new AtomicLong();
private final AtomicLong missCount = new AtomicLong();
private volatile BloomFilter<K> bloomFilter;
private int estimatedSize;
- SqlStore(String jdbcUrl, TypeLiteral<K> keyType, long maxSize) {
+ SqlStore(String jdbcUrl, TypeLiteral<K> keyType, long maxSize,
+ long expireAfterWrite) {
this.url = jdbcUrl;
this.keyType = KeyType.create(keyType);
this.maxSize = maxSize;
+ this.expireAfterWrite = expireAfterWrite;
int cores = Runtime.getRuntime().availableProcessors();
int keep = Math.min(cores, 16);
@@ -408,7 +411,7 @@
try {
c = acquire();
if (c.get == null) {
- c.get = c.conn.prepareStatement("SELECT v FROM data WHERE k=?");
+ c.get = c.conn.prepareStatement("SELECT v, created FROM data WHERE k=?");
}
keyType.set(c.get, 1, key);
ResultSet r = c.get.executeQuery();
@@ -418,6 +421,13 @@
return null;
}
+ Timestamp created = r.getTimestamp(2);
+ if (expired(created)) {
+ invalidate(key);
+ missCount.incrementAndGet();
+ return null;
+ }
+
@SuppressWarnings("unchecked")
V val = (V) r.getObject(1);
ValueHolder<V> h = new ValueHolder<>(val);
@@ -438,6 +448,14 @@
}
}
+ private boolean expired(Timestamp created) {
+ if (expireAfterWrite == 0) {
+ return false;
+ }
+ long age = TimeUtil.nowMs() - created.getTime();
+ return 1000 * expireAfterWrite < age;
+ }
+
private void touch(SqlHandle c, K key) throws SQLException {
if (c.touch == null) {
c.touch =c.conn.prepareStatement("UPDATE data SET accessed=? WHERE k=?");
@@ -552,12 +570,14 @@
r = s.executeQuery("SELECT"
+ " k"
+ ",OCTET_LENGTH(k) + OCTET_LENGTH(v)"
+ + ",created"
+ " FROM data"
+ " ORDER BY accessed");
try {
while (maxSize < used && r.next()) {
K key = keyType.get(r, 1);
- if (mem.getIfPresent(key) != null) {
+ Timestamp created = r.getTimestamp(3);
+ if (mem.getIfPresent(key) != null && !expired(created)) {
touch(c, key);
} else {
invalidate(c, key);
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ChangeApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ChangeApi.java
index 4d509e9..6dd6b06 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ChangeApi.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ChangeApi.java
@@ -20,6 +20,7 @@
import com.google.gerrit.extensions.restapi.RestApiException;
import java.util.EnumSet;
+import java.util.Set;
public interface ChangeApi {
String id();
@@ -86,6 +87,18 @@
ChangeInfo info() throws RestApiException;
/**
+ * Set hashtags on a change
+ **/
+ void setHashtags(HashtagsInput input) throws RestApiException;
+
+ /**
+ * Get hashtags on a change.
+ * @return hashtags
+ * @throws RestApiException
+ */
+ Set<String> getHashtags() throws RestApiException;
+
+ /**
* A default implementation which allows source compatibility
* when adding new methods to the interface.
**/
@@ -174,5 +187,15 @@
public ChangeInfo info() throws RestApiException {
throw new NotImplementedException();
}
+
+ @Override
+ public void setHashtags(HashtagsInput input) throws RestApiException {
+ throw new NotImplementedException();
+ }
+
+ @Override
+ public Set<String> getHashtags() throws RestApiException {
+ throw new NotImplementedException();
+ }
}
}
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/HashtagsInput.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/HashtagsInput.java
new file mode 100644
index 0000000..bf84ccb0
--- /dev/null
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/HashtagsInput.java
@@ -0,0 +1,25 @@
+// Copyright (C) 2014 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.api.changes;
+
+import com.google.gerrit.extensions.restapi.DefaultInput;
+
+import java.util.Set;
+
+public class HashtagsInput {
+ @DefaultInput
+ public Set<String> add;
+ public Set<String> remove;
+}
diff --git a/gerrit-gwtdebug/src/main/java/com/google/gwt/dev/codeserver/WebServer.java b/gerrit-gwtdebug/src/main/java/com/google/gwt/dev/codeserver/WebServer.java
index 8eb1300..53db8ca 100644
--- a/gerrit-gwtdebug/src/main/java/com/google/gwt/dev/codeserver/WebServer.java
+++ b/gerrit-gwtdebug/src/main/java/com/google/gwt/dev/codeserver/WebServer.java
@@ -20,6 +20,7 @@
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.json.JsonArray;
import com.google.gwt.dev.json.JsonObject;
+
import org.eclipse.jetty.http.MimeTypes;
import org.eclipse.jetty.server.HttpConnection;
import org.eclipse.jetty.server.Request;
@@ -41,8 +42,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.servlet.ServletException;
import javax.servlet.DispatcherType;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
index 8797b48..bfe3d0b 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
@@ -103,6 +103,7 @@
public static final SystemInfoService SYSTEM_SVC;
public static final EventBus EVENT_BUS = GWT.create(SimpleEventBus.class);
public static Themer THEMER = GWT.create(Themer.class);
+ public static final String PROJECT_NAME_MENU_VAR = "${projectName}";
private static String myHost;
private static GerritConfig myConfig;
@@ -773,15 +774,10 @@
for (TopMenu menu : topMenuExtensions) {
String name = menu.getName();
LinkMenuBar existingBar = menuBars.get(name);
- LinkMenuBar bar = existingBar != null ? existingBar : new LinkMenuBar();
- if (GerritTopMenu.PROJECTS.menuName.equals(name)) {
- for (TopMenuItem item : Natives.asList(menu.getItems())) {
- addProjectLink(bar, item);
- }
- } else {
- for (TopMenuItem item : Natives.asList(menu.getItems())) {
- addExtensionLink(bar, item);
- }
+ LinkMenuBar bar =
+ existingBar != null ? existingBar : new LinkMenuBar();
+ for (TopMenuItem item : Natives.asList(menu.getItems())) {
+ addMenuLink(bar, item);
}
if (existingBar == null) {
menuBars.put(name, bar);
@@ -908,14 +904,21 @@
LinkMenuItem i = new ProjectLinkMenuItem(item.getName(), item.getUrl()) {
@Override
protected void onScreenLoad(Project.NameKey project) {
- String p = panel.replace("${projectName}", project.get());
- if (panel.startsWith("/x/")) {
- setTargetHistoryToken(p);
- } else if (isAbsolute(panel)) {
- getElement().setPropertyString("href", p);
- } else {
- getElement().setPropertyString("href", selfRedirect(p));
+ String p =
+ panel.replace(PROJECT_NAME_MENU_VAR,
+ URL.encodeQueryString(project.get()));
+ if (!panel.startsWith("/x/") && !isAbsolute(panel)) {
+ UrlBuilder builder = new UrlBuilder();
+ builder.setProtocol(Location.getProtocol());
+ builder.setHost(Location.getHost());
+ String port = Location.getPort();
+ if (port != null && !port.isEmpty()) {
+ builder.setPort(Integer.parseInt(port));
+ }
+ builder.setPath(Location.getPath());
+ p = builder.buildString() + p;
}
+ getElement().setPropertyString("href", p);
}
@Override
@@ -962,6 +965,14 @@
m.add(atag);
}
+ private static void addMenuLink(LinkMenuBar m, TopMenuItem item) {
+ if (item.getUrl().contains(PROJECT_NAME_MENU_VAR)) {
+ addProjectLink(m, item);
+ } else {
+ addExtensionLink(m, item);
+ }
+ }
+
private static void addExtensionLink(LinkMenuBar m, TopMenuItem item) {
if (item.getUrl().startsWith("#")
&& (item.getTarget() == null || item.getTarget().isEmpty())) {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java
index d106ad5..c45c797 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java
@@ -37,6 +37,9 @@
@Source("editText.png")
public ImageResource edit();
+ @Source("mediaFloppy.png")
+ public ImageResource save();
+
@Source("starOpen.gif")
public ImageResource starOpen();
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/DiffPreferences.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/DiffPreferences.java
index 8a4666b..029e7c2 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/DiffPreferences.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/DiffPreferences.java
@@ -35,6 +35,7 @@
p.showWhitespaceErrors(in.isShowWhitespaceErrors());
p.syntaxHighlighting(in.isSyntaxHighlighting());
p.hideTopMenu(in.isHideTopMenu());
+ p.autoHideDiffTableHeader(in.isAutoHideDiffTableHeader());
p.hideLineNumbers(in.isHideLineNumbers());
p.expandAllComments(in.isExpandAllComments());
p.manualReview(in.isManualReview());
@@ -55,6 +56,7 @@
p.setShowWhitespaceErrors(showWhitespaceErrors());
p.setSyntaxHighlighting(syntaxHighlighting());
p.setHideTopMenu(hideTopMenu());
+ p.setAutoHideDiffTableHeader(autoHideDiffTableHeader());
p.setHideLineNumbers(hideLineNumbers());
p.setExpandAllComments(expandAllComments());
p.setManualReview(manualReview());
@@ -82,6 +84,7 @@
public final native void showWhitespaceErrors(boolean s) /*-{ this.show_whitespace_errors = s }-*/;
public final native void syntaxHighlighting(boolean s) /*-{ this.syntax_highlighting = s }-*/;
public final native void hideTopMenu(boolean s) /*-{ this.hide_top_menu = s }-*/;
+ public final native void autoHideDiffTableHeader(boolean s) /*-{ this.auto_hide_diff_table_header = s }-*/;
public final native void hideLineNumbers(boolean s) /*-{ this.hide_line_numbers = s }-*/;
public final native void expandAllComments(boolean e) /*-{ this.expand_all_comments = e }-*/;
public final native void manualReview(boolean r) /*-{ this.manual_review = r }-*/;
@@ -110,6 +113,7 @@
public final native boolean showWhitespaceErrors() /*-{ return this.show_whitespace_errors || false }-*/;
public final native boolean syntaxHighlighting() /*-{ return this.syntax_highlighting || false }-*/;
public final native boolean hideTopMenu() /*-{ return this.hide_top_menu || false }-*/;
+ public final native boolean autoHideDiffTableHeader() /*-{ return this.auto_hide_diff_table_header || false }-*/;
public final native boolean hideLineNumbers() /*-{ return this.hide_line_numbers || false }-*/;
public final native boolean expandAllComments() /*-{ return this.expand_all_comments || false }-*/;
public final native boolean manualReview() /*-{ return this.manual_review || false }-*/;
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/actions/ActionButton.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/actions/ActionButton.java
index 6aaac8c..2e2d314 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/actions/ActionButton.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/actions/ActionButton.java
@@ -68,6 +68,7 @@
.openDiv()
.append(action.label())
.closeDiv());
+ setStyleName("");
setTitle(action.title());
setEnabled(action.enabled());
addClickHandler(this);
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java
index 558a2e9..a0b1fc73 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java
@@ -554,9 +554,13 @@
private void initProjectActions(ConfigInfo info) {
actionsGrid.clear(true);
actionsGrid.removeAllRows();
+ boolean showCreateChange = Gerrit.isSignedIn();
NativeMap<ActionInfo> actions = info.actions();
- if (actions == null || actions.isEmpty()) {
+ if (actions == null) {
+ actions = NativeMap.create().cast();
+ }
+ if (actions.isEmpty() && !showCreateChange) {
return;
}
actions.copyKeysIntoChildren("id");
@@ -571,13 +575,16 @@
actions.get(id)));
}
- if (Gerrit.isSignedIn()) {
+ // TODO: The user should have create permission on the branch referred to by
+ // HEAD. This would have to happen on the server side.
+ if (showCreateChange) {
actionsPanel.add(createChangeAction());
}
}
private Button createChangeAction() {
final Button createChange = new Button(Util.C.buttonCreateChange());
+ createChange.setStyleName("");
createChange.setTitle(Util.C.buttonCreateChangeDescription());
createChange.addClickHandler(new ClickHandler() {
@Override
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ApiGlue.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ApiGlue.java
index b0b9e66..490edee 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ApiGlue.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ApiGlue.java
@@ -16,6 +16,7 @@
import com.google.gerrit.client.ErrorDialog;
import com.google.gerrit.client.Gerrit;
+import com.google.gerrit.client.account.AccountInfo;
import com.google.gwt.core.client.JavaScriptObject;
import com.google.gwt.core.client.JsArray;
import com.google.gwt.user.client.History;
@@ -66,6 +67,7 @@
refresh: @com.google.gerrit.client.api.ApiGlue::refresh(),
refreshMenuBar: @com.google.gerrit.client.api.ApiGlue::refreshMenuBar(),
showError: @com.google.gerrit.client.api.ApiGlue::showError(Ljava/lang/String;),
+ getCurrentUser: @com.google.gerrit.client.api.ApiGlue::getCurrentUser(),
on: function (e,f){(this.events[e] || (this.events[e]=[])).push(f)},
onAction: function (t,n,c){this._onAction(this.getPluginName(),t,n,c)},
@@ -194,6 +196,10 @@
Gerrit.display(History.getToken());
}
+ private static final AccountInfo getCurrentUser() {
+ return Gerrit.getUserAccountInfo();
+ }
+
private static final void refreshMenuBar() {
Gerrit.refreshMenuBar();
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/Plugin.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/Plugin.java
index 7ef022a..8312cc3 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/Plugin.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/Plugin.java
@@ -50,6 +50,7 @@
var G = $wnd.Gerrit;
@com.google.gerrit.client.api.Plugin::TYPE.prototype = {
getPluginName: function(){return this.name},
+ getCurrentUser: @com.google.gerrit.client.api.ApiGlue::getCurrentUser(),
go: @com.google.gerrit.client.api.ApiGlue::go(Ljava/lang/String;),
refresh: @com.google.gerrit.client.api.ApiGlue::refresh(),
refreshMenuBar: @com.google.gerrit.client.api.ApiGlue::refreshMenuBar(),
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.ui.xml
index 4302a5b..b579b0f 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.ui.xml
@@ -459,8 +459,7 @@
<td ui:field='actionDate'/>
</tr>
<tr ui:field='hashtagTableRow'>
- <th><ui:msg>Hashtags</ui:msg></th>
- <td>
+ <td colspan='2'>
<c:Hashtags ui:field='hashtags'/>
</td>
</tr>
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java
index 0cc3ced..bc84984 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java
@@ -162,9 +162,10 @@
.setAttribute(DATA_ID, hashtagName)
.setStyleName(style.hashtagName())
.openAnchor()
- .setAttribute("href", "#" + PageLinks.toChangeQuery("hashtag:" + hashtagName))
+ .setAttribute("href",
+ "#" + PageLinks.toChangeQuery("hashtag:\"" + hashtagName + "\""))
.setAttribute("role", "listitem")
- .append(hashtagName)
+ .append("#").append(hashtagName)
.closeAnchor()
.openElement("button")
.setAttribute("title", "Remove hashtag")
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.ui.xml
index 770fb83..7bc3edd 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.ui.xml
@@ -60,7 +60,7 @@
addStyleNames='{style.openAdd}'
visible='false'>
<ui:attribute name='title'/>
- <div><ui:msg>Add...</ui:msg></div>
+ <div><ui:msg>Add #...</ui:msg></div>
</g:Button>
</div>
<div ui:field='form' style='display: none' aria-hidden='true'>
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.java
index c9d5ce7..5a1c54f 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.java
@@ -80,6 +80,7 @@
private SideBySide2 parent;
private boolean header;
private boolean headerVisible;
+ private boolean autoHideHeader;
private boolean visibleA;
private ChangeType changeType;
@@ -134,7 +135,11 @@
}
void setHeaderVisible(boolean show) {
- headerVisible = show;
+ headerVisible = !autoHideHeader || show;
+ showHeader(headerVisible);
+ }
+
+ private void showHeader(boolean show) {
UIObject.setVisible(patchSetNavRow, show);
UIObject.setVisible(diffHeaderRow, show && header);
if (show) {
@@ -145,6 +150,13 @@
parent.resizeCodeMirror();
}
+ void setAutoHideDiffHeader(boolean hide) {
+ autoHideHeader = hide;
+ if (!hide) {
+ showHeader(true);
+ }
+ }
+
int getHeaderHeight() {
int h = patchSetSelectBoxA.getOffsetHeight();
if (header) {
@@ -160,6 +172,7 @@
void set(DiffPreferences prefs, JsArray<RevisionInfo> list, DiffInfo info,
boolean editExists, int currentPatchSet) {
this.changeType = info.change_type();
+ this.autoHideHeader = prefs.autoHideDiffTableHeader();
patchSetSelectBoxA.setUpPatchSetNav(list, info.meta_a(),
Natives.asList(info.web_links_a()), editExists, currentPatchSet);
patchSetSelectBoxB.setUpPatchSetNav(list, info.meta_b(),
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox2.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox2.java
index d3fce02..786df47 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox2.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox2.java
@@ -16,8 +16,8 @@
import com.google.gerrit.client.Dispatcher;
import com.google.gerrit.client.Gerrit;
+import com.google.gerrit.client.VoidResult;
import com.google.gerrit.client.WebLinkInfo;
-import com.google.gerrit.client.change.EditFileAction;
import com.google.gerrit.client.changes.ChangeFileApi;
import com.google.gerrit.client.changes.ChangeInfo.RevisionInfo;
import com.google.gerrit.client.patches.PatchUtil;
@@ -139,21 +139,35 @@
}
private Widget createEditIcon() {
- Anchor anchor = new Anchor(
+ final Anchor anchor = new Anchor(
new ImageResourceRenderer().render(Gerrit.RESOURCES.edit()));
anchor.addClickHandler(new ClickHandler() {
+ boolean editing = false;
@Override
public void onClick(ClickEvent event) {
final PatchSet.Id id = (idActive == null) ? other.idActive : idActive;
- ChangeFileApi.getContent(id, path,
- new GerritCallback<String>() {
- @Override
- public void onSuccess(String result) {
- EditFileAction edit = new EditFileAction(
- id, result, path, style.replyBox(), null, icon);
- edit.onEdit();
- }
- });
+ editing = !editing;
+ parent.editSideB(editing);
+
+ if (editing) {
+ ChangeFileApi.getContent(id, path,
+ new GerritCallback<String>() {
+ @Override
+ public void onSuccess(String content) {
+ parent.setSideBContent(content);
+ }
+ });
+ anchor.setHTML(new ImageResourceRenderer().render(Gerrit.RESOURCES.save()));
+ } else {
+ anchor.setHTML(new ImageResourceRenderer().render(Gerrit.RESOURCES.edit()));
+ String siteBContent = parent.getSideBContent();
+ ChangeFileApi.putContent(id, path, siteBContent,
+ new GerritCallback<VoidResult>() {
+ @Override
+ public void onSuccess(VoidResult result) {
+ }
+ });
+ }
}
});
anchor.setTitle(PatchUtil.C.edit());
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.java
index ac11cd5..0978d13 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.java
@@ -90,6 +90,7 @@
@UiField ToggleButton leftSide;
@UiField ToggleButton emptyPane;
@UiField ToggleButton topMenu;
+ @UiField ToggleButton autoHideDiffTableHeader;
@UiField ToggleButton manualReview;
@UiField ToggleButton expandAllComments;
@UiField ToggleButton renderEntireFile;
@@ -157,6 +158,7 @@
leftSide.setEnabled(!(prefs.hideEmptyPane()
&& view.diffTable.getChangeType() == ChangeType.ADDED));
topMenu.setValue(!prefs.hideTopMenu());
+ autoHideDiffTableHeader.setValue(!prefs.autoHideDiffTableHeader());
manualReview.setValue(prefs.manualReview());
expandAllComments.setValue(prefs.expandAllComments());
renderEntireFile.setValue(prefs.renderEntireFile());
@@ -322,6 +324,13 @@
view.resizeCodeMirror();
}
+ @UiHandler("autoHideDiffTableHeader")
+ void onAutoHideDiffTableHeader(ValueChangeEvent<Boolean> e) {
+ prefs.autoHideDiffTableHeader(!e.getValue());
+ view.setAutoHideDiffHeader(!e.getValue());
+ view.resizeCodeMirror();
+ }
+
@UiHandler("manualReview")
void onManualReview(ValueChangeEvent<Boolean> e) {
prefs.manualReview(e.getValue());
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.ui.xml
index af53916..2f22cdd 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.ui.xml
@@ -250,6 +250,13 @@
</g:ToggleButton></td>
</tr>
<tr>
+ <th><ui:msg>Auto Hide Diff Table Header</ui:msg></th>
+ <td><g:ToggleButton ui:field='autoHideDiffTableHeader'>
+ <g:upFace><ui:msg>Yes</ui:msg></g:upFace>
+ <g:downFace><ui:msg>No</ui:msg></g:downFace>
+ </g:ToggleButton></td>
+ </tr>
+ <tr>
<th><ui:msg>Mark Reviewed</ui:msg></th>
<td><g:ToggleButton ui:field='manualReview'>
<g:upFace><ui:msg>Automatic</ui:msg></g:upFace>
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
index 157b042..2547a4f 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
@@ -132,6 +132,8 @@
private List<HandlerRegistration> handlers;
private PreferencesAction prefsAction;
private int reloadVersionId;
+ private KeyMap sbsKeyMap;
+ private boolean isEdited = false;
public SideBySide2(
PatchSet.Id base,
@@ -338,7 +340,7 @@
cm.on("cursorActivity", updateActiveLine(cm));
cm.on("gutterClick", onGutterClick(cm));
cm.on("focus", updateActiveLine(cm));
- cm.addKeyMap(KeyMap.create()
+ sbsKeyMap = KeyMap.create()
.on("A", upToChange(true))
.on("U", upToChange(false))
.on("[", header.navigate(Direction.PREV))
@@ -403,7 +405,8 @@
public void run() {
cm.execCommand("selectAll");
}
- }));
+ });
+ cm.addKeyMap(sbsKeyMap);
if (prefs.renderEntireFile()) {
cm.addKeyMap(RENDER_ENTIRE_FILE_KEYMAP);
}
@@ -415,6 +418,9 @@
@Override
public void handle(CodeMirror cm, LineCharacter anchor, LineCharacter head) {
+ if (isEdited) {
+ return;
+ }
if (anchor == head
|| (anchor.getLine() == head.getLine()
&& anchor.getCh() == head.getCh())) {
@@ -533,6 +539,30 @@
}));
}
+ public void editSideB(boolean state) {
+ isEdited = state;
+ cmB.setOption("readOnly", !state);
+ JumpKeys.enable(!state);
+ if (state) {
+ removeKeyHandlerRegistrations();
+ cmB.removeKeyMap(sbsKeyMap);
+ cmB.setOption("keyMap", "default");
+ cmB.focus();
+ } else {
+ cmB.setOption("keyMap", "vim_ro");
+ cmB.addKeyMap(sbsKeyMap);
+ registerKeys();
+ }
+ }
+
+ public String getSideBContent() {
+ return cmB.getValue();
+ }
+
+ public void setSideBContent(String content) {
+ cmB.setValue(content);
+ }
+
private void display(final CommentsCollections comments) {
setThemeStyles(prefs.theme().isDark());
setShowTabs(prefs.showTabs());
@@ -716,6 +746,10 @@
});
}
+ void setAutoHideDiffHeader(boolean hide) {
+ diffTable.setAutoHideDiffHeader(hide);
+ }
+
private void render(DiffInfo diff) {
header.setNoDiff(diff);
chunkManager.render(diff);
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/mediaFloppy.png b/gerrit-gwtui/src/main/java/com/google/gerrit/client/mediaFloppy.png
new file mode 100644
index 0000000..f1d7a19
--- /dev/null
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/mediaFloppy.png
Binary files differ
diff --git a/gerrit-gwtui/src/main/java/net/codemirror/lib/CodeMirror.java b/gerrit-gwtui/src/main/java/net/codemirror/lib/CodeMirror.java
index 941ef7a..4b8970a 100644
--- a/gerrit-gwtui/src/main/java/net/codemirror/lib/CodeMirror.java
+++ b/gerrit-gwtui/src/main/java/net/codemirror/lib/CodeMirror.java
@@ -96,7 +96,15 @@
private final native void addLineClassNative(LineHandle line, String where,
String lineClass) /*-{
- this.addLineClass(line, where, lineClass);
+ try {
+ this.addLineClass(line, where, lineClass);
+ } catch (err) {
+ if ("TypeError: Cannot read property 'parrent' of undefinded" == err.toString()) {
+ // ignore CodeMirror bug after going to new line
+ return;
+ }
+ throw err;
+ }
}-*/;
public final void removeLineClass(int line, LineClassWhere where,
@@ -362,4 +370,8 @@
public interface BeforeSelectionChangeHandler {
public void handle(CodeMirror instance, LineCharacter anchor, LineCharacter head);
}
+
+ public final native String getValue() /*-{
+ return this.getValue();
+ }-*/;
}
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/GetUserFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GetUserFilter.java
similarity index 72%
rename from gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/GetUserFilter.java
rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/GetUserFilter.java
index 4f35f1c..94b8f29 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/GetUserFilter.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GetUserFilter.java
@@ -12,9 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.pgm.http.jetty;
+package com.google.gerrit.httpd;
import com.google.gerrit.server.CurrentUser;
+import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.inject.Inject;
import com.google.inject.Provider;
@@ -24,7 +25,6 @@
import org.eclipse.jgit.lib.Config;
import java.io.IOException;
-import java.net.URI;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
@@ -34,28 +34,26 @@
import javax.servlet.ServletResponse;
/**
- * Stores as a request attribute, so the {@link HttpLog} can include the the
- * user for the request outside of the request scope.
+ * Stores user as a request attribute, so servlets can access it outside of the
+ * request scope.
*/
@Singleton
public class GetUserFilter implements Filter {
- static final String REQ_ATTR_KEY = CurrentUser.class.toString();
+ public static final String REQ_ATTR_KEY = "User";
public static class Module extends ServletModule {
- private boolean loggingEnabled;
+ private final boolean enabled;
@Inject
Module(@GerritServerConfig final Config cfg) {
- URI[] urls = JettyServer.listenURLs(cfg);
- boolean reverseProxy = JettyServer.isReverseProxied(urls);
- this.loggingEnabled = cfg.getBoolean("httpd", "requestLog", !reverseProxy);
+ enabled = cfg.getBoolean("http", "addUserAsRequestAttribute", true);
}
@Override
protected void configureServlets() {
- if (loggingEnabled) {
+ if (enabled) {
filter("/*").through(GetUserFilter.class);
}
}
@@ -72,7 +70,15 @@
public void doFilter(
ServletRequest req, ServletResponse resp, FilterChain chain)
throws IOException, ServletException {
- req.setAttribute(REQ_ATTR_KEY, userProvider.get());
+ CurrentUser user = userProvider.get();
+ if (user != null && user.isIdentifiedUser()) {
+ IdentifiedUser who = (IdentifiedUser) user;
+ if (who.getUserName() != null && !who.getUserName().isEmpty()) {
+ req.setAttribute(REQ_ATTR_KEY, who.getUserName());
+ } else {
+ req.setAttribute(REQ_ATTR_KEY, "a/" + who.getAccountId());
+ }
+ }
chain.doFilter(req, resp);
}
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
index 75f2e96..cc00294 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
@@ -21,6 +21,7 @@
import com.google.gerrit.common.ChangeHookRunner;
import com.google.gerrit.httpd.AllRequestFilter;
import com.google.gerrit.httpd.GerritOptions;
+import com.google.gerrit.httpd.GetUserFilter;
import com.google.gerrit.httpd.GitOverHttpModule;
import com.google.gerrit.httpd.H2CacheBasedWebSession;
import com.google.gerrit.httpd.HttpCanonicalWebUrlProvider;
@@ -31,7 +32,6 @@
import com.google.gerrit.httpd.plugins.HttpPluginModule;
import com.google.gerrit.lifecycle.LifecycleManager;
import com.google.gerrit.lucene.LuceneIndexModule;
-import com.google.gerrit.pgm.http.jetty.GetUserFilter;
import com.google.gerrit.pgm.http.jetty.JettyEnv;
import com.google.gerrit.pgm.http.jetty.JettyModule;
import com.google.gerrit.pgm.http.jetty.ProjectQoSFilter;
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLog.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLog.java
index ba97d4a..f84abce 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLog.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLog.java
@@ -14,8 +14,7 @@
package com.google.gerrit.pgm.http.jetty;
-import com.google.gerrit.server.CurrentUser;
-import com.google.gerrit.server.IdentifiedUser;
+import com.google.gerrit.httpd.GetUserFilter;
import com.google.gerrit.server.util.SystemLog;
import com.google.gerrit.server.util.TimeUtil;
import com.google.inject.Inject;
@@ -66,11 +65,6 @@
@Override
public void log(final Request req, final Response rsp) {
- CurrentUser user = (CurrentUser) req.getAttribute(GetUserFilter.REQ_ATTR_KEY);
- doLog(req, rsp, user);
- }
-
- private void doLog(Request req, Response rsp, CurrentUser user) {
final LoggingEvent event = new LoggingEvent( //
Logger.class.getName(), // fqnOfCategoryClass
log, // logger
@@ -90,13 +84,9 @@
uri = uri + "?" + qs;
}
- if (user != null && user.isIdentifiedUser()) {
- IdentifiedUser who = (IdentifiedUser) user;
- if (who.getUserName() != null && !who.getUserName().isEmpty()) {
- event.setProperty(P_USER, who.getUserName());
- } else {
- event.setProperty(P_USER, "a/" + who.getAccountId());
- }
+ String user = (String) req.getAttribute(GetUserFilter.REQ_ATTR_KEY);
+ if (user != null) {
+ event.setProperty(P_USER, user);
}
set(event, P_HOST, req.getRemoteAddr());
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountDiffPreference.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountDiffPreference.java
index cf951c1..6bdd4b0 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountDiffPreference.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountDiffPreference.java
@@ -92,6 +92,7 @@
p.setContext(DEFAULT_CONTEXT);
p.setManualReview(false);
p.setHideEmptyPane(false);
+ p.setAutoHideDiffTableHeader(true);
return p;
}
@@ -156,6 +157,9 @@
@Column(id = 20)
protected boolean hideEmptyPane;
+ @Column(id = 21)
+ protected boolean autoHideDiffTableHeader;
+
protected AccountDiffPreference() {
}
@@ -183,6 +187,7 @@
this.hideLineNumbers = p.hideLineNumbers;
this.renderEntireFile = p.renderEntireFile;
this.hideEmptyPane = p.hideEmptyPane;
+ this.autoHideDiffTableHeader = p.autoHideDiffTableHeader;
}
public Account.Id getAccountId() {
@@ -343,4 +348,12 @@
public void setHideEmptyPane(boolean hideEmptyPane) {
this.hideEmptyPane = hideEmptyPane;
}
+
+ public void setAutoHideDiffTableHeader(boolean hide) {
+ autoHideDiffTableHeader = hide;
+ }
+
+ public boolean isAutoHideDiffTableHeader() {
+ return autoHideDiffTableHeader;
+ }
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java b/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java
index 573f0e4..973149c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java
@@ -74,8 +74,8 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
+import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
index 629e75b..d2e3e49 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
@@ -18,12 +18,15 @@
import com.google.gerrit.extensions.common.WebLinkInfo;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.webui.BranchWebLink;
-import com.google.gerrit.extensions.webui.PatchSetWebLink;
import com.google.gerrit.extensions.webui.FileWebLink;
+import com.google.gerrit.extensions.webui.PatchSetWebLink;
import com.google.gerrit.extensions.webui.ProjectWebLink;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
import java.util.List;
+@Singleton
public class WebLinks {
private final DynamicSet<PatchSetWebLink> patchSetLinks;
@@ -31,6 +34,7 @@
private final DynamicSet<ProjectWebLink> projectLinks;
private final DynamicSet<BranchWebLink> branchLinks;
+ @Inject
public WebLinks(DynamicSet<PatchSetWebLink> patchSetLinks,
DynamicSet<FileWebLink> fileLinks,
DynamicSet<ProjectWebLink> projectLinks,
@@ -52,7 +56,7 @@
return links;
}
- public Iterable<WebLinkInfo> getPatchLinks(String project, String revision,
+ public Iterable<WebLinkInfo> getFileLinks(String project, String revision,
String file) {
List<WebLinkInfo> links = Lists.newArrayList();
for (FileWebLink webLink : fileLinks) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinksProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinksProvider.java
deleted file mode 100644
index d3d961e..0000000
--- a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinksProvider.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (C) 2014 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.gerrit.server;
-
-import com.google.gerrit.extensions.registration.DynamicSet;
-import com.google.gerrit.extensions.webui.BranchWebLink;
-import com.google.gerrit.extensions.webui.PatchSetWebLink;
-import com.google.gerrit.extensions.webui.FileWebLink;
-import com.google.gerrit.extensions.webui.ProjectWebLink;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-
-public class WebLinksProvider implements Provider<WebLinks> {
-
- private final DynamicSet<PatchSetWebLink> patchSetLinks;
- private final DynamicSet<FileWebLink> fileLinks;
- private final DynamicSet<ProjectWebLink> projectLinks;
- private final DynamicSet<BranchWebLink> branchLinks;
-
- @Inject
- public WebLinksProvider(DynamicSet<PatchSetWebLink> patchSetLinks,
- DynamicSet<FileWebLink> fileLinks,
- DynamicSet<ProjectWebLink> projectLinks,
- DynamicSet<BranchWebLink> branchLinks) {
- this.patchSetLinks = patchSetLinks;
- this.fileLinks = fileLinks;
- this.projectLinks = projectLinks;
- this.branchLinks = branchLinks;
- }
-
- @Override
- public WebLinks get() {
- return new WebLinks(patchSetLinks, fileLinks, projectLinks, branchLinks);
- }
-}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetDiffPreferences.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetDiffPreferences.java
index 5959fac..7169e91 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetDiffPreferences.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetDiffPreferences.java
@@ -70,6 +70,7 @@
info.skipDeleted = p.isSkipDeleted() ? true : null;
info.skipUncommented = p.isSkipUncommented() ? true : null;
info.hideTopMenu = p.isHideTopMenu() ? true : null;
+ info.autoHideDiffTableHeader = p.isAutoHideDiffTableHeader() ? true : null;
info.hideLineNumbers = p.isHideLineNumbers() ? true : null;
info.syntaxHighlighting = p.isSyntaxHighlighting() ? true : null;
info.tabSize = p.getTabSize();
@@ -93,6 +94,7 @@
public Boolean skipUncommented;
public Boolean syntaxHighlighting;
public Boolean hideTopMenu;
+ public Boolean autoHideDiffTableHeader;
public Boolean hideLineNumbers;
public Boolean renderEntireFile;
public Boolean hideEmptyPane;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/SetDiffPreferences.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/SetDiffPreferences.java
index 08386b2..d922faf 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/SetDiffPreferences.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/SetDiffPreferences.java
@@ -48,6 +48,7 @@
Boolean skipUncommented;
Boolean syntaxHighlighting;
Boolean hideTopMenu;
+ Boolean autoHideDiffTableHeader;
Boolean hideLineNumbers;
Boolean renderEntireFile;
Integer tabSize;
@@ -127,6 +128,9 @@
if (input.hideTopMenu != null) {
p.setHideTopMenu(input.hideTopMenu);
}
+ if (input.autoHideDiffTableHeader != null) {
+ p.setAutoHideDiffTableHeader(input.autoHideDiffTableHeader);
+ }
if (input.hideLineNumbers != null) {
p.setHideLineNumbers(input.hideLineNumbers);
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java
index 02c47f4..462300c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java
@@ -19,6 +19,7 @@
import com.google.gerrit.extensions.api.changes.AddReviewerInput;
import com.google.gerrit.extensions.api.changes.ChangeApi;
import com.google.gerrit.extensions.api.changes.Changes;
+import com.google.gerrit.extensions.api.changes.HashtagsInput;
import com.google.gerrit.extensions.api.changes.RestoreInput;
import com.google.gerrit.extensions.api.changes.RevertInput;
import com.google.gerrit.extensions.api.changes.RevisionApi;
@@ -29,7 +30,9 @@
import com.google.gerrit.server.change.Abandon;
import com.google.gerrit.server.change.ChangeJson;
import com.google.gerrit.server.change.ChangeResource;
+import com.google.gerrit.server.change.GetHashtags;
import com.google.gerrit.server.change.GetTopic;
+import com.google.gerrit.server.change.PostHashtags;
import com.google.gerrit.server.change.PostReviewers;
import com.google.gerrit.server.change.PutTopic;
import com.google.gerrit.server.change.Restore;
@@ -42,6 +45,7 @@
import java.io.IOException;
import java.util.EnumSet;
+import java.util.Set;
class ChangeApiImpl extends ChangeApi.NotImplemented implements ChangeApi {
interface Factory {
@@ -57,8 +61,10 @@
private final Restore restore;
private final GetTopic getTopic;
private final PutTopic putTopic;
- private final Provider<PostReviewers> postReviewers;
+ private final PostReviewers postReviewers;
private final Provider<ChangeJson> changeJson;
+ private final PostHashtags postHashtags;
+ private final GetHashtags getHashtags;
@Inject
ChangeApiImpl(Changes changeApi,
@@ -69,8 +75,10 @@
Restore restore,
GetTopic getTopic,
PutTopic putTopic,
- Provider<PostReviewers> postReviewers,
+ PostReviewers postReviewers,
Provider<ChangeJson> changeJson,
+ PostHashtags postHashtags,
+ GetHashtags getHashtags,
@Assisted ChangeResource change) {
this.changeApi = changeApi;
this.revert = revert;
@@ -82,6 +90,8 @@
this.putTopic = putTopic;
this.postReviewers = postReviewers;
this.changeJson = changeJson;
+ this.postHashtags = postHashtags;
+ this.getHashtags = getHashtags;
this.change = change;
}
@@ -178,7 +188,7 @@
@Override
public void addReviewer(AddReviewerInput in) throws RestApiException {
try {
- postReviewers.get().apply(change, in);
+ postReviewers.apply(change, in);
} catch (OrmException | EmailException | IOException e) {
throw new RestApiException("Cannot add change reviewer", e);
}
@@ -204,4 +214,22 @@
public ChangeInfo info() throws RestApiException {
return get(EnumSet.noneOf(ListChangesOption.class));
}
+
+ @Override
+ public void setHashtags(HashtagsInput input) throws RestApiException {
+ try {
+ postHashtags.apply(change, input);
+ } catch (IOException | OrmException e) {
+ throw new RestApiException("Cannot post hashtags", e);
+ }
+ }
+
+ @Override
+ public Set<String> getHashtags() throws RestApiException {
+ try {
+ return getHashtags.apply(change).value();
+ } catch (IOException | OrmException e) {
+ throw new RestApiException("Cannot get hashtags", e);
+ }
+ }
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
index d0c2b98..184f1a8 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
@@ -19,6 +19,7 @@
import com.google.common.util.concurrent.CheckedFuture;
import com.google.gerrit.common.ChangeHooks;
import com.google.gerrit.common.data.LabelTypes;
+import com.google.gerrit.extensions.api.changes.HashtagsInput;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.ChangeMessage;
@@ -29,12 +30,15 @@
import com.google.gerrit.server.ApprovalsUtil;
import com.google.gerrit.server.ChangeMessagesUtil;
import com.google.gerrit.server.ChangeUtil;
+import com.google.gerrit.server.account.AccountCache;
+import com.google.gerrit.server.auth.AuthException;
import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
import com.google.gerrit.server.mail.CreateChangeSender;
import com.google.gerrit.server.notedb.ChangeUpdate;
import com.google.gerrit.server.patch.PatchSetInfoFactory;
import com.google.gerrit.server.project.ChangeControl;
import com.google.gerrit.server.project.RefControl;
+import com.google.gerrit.server.validators.ValidationException;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
@@ -66,6 +70,8 @@
private final ChangeMessagesUtil cmUtil;
private final MergeabilityChecker mergeabilityChecker;
private final CreateChangeSender.Factory createChangeSenderFactory;
+ private final HashtagsUtil hashtagsUtil;
+ private final AccountCache accountCache;
private final RefControl refControl;
private final Change change;
@@ -77,6 +83,7 @@
private Set<Account.Id> reviewers;
private Set<Account.Id> extraCC;
private Map<String, Short> approvals;
+ private Set<String> hashtags;
private boolean runHooks;
private boolean sendMail;
@@ -90,6 +97,8 @@
ChangeMessagesUtil cmUtil,
MergeabilityChecker mergeabilityChecker,
CreateChangeSender.Factory createChangeSenderFactory,
+ HashtagsUtil hashtagsUtil,
+ AccountCache accountCache,
@Assisted RefControl refControl,
@Assisted Change change,
@Assisted RevCommit commit) {
@@ -101,12 +110,15 @@
this.cmUtil = cmUtil;
this.mergeabilityChecker = mergeabilityChecker;
this.createChangeSenderFactory = createChangeSenderFactory;
+ this.hashtagsUtil = hashtagsUtil;
+ this.accountCache = accountCache;
this.refControl = refControl;
this.change = change;
this.commit = commit;
this.reviewers = Collections.emptySet();
this.extraCC = Collections.emptySet();
this.approvals = Collections.emptyMap();
+ this.hashtags = Collections.emptySet();
this.runHooks = true;
this.sendMail = true;
@@ -145,6 +157,11 @@
return this;
}
+ public ChangeInserter setHashtags(Set<String> hashtags) {
+ this.hashtags = hashtags;
+ return this;
+ }
+
public ChangeInserter setRunHooks(boolean runHooks) {
this.runHooks = runHooks;
return this;
@@ -191,7 +208,19 @@
} finally {
db.rollback();
}
+
update.commit();
+
+ if (hashtags != null && hashtags.size() > 0) {
+ try {
+ HashtagsInput input = new HashtagsInput();
+ input.add = hashtags;
+ hashtagsUtil.setHashtags(ctl, input, false, false);
+ } catch (ValidationException | AuthException e) {
+ log.error("Cannot add hashtags to change " + change.getId(), e);
+ }
+ }
+
CheckedFuture<?, IOException> f = mergeabilityChecker.newCheck()
.addChange(change)
.reindex()
@@ -221,6 +250,11 @@
if (runHooks) {
hooks.doPatchsetCreatedHook(change, patchSet, db);
+ if (hashtags != null && hashtags.size() > 0) {
+ hooks.doHashtagsChangedHook(change,
+ accountCache.get(change.getOwner()).getAccount(),
+ hashtags, null, hashtags, db);
+ }
}
return change;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
index 7b5e412..e6b36e5 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
@@ -126,7 +126,7 @@
private final DynamicMap<DownloadCommand> downloadCommands;
private final DynamicMap<RestView<ChangeResource>> changeViews;
private final Revisions revisions;
- private final Provider<WebLinks> webLinks;
+ private final WebLinks webLinks;
private final EnumSet<ListChangesOption> options;
private final ChangeMessagesUtil cmUtil;
private final PatchLineCommentsUtil plcUtil;
@@ -149,7 +149,7 @@
DynamicMap<DownloadCommand> downloadCommands,
DynamicMap<RestView<ChangeResource>> changeViews,
Revisions revisions,
- Provider<WebLinks> webLinks,
+ WebLinks webLinks,
ChangeMessagesUtil cmUtil,
PatchLineCommentsUtil plcUtil) {
this.db = db;
@@ -844,7 +844,7 @@
if (has(WEB_LINKS)) {
out.webLinks = Lists.newArrayList();
- for (WebLinkInfo link : webLinks.get().getPatchSetLinks(
+ for (WebLinkInfo link : webLinks.getPatchSetLinks(
project, in.getRevision().get())) {
out.webLinks.add(link);
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/EmailReviewComments.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/EmailReviewComments.java
index bc38039..6330e34 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/EmailReviewComments.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/EmailReviewComments.java
@@ -32,6 +32,7 @@
import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Inject;
+import com.google.inject.OutOfScopeException;
import com.google.inject.Provider;
import com.google.inject.ProvisionException;
import com.google.inject.assistedinject.Assisted;
@@ -152,7 +153,7 @@
@Override
public CurrentUser getCurrentUser() {
- return null;
+ throw new OutOfScopeException("No user on email thread");
}
@Override
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java
index f18481e..9efe8dc 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java
@@ -47,8 +47,6 @@
import com.google.gerrit.server.project.ProjectState;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
-import com.google.inject.Provider;
-
import org.eclipse.jgit.diff.Edit;
import org.eclipse.jgit.diff.ReplaceEdit;
import org.kohsuke.args4j.CmdLineException;
@@ -69,7 +67,7 @@
private final ProjectCache projectCache;
private final PatchScriptFactory.Factory patchScriptFactoryFactory;
private final Revisions revisions;
- private final Provider<WebLinks> webLinks;
+ private final WebLinks webLinks;
@Option(name = "--base", metaVar = "REVISION")
String base;
@@ -87,7 +85,7 @@
GetDiff(ProjectCache projectCache,
PatchScriptFactory.Factory patchScriptFactoryFactory,
Revisions revisions,
- Provider<WebLinks> webLinks) {
+ WebLinks webLinks) {
this.projectCache = projectCache;
this.patchScriptFactoryFactory = patchScriptFactoryFactory;
this.revisions = revisions;
@@ -206,7 +204,7 @@
private List<WebLinkInfo> getFileWebLinks(Project project, String rev,
String file) {
List<WebLinkInfo> fileWebLinks = new ArrayList<>();
- for (WebLinkInfo link : webLinks.get().getPatchLinks(project.getName(),
+ for (WebLinkInfo link : webLinks.getFileLinks(project.getName(),
rev, file)) {
if (!Strings.isNullOrEmpty(link.name) && !Strings.isNullOrEmpty(link.url)) {
fileWebLinks.add(link);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetHashtags.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetHashtags.java
index dc4ffb0..4846c0b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetHashtags.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetHashtags.java
@@ -14,7 +14,6 @@
package com.google.gerrit.server.change;
-import com.google.common.collect.ImmutableSet;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.Response;
@@ -25,8 +24,8 @@
import com.google.inject.Singleton;
import java.io.IOException;
+import java.util.Collections;
import java.util.Set;
-import java.util.TreeSet;
@Singleton
public class GetHashtags implements RestReadView<ChangeResource> {
@@ -38,8 +37,8 @@
ChangeNotes notes = control.getNotes().load();
Set<String> hashtags = notes.getHashtags();
if (hashtags == null) {
- hashtags = ImmutableSet.of();
+ hashtags = Collections.emptySet();
}
- return Response.ok(new TreeSet<String>(hashtags));
+ return Response.ok(hashtags);
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetRelated.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetRelated.java
index 4834950..077ec6f1 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetRelated.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetRelated.java
@@ -127,9 +127,7 @@
if (list.size() == 1) {
ChangeAndCommit r = list.get(0);
- if (r._changeNumber != null && r._revisionNumber != null
- && r._changeNumber == rsrc.getChange().getChangeId()
- && r._revisionNumber == rsrc.getPatchSet().getPatchSetId()) {
+ if (r.commit != null && r.commit.commit.equals(rsrc.getPatchSet().getRevision().get())) {
return Collections.emptyList();
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/HashtagsUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/HashtagsUtil.java
new file mode 100644
index 0000000..f7d7125
--- /dev/null
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/HashtagsUtil.java
@@ -0,0 +1,140 @@
+// Copyright (C) 2014 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.server.change;
+
+import static com.google.common.base.CharMatcher.WHITESPACE;
+
+import com.google.common.base.CharMatcher;
+import com.google.gerrit.common.ChangeHooks;
+import com.google.gerrit.extensions.api.changes.HashtagsInput;
+import com.google.gerrit.extensions.registration.DynamicSet;
+import com.google.gerrit.reviewdb.server.ReviewDb;
+import com.google.gerrit.server.IdentifiedUser;
+import com.google.gerrit.server.auth.AuthException;
+import com.google.gerrit.server.index.ChangeIndexer;
+import com.google.gerrit.server.notedb.ChangeNotes;
+import com.google.gerrit.server.notedb.ChangeUpdate;
+import com.google.gerrit.server.project.ChangeControl;
+import com.google.gerrit.server.validators.HashtagValidationListener;
+import com.google.gerrit.server.validators.ValidationException;
+import com.google.gwtorm.server.OrmException;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.Singleton;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.TreeSet;
+
+@Singleton
+public class HashtagsUtil {
+ private static final CharMatcher LEADER = WHITESPACE.or(CharMatcher.is('#'));
+
+ private final ChangeUpdate.Factory updateFactory;
+ private final Provider<ReviewDb> dbProvider;
+ private final ChangeIndexer indexer;
+ private final ChangeHooks hooks;
+ private final DynamicSet<HashtagValidationListener> hashtagValidationListeners;
+
+ @Inject
+ HashtagsUtil(ChangeUpdate.Factory updateFactory,
+ Provider<ReviewDb> dbProvider, ChangeIndexer indexer,
+ ChangeHooks hooks,
+ DynamicSet<HashtagValidationListener> hashtagValidationListeners) {
+ this.updateFactory = updateFactory;
+ this.dbProvider = dbProvider;
+ this.indexer = indexer;
+ this.hooks = hooks;
+ this.hashtagValidationListeners = hashtagValidationListeners;
+ }
+
+ public static String cleanupHashtag(String hashtag) {
+ hashtag = LEADER.trimLeadingFrom(hashtag);
+ hashtag = WHITESPACE.trimTrailingFrom(hashtag);
+ return hashtag.toLowerCase();
+ }
+
+ private Set<String> extractTags(Set<String> input)
+ throws IllegalArgumentException {
+ if (input == null) {
+ return Collections.emptySet();
+ } else {
+ HashSet<String> result = new HashSet<>();
+ for (String hashtag : input) {
+ if (hashtag.contains(",")) {
+ throw new IllegalArgumentException("Hashtags may not contain commas");
+ }
+ hashtag = cleanupHashtag(hashtag);
+ if (!hashtag.isEmpty()) {
+ result.add(hashtag);
+ }
+ }
+ return result;
+ }
+ }
+
+ public TreeSet<String> setHashtags(ChangeControl control,
+ HashtagsInput input, boolean runHooks, boolean index)
+ throws IllegalArgumentException, IOException,
+ ValidationException, AuthException, OrmException {
+ if (input == null
+ || (input.add == null && input.remove == null)) {
+ throw new IllegalArgumentException("Hashtags are required");
+ }
+
+ if (!control.canEditHashtags()) {
+ throw new AuthException("Editing hashtags not permitted");
+ }
+ ChangeUpdate update = updateFactory.create(control);
+ ChangeNotes notes = control.getNotes().load();
+
+ Set<String> existingHashtags = notes.getHashtags();
+ Set<String> updatedHashtags = new HashSet<>();
+ Set<String> toAdd = new HashSet<>(extractTags(input.add));
+ Set<String> toRemove = new HashSet<>(extractTags(input.remove));
+
+ for (HashtagValidationListener validator : hashtagValidationListeners) {
+ validator.validateHashtags(update.getChange(), toAdd, toRemove);
+ }
+
+ if (existingHashtags != null && !existingHashtags.isEmpty()) {
+ updatedHashtags.addAll(existingHashtags);
+ toAdd.removeAll(existingHashtags);
+ toRemove.retainAll(existingHashtags);
+ }
+
+ if (toAdd.size() > 0 || toRemove.size() > 0) {
+ updatedHashtags.addAll(toAdd);
+ updatedHashtags.removeAll(toRemove);
+ update.setHashtags(updatedHashtags);
+ update.commit();
+
+ if (index) {
+ indexer.index(dbProvider.get(), update.getChange());
+ }
+
+ if (runHooks) {
+ IdentifiedUser currentUser = ((IdentifiedUser) control.getCurrentUser());
+ hooks.doHashtagsChangedHook(
+ update.getChange(), currentUser.getAccount(),
+ toAdd, toRemove, updatedHashtags,
+ dbProvider.get());
+ }
+ }
+ return new TreeSet<String>(updatedHashtags);
+ }
+}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostHashtags.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostHashtags.java
index d7671b7..fee457c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostHashtags.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostHashtags.java
@@ -14,128 +14,43 @@
package com.google.gerrit.server.change;
-import com.google.common.collect.ImmutableSet;
-import com.google.gerrit.common.ChangeHooks;
-import com.google.gerrit.extensions.registration.DynamicSet;
+import com.google.gerrit.extensions.api.changes.HashtagsInput;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.BadRequestException;
-import com.google.gerrit.extensions.restapi.DefaultInput;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.extensions.restapi.Response;
import com.google.gerrit.extensions.restapi.RestModifyView;
-import com.google.gerrit.reviewdb.server.ReviewDb;
-import com.google.gerrit.server.change.PostHashtags.Input;
-import com.google.gerrit.server.IdentifiedUser;
-import com.google.gerrit.server.index.ChangeIndexer;
-import com.google.gerrit.server.notedb.ChangeNotes;
-import com.google.gerrit.server.notedb.ChangeUpdate;
-import com.google.gerrit.server.project.ChangeControl;
-import com.google.gerrit.server.validators.HashtagValidationListener;
import com.google.gerrit.server.validators.ValidationException;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
-import com.google.inject.Provider;
import com.google.inject.Singleton;
import java.io.IOException;
-import java.util.HashSet;
import java.util.Set;
-import java.util.TreeSet;
@Singleton
-public class PostHashtags implements RestModifyView<ChangeResource, Input> {
- private final ChangeUpdate.Factory updateFactory;
- private final Provider<ReviewDb> dbProvider;
- private final ChangeIndexer indexer;
- private final ChangeHooks hooks;
- private final DynamicSet<HashtagValidationListener> hashtagValidationListeners;
-
- public static class Input {
- @DefaultInput
- public Set<String> add;
- public Set<String> remove;
- }
+public class PostHashtags implements RestModifyView<ChangeResource, HashtagsInput> {
+ private HashtagsUtil hashtagsUtil;
@Inject
- PostHashtags(ChangeUpdate.Factory updateFactory,
- Provider<ReviewDb> dbProvider, ChangeIndexer indexer,
- ChangeHooks hooks,
- DynamicSet<HashtagValidationListener> hashtagValidationListeners) {
- this.updateFactory = updateFactory;
- this.dbProvider = dbProvider;
- this.indexer = indexer;
- this.hooks = hooks;
- this.hashtagValidationListeners = hashtagValidationListeners;
- }
-
- private Set<String> extractTags(Set<String> input)
- throws BadRequestException {
- if (input == null) {
- return ImmutableSet.of();
- } else {
- HashSet<String> result = new HashSet<>();
- for (String hashtag : input) {
- if (hashtag.contains(",")) {
- throw new BadRequestException("Hashtags may not contain commas");
- }
- if (!hashtag.trim().isEmpty()) {
- result.add(hashtag.trim());
- }
- }
- return result;
- }
+ PostHashtags(HashtagsUtil hashtagsUtil) {
+ this.hashtagsUtil = hashtagsUtil;
}
@Override
- public Response<? extends Set<String>> apply(ChangeResource req, Input input)
+ public Response<? extends Set<String>> apply(ChangeResource req, HashtagsInput input)
throws AuthException, OrmException, IOException, BadRequestException,
ResourceConflictException {
- if (input == null
- || (input.add == null && input.remove == null)) {
- throw new BadRequestException("Hashtags are required");
+
+ try {
+ return Response.ok(hashtagsUtil.setHashtags(
+ req.getControl(), input, true, true));
+ } catch (IllegalArgumentException e) {
+ throw new BadRequestException(e.getMessage());
+ } catch (ValidationException e) {
+ throw new ResourceConflictException(e.getMessage());
+ } catch (com.google.gerrit.server.auth.AuthException e) {
+ throw new AuthException(e.getMessage());
}
-
- ChangeControl control = req.getControl();
- if (!control.canEditHashtags()) {
- throw new AuthException("Editing hashtags not permitted");
- }
- ChangeUpdate update = updateFactory.create(control);
- ChangeNotes notes = control.getNotes().load();
-
- Set<String> existingHashtags = notes.getHashtags();
- Set<String> updatedHashtags = new HashSet<>();
- Set<String> toAdd = new HashSet<>(extractTags(input.add));
- Set<String> toRemove = new HashSet<>(extractTags(input.remove));
-
- for (HashtagValidationListener validator : hashtagValidationListeners) {
- try {
- validator.validateHashtags(req.getChange(), toAdd, toRemove);
- } catch (ValidationException e) {
- throw new ResourceConflictException(e.getMessage(), e);
- }
- }
-
- if (existingHashtags != null && !existingHashtags.isEmpty()) {
- updatedHashtags.addAll(existingHashtags);
- toAdd.removeAll(existingHashtags);
- toRemove.retainAll(existingHashtags);
- }
-
- if (toAdd.size() > 0 || toRemove.size() > 0) {
- updatedHashtags.addAll(toAdd);
- updatedHashtags.removeAll(toRemove);
- update.setHashtags(updatedHashtags);
- update.commit();
-
- indexer.index(dbProvider.get(), update.getChange());
-
- IdentifiedUser currentUser = ((IdentifiedUser) control.getCurrentUser());
- hooks.doHashtagsChangedHook(
- req.getChange(), currentUser.getAccount(),
- toAdd, toRemove, updatedHashtags,
- dbProvider.get());
- }
-
- return Response.ok(new TreeSet<String>(updatedHashtags));
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java
index 6d2db2a..8e06229 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java
@@ -33,8 +33,8 @@
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.systemstatus.MessageOfTheDay;
import com.google.gerrit.extensions.webui.BranchWebLink;
-import com.google.gerrit.extensions.webui.PatchSetWebLink;
import com.google.gerrit.extensions.webui.FileWebLink;
+import com.google.gerrit.extensions.webui.PatchSetWebLink;
import com.google.gerrit.extensions.webui.ProjectWebLink;
import com.google.gerrit.extensions.webui.TopMenu;
import com.google.gerrit.reviewdb.client.AccountGroup;
@@ -47,8 +47,6 @@
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.MimeUtilFileTypeRegistry;
import com.google.gerrit.server.PluginUser;
-import com.google.gerrit.server.WebLinks;
-import com.google.gerrit.server.WebLinksProvider;
import com.google.gerrit.server.account.AccountByEmailCacheImpl;
import com.google.gerrit.server.account.AccountCacheImpl;
import com.google.gerrit.server.account.AccountControl;
@@ -237,7 +235,6 @@
.in(SINGLETON);
bind(FromAddressGenerator.class).toProvider(
FromAddressGeneratorProvider.class).in(SINGLETON);
- bind(WebLinks.class).toProvider(WebLinksProvider.class).in(SINGLETON);
bind(Boolean.class).annotatedWith(DisableReverseDnsLookup.class)
.toProvider(DisableReverseDnsLookupProvider.class).in(SINGLETON);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditUtil.java
index d74a314f..3767b32 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditUtil.java
@@ -27,6 +27,7 @@
import com.google.gerrit.reviewdb.client.RevId;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.ChangeUtil;
+import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.change.PatchSetInserter;
import com.google.gerrit.server.git.GitRepositoryManager;
@@ -63,14 +64,14 @@
private final PatchSetInserter.Factory patchSetInserterFactory;
private final ChangeControl.GenericFactory changeControlFactory;
private final Provider<ReviewDb> db;
- private final Provider<IdentifiedUser> user;
+ private final Provider<CurrentUser> user;
@Inject
ChangeEditUtil(GitRepositoryManager gitManager,
PatchSetInserter.Factory patchSetInserterFactory,
ChangeControl.GenericFactory changeControlFactory,
Provider<ReviewDb> db,
- Provider<IdentifiedUser> user) {
+ Provider<CurrentUser> user) {
this.gitManager = gitManager;
this.patchSetInserterFactory = patchSetInserterFactory;
this.changeControlFactory = changeControlFactory;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/CommitMergeStatus.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/CommitMergeStatus.java
index 4c3e5f4..f421dcb 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/CommitMergeStatus.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/CommitMergeStatus.java
@@ -16,7 +16,7 @@
public enum CommitMergeStatus {
/** */
- CLEAN_MERGE("Change has been successfully merged into the git repository."),
+ CLEAN_MERGE("Change has been successfully merged into the git repository"),
/** */
CLEAN_PICK("Change has been successfully cherry-picked"),
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
index 1b2a023..8eb0bbb 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
@@ -668,6 +668,14 @@
return account;
}
+ private String getByAccountName(CodeReviewCommit codeReviewCommit) {
+ Account account = getAccount(codeReviewCommit);
+ if (account != null && account.getFullName() != null) {
+ return " by " + account.getFullName();
+ }
+ return "";
+ }
+
private void updateChangeStatus(final List<Change> submitted) throws NoSuchChangeException {
for (final Change c : submitted) {
final CodeReviewCommit commit = commits.get(c.getId());
@@ -684,12 +692,13 @@
try {
switch (s) {
case CLEAN_MERGE:
- setMerged(c, message(c, txt));
+ setMerged(c, message(c, txt + getByAccountName(commit)));
break;
case CLEAN_REBASE:
case CLEAN_PICK:
- setMerged(c, message(c, txt + " as " + commit.name()));
+ setMerged(c, message(c, txt + " as " + commit.name()
+ + getByAccountName(commit)));
break;
case ALREADY_MERGED:
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
index 2bfdaa7..c805bb8 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
@@ -15,6 +15,7 @@
package com.google.gerrit.server.git;
import static com.google.gerrit.reviewdb.client.RefNames.REFS_CHANGES;
+import static com.google.gerrit.server.change.HashtagsUtil.cleanupHashtag;
import static com.google.gerrit.server.git.MultiProgressMonitor.UNKNOWN;
import static com.google.gerrit.server.mail.MailUtil.getRecipientsFromFooters;
import static com.google.gerrit.server.mail.MailUtil.getRecipientsFromReviewers;
@@ -99,7 +100,9 @@
import com.google.gerrit.server.mail.MailUtil.MailRecipients;
import com.google.gerrit.server.mail.MergedSender;
import com.google.gerrit.server.mail.ReplacePatchSetSender;
+import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.notedb.ChangeUpdate;
+import com.google.gerrit.server.notedb.NotesMigration;
import com.google.gerrit.server.patch.PatchSetInfoFactory;
import com.google.gerrit.server.project.ChangeControl;
import com.google.gerrit.server.project.NoSuchChangeException;
@@ -328,6 +331,7 @@
private final Provider<Submit> submitProvider;
private final MergeQueue mergeQueue;
private final DynamicMap<ProjectConfigEntry> pluginConfigEntries;
+ private final NotesMigration notesMigration;
private final List<CommitValidationMessage> messages = new ArrayList<>();
private ListMultimap<Error, String> errors = LinkedListMultimap.create();
@@ -378,7 +382,8 @@
final Provider<Submit> submitProvider,
final MergeQueue mergeQueue,
final ChangeKindCache changeKindCache,
- final DynamicMap<ProjectConfigEntry> pluginConfigEntries) throws IOException {
+ final DynamicMap<ProjectConfigEntry> pluginConfigEntries,
+ final NotesMigration notesMigration) throws IOException {
this.currentUser = (IdentifiedUser) projectControl.getCurrentUser();
this.db = db;
this.changeDataFactory = changeDataFactory;
@@ -424,6 +429,7 @@
this.submitProvider = submitProvider;
this.mergeQueue = mergeQueue;
this.pluginConfigEntries = pluginConfigEntries;
+ this.notesMigration = notesMigration;
this.messageSender = new ReceivePackMessageSender();
@@ -1110,6 +1116,8 @@
List<RevCommit> baseCommit;
LabelTypes labelTypes;
CmdLineParser clp;
+ Set<String> hashtags = new HashSet<>();
+ NotesMigration notesMigration;
@Option(name = "--base", metaVar = "BASE", usage = "merge base of changes")
List<ObjectId> base;
@@ -1151,10 +1159,26 @@
labels.put(v.getLabel(), v.getValue());
}
- MagicBranchInput(ReceiveCommand cmd, LabelTypes labelTypes) {
+ @Option(name = "--hashtag", aliases = {"-t"}, metaVar = "HASHTAG",
+ usage = "add hashtag to changes")
+ void addHashtag(String token) throws CmdLineException {
+ if (!notesMigration.enabled()) {
+ throw clp.reject("cannot add hashtags; noteDb is disabled");
+ }
+ String hashtag = cleanupHashtag(token);
+ if (!hashtag.isEmpty()) {
+ hashtags.add(hashtag);
+ }
+ //TODO(dpursehouse): validate hashtags
+ }
+
+ @Inject
+ MagicBranchInput(ReceiveCommand cmd, LabelTypes labelTypes,
+ NotesMigration notesMigration) {
this.cmd = cmd;
this.draft = cmd.getRefName().startsWith(MagicBranch.NEW_DRAFT_CHANGE);
this.labelTypes = labelTypes;
+ this.notesMigration = notesMigration;
}
boolean isDraft() {
@@ -1169,6 +1193,10 @@
return new MailRecipients(reviewer, cc);
}
+ Set<String> getHashtags() {
+ return hashtags;
+ }
+
Map<String, Short> getLabels() {
return labels;
}
@@ -1228,7 +1256,7 @@
return;
}
- magicBranch = new MagicBranchInput(cmd, labelTypes);
+ magicBranch = new MagicBranchInput(cmd, labelTypes, notesMigration);
magicBranch.reviewer.addAll(reviewersFromCommandLine);
magicBranch.cc.addAll(ccFromCommandLine);
@@ -1679,6 +1707,7 @@
if (magicBranch != null) {
recipients.add(magicBranch.getMailRecipients());
approvals = magicBranch.getLabels();
+ ins.setHashtags(magicBranch.getHashtags());
}
recipients.add(getRecipientsFromFooters(accountResolver, ps, footerLines));
recipients.remove(me);
@@ -2037,14 +2066,23 @@
final List<FooterLine> footerLines = newCommit.getFooterLines();
final MailRecipients recipients = new MailRecipients();
Map<String, Short> approvals = new HashMap<>();
+ ChangeUpdate update = updateFactory.create(
+ changeCtl, newPatchSet.getCreatedOn());
+ update.setPatchSetId(newPatchSet.getId());
+
if (magicBranch != null) {
recipients.add(magicBranch.getMailRecipients());
approvals = magicBranch.getLabels();
+ Set<String> hashtags = magicBranch.getHashtags();
+ if (!hashtags.isEmpty()) {
+ ChangeNotes notes = changeCtl.getNotes().load();
+ hashtags.addAll(notes.getHashtags());
+ update.setHashtags(hashtags);
+ }
}
recipients.add(getRecipientsFromFooters(accountResolver, newPatchSet, footerLines));
recipients.remove(me);
- ChangeUpdate update = updateFactory.create(changeCtl, newPatchSet.getCreatedOn());
db.changes().beginTransaction(change.getId());
try {
change = db.changes().get(change.getId());
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java
index 2d5d4ad..d89651b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java
@@ -24,6 +24,7 @@
import com.google.common.collect.ImmutableListMultimap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.Ordering;
import com.google.common.collect.Table;
import com.google.common.primitives.Ints;
@@ -165,8 +166,12 @@
return reviewers;
}
+ /**
+ *
+ * @return a ImmutableSet of all hashtags for this change sorted in alphabetical order.
+ */
public ImmutableSet<String> getHashtags() {
- return hashtags;
+ return ImmutableSortedSet.copyOf(hashtags);
}
/**
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeUpdate.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeUpdate.java
index 1e9e4dd..5647639 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeUpdate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeUpdate.java
@@ -37,7 +37,6 @@
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.GerritPersonIdent;
-import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.config.AllUsersName;
import com.google.gerrit.server.config.AnonymousCowardName;
@@ -115,7 +114,6 @@
Provider<AllUsersName> allUsers,
ChangeDraftUpdate.Factory draftUpdateFactory,
ProjectCache projectCache,
- IdentifiedUser user,
@Assisted ChangeControl ctl,
CommentsInNotesUtil commentsUtil) {
this(serverIdent, anonymousCowardName, repoManager, migration, accountCache,
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java
index ba31805..01e705a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java
@@ -29,7 +29,6 @@
import com.google.gerrit.server.extensions.webui.UiActions;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.inject.Inject;
-import com.google.inject.Provider;
import com.google.inject.Singleton;
import com.google.inject.util.Providers;
@@ -51,12 +50,12 @@
public class ListBranches implements RestReadView<ProjectResource> {
private final GitRepositoryManager repoManager;
private final DynamicMap<RestView<BranchResource>> branchViews;
- private final Provider<WebLinks> webLinks;
+ private final WebLinks webLinks;
@Inject
public ListBranches(GitRepositoryManager repoManager,
DynamicMap<RestView<BranchResource>> branchViews,
- Provider<WebLinks> webLinks) {
+ WebLinks webLinks) {
this.repoManager = repoManager;
this.branchViews = branchViews;
this.webLinks = webLinks;
@@ -169,7 +168,7 @@
info.actions.put(d.getId(), new ActionInfo(d));
}
info.webLinks = Lists.newArrayList();
- for (WebLinkInfo link : webLinks.get().getBranchLinks(
+ for (WebLinkInfo link : webLinks.getBranchLinks(
refControl.getProjectControl().getProject().getName(), ref.getName())) {
if (!Strings.isNullOrEmpty(link.name) && !Strings.isNullOrEmpty(link.url)) {
info.webLinks.add(link);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java
index ad9636e..6fd7d16 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java
@@ -43,8 +43,6 @@
import com.google.gerrit.server.util.TreeFormatter;
import com.google.gson.reflect.TypeToken;
import com.google.inject.Inject;
-import com.google.inject.Provider;
-
import org.eclipse.jgit.errors.RepositoryNotFoundException;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Ref;
@@ -112,7 +110,7 @@
private final GroupControl.Factory groupControlFactory;
private final GitRepositoryManager repoManager;
private final ProjectNode.Factory projectNodeFactory;
- private final Provider<WebLinks> webLinks;
+ private final WebLinks webLinks;
@Deprecated
@Option(name = "--format", usage = "(deprecated) output format")
@@ -193,7 +191,7 @@
protected ListProjects(CurrentUser currentUser, ProjectCache projectCache,
GroupCache groupCache, GroupControl.Factory groupControlFactory,
GitRepositoryManager repoManager, ProjectNode.Factory projectNodeFactory,
- Provider<WebLinks> webLinks) {
+ WebLinks webLinks) {
this.currentUser = currentUser;
this.projectCache = projectCache;
this.groupCache = groupCache;
@@ -385,7 +383,7 @@
}
info.webLinks = Lists.newArrayList();
- for (WebLinkInfo link : webLinks.get().getProjectLinks(projectName.get())) {
+ for (WebLinkInfo link : webLinks.getProjectLinks(projectName.get())) {
if (!Strings.isNullOrEmpty(link.name) && !Strings.isNullOrEmpty(link.url)) {
info.webLinks.add(link);
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectJson.java
index 4cafc0a..5ff0448 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectJson.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectJson.java
@@ -24,18 +24,17 @@
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.config.AllProjectsNameProvider;
import com.google.inject.Inject;
-import com.google.inject.Provider;
import com.google.inject.Singleton;
@Singleton
public class ProjectJson {
private final AllProjectsName allProjects;
- private final Provider<WebLinks> webLinks;
+ private final WebLinks webLinks;
@Inject
ProjectJson(AllProjectsNameProvider allProjectsNameProvider,
- Provider<WebLinks> webLinks) {
+ WebLinks webLinks) {
this.allProjects = allProjectsNameProvider.get();
this.webLinks = webLinks;
}
@@ -54,7 +53,7 @@
info.id = Url.encode(info.name);
info.webLinks = Lists.newArrayList();
- for (WebLinkInfo link : webLinks.get().getProjectLinks(p.getName())) {
+ for (WebLinkInfo link : webLinks.getProjectLinks(p.getName())) {
if (!Strings.isNullOrEmpty(link.name) && !Strings.isNullOrEmpty(link.url)) {
info.webLinks.add(link);
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/HashtagPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/HashtagPredicate.java
index dfc0b22..ea591ec 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/HashtagPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/HashtagPredicate.java
@@ -14,13 +14,14 @@
package com.google.gerrit.server.query.change;
+import com.google.gerrit.server.change.HashtagsUtil;
import com.google.gerrit.server.index.ChangeField;
import com.google.gerrit.server.index.IndexPredicate;
import com.google.gwtorm.server.OrmException;
class HashtagPredicate extends IndexPredicate<ChangeData> {
HashtagPredicate(String hashtag) {
- super(ChangeField.HASHTAG, hashtag.toLowerCase());
+ super(ChangeField.HASHTAG, HashtagsUtil.cleanupHashtag(hashtag));
}
@Override
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java
index 11479cc..bd1f8e8 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java
@@ -32,7 +32,7 @@
/** A version of the database schema. */
public abstract class SchemaVersion {
/** The current schema version. */
- public static final Class<Schema_98> C = Schema_98.class;
+ public static final Class<Schema_99> C = Schema_99.class;
public static class Module extends AbstractModule {
@Override
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_99.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_99.java
new file mode 100644
index 0000000..b7fab7f
--- /dev/null
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_99.java
@@ -0,0 +1,25 @@
+// Copyright (C) 2014 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.server.schema;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+
+public class Schema_99 extends SchemaVersion {
+ @Inject
+ Schema_99(Provider<Schema_98> prior) {
+ super(prior);
+ }
+}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/MostSpecificComparator.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/MostSpecificComparator.java
index 804a7ec..1cb180b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/util/MostSpecificComparator.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/MostSpecificComparator.java
@@ -28,7 +28,7 @@
* name and the regex string shortest example. A shorter distance is a more
* specific match.
* <li>2 - Finites first, infinities after.
- * <li>3 - Number of transitions.
+ * <li>3 - Number of transitions. More transitions is more specific.
* <li>4 - Length of the expression text.
* </ul>
*
@@ -72,7 +72,7 @@
}
}
if (cmp == 0) {
- cmp = transitions(pattern1) - transitions(pattern2);
+ cmp = transitions(pattern2) - transitions(pattern1);
}
if (cmp == 0) {
cmp = pattern2.length() - pattern1.length();
@@ -86,7 +86,7 @@
example = RefControl.shortestExample(pattern);
} else if (pattern.endsWith("/*")) {
- example = pattern.substring(0, pattern.length() - 1) + '1';
+ example = pattern;
} else if (pattern.equals(refName)) {
return 0;
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
index c9fdfbd..4181c14 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
@@ -21,13 +21,18 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import com.google.common.hash.Hashing;
import com.google.gerrit.common.Nullable;
+import com.google.gerrit.extensions.api.GerritApi;
+import com.google.gerrit.extensions.api.changes.HashtagsInput;
import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.extensions.api.projects.ProjectInput;
import com.google.gerrit.extensions.restapi.BadRequestException;
@@ -48,12 +53,14 @@
import com.google.gerrit.server.change.ChangesCollection;
import com.google.gerrit.server.change.PostReview;
import com.google.gerrit.server.change.RevisionResource;
+import com.google.gerrit.server.notedb.NotesMigration;
import com.google.gerrit.server.project.CreateProject;
import com.google.gerrit.server.project.ProjectControl;
import com.google.gerrit.server.schema.SchemaCreator;
import com.google.gerrit.server.util.RequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestContext;
import com.google.gerrit.server.util.TimeUtil;
+import com.google.gerrit.testutil.ConfigSuite;
import com.google.gerrit.testutil.InMemoryDatabase;
import com.google.gerrit.testutil.InMemoryRepositoryManager;
import com.google.inject.Inject;
@@ -63,6 +70,7 @@
import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
import org.eclipse.jgit.junit.TestRepository;
+import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.revwalk.RevCommit;
import org.joda.time.DateTime;
import org.joda.time.DateTimeUtils;
@@ -71,21 +79,31 @@
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.runner.RunWith;
import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
@Ignore
+@RunWith(ConfigSuite.class)
public abstract class AbstractQueryChangesTest {
private static final TopLevelResource TLR = TopLevelResource.INSTANCE;
+ @ConfigSuite.Config
+ public static Config noteDbEnabled() {
+ return NotesMigration.allEnabledConfig();
+ }
+
+ @ConfigSuite.Parameter public Config config;
@Inject protected AccountManager accountManager;
@Inject protected ChangeInserter.Factory changeFactory;
@Inject protected ChangesCollection changes;
@Inject protected CreateProject.Factory projectFactory;
+ @Inject protected GerritApi gApi;
@Inject protected IdentifiedUser.RequestFactory userFactory;
@Inject protected InMemoryDatabase schemaFactory;
@Inject protected InMemoryRepositoryManager repoManager;
+ @Inject protected NotesMigration notesMigration;
@Inject protected PostReview postReview;
@Inject protected ProjectControl.GenericFactory projectControlFactory;
@Inject protected Provider<QueryChanges> queryProvider;
@@ -896,6 +914,50 @@
}
}
+ private List<Change> setUpHashtagChanges() throws Exception {
+ TestRepository<InMemoryRepository> repo = createProject("repo");
+ Change change1 = newChange(repo, null, null, null, null).insert();
+ Change change2 = newChange(repo, null, null, null, null).insert();
+
+ HashtagsInput in = new HashtagsInput();
+ in.add = ImmutableSet.of("foo");
+ gApi.changes().id(change1.getId().get()).setHashtags(in);
+
+ in.add = ImmutableSet.of("foo", "bar", "a tag");
+ gApi.changes().id(change2.getId().get()).setHashtags(in);
+
+ return ImmutableList.of(change1, change2);
+ }
+
+ @Test
+ public void byHashtagWithNotedb() throws Exception {
+ assumeTrue("notedb disabled", notesMigration.enabled());
+ List<Change> changes = setUpHashtagChanges();
+ List<ChangeInfo> results = query("hashtag:foo");
+ assertEquals(2, results.size());
+ assertResultEquals(changes.get(1), results.get(0));
+ assertResultEquals(changes.get(0), results.get(1));
+ assertResultEquals(changes.get(1), queryOne("hashtag:bar"));
+ assertResultEquals(changes.get(1), queryOne("hashtag:\"a tag\""));
+ assertResultEquals(changes.get(1), queryOne("hashtag:\"a tag \""));
+ assertResultEquals(changes.get(1), queryOne("hashtag:\" a tag \""));
+ assertResultEquals(changes.get(1), queryOne("hashtag:\"#a tag\""));
+ assertResultEquals(changes.get(1), queryOne("hashtag:\"# #a tag\""));
+ }
+
+ @Test
+ public void byHashtagWithoutNotedb() throws Exception {
+ assumeFalse("notedb enabled", notesMigration.enabled());
+ setUpHashtagChanges();
+ assertTrue(query("hashtag:foo").isEmpty());
+ assertTrue(query("hashtag:bar").isEmpty());
+ assertTrue(query("hashtag:\" bar \"").isEmpty());
+ assertTrue(query("hashtag:\"a tag\"").isEmpty());
+ assertTrue(query("hashtag:\" a tag \"").isEmpty());
+ assertTrue(query("hashtag:#foo").isEmpty());
+ assertTrue(query("hashtag:\"# #foo\"").isEmpty());
+ }
+
@Test
public void byDefault() throws Exception {
TestRepository<InMemoryRepository> repo = createProject("repo");
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/LuceneQueryChangesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/LuceneQueryChangesTest.java
index 1c75487..d1e21df 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/LuceneQueryChangesTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/LuceneQueryChangesTest.java
@@ -22,13 +22,16 @@
import com.google.inject.Injector;
import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
+import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.junit.Test;
public class LuceneQueryChangesTest extends AbstractQueryChangesTest {
protected Injector createInjector() {
- return Guice.createInjector(new InMemoryModule());
+ Config luceneConfig = new Config(config);
+ InMemoryModule.setDefaults(luceneConfig);
+ return Guice.createInjector(new InMemoryModule(luceneConfig));
}
@Test
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/util/MostSpecificComparatorTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/util/MostSpecificComparatorTest.java
new file mode 100644
index 0000000..e974f1f
--- /dev/null
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/util/MostSpecificComparatorTest.java
@@ -0,0 +1,80 @@
+// Copyright (C) 2014 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.server.util;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class MostSpecificComparatorTest {
+
+ private MostSpecificComparator cmp;
+
+ @Test
+ public void shorterDistanceWins() {
+ cmp = new MostSpecificComparator("refs/heads/master");
+ moreSpecificFirst("refs/heads/master", "refs/heads/master2");
+ moreSpecificFirst("refs/heads/master", "refs/heads/maste");
+ moreSpecificFirst("refs/heads/master", "refs/heads/*");
+ moreSpecificFirst("refs/heads/master", "^refs/heads/.*");
+ moreSpecificFirst("refs/heads/master", "^refs/heads/master.*");
+ }
+
+ /**
+ * Assuming two patterns have the same Levenshtein distance,
+ * the pattern which represents a finite language wins over a pattern
+ * which represents an infinite language.
+ */
+ @Test
+ public void finiteWinsOverInfinite() {
+ cmp = new MostSpecificComparator("refs/heads/master");
+ moreSpecificFirst("^refs/heads/......", "refs/heads/*");
+ moreSpecificFirst("^refs/heads/maste.", "^refs/heads/maste.*");
+ }
+
+ /**
+ * Assuming two patterns have the same Levenshtein distance
+ * and are both either finite or infinite the one with the higher
+ * number of state transitions (in an equivalent automaton) wins
+ */
+ @Test
+ public void higherNumberOfTransitionsWins() {
+ cmp = new MostSpecificComparator("refs/heads/x");
+ moreSpecificFirst("^refs/heads/[a-z].*", "refs/heads/*");
+ // Previously there was a bug where having a '1' in a refname would cause a
+ // glob pattern's Levenshtein distance to decrease by 1. These two
+ // patterns should be a Levenshtein distance of 12 from the both of the
+ // refnames, where previously the 'branch1' refname would be a distance of
+ // 11 from 'refs/heads/abc/*'
+ cmp = new MostSpecificComparator("refs/heads/abc/spam/branch2");
+ moreSpecificFirst("^refs/heads/.*spam.*", "refs/heads/abc/*");
+ cmp = new MostSpecificComparator("refs/heads/abc/spam/branch1");
+ moreSpecificFirst("^refs/heads/.*spam.*", "refs/heads/abc/*");
+ }
+
+ /**
+ * Assuming the same Levenshtein distance, (in)finity and the number
+ * of transitions, the longer pattern wins
+ */
+ @Test
+ public void longerPatternWins() {
+ cmp = new MostSpecificComparator("refs/heads/x");
+ moreSpecificFirst("^refs/heads/[a-z].*", "^refs/heads/..*");
+ }
+
+ private void moreSpecificFirst(String first, String second) {
+ assertTrue(cmp.compare(first, second) < 0);
+ }
+}
diff --git a/gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryModule.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryModule.java
index c2cdfbc..5e9858c 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryModule.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryModule.java
@@ -81,6 +81,11 @@
public class InMemoryModule extends FactoryModule {
public static Config newDefaultConfig() {
Config cfg = new Config();
+ setDefaults(cfg);
+ return cfg;
+ }
+
+ public static void setDefaults(Config cfg) {
cfg.setEnum("auth", null, "type", AuthType.DEVELOPMENT_BECOME_ANY_ACCOUNT);
cfg.setString("gerrit", null, "basePath", "git");
cfg.setString("gerrit", null, "allProjects", "Test-Projects");
@@ -92,7 +97,6 @@
cfg.setBoolean("index", "lucene", "testInmemory", true);
cfg.setInt("index", "lucene", "testVersion",
ChangeSchemas.getLatest().getVersion());
- return cfg;
}
private final Config cfg;
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/DefaultCommandModule.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/DefaultCommandModule.java
index f905c5b..cd20f2a 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/DefaultCommandModule.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/DefaultCommandModule.java
@@ -31,6 +31,7 @@
protected void configure() {
final CommandName git = Commands.named("git");
final CommandName gerrit = Commands.named("gerrit");
+ final CommandName logging = Commands.named(gerrit, "logging");
final CommandName plugin = Commands.named(gerrit, "plugin");
final CommandName testSubmit = Commands.named(gerrit, "test-submit");
@@ -98,5 +99,11 @@
command(gerrit, CreateAccountCommand.class);
command(testSubmit, TestSubmitRuleCommand.class);
command(testSubmit, TestSubmitTypeCommand.class);
+
+ command(logging).toProvider(new DispatchCommandProvider(logging));
+ command(logging, SetLoggingLevelCommand.class);
+ command(logging, ListLoggingLevelCommand.class);
+ alias(logging, "ls", ListLoggingLevelCommand.class);
+ alias(logging, "set", SetLoggingLevelCommand.class);
}
}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListLoggingLevelCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListLoggingLevelCommand.java
new file mode 100644
index 0000000..bc6bc17
--- /dev/null
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListLoggingLevelCommand.java
@@ -0,0 +1,55 @@
+// Copyright (C) 2014 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.gerrit.sshd.CommandMetaData.Mode.MASTER_OR_SLAVE;
+
+import com.google.gerrit.common.data.GlobalCapability;
+import com.google.gerrit.extensions.annotations.RequiresCapability;
+import com.google.gerrit.sshd.CommandMetaData;
+import com.google.gerrit.sshd.SshCommand;
+
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.kohsuke.args4j.Argument;
+
+import java.util.Enumeration;
+import java.util.Map;
+import java.util.TreeMap;
+
+@RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER)
+@CommandMetaData(name = "ls-level", description = "list the level of loggers",
+ runsAt = MASTER_OR_SLAVE)
+public class ListLoggingLevelCommand extends SshCommand {
+
+ @Argument(index = 0, required = false, metaVar = "NAME", usage = "used to match loggers")
+ private String name;
+
+ @SuppressWarnings("unchecked")
+ @Override
+ protected void run() {
+ Map<String, String> logs = new TreeMap<>();
+ for (Enumeration<Logger> logger = LogManager.getCurrentLoggers(); logger
+ .hasMoreElements();) {
+ Logger log = logger.nextElement();
+ if (name == null || log.getName().contains(name)) {
+ logs.put(log.getName(), log.getEffectiveLevel().toString());
+ }
+ }
+ for (Map.Entry<String, String> e : logs.entrySet()) {
+ stdout.println(e.getKey() + ": " + e.getValue());
+ }
+ }
+}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java
index b56c439..76a5f24 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java
@@ -36,8 +36,8 @@
import com.google.gerrit.server.account.GetSshKeys.SshKeyInfo;
import com.google.gerrit.server.account.PutActive;
import com.google.gerrit.server.account.PutHttpPassword;
-import com.google.gerrit.server.account.PutPreferred;
import com.google.gerrit.server.account.PutName;
+import com.google.gerrit.server.account.PutPreferred;
import com.google.gerrit.sshd.CommandMetaData;
import com.google.gerrit.sshd.SshCommand;
import com.google.gwtorm.server.OrmException;
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetLoggingLevelCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetLoggingLevelCommand.java
new file mode 100644
index 0000000..49edf14
--- /dev/null
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetLoggingLevelCommand.java
@@ -0,0 +1,91 @@
+// Copyright (C) 2014 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.gerrit.sshd.CommandMetaData.Mode.MASTER_OR_SLAVE;
+
+import com.google.common.base.Strings;
+import com.google.gerrit.common.data.GlobalCapability;
+import com.google.gerrit.extensions.annotations.RequiresCapability;
+import com.google.gerrit.sshd.CommandMetaData;
+import com.google.gerrit.sshd.SshCommand;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PropertyConfigurator;
+import org.apache.log4j.helpers.Loader;
+import org.kohsuke.args4j.Argument;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Enumeration;
+
+@RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER)
+@CommandMetaData(name = "set-level", description = "Change the level of loggers",
+ runsAt = MASTER_OR_SLAVE)
+public class SetLoggingLevelCommand extends SshCommand {
+ private static final String LOG_CONFIGURATION = "log4j.properties";
+ private static final String JAVA_OPTIONS_LOG_CONFIG = "log4j.configuration";
+
+ private static enum LevelOption {
+ ALL,
+ TRACE,
+ DEBUG,
+ INFO,
+ WARN,
+ ERROR,
+ FATAL,
+ OFF,
+ RESET,
+ }
+
+ @Argument(index = 0, required = true, metaVar = "LEVEL", usage = "logging level to set to")
+ private LevelOption level;
+
+ @Argument(index = 1, required = false, metaVar = "NAME", usage = "used to match loggers")
+ private String name;
+
+ @SuppressWarnings("unchecked")
+ @Override
+ protected void run() throws MalformedURLException {
+ if (level == LevelOption.RESET) {
+ reset();
+ } else {
+ for (Enumeration<Logger> logger = LogManager.getCurrentLoggers(); logger
+ .hasMoreElements();) {
+ Logger log = logger.nextElement();
+ if (name == null || log.getName().contains(name)) {
+ log.setLevel(Level.toLevel(level.name()));
+ }
+ }
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private static void reset() throws MalformedURLException {
+ for (Enumeration<Logger> logger = LogManager.getCurrentLoggers();
+ logger.hasMoreElements();) {
+ logger.nextElement().setLevel(null);
+ }
+
+ String path = System.getProperty(JAVA_OPTIONS_LOG_CONFIG);
+ if (Strings.isNullOrEmpty(path)) {
+ PropertyConfigurator.configure(Loader.getResource(LOG_CONFIGURATION));
+ } else {
+ PropertyConfigurator.configure(new URL(path));
+ }
+ }
+}
diff --git a/gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java b/gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java
index 99db2db..fbe2743 100644
--- a/gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java
+++ b/gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java
@@ -344,6 +344,7 @@
if (authConfig.getAuthType() == AuthType.OPENID) {
modules.add(new OpenIdModule());
}
+ modules.add(sysInjector.getInstance(GetUserFilter.Module.class));
return sysInjector.createChildInjector(modules);
}
diff --git a/lib/BUCK b/lib/BUCK
index fa7d0cf..75f2749 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -174,15 +174,7 @@
id = 'junit:junit:4.11',
sha1 = '4e031bb61df09069aeb2bffb4019e7a5034a4ee0',
license = 'DO_NOT_DISTRIBUTE',
- deps = [':hamcrest-core'],
-)
-
-maven_jar(
- name = 'hamcrest-core',
- id = 'org.hamcrest:hamcrest-core:1.3',
- sha1 = '42a25dc3219429f0e5d060061f71acb49bf010a0',
- license = 'DO_NOT_DISTRIBUTE',
- visibility = ['//lib:junit'],
+ deps = ['//lib/hamcrest:hamcrest-core'],
)
maven_jar(
diff --git a/lib/commons/BUCK b/lib/commons/BUCK
index 85e404f..fe249fa 100644
--- a/lib/commons/BUCK
+++ b/lib/commons/BUCK
@@ -87,31 +87,3 @@
license = 'Apache2.0',
)
-maven_jar(
- name = 'httpclient',
- id = 'org.apache.httpcomponents:httpclient:4.3.4',
- bin_sha1 = 'a9a1fef2faefed639ee0d0fba5b3b8e4eb2ff2d8',
- src_sha1 = '7a14aafed8c5e2c4e360a2c1abd1602efa768b1f',
- license = 'Apache2.0',
- deps = [
- ':codec',
- ':httpcore',
- '//lib/log:jcl-over-slf4j',
- ],
-)
-
-maven_jar(
- name = 'httpcore',
- id = 'org.apache.httpcomponents:httpcore:4.3.2',
- bin_sha1 = '31fbbff1ddbf98f3aa7377c94d33b0447c646b6e',
- src_sha1 = '4809f38359edeea9487f747e09aa58ec8d3a54c5',
- license = 'Apache2.0',
-)
-
-maven_jar(
- name = 'httpmime',
- id = 'org.apache.httpcomponents:httpmime:4.3.4',
- bin_sha1 = '54ffde537682aea984c22fbcf0106f21397c5f9b',
- src_sha1 = '0651e21152b0963661068f948d84ed08c18094f8',
- license = 'Apache2.0',
-)
diff --git a/lib/guice/BUCK b/lib/guice/BUCK
index 162ad07..703573e 100644
--- a/lib/guice/BUCK
+++ b/lib/guice/BUCK
@@ -1,7 +1,6 @@
include_defs('//lib/maven.defs')
-VERSION = '4.0-beta'
-COOKIE_PATCH = '4.0-beta-98-g8d88344'
+VERSION = '4.0-beta5'
EXCLUDE = [
'META-INF/DEPENDENCIES',
'META-INF/LICENSE',
@@ -20,7 +19,7 @@
maven_jar(
name = 'guice_library',
id = 'com.google.inject:guice:' + VERSION,
- sha1 = 'a82be989679df08b66d48b42659a3ca2daaf1d5b',
+ sha1 = 'fdf5df843620978a6f2929fd56f719a20d713c2b',
license = 'Apache2.0',
deps = [':aopalliance'],
exclude_java_sources = True,
@@ -34,7 +33,7 @@
maven_jar(
name = 'guice-assistedinject',
id = 'com.google.inject.extensions:guice-assistedinject:' + VERSION,
- sha1 = 'abd6511011a9e4b64e2ebb60caac2e1cd6cd19a1',
+ sha1 = '820f10e0650cd9ed2591f398937df50f330b147d',
license = 'Apache2.0',
deps = [':guice'],
exclude = EXCLUDE,
@@ -42,9 +41,8 @@
maven_jar(
name = 'guice-servlet',
- id = 'com.google.inject.extensions:guice-servlet:' + COOKIE_PATCH,
- repository = GERRIT,
- sha1 = 'fa17d57a083fe9fc86b93f2dc37069573a2e65cd',
+ id = 'com.google.inject.extensions:guice-servlet:' + VERSION,
+ sha1 = '852af296c8a06aac968d17491fd8c1eab1ec8b10',
license = 'Apache2.0',
deps = [':guice'],
exclude = EXCLUDE,
diff --git a/lib/hamcrest/BUCK b/lib/hamcrest/BUCK
new file mode 100644
index 0000000..38d7baf
--- /dev/null
+++ b/lib/hamcrest/BUCK
@@ -0,0 +1,25 @@
+include_defs('//lib/maven.defs')
+
+VERSION = '1.3'
+
+maven_jar(
+ name = 'hamcrest-core',
+ id = 'org.hamcrest:hamcrest-core:' + VERSION,
+ sha1 = '42a25dc3219429f0e5d060061f71acb49bf010a0',
+ license = 'DO_NOT_DISTRIBUTE',
+ visibility = [
+ '//lib:junit',
+ '//gerrit-acceptance-tests:lib'
+ ],
+)
+
+maven_jar(
+ name = 'hamcrest-library',
+ id = 'org.hamcrest:hamcrest-library:' + VERSION,
+ sha1 = '4785a3c21320980282f9f33d0d1264a69040538f',
+ license = 'DO_NOT_DISTRIBUTE',
+ visibility = [
+ '//lib:junit',
+ '//gerrit-acceptance-tests:lib'
+ ],
+)
diff --git a/lib/httpcomponents/BUCK b/lib/httpcomponents/BUCK
new file mode 100644
index 0000000..50e463d
--- /dev/null
+++ b/lib/httpcomponents/BUCK
@@ -0,0 +1,31 @@
+include_defs('//lib/maven.defs')
+
+maven_jar(
+ name = 'httpclient',
+ id = 'org.apache.httpcomponents:httpclient:4.3.4',
+ bin_sha1 = 'a9a1fef2faefed639ee0d0fba5b3b8e4eb2ff2d8',
+ src_sha1 = '7a14aafed8c5e2c4e360a2c1abd1602efa768b1f',
+ license = 'Apache2.0',
+ deps = [
+ '//lib/commons:codec',
+ ':httpcore',
+ '//lib/log:jcl-over-slf4j',
+ ],
+)
+
+maven_jar(
+ name = 'httpcore',
+ id = 'org.apache.httpcomponents:httpcore:4.3.2',
+ bin_sha1 = '31fbbff1ddbf98f3aa7377c94d33b0447c646b6e',
+ src_sha1 = '4809f38359edeea9487f747e09aa58ec8d3a54c5',
+ license = 'Apache2.0',
+)
+
+maven_jar(
+ name = 'httpmime',
+ id = 'org.apache.httpcomponents:httpmime:4.3.4',
+ bin_sha1 = '54ffde537682aea984c22fbcf0106f21397c5f9b',
+ src_sha1 = '0651e21152b0963661068f948d84ed08c18094f8',
+ license = 'Apache2.0',
+)
+
diff --git a/lib/openid/BUCK b/lib/openid/BUCK
index c6c8baf..728698b 100644
--- a/lib/openid/BUCK
+++ b/lib/openid/BUCK
@@ -8,7 +8,7 @@
deps = [
':nekohtml',
':xerces',
- '//lib/commons:httpclient',
+ '//lib/httpcomponents:httpclient',
'//lib/log:jcl-over-slf4j',
'//lib/guice:guice',
],
diff --git a/lib/solr/BUCK b/lib/solr/BUCK
index afaa948..cd39742 100644
--- a/lib/solr/BUCK
+++ b/lib/solr/BUCK
@@ -9,8 +9,8 @@
deps = [
':noggit',
':zookeeper',
- '//lib/commons:httpclient',
- '//lib/commons:httpmime',
+ '//lib/httpcomponents:httpclient',
+ '//lib/httpcomponents:httpmime',
'//lib/commons:io',
],
)
diff --git a/plugins/reviewnotes b/plugins/reviewnotes
index de5eccc..b2e2b70 160000
--- a/plugins/reviewnotes
+++ b/plugins/reviewnotes
@@ -1 +1 @@
-Subproject commit de5eccc9c5477a3c504c523f39dfede35426ec8c
+Subproject commit b2e2b7046f4830ff41fcfe2e115fa349e3635135
diff --git a/tools/eclipse/project.py b/tools/eclipse/project.py
index 133e8b4..294aad2 100755
--- a/tools/eclipse/project.py
+++ b/tools/eclipse/project.py
@@ -37,15 +37,17 @@
opts = OptionParser()
opts.add_option('--src', action='store_true')
+opts.add_option('--plugins', help='create eclipse projects for plugins',
+ action='store_true')
args, _ = opts.parse_args()
-def gen_project():
- p = path.join(ROOT, '.project')
+def gen_project(name='gerrit', dir=ROOT):
+ p = path.join(dir, '.project')
with open(p, 'w') as fd:
print("""\
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>gerrit</name>
+ <name>""" + name + """</name>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
@@ -57,6 +59,18 @@
</projectDescription>\
""", file=fd)
+def gen_plugin_classpath(dir):
+ p = path.join(dir, '.classpath')
+ with open(p, 'w') as fd:
+ print("""\
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/gerrit"/>
+ <classpathentry kind="output" path="buck-out/eclipse/classes"/>
+</classpath>""", file=fd)
+
def gen_classpath():
def query_classpath(targets):
deps = []
@@ -72,7 +86,7 @@
impl = minidom.getDOMImplementation()
return impl.createDocument(None, 'classpath', None)
- def classpathentry(kind, path, src=None, out=None):
+ def classpathentry(kind, path, src=None, out=None, exported=None):
e = doc.createElement('classpathentry')
e.setAttribute('kind', kind)
e.setAttribute('path', path)
@@ -80,6 +94,8 @@
e.setAttribute('sourcepath', src)
if out:
e.setAttribute('output', out)
+ if exported:
+ e.setAttribute('exported', 'true')
doc.documentElement.appendChild(e)
doc = make_classpath()
@@ -87,6 +103,7 @@
lib = set()
gwt_src = set()
gwt_lib = set()
+ plugins = set()
java_library = re.compile(r'[^/]+/gen/(.*)/lib__[^/]+__output/[^/]+[.]jar$')
for p in query_classpath(MAIN):
@@ -119,6 +136,9 @@
if s.startswith('lib/'):
out = 'buck-out/eclipse/lib'
elif s.startswith('plugins/'):
+ if args.plugins:
+ plugins.add(s)
+ continue
out = 'buck-out/eclipse/' + s
p = path.join(s, 'java')
@@ -145,8 +165,10 @@
s = j[:-4] + '-src.jar'
if not path.exists(s):
s = None
- classpathentry('lib', j, s)
-
+ if args.plugins:
+ classpathentry('lib', j, s, exported=True)
+ else:
+ classpathentry('lib', j, s)
for s in sorted(gwt_src):
p = path.join(ROOT, s, 'src', 'main', 'java')
classpathentry('lib', p, out='buck-out/eclipse/gwtsrc')
@@ -158,6 +180,15 @@
with open(p, 'w') as fd:
doc.writexml(fd, addindent='\t', newl='\n', encoding='UTF-8')
+ if args.plugins:
+ for plugin in plugins:
+ plugindir = path.join(ROOT, plugin)
+ try:
+ gen_project(plugin.replace('plugins/', ""), plugindir)
+ gen_plugin_classpath(plugindir)
+ except (IOError, OSError) as err:
+ print('error generating project for %s: %s' % (plugin, err), file=sys.stderr)
+
try:
if args.src:
try:
