9354 Commits

Author SHA1 Message Date
Shawn Pearce
10f09d3d52 Require Java 7
Jetty 9 was built with compiler settings producing class files that
are not recognized by Java 6 runtimes.

Gerrit 2.9 will require Java 7 as its minimum runtime version.

Change-Id: Ifed3f9e07bf77a7a737b16c20e6e400acd990649
2013-11-16 19:58:03 -08:00
Shawn Pearce
fc798093b8 Merge branch 'stable-2.8'
* stable-2.8:
  Allow large patches to function reasonably in diffs
2013-11-16 18:48:08 -08:00
Shawn Pearce
6d0a93b31d Merge "Allow large patches to function reasonably in diffs" into stable-2.8 2013-11-17 02:47:15 +00:00
Shawn Pearce
76647556da Merge changes I84c97525,Ib2c9bedf
* changes:
  Explain that review command ignores invalid and non permitted votes
  Make indention in review command documentation consistent
2013-11-17 02:30:30 +00:00
Shawn Pearce
c8da0db6e2 Merge "Add example to review command how to vote on project specific label" 2013-11-17 02:29:32 +00:00
Edwin Kempin
9dbba186df Fix 'Invalid config file' error message
Change-Id: I62e8353dee9095538c6bb481d57c7fe974d859fb
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
2013-11-16 20:06:48 +01:00
Edwin Kempin
397b13a606 Add example to review command how to vote on project specific label
Change-Id: Ieac5a0b556dc040b823ba43c365fa2b06c22b163
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
2013-11-16 07:25:46 +01:00
Edwin Kempin
5a6edb1d70 Explain that review command ignores invalid and non permitted votes
Change-Id: I84c975251f5e5b4a32c43175496a7a1afc599063
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
2013-11-16 07:21:13 +01:00
Edwin Kempin
4fc7ab284d Make indention in review command documentation consistent
Change-Id: Ib2c9bedf9f8a52d2273a1d37c38925f4f860170b
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
2013-11-16 07:12:27 +01:00
Edwin Kempin
880375dc04 Clarify for review command when --verified can be used
Change-Id: I4051e9c3e7238b63224582f15a8666c7b599e0b3
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
2013-11-16 06:51:22 +01:00
Shawn Pearce
8df3d44ee1 Only display GC action for LocalDiskRepositoryManager
JGit cannot currently run GC on DFS backed repositories. Only offer
GC if the implementation of GitRepositoryManager is the default
LocalDiskRepositoryManager, which uses FileRepository, a type JGit
knows how to run GC on.

Change-Id: I23df492cb9657ca7bb5190b5313d2e62cdd87df4
2013-11-15 21:22:40 -08:00
Shawn Pearce
9f0c0f7d61 Merge "Update cookbook-plugin" 2013-11-16 01:47:37 +00:00
Shawn Pearce
7009aef17a Merge "Document missing capabilities for CapabilityInfo entity" 2013-11-16 01:41:27 +00:00
Yuxuan 'fishy' Wang
d85b687536 Bypass the rendering differences in AsciiDoctor.
AsciiDoctor have different understanding of [verse] with asciidoc, causing some
rendering differences. To get similar result with asciidoc, we use something
else instead of [verse] now.

Screenshots:
before:
http://imgur.com/JKMdBiv
after:
http://imgur.com/yFVvVac

Change-Id: I14e84f0e998e1e87b633681e8028ad657bde07e4
2013-11-15 11:47:46 -08:00
Shawn Pearce
4e8a96f708 Merge branch 'stable-2.8'
* stable-2.8:
  SideBySide2: Revise SkipBar and disable horizontal scroll on LineWidgets
  Update CodeMirror3
2013-11-15 10:11:30 -08:00
Michael Zhou
af6f3a7e2e SideBySide2: Revise SkipBar and disable horizontal scroll on LineWidgets
CodeMirror finally supports hiding the first line completely, revise
SkipBar implementation to be less hackish.

While we now use horizontal scrolling, line widgets (SkipBars and
CommentBoxes) should not scroll with the content. Set "noHScroll"
to true when creating them.

Remove clipping when calling scrollTo() since CodeMirror now handles that.

Change-Id: I0c08597bb1c856b332fe96fa700fea0a68504c9a
2013-11-15 18:05:11 +00:00
Shawn Pearce
30ea943624 Update CodeMirror3
- Fixes hiding of the first line
- Fixes random moving of line number gutters

Change-Id: Iae501b7b85798fe3e164467d1b6ffb55e85bdddf
2013-11-15 09:52:01 -08:00
Edwin Kempin
8f489a472e Document missing capabilities for CapabilityInfo entity
Also sort the capabilities alphabetically.

Change-Id: Ia4e3f626de701802a9d4219b0c0ed3f2496a700d
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
2013-11-15 16:27:33 +01:00
Edwin Kempin
9f4296eb95 Update cookbook-plugin
* Cookbook-plugin: Add GWT greetings dialog

Change-Id: I32e705b6a103ab5f50f5bb48b0879a7a167cdc1c
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
2013-11-15 10:25:44 +01:00
Shawn Pearce
8610d49e2c Merge "For the 'conflicts' operator return only changes that actually conflict" 2013-11-15 08:33:09 +00:00
Shawn Pearce
cb48541b99 Merge "Cleanup implementation of REST views" 2013-11-15 08:24:30 +00:00
Shawn Pearce
fe3e0eb132 Merge branch 'stable-2.8'
* stable-2.8:
  Fix inclusion of LF in IntralineLoader
2013-11-15 00:18:59 -08:00
Shawn Pearce
157f8d467d Merge "Support creation of drop-down-list in ActionContext" 2013-11-15 08:18:04 +00:00
Edwin Kempin
15ce80c326 Support creation of drop-down-list in ActionContext
With this UI actions can create a drop-down-list from JavaScript by
  var s = c.select(['VALUE1', 'VALUE2', 'VALUE3', 'VALUE4'], 2);
with having 'VALUE3' preselected.

The selected value can be retrieved by
  c.selected(s)

Change-Id: I6ff135c313fd173909d6cf87f96a90e0ceb50d46
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
2013-11-15 09:08:33 +01:00
Shawn Pearce
926b7ee3d7 Merge "Buck: Add support for gerrit GWT plugins" 2013-11-15 08:08:04 +00:00
David Ostrovsky
c53827816d Buck: Add support for gerrit GWT plugins
This changes extends gerrit_plugin function with additional gwt_module
parameters. When passed, GWT application is created. Assumtion is met,
that this application depends on gerrit-plugin-gwtui module.

With this change Gerrit GWT plugins can be build with Buck:

  MODULE = 'com.googlesource.gerrit.plugins.cookbook.HelloForm'

  gerrit_plugin(
    name = 'cookbook-plugin',
    srcs = glob(['src/main/java/**/*.java']),
    resources = glob(['src/main/**/*']),
    gwt_module = MODULE,
    manifest_entries = [
      'Gerrit-PluginName: cookbook',
      'Gerrit-Module: com.googlesource.gerrit.plugins.cookbook.Module',
      'Gerrit-HttpModule: com.googlesource.gerrit.plugins.cookbook.HttpModule',
      'Gerrit-SshModule: com.googlesource.gerrit.plugins.cookbook.SshModule',
    ]
  )

Change-Id: I4b131c7c2672675d99457651fcee63bf4f149c2f
2013-11-15 09:53:24 +01:00
Shawn Pearce
445a70549e Merge "Bump args4j version to 2.0.26" 2013-11-15 08:05:28 +00:00
David Ostrovsky
985752f232 Bump args4j version to 2.0.26
New version has features which be useful for Gerrit core and plugins:

* new hidden attribute, specifying to hide it in help message
* new depends attribute, specifying the dependent option(s)
* multiValued attribute was removed

Change-Id: Ic7e9f37231cb83940db50fe3b9efe8ad972108cf
2013-11-15 09:58:39 +01:00
Shawn Pearce
a9e635929b Merge changes I3e19b234,I9d7d04f4
* changes:
  Add UI action to trigger GC on a project
  Add option for running GC whether progress information should be shown
2013-11-15 08:02:05 +00:00
Shawn Pearce
58a688e809 Merge "On project default action refresh project screen" 2013-11-15 08:01:52 +00:00
Shawn Pearce
6c5ca79329 Merge "Allow RestApi calls to receive text from handlers" 2013-11-15 07:54:36 +00:00
Edwin Kempin
50ca15aeb6 Add UI action to trigger GC on a project
Change-Id: I3e19b2341be293a9b8a2e3c987aba50e3be46321
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
2013-11-15 08:53:37 +01:00
Edwin Kempin
4bdc72d099 Add option for running GC whether progress information should be shown
By default progress information on GC is not shown anymore. The
progress information is not useful if the command output should be
parsed by scripts or if it should be shown in the UI. Add new option
was added so that the progress information can be switched on.

Change-Id: I9d7d04f4e2666002dc9de05764e010d052d964e8
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
2013-11-15 07:51:19 +00:00
Edwin Kempin
6333e4e1cb On project default action refresh project screen
Do not navigate to the project list. After a project action users
expect to stay on the project screen.

Change-Id: I37fcb80a837f5c27810ecdf21dfa444aa2fb6d23
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
2013-11-15 07:50:53 +00:00
Dave Borowitz
e4563e0b97 Allow RestApi calls to receive text from handlers
Wrap the result in a NativeString, and naively cast it to whatever
the callback is asking for (which is not particularly less safe than
what we do for JSON).

Change-Id: I1807ce33544964533f8d2a88c45576c18f4394ec
2013-11-15 08:50:12 +01:00
Shawn Pearce
61041106db Merge "Bump Jetty version to 9.0.6.v20130930" 2013-11-15 07:37:24 +00:00
David Ostrovsky
8e78797190 Bump Jetty version to 9.0.6.v20130930
Change-Id: Id7306c3a2b9b3f59d24de1b93c114d7a284a3515
2013-11-15 09:24:17 +01:00
Shawn Pearce
c979df57f1 Merge "Fix inclusion of LF in IntralineLoader" into stable-2.8 2013-11-15 07:20:54 +00:00
Shawn Pearce
e76ee0823f Merge "Enable Closure Compiler when building ui_opt" 2013-11-15 01:38:36 +00:00
Shawn Pearce
61a7433fbb Merge "Remove unnecessary type cast" 2013-11-15 01:24:18 +00:00
David Pursehouse
8bfd3fb6db Merge "Update replication plugin to latest revision" 2013-11-15 01:01:42 +00:00
alex.ryazantsev
294da1a18a Remove unnecessary semicolons
Change-Id: Id9f67b3a3f15ebf4e5f0282c5fbd3295157a0289
2013-11-15 00:55:52 +04:00
alex.ryazantsev
0d7a9e0875 Remove unnecessary type cast
Change-Id: I1a2f25032a829ac7721a1689398cf1490ac60801
2013-11-15 00:36:14 +04:00
Hugo Arès
7b1584305c Update replication plugin to latest revision
Change-Id: Ic30f045239d1089c2c97de80d791548e1ea3a4dd
2013-11-14 13:43:48 -05:00
Sasa Zivkov
5cf89bc928 canReadCommit: swap preconditions check to improve performance
It is much cheaper to check READ access on a ref than to check
if a commit is merged into that ref. Therefore, do the checks in
this order and avoid traversal of potentially large commit graph
when we know that the user cannot read that branch.

Change-Id: I008990915e15854100a84b3d795f6c54efe35c81
2013-11-14 15:22:32 +01:00
Sasa Zivkov
16da16af68 Merge branch 'stable-2.8' into master
* stable-2.8:
  Fix: Performance issue when traversing large Git repositories
  Add release notes for recently made changes
  Linkify starred change state documentation
  Update release notes with recently made changes

Change-Id: I21cc559018eff24353ba2a1698036858791fa517
2013-11-14 15:08:39 +01:00
Sasa Zivkov
5140786568 Merge branch 'stable-2.7' into stable-2.8
* stable-2.7:
  Fix: Performance issue when traversing large Git repositories

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java

Change-Id: Ic0c4d5c7ae41de558b8034223611ac71ecb40f01
2013-11-14 15:01:45 +01:00
Sasa Zivkov
6a71917078 Merge branch 'stable-2.6' into stable-2.7
* stable-2.6:
  Fix: Performance issue when traversing large Git repositories

Change-Id: I1078171ef584831a4cca92a08c4cc570d163db8d
2013-11-14 14:50:33 +01:00
Sven Selberg
8b49b130ef Fix: Performance issue when traversing large Git repositories
The commit:

	3488eece9f1a197aedfe41d0b3275065c4981c82
	"Verify access to source ref during add branch operation"

introduced a performance issue on Git repositories with
many refs and large commit graphs. Tree traversal,
to verify visibility of initial revision, included namespaces
whose tips are not reachable from any branch. Iterating over
all these refs ended up stalling our system.

By filtering the refs, so that only "refs/heads" and "refs/tags"
namespaces are traversed, time was reduced from 1h+ to ~10 seconds
for a create branch operation.

Change-Id: I64c1123cc092fa5a7de6db8be7999672bd9f67b0
2013-11-14 13:12:53 +01:00
Edwin Kempin
86e8362313 For the 'conflicts' operator return only changes that actually conflict
So far the 'conflicts:<change>' query operator returns all changes that
touch at least one file that was also modified by the specified change.
This means all changes that potentially conflict with the specifed
change are returned.

Now we check the mergeability for the changes and only return those
changes that actually conflict. This means now the 'Automatically
resolve conflicts' project setting is taken into account and if the
content merge succeeds a change is not returned.

A new persistent cache is added to cache for two commits and a given
submit type whether the commits are conflicting. This ensures that the
expensive mergeability check for two changes is only done once.

Change-Id: I1d6a3c431ed679f786e589bbed3aed52fe439895
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
2013-11-14 12:41:25 +01:00