commit | efc81216a1bffe599477cca32cf9d82307109ca9 | [log] [tgz] |
---|---|---|
author | Wyatt Allen <wyatta@google.com> | Mon Aug 20 16:40:48 2018 -0700 |
committer | Wyatt Allen <wyatta@google.com> | Fri Sep 14 13:43:19 2018 -0700 |
tree | 302511ef9bc66554ebf2cd2c67f5e8d0c417cacc | |
parent | 47032f3648a6290ccc6e5fc5750e226d953a7d80 [diff] |
Add ignore-whitespace control When a diff request includes an ignore-whitespace level, the same diff content is returned, but a number of diff chunks are marked as "common" with the understanding that those chunks only contain the kind of whitespace that can be ignored. Thus, actually ignoring these chunks is up to the frontend. In this commit, support is added for editing the preferred whitespace level, and the preferred level is included in diff requests. When a diff is loaded with an ignore-whitespace level, gr-diff-host transforms the marked deltas into shared chunks. In this way, when the transformed diff is passed down into gr-diff, it can be rendered like normal and the unwanted whitespace deltas do not appear. To transform a diff with chunks to be ignored, the strategy is as follows. If a marked delta chunk has revision (a right-side), then it's converted to a shared chunk where both sides are made up of the revision content. (If a marked delta chunk has no revision content, it's merely omitted.) Finally, adjacent shared chunks that result from modifying the marked chunks are merged together so that gr-diff will properly position context-control barriers. Feature: Issue 6198 Change-Id: I1e4cc1075edf34f5ce87ee6bfc2cf415a3b98d94
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 IRC channel on freenode is #gerrit. An archive is available at: echelog.com.
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 --recursive 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 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.