Google Git
Sign in
gerrit / gerrit / 6b6bee7cb1b803f2c2974833251de8cad2c6c975
commit6b6bee7cb1b803f2c2974833251de8cad2c6c975[log] [tgz]
authorWyatt Allen <wyatta@google.com>Tue Aug 21 11:12:25 2018 -0700
committerWyatt Allen <wyatta@google.com>Tue Aug 21 11:12:25 2018 -0700
tree56bf1f59223113b06070cd7c292dffe3d9fc674b
parent7acae7f2f24f3c38eb72d2a333c15a4496d32e82 [diff]
Count unresolved threads within thread groups rather than by leaves

This is a partial cherry-pick of I2788fdb22. This only ports over the
Java part of the original change, which drives the Prolog fact. It
doesn't port the UI fix because of significant restructuring of the
gr-comment-api webcomponent.

Diff comments are threaded together based on the in_reply_to relation
(which potentially expresses a tree structure) but are always displayed
linearly in the UI. This means that some comments in the middle of a
linear thread may be actually stored as leaves of a tree.

For example, the following thread of comments can be created if comments
two and three are created at nearly the same time.

Comment 1: thread root, unresolved,
┣ Comment 2: in reply to comment 1, unresolved,
┗ Comment 3: also in reply to comment 1, unresolved,
  ┗ Comment 4: in reply to comment 3, resolved

Because the thread is flattened, the resolved state of the thread should
be determined by the state of the chronologically latest comment (#4),
resulting in this thread being considered as resolved.

However, in a couple of locations, the resolved state is counted
differently. Namely, it finds the "leaf" comments -- that is, the
comments that are not marked as the parent of any other comment -- and
the number of unresolved threads is determined as the number of
unresolved leaves.

This fixes the logic used in ChangeData#unresolvedCommentCount in the
Java server code, which determines, among other things, the value of the
unresolved_comment_count change detail property, as well as the Prolog
fact used by the Prolog recipe that requires all comments to be resolved
before a change can be submitted.

With this change, the unresolved thread logic is modified to group
comments into flat threads, and consider the resolved state of each one
based on the chronologically final comment, irregardless of the leaves.

Bug: Issue 8472
Change-Id: I2788fdb22ecfd56f0b3da763790a7732ec73be33
1 file changed
tree: 56bf1f59223113b06070cd7c292dffe3d9fc674b
  1. .settings/
  2. contrib/
  3. Documentation/
  4. gerrit-acceptance-framework/
  5. gerrit-acceptance-tests/
  6. gerrit-cache-h2/
  7. gerrit-cache-mem/
  8. gerrit-common/
  9. gerrit-elasticsearch/
  10. gerrit-extension-api/
  11. gerrit-gpg/
  12. gerrit-gwtdebug/
  13. gerrit-gwtexpui/
  14. gerrit-gwtui/
  15. gerrit-gwtui-common/
  16. gerrit-httpd/
  17. gerrit-index/
  18. gerrit-launcher/
  19. gerrit-lucene/
  20. gerrit-main/
  21. gerrit-oauth/
  22. gerrit-openid/
  23. gerrit-patch-commonsnet/
  24. gerrit-patch-jgit/
  25. gerrit-pgm/
  26. gerrit-plugin-api/
  27. gerrit-plugin-gwtui/
  28. gerrit-prettify/
  29. gerrit-reviewdb/
  30. gerrit-server/
  31. gerrit-sshd/
  32. gerrit-test-util/
  33. gerrit-util-cli/
  34. gerrit-util-http/
  35. gerrit-util-ssl/
  36. gerrit-war/
  37. lib/
  38. plugins/
  39. polygerrit-ui/
  40. ReleaseNotes/
  41. tools/
  42. website/
  43. .bazelproject
  44. .bazelrc
  45. .editorconfig
  46. .git-blame-ignore-revs
  47. .gitignore
  48. .gitmodules
  49. .mailmap
  50. .pydevproject
  51. 0001-Replace-native-http-git-_archive-with-Skylark-rules.patch
  52. BUILD
  53. COPYING
  54. INSTALL
  55. README.md
  56. SUBMITTING_PATCHES
  57. version.bzl
  58. WORKSPACE
README.md

Gerrit Code Review

Gerrit is a code review and project management tool for Git based projects.

Build Status

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.