| commit | e6eec3adcfa99d6b90d5aeb76c439e1d0ff59991 | [log] [tgz] |
|---|---|---|
| author | Youssef Elghareeb <ghareeb@google.com> | Thu Nov 11 17:14:41 2021 +0100 |
| committer | Youssef Elghareeb <ghareeb@google.com> | Fri Nov 12 08:22:38 2021 +0100 |
| tree | 210d9af6ae356549e2df69c69dcb226facf5185a | |
| parent | 4052c45e7c35c840ccf02dda3ee2e0b6da520c85 [diff] |
Fix porting comments when all edits are due to rebase Porting comments relies on the diff logic to map positions of comments from the source patchset to the target patchset. By default, the diff logic in DiffOperations skips files whose edits are all due to rebase between the old/new commits. This made sense for the diff view because we don't want to bother users looking at a modified file in the files tab when it was really unchanged. For porting comments, this resulted in the porter thinking that the file was unchanged, hence it mapped the comment to the same line in the target patchset which is wrong. We need to account for all edits (including rebase edits) when doing the mapping. In this change, I added another parameter to the DiffOperations methods named "DiffOptions" that controls whether we would like to skip files whose edits are all due to rebase or not. I updated all callers to use the current default option, hence this change is a no/op for these callers. I only updated the CommentPorter caller to pass this options with false. Note that this change to the API can break external callers (e.g. plugins) that rely on this interface. I'm aware of one such plugin which is the code-owners plugin. I'll adapt it in a follow up change. I added a test in PortedCommentsIT for this case: the test fails before this change (comment is ported to the wrong line) and passes with it. Bug: Google b/204837335 Change-Id: I22a465e493776772a1440c9c6294478335fa2bcc
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.