CommentsUtil: Don't use the diff cache to look up the parent commit

It's a bit strange that we used the diff caches to lookup a specific
parent commit (e.g. first parent, second parent, auto-merge) of a
patchset even though we weren't interested in the diff at all.

One reason might be that auto-merge commits are only reliably available
within the diff cache. Furthermore, the diff result is cached and hence
quickly available on subsequent calls.

Besides being confusing and possibly doing more than necessary (e.g.
computing actual diffs), this approach has another major disadvantage:
It returns the wrong commit SHA-1 if the specified 'side' doesn't exist
for the commit (e.g. if the second parent is specified but the patchset
isn't a merge commit). In such a case, the diff cache falls back to the
first parent commit without further notice. That's problematic if you're
relying on the returned commit SHA-1 to be correct as we do for ported
comments.

A better approach than using the diff cache is to directly lookup the
desired parent commit. One possible disadvantage of this approach is
that we always need to open the repository to do so.

The new approach also lets callers decide how to react to a non-existent
parent commit as it returns an Optional.empty() instead of directly
throwing an exception. Callers may choose to ignore such a parent or
throw an exception of a type and message of their choice.

For auto-merge commits, we still need to use the old approach. With the
redesigned diff caches, we should be able to switch to a different
approach, too.

Change-Id: Iad263b16c45b7c0d826b98aeb8f8865296326bf7
12 files changed
tree: 24f276502a0100f9a432fb11482ecf69634f3a08
  1. .settings/
  2. .ts-out/
  3. antlr3/
  4. contrib/
  5. Documentation/
  6. e2e-tests/
  7. java/
  8. javatests/
  9. lib/
  10. modules/
  11. plugins/
  12. polygerrit-ui/
  13. prolog/
  14. prologtests/
  15. proto/
  16. resources/
  17. tools/
  18. webapp/
  19. .bazelignore
  20. .bazelproject
  21. .bazelrc
  22. .bazelversion
  23. .editorconfig
  24. .git-blame-ignore-revs
  25. .gitignore
  26. .gitmodules
  27. .gitreview
  28. .mailmap
  29. .pydevproject
  30. .zuul.yaml
  31. BUILD
  32. COPYING
  33. INSTALL
  34. Jenkinsfile
  35. package.json
  36. README.md
  37. SUBMITTING_PATCHES
  38. version.bzl
  39. WORKSPACE
  40. 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.