Kill the MergeQueue

The MergeQueue is a historical artifact of Gerrit from the time when
accepting submissions and merging was performed on different machines.
Nowadays this is done in the same process, so we do not require an
intermediate queue anymore (also the SUBMITTED state is superfluous).

This change will directly integrate a submission or refuse to do so
and complain to the user. Many user complaints about Gerrit at Google can
be translated to the existence of the MergeQueue as when something goes
wrong in the back end, all the user sees is a "SUBMITTED, MERGE PENDING"
state with delayed information when this is actually merged or if
there is a problem they need to address. This is an unfortunate user
experience, as patience is hard.

A common work flow is to submit a set of changes on one branch by submitting
the later changes of the branch first, such that these enter the merge
pending state and on submitting the first patch of the branch, all the
changes get integrated at once (such as by a single merge commit performed
by Gerrit).

This behavior doesn't work any more with this change, but you'd rather get
a notification when trying to merge a later change of the branch.
That work flow however will be enabled again in another patch of this
topic, when change submission also submits all changes it depends on.

I just don't want to bundle that with this change (as (a) this is already
a large change and (b) it is changing fundamental behavior).

Change-Id: I0c43b16a216db2a82aa0e59375a8a43482bb3b45
12 files changed
tree: fd17ceefecede7b35d5db744ded709cbb5937310
  1. .settings/
  2. bucklets/
  3. contrib/
  4. Documentation/
  5. gerrit-acceptance-tests/
  6. gerrit-antlr/
  7. gerrit-cache-h2/
  8. gerrit-common/
  9. gerrit-extension-api/
  10. gerrit-gwtdebug/
  11. gerrit-gwtexpui/
  12. gerrit-gwtui/
  13. gerrit-gwtui-common/
  14. gerrit-httpd/
  15. gerrit-launcher/
  16. gerrit-lucene/
  17. gerrit-main/
  18. gerrit-oauth/
  19. gerrit-openid/
  20. gerrit-patch-commonsnet/
  21. gerrit-patch-jgit/
  22. gerrit-pgm/
  23. gerrit-plugin-api/
  24. gerrit-plugin-archetype/
  25. gerrit-plugin-gwt-archetype/
  26. gerrit-plugin-gwtui/
  27. gerrit-plugin-js-archetype/
  28. gerrit-prettify/
  29. gerrit-reviewdb/
  30. gerrit-server/
  31. gerrit-solr/
  32. gerrit-sshd/
  33. gerrit-util-cli/
  34. gerrit-util-http/
  35. gerrit-util-ssl/
  36. gerrit-war/
  37. lib/
  38. plugins/
  39. ReleaseNotes/
  40. tools/
  41. website/
  42. .buckconfig
  43. .buckversion
  44. .editorconfig
  45. .gitignore
  46. .gitmodules
  47. .mailmap
  48. .pydevproject
  49. .watchmanconfig
  50. BUCK
  51. COPYING
  52. INSTALL
  53. README.md
  54. SUBMITTING_PATCHES
  55. VERSION
README.md

Gerrit Code Review

Gerrit is a code review and project management tool for Git based projects.

Objective

Gerrit makes reviews easier by showing changes in a side-by-side display, and allowing inline comments to be added by any reviewer.

Gerrit simplifies Git based project maintainership by permitting any authorized user to submit changes to the master Git repository, rather than requiring all approved changes to be merged in by hand by the project maintainer.

Documentation

For information about how to install and use Gerrit, refer to the documentation.

Source

Our canonical Git repository is located on googlesource.com. There is a mirror of the repository on Github.

Reporting bugs

Please report bugs on the issue tracker.

Contribute

Gerrit is the work of hundreds of contributors. We appreciate your help!

Please read the contribution guidelines.

Note that we do not accept Pull Requests via the Github mirror.

Getting in contact

The IRC channel on freenode is #gerrit. An archive is available at: echelog.com.

The Developer Mailing list is repo-discuss on Google Groups.

License

Gerrit is provided under the Apache License 2.0.

Build

Install Buck and run the following:

    git clone --recursive https://gerrit.googlesource.com/gerrit
    cd gerrit && buck build all

Install binary packages (Deb/Rpm)

The instruction how to configure GerritForge/BinTray repositories is here

On Debian/Ubuntu run:

    apt-get update & apt-get install gerrit=<version>-<release>

NOTE: release is a counter that starts with 1 and indicates the number of packages that have been released with the same version of the software.

On CentOS/RedHat run:

    yum clean all && yum install gerrit-<version>[-<release>]

NOTE: release is optional. Last released package of the version is installed if the release number is omitted.

Events

Next developer conference is September 2015, Berlin. Next user conference is November 2015, MV, CA. Registration form is here.