25027 Commits

Author SHA1 Message Date
David Pursehouse
e273767e65 Update git submodules
* Update plugins/replication from branch 'master'
  - PushOne: Remove redundant string concatenation
    
    Change-Id: Idfe060d260eb0343d0766f4c6d6cea6cfbf733bb
2017-05-19 01:56:17 +00:00
Edwin Kempin
aba0d645c4 Add test to abandon inactive open changes
This increases the test coverage of AbandonUtil from 15% to 75%.

Change-Id: Ifc1c3c98a0e9557f568a0ea4643e572dd0af200d
Signed-off-by: Edwin Kempin <ekempin@google.com>
2017-05-19 08:51:58 +09:00
Edwin Kempin
63daa534c0 Move abandon/restore tests into a new AbandonIT class
ChangeIT is growing too big which is why some tests should be moved out.

Change-Id: I95789af43d2c782a29b78ad079152f063cc3b29c
Signed-off-by: Edwin Kempin <ekempin@google.com>
2017-05-19 08:50:26 +09:00
David Pursehouse
db1134da98 Merge branch 'stable-2.14'
* stable-2.14:
  Fix firing change related event for deleted change

Change-Id: I6cadb61f7ee2e5579afb2a038d42bb4379375c52
2017-05-19 08:43:49 +09:00
Wyatt Allen
837ed15453 Merge "PolyGerrit: Add support for muting and unmuting changes" 2017-05-18 22:30:44 +00:00
Kasper Nilsson
2a992d60ad Merge "Fix Polylint errors" 2017-05-18 22:07:32 +00:00
Paladox none
288f57c9a0 PolyGerrit: Add support for muting and unmuting changes
Bug: Issue 6191
Change-Id: I95f01ed91e839c213987e3d5da68ca612c6e311c
2017-05-18 22:41:05 +01:00
Paladox none
1f6008b319 PolyGerrit: Add support for private changes
Bug: Issue 6042
Change-Id: Iaf3edeeb21959fdc3fd7b0d48958606130a99975
2017-05-18 14:11:40 -07:00
Becky Siegel
94cf669dc0 Do not show delete button for admins when comment is a draft
There was a formatting issue caused by delete buttons in a draft change.
It really does not make sense for the button to be there for drafts
anyway. This change hides the delete button for admins on draft changes.

Bug: Issue 6257
Change-Id: I236eff9db1f0ca76ed658f3048132c9c675ee407
2017-05-18 13:15:09 -07:00
Kasper Nilsson
e23754b0b9 Fix autocomplete focus behavior
On keyboard completion, the autocomplete did not re-focus on the input.
This change fixes that, and prevents any regression by adding asserts
to the test suite.

Bug: Issue 6253
Change-Id: I76bae30e069d28c00d3029fe36ff9d731fd7631b
2017-05-18 11:31:08 -07:00
Hugo Arès
9169fc2ee6 Fix firing change related event for deleted change
Change-Id: I44f40bb3b63a0f7a8e35944dde289dcd4da2d7ab
2017-05-18 13:56:25 -04:00
Logan Hanks
090e2b1cdc Merge "Move WIP button into overflow menu" 2017-05-18 17:10:17 +00:00
Aaron Gable
e82fb89df3 Move WIP button into overflow menu
Bug: issue 6247
Change-Id: I84ebe05385c75a205caea297e5231beed84cb48e
2017-05-18 16:49:56 +00:00
Kasper Nilsson
db2ca39d21 Remove certain lint rules from eslint config
During the migration step of the ESLint project, there were a few rules
that were stricter than need be -- specifically, the rules that force
devs to not use indexOf and Array.forEach.

There are several legitimate cases for using these functions, and as
all of the instances where ES6 features like Array.includes and for...of
would work better have been addressed, these rules ought to be removed.

Bug: Issue 6179
Change-Id: Ib8c730a98c8d4a22999b1669dc4ce1a5a85fd749
2017-05-18 09:46:49 -07:00
Han-Wen Nienhuys
ae0c04cf5c Standardize ordering of AbstractDaemonTest#block/deny/allow arguments
The new standard ordering is (project, ref, permission, [force], ID)

Change-Id: I20387e5349218322ecd8fd5529532d9a9ae57b0d
2017-05-18 15:55:52 +09:00
David Pursehouse
d4f898d405 Merge branch 'stable-2.14'
* stable-2.14:
  UploadValidationListener: Use Java 8 default on interface methods
  Enhance UploadValidators to allow listening to negotation start

Change-Id: I1fddbf0448c182e3a73052afbe5891a64eb79c0a
2017-05-18 15:33:14 +09:00
David Ostrovsky
946d6c3b14 Move prolog:common rule to gerrit-server root build file
Change-Id: Iacbff16b71d8464ccea6d2b631868e24a0605ec4
2017-05-18 06:17:11 +02:00
David Pursehouse
d4019bc28e UploadValidationListener: Use Java 8 default on interface methods
Change-Id: Icdba759881da3aea40784d4d6f00536863f759fa
2017-05-18 12:53:58 +09:00
David Pursehouse
bc9ad698d1 Merge branch 'stable-2.13' into stable-2.14
* stable-2.13:
  Enhance UploadValidators to allow listening to negotation start

Change-Id: I38f1031dd04c5d47be7919ca11ae7751d3ec8cea
2017-05-18 11:44:23 +09:00
David Pursehouse
e251dd100d Merge changes from topics 'submodule-op-cleanup', 'retry-config'
* changes:
  SubmoduleOp: Preserve exception from constructor
  SubmoduleOp: TODO format cleanup
  SubmoduleException: Minor cleanup
  RetryHelper: Make time limits configurable
  RetryHelper: Disable retrying when updates are non-idempotent
2017-05-18 02:25:42 +00:00
Wyatt Allen
0f63ca0f83 Merge "ES6ify /gr-diff-builder/*" 2017-05-18 00:50:38 +00:00
Wyatt Allen
13031eb098 Fix Polylint errors
Change-Id: Iaf18389c43a3eb3d93b63cb782b3dd2850cb26df
2017-05-17 17:45:11 -07:00
Wyatt Allen
c0aa3abec0 Merge "Catch-all fix for merged linter errors" 2017-05-18 00:34:59 +00:00
Kasper Nilsson
3a2f287d71 ES6ify /gr-diff-builder/*
Bug: Issue 6179
Change-Id: I9d72fb89a3c3ad916c9097bdf6e5fb31a1dd4cf0
2017-05-18 00:32:33 +00:00
Kasper Nilsson
72bd42419d Merge "ES6ify /gr-file-list/*" 2017-05-18 00:27:39 +00:00
Kasper Nilsson
fbad19e18e Catch-all fix for merged linter errors
Bug: Issue 6179
Change-Id: I436b6dbd88e83b4d901d5446a0c7900678be157d
2017-05-17 17:17:25 -07:00
Dave Borowitz
ac4da62995 SubmoduleOp: Preserve exception from constructor
Exceptions from assisted-inject constructors get wrapped in
ProvisionException, so there's no guarantee that a higher-level handler
will be able to reasonably unwrap the exception message that's intended
for the user. These messages are important, and
SubmoduleSubscriptionsWholeTopicMergeIT explicitly checks for them, but
it's basically an accident that this was working currently.

SubmoduleOp really wants to do real work in its constructor to
initialize the sortedBranches map. Simply moving that map out of the
constructor doesn't work, because it depends in subtle ways on some of
the other fields which are mutable over the course of the instance's
lifetime. In an ideal world this subtle logic would get cleaned up, but
for now, do the simplest thing that fixes the exception-throwing
behavior, since this is preventing us from converting MergeOp to use
RetryHelper.

Change-Id: I4f6a22a95ecc533166ebf6c1518c2a488fe3422b
2017-05-17 20:16:02 -04:00
Kasper Nilsson
3d300c39f8 ES6ify /gr-file-list/*
Bug: Issue 6179
Change-Id: I3e205a480e0b5fc148fa14d3e87bb5c05868e0c7
2017-05-17 17:08:54 -07:00
Dave Borowitz
5a2af6a194 SubmoduleOp: TODO format cleanup
Change-Id: I034f34c6a8ccf071055020d56cc31b83e91f96b5
2017-05-17 19:30:35 -04:00
Dave Borowitz
e47058e15c SubmoduleException: Minor cleanup
* Indicate that message should be user-visible.
* Remove unnecessary finals.

Change-Id: Ie826965c1e3675ff2b057cf9202626e15b28d0e7
2017-05-17 19:30:35 -04:00
Dave Borowitz
2b87d7f862 RetryHelper: Make time limits configurable
Use an arbitrarily high limit during NoteDbOnlyIT, where we explicitly
want retries to happen, in order to avoid spurious timeouts caused by
scheduling delays on overloaded test machines. For other tests,
LockFailureExceptions generally shouldn't crop up during updates anyway,
and if they do, we would rather the updates time out in finite amount of
time so we can see the resulting stack trace.

Change-Id: I5bad32749b994e6473176cdd45cc80d9d4e195eb
2017-05-17 19:29:08 -04:00
Dave Borowitz
c08066c1e6 RetryHelper: Disable retrying when updates are non-idempotent
This includes everything except NoteDb fused mode, matching the old
behavior. In practice, RetryHelper wouldn't have retried in
ReviewDb-only mode previously, because BatchUpdate wouldn't throw
LockFailureException. But this is essentially an implementation detail;
we shouldn't count on that exception type never being thrown. Safer to
explicitly disable retries in this case.

Change-Id: Ibf502ac8157a1571b796d910862e3e69e6a0560c
2017-05-17 19:29:08 -04:00
David Pursehouse
e2eefc309f Merge branch 'stable-2.14'
* stable-2.14:
  ConfigSuite: Fix error message
  Make sure 'Merge Conflict' displays on change view

Change-Id: Icda2f244214aec66577d1ddc95d6a85dc03cb8cd
2017-05-18 08:16:47 +09:00
Edwin Kempin
5a1194f077 ConfigSuite: Fix error message
Change-Id: I94c6c48f3ca5ef1a5ac5a3a55eff777c619aadf1
Signed-off-by: Edwin Kempin <ekempin@google.com>
2017-05-17 23:01:34 +00:00
Kasper Nilsson
75f5614895 Merge "ES6ify /gr-diff-processor/*" 2017-05-17 22:50:13 +00:00
Kasper Nilsson
f86aa8d2ab Merge "ES6ify /gr-diff-view/*" 2017-05-17 22:50:07 +00:00
Kasper Nilsson
96fa08bea1 Merge "Fix faulty equality comparison in download dialog" 2017-05-17 22:45:49 +00:00
Kasper Nilsson
ef51194c11 ES6ify /gr-diff-view/*
Bug: Issue 6179
Change-Id: Ia2268dba166b9f98cd43fb407666a4a29bf285d2
2017-05-17 15:34:20 -07:00
Kasper Nilsson
98501986a8 ES6ify /gr-diff-processor/*
Prior change was reverted due to incorrect modification of lint config.

Bug: Issue 6179
Change-Id: Ieb795403ffa86752d41ae39a4b963e7a1b42b573
2017-05-17 15:33:02 -07:00
Becky Siegel
8fe83b5d4d Merge "ES6ify /gr-ranged-comment-layer/*" 2017-05-17 22:30:13 +00:00
Kasper Nilsson
b9451ec51c Fix faulty equality comparison in download dialog
In the change object, the revision number is represented as an integer.
In the download dialog, patchNum is passed as a string. Due to strict
equality comparison, the download schemes for a particular patchset were
never found.

This change parses the patchNum to an int every time an attempt to
compare it is made.

To protect against regressions, all of the mocked patchNum values in the
test suite have been changed to string values to more accurately reflect
the actual data.

Bug: Issue 6224
Change-Id: I3626cda9eaad48c05fb97efd97ba313f20ab5473
2017-05-17 15:24:54 -07:00
Becky Siegel
94db86fc1b Make sure 'Merge Conflict' displays on change view
Previously, if a change status was 'NEW' the function that determines
if 'Merge Conflict' should be displayed was not called. This change
ensures that it is not bypassed if a change is 'NEW'

Change-Id: Ia014452be5d7b8a24abb6a8b29483dd5289cc515
2017-05-17 22:09:00 +01:00
Kasper Nilsson
7cdfde1a92 Merge "Make sure 'Merge Conflict' displays on change view" 2017-05-17 21:03:58 +00:00
Becky Siegel
1f50cce86c Merge "ES6ify /gr-selection-action-box/*" 2017-05-17 20:40:43 +00:00
Kasper Nilsson
1c4ef42d74 Merge "Revert "ES6ify /gr-diff-processor/*"" 2017-05-17 20:39:04 +00:00
Kasper Nilsson
6a41c80d50 Revert "ES6ify /gr-diff-processor/*"
This reverts commit fb62c1768184698f6855851cd202c0389cbce591.

Reason for revert: Incorrectly added file

Change-Id: I4970d5b796a8b3ae59368445223323b529516ca0
2017-05-17 20:37:56 +00:00
Becky Siegel
ca9c93e3ee Make sure 'Merge Conflict' displays on change view
Previously, if a change status was 'NEW' the function that determines
if 'Merge Conflict' should be displayed was not called. This change
ensures that it is not bypassed if a change is 'NEW'

Change-Id: Ia273aa846682e7e4453370314044888c8e8c7f99
2017-05-17 13:34:46 -07:00
Kasper Nilsson
00004bc25c Merge "ES6ify /gr-diff-cursor/*" 2017-05-17 20:24:54 +00:00
Kasper Nilsson
e1372fbb66 Merge "ES6ify /gr-diff-highlight/*" 2017-05-17 20:24:14 +00:00
Kasper Nilsson
6f93b2f413 Merge "ES6ify /gr-diff-processor/*" 2017-05-17 20:23:59 +00:00