Google Git
Sign in
gerrit / gerrit / cf6199302d2c4a3d0018a7ce5d4556a917329f76
commitcf6199302d2c4a3d0018a7ce5d4556a917329f76[log] [tgz]
authorDmitrii Filippov <dmfilippov@google.com>Wed Nov 13 21:36:55 2024 +0100
committerpaladox <thomasmulhall410@yahoo.com>Thu Nov 14 15:48:10 2024 +0000
tree473804e6ae0b73cf49bcf4e837e0238dc0b21f38
parentd1b62774542cc587ca6f7ee198bb76df99f525db [diff]
Return ResourceConflict error when suggested fix can't be applied.

When a patch can't be applied, the ApplyPatchUtil.applyPatch returns
a result with some files missed in the new tree (e.g. this happens
when there is a merge conflict between patch and the target commit).

It caused internal server error when ApplyFix api is called, but the fix
can't be applied.

To fix this problem, this change checks errors returned by applyPatch
and throws ResourceConflictException if the patch can't be applied. To
make a error message more clear, it allows merge conflicts when applying
patch - as a result, the Error.isGitConflict is set if there is a merge
conflict (without setting allowConflicts to true Error.isGitConflict is
always false).

Google-Bug-Id: b/378863055
Release-Notes: skip
Change-Id: I6b8190d02af6c3d33fce8513c02da43830fe0d89
(cherry picked from commit b8a41d0b8850b290a6008532bfa746efb47dc8b9)
2 files changed
tree: 473804e6ae0b73cf49bcf4e837e0238dc0b21f38
  1. .github/
  2. .settings/
  3. .ts-out/
  4. antlr3/
  5. contrib/
  6. Documentation/
  7. e2e-tests/
  8. java/
  9. javatests/
  10. lib/
  11. modules/
  12. plugins/
  13. polygerrit-ui/
  14. prolog/
  15. prologtests/
  16. proto/
  17. resources/
  18. tools/
  19. webapp/
  20. polymer-bridges
  21. .bazelignore
  22. .bazelproject
  23. .bazelrc
  24. .bazelversion
  25. .editorconfig
  26. .git-blame-ignore-revs
  27. .gitignore
  28. .gitmodules
  29. .gitreview
  30. .mailmap
  31. .pydevproject
  32. .zuul.yaml
  33. BUILD
  34. COPYING
  35. INSTALL
  36. Jenkinsfile
  37. MODULE.bazel
  38. package.json
  39. README.md
  40. SUBMITTING_PATCHES
  41. version.bzl
  42. web-dev-server.config.mjs
  43. WORKSPACE
  44. yarn.lock
README.md

Gerrit Code Review

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

Build Status Maven Central

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 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 --recurse-submodules 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 8 based Gerrit image:

    docker run -p 8080:8080 gerritcodereview/gerrit[:version]-centos8

To run a Ubuntu 20.04 based Gerrit image:

    docker run -p 8080:8080 gerritcodereview/gerrit[:version]-ubuntu20

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