2f62486149
The diff between two patch sets contains hunks which weren't introduced by either patch set if a rebase occurred between those patch sets. Previous optimizations for this case simply omitted all files which aren't touched by either of the patch sets. This change goes one step further: All hunks which can clearly be identified as being introduced by a rebase are marked. In case of doubt (e.g. they overlap with a regular hunk), they aren't marked. To be consistent with the previous behavior, we exclude all files from the result which only contain hunks due to rebase. In some cases (e.g. a patch set touches 'fileA' but all identified hunks were introduced by the rebase), this rule can be stricter than the previously mentioned (as the previous rule would still show file 'fileA' but we exclude it now). Hunks which are introduced by a rebase are identified by computing the diff between the parents of the two patch sets and transforming the result to differences in terms of treeA of patch set A and treeB of patch set B. This follows a suggestion which was posted as a comment (https://gerrit-review.googlesource.com/c/33091/5//COMMIT_MSG#7) in change I63d3a21ad4f. As we always determine which hunks are introduced by a rebase when two commits are explicitly specified which don't share a common parent, we will determine those hunks even when we compute the diff between the parents of the patch sets provided that those parents fulfill the condition of being separated by a rebase. Those situations should be rare and hence we refrain from adding optimizations for this case for the moment. Bug: Issue 217 Change-Id: If06381d506d360f0e3d24d078dcb54692698e766
Gerrit Code Review
Gerrit is a code review and project management tool for Git based projects.
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 IRC channel on freenode is #gerrit. An archive is available at: echelog.com.
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 --recursive 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 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.