| commit | dda85a9d441f874269a2908ed07119ffc995365b | [log] [tgz] |
|---|---|---|
| author | Edwin Kempin <ekempin@google.com> | Mon Oct 07 17:12:26 2019 +0200 |
| committer | David Pursehouse <dpursehouse@collab.net> | Wed Oct 09 09:51:49 2019 +0900 |
| tree | 04e3a846ef21b53e2210154801688942ee2c1a7e | |
| parent | d3e51d13c821e858928d06ddef76f72f0d5686dc [diff] |
CreateChange: Do not fail with 500 ISE if creating merge commit fails with NoMergeBaseException NoMergeBaseException is thrown in 3 cases: 1. TOO_MANY_MERGE_BASES: The number of merge bases exceeds 200. 2. CONFLICTS_DURING_MERGE_BASE_CALCULATION: In order to find a single merge base it may required to merge together multiple common predecessors. If during these merges conflicts occur the merge fails with this reason. 3. MULTIPLE_MERGE_BASES_NOT_SUPPORTED: Multiple merge bases have been found (e.g. the commits to be merged have multiple common predecessors) but the merge strategy doesn't support this (e.g. ResolveMerge). 3. cannot happen because we always use a RecursiveMerger which does support having multiple merge bases. If it happens anyway, that's an error. 1. and 2. are not Gerrit errors, but the state of the input commits don't allow us to create a merge commit. Hence in this situation we should not fail with 500 Internal Server Error, but rather return 409 Conflict and let the user know what's the problem. This change has a test for 1. that verifies that we return 409 Conflict with a proper error message now. I wasn't able to reproduce 2. from a test, but this is what we saw in production at Google. Signed-off-by: Edwin Kempin <ekempin@google.com> Change-Id: Ia485e24c1bf3fc3e3857eb0669b67e11623f4a58
Gerrit is a code review and project management tool for Git based projects.
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.
For information about how to install and use Gerrit, refer to the documentation.
Our canonical Git repository is located on googlesource.com. There is a mirror of the repository on Github.
Please report bugs on the issue tracker.
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.
The Developer Mailing list is repo-discuss on Google Groups.
Gerrit is provided under the Apache License 2.0.
Install Bazel and run the following:
git clone --recurse-submodules https://gerrit.googlesource.com/gerrit
cd gerrit && bazel build release
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>]
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.