Google Git
Sign in
gerrit / gerrit / 0f2faafdda92c1fe70f18cb112772d160b27aea2
commit0f2faafdda92c1fe70f18cb112772d160b27aea2[log] [tgz]
authorAlice Kober-Sotzek <aliceks@google.com>Wed Feb 21 11:11:44 2018 +0100
committerDavid Pursehouse <dpursehouse@collab.net>Thu Feb 22 19:11:22 2018 +0900
tree1bcf12889e0b01751e5583800fc383c7b5f524b6
parentbe89feda855d6b8876decb4a424be13626a7cd59 [diff]
Don't treat MergeIdenticalTreeException as internal server error

MergeIdenticalTreeException as well as its derived class
ChangeAlreadyMergedException were previously interpreted as an internal
server error because no custom mapping existed for them in
RestApiServlet. Strangely, they inherited from RestApiException, which
we typically use to indicate that we handle such exceptions gracefully
(e.g. we return a proper error code and a message as explanation).

Both MergeIdenticalTreeException and ChangeAlreadyMergedException
actually indicate an internal conflict, which we typically represent by
a ResourceConflictException. By inheriting from
ResourceConflictException, we automatically get the mapping to a proper
error code. This is in line with MergeConflictException, which also
inherits from ResourceConflictException.

Change-Id: Ieacd730ccd0ab2efdb1b02b0556dd6117ab5f920
1 file changed
tree: 1bcf12889e0b01751e5583800fc383c7b5f524b6
  1. .settings/
  2. contrib/
  3. Documentation/
  4. gerrit-acceptance-framework/
  5. gerrit-acceptance-tests/
  6. gerrit-antlr/
  7. gerrit-cache-h2/
  8. gerrit-common/
  9. gerrit-elasticsearch/
  10. gerrit-extension-api/
  11. gerrit-gpg/
  12. gerrit-gwtdebug/
  13. gerrit-gwtexpui/
  14. gerrit-gwtui/
  15. gerrit-gwtui-common/
  16. gerrit-httpd/
  17. gerrit-launcher/
  18. gerrit-lucene/
  19. gerrit-main/
  20. gerrit-oauth/
  21. gerrit-openid/
  22. gerrit-patch-commonsnet/
  23. gerrit-patch-jgit/
  24. gerrit-pgm/
  25. gerrit-plugin-api/
  26. gerrit-plugin-gwtui/
  27. gerrit-prettify/
  28. gerrit-reviewdb/
  29. gerrit-server/
  30. gerrit-sshd/
  31. gerrit-test-util/
  32. gerrit-util-cli/
  33. gerrit-util-http/
  34. gerrit-util-ssl/
  35. gerrit-war/
  36. lib/
  37. plugins/
  38. polygerrit-ui/
  39. ReleaseNotes/
  40. tools/
  41. website/
  42. .bazelproject
  43. .editorconfig
  44. .git-blame-ignore-revs
  45. .gitignore
  46. .gitmodules
  47. .mailmap
  48. .pydevproject
  49. BUILD
  50. COPYING
  51. INSTALL
  52. README.md
  53. SUBMITTING_PATCHES
  54. version.bzl
  55. WORKSPACE
README.md

Gerrit Code Review

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

Build Status

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 Bazel and run the following:

    git clone --recursive https://gerrit.googlesource.com/gerrit
    cd gerrit && bazel build release

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>]

On Fedora run:

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

Use pre-built Gerrit images on Docker

Docker images of Gerrit are available on DockerHub

To run a CentOS 7 based Gerrit image:

    docker run -p 8080:8080 gerritforge/gerrit-centos7[:version]

To run a Ubuntu 15.04 based Gerrit image:

    docker run -p 8080:8080 gerritforge/gerrit-ubuntu15.04[:version]

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