| commit | 6fe9aac37233fb2ace6caee121fae0022f94d154 | [log] [tgz] |
|---|---|---|
| author | Edwin Kempin <ekempin@google.com> | Fri Feb 07 09:44:16 2020 +0100 |
| committer | Edwin Kempin <ekempin@google.com> | Fri Feb 07 09:29:46 2020 +0000 |
| tree | 20fc329eb4d4f2083e3c244a4d776b8906db8227 | |
| parent | b6e53e6ec3d09e7e6a8dd328f60ccee243f0aa57 [diff] |
CheckMergeability: Do not fail with 500 ISE on NoMergeBaseException If NoMergeBaseException is thrown it's the state of the repository that prevents the merge (e.g. the reason is CONFLICTS_DURING_MERGE_BASE_CALCULATION). We should return '409 Conflict' in this case as we do in other REST endpoints. It would be better to return a MergeableInfo with mergeable = false, but if we do that now the caller cannot find out the reason why the change is not mergeable since MergeableInfo doesn't have any field to carry a message or a reason. We could add this field, but then the frontend also needs to be adapted to show that message to the user. That's more work that we leave for later. For now returning '409 Conflict' is better than failing with '500 Internal Server Error'. Change-Id: I307aab2bd94495634c77eda0976dea435673bdcb Signed-off-by: Edwin Kempin <ekempin@google.com>
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.