| commit | 4655d8b0ec06d7a2c634b3a7a4309db51befb5f9 | [log] [tgz] |
|---|---|---|
| author | Nitzan Gur-Furman <nitzan@google.com> | Fri Dec 16 08:46:18 2022 +0100 |
| committer | Nitzan Gur-Furman <nitzan@google.com> | Tue Dec 20 15:08:41 2022 +0100 |
| tree | ee5a9036436ab3f99b10f025e29e270be55c7af0 | |
| parent | 4c0c574f541ce06a94bf29f4ba4f984b1b8d2d01 [diff] |
Add a REST API to rebase a chain of changes Motivation: Currently, rebasing a chain of changes requires to rebase them one-by-one, starting with the great-ancestor. This is non-atomic, so prone to failing in the middle, leaving the user with a chain of half-rebased commits. This API allows chain-rebasing by a single API call. API: The new call, `rebase:chain`, is similar to the `rebase` call, with the following differences: - The operated change is treated as the chain tip. All ancestors since the target branch are rebased. - Requires a linear ancestry relation (single parenting throughout the chain). - Returns `ChangeInfo` list for the updated changes in the chain. If merging conflicts are allowed, also returns whether any of the changes had conflicts, and adds the conflict details to the relevant `ChangeInfo`s, using the same format as `RebaseChange`. - The update is atomic. Any failure mid-chain will fail the whole call. Technical details: - Expand `RebaseChangeOp` to support rebasing on the current patch-set of a change rather than on a given commit. When fetching the last patch-set, the `updateRepo` method also checks for pending patch sets. - Add `RebaseChain` API which detects (and validates) the chain, then adds `RebaseChangeOp`s to the same batch-update. Change-Id: I28d21c0992287ea4d46de1e33d647bcbec856cf9 Bug: Google b/247028060 Release-Notes: New REST API for rebasing a chain of changes
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 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.