Google Git
Sign in
gerrit / gerrit / 1f8bf7904e776f367e0d3bf4b0f6696fef86252d
commit1f8bf7904e776f367e0d3bf4b0f6696fef86252d[log] [tgz]
authorEdwin Kempin <ekempin@google.com>Fri Oct 18 07:10:27 2024 +0000
committerPaladox none <thomasmulhall410@yahoo.com>Mon Oct 21 12:36:09 2024 +0000
treeaa0328f81508780200b6a63d3b2cd54fa035b95e
parent69d903302192b295a1aae00235813fe2c08cc37f [diff]
ChangeEditModifier: Add distinct methods for merging trees and rebasing edits

At the moment the "merge" method is used for both, merging trees and
rebasing edits. We intend to allow rebasing change edits with conflicts.
For this we must modify the "merge" method, but allowing conflicts
requires that both sides of the merge are commits. This means the
"merge" method must be changed to get RevCommit as an input rather than
just ObjectId.  However, when merging trees we do not have a RevCommit
but only a tree ID as an ObjectId.

To make both work, we duplicate the merge method:

* "merge" that requires a RevCommit as input is used to rebase change
  edits
* "mergeTrees" that requires a ObjectId as input is used to merge trees

Release-Notes: skip
Bug: Google b/364179875
Change-Id: Ie935f19078d712d8dc853d55f7da3fed9d4bc1f0
Signed-off-by: Edwin Kempin <ekempin@google.com>
(cherry picked from commit 705d51d3b60e2102ba83aac4def4015092890dc6)
1 file changed
tree: aa0328f81508780200b6a63d3b2cd54fa035b95e
  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.