Google Git
Sign in
gerrit / gerrit / c235ba7e51acb8839ff33c9a7f4932a6808b3414
commitc235ba7e51acb8839ff33c9a7f4932a6808b3414[log] [tgz]
authorEdwin Kempin <ekempin@google.com>Wed Sep 14 17:12:06 2016 +0200
committerEdwin Kempin <ekempin@google.com>Wed Sep 28 11:12:02 2016 +0200
tree151fd3d8fe13947d1b15de730372de209849fe1d
parent1a865ce7fd77603a67f1dab3a66917011ef23c57 [diff]
ChangeScreen: Keep 'Auto Merge' selected when navigating to diff and back

If the user preference 'Default Base For Merges' is set to
'First Parent' then the change screen pre-selects the first parent in
the 'Diff Against' drop-down list when no base was specified in the
URL. This is what we want, but if the user selects 'Auto Merge' now
and navigates to a diff and then back to the change screen, by
clicking on the up arrow in the diff screen, then it's expected that
'Auto Merge' is still selected. However in this case the change screen
switches back to the first parent. This is because 'Auto Merge' has no
representation in the URL and we cannot differentiate between no base
selected and 'Auto Merge' selected.

To fix this represent patch set n against 'Auto Merge' in the URL as
'AutoMerge..n'. Do this only if the user preference 'Default Base For
Merges' is set to 'First Parent'. If it is set to 'Auto Merge' there
is no problem because no base is resolved to 'Auto Merge'.

Change-Id: I751f63ac0da7ea46ade4012838672ff052c54d2f
Signed-off-by: Edwin Kempin <ekempin@google.com>
4 files changed
tree: 151fd3d8fe13947d1b15de730372de209849fe1d
  1. .settings/
  2. bucklets/
  3. contrib/
  4. Documentation/
  5. gerrit-acceptance-framework/
  6. gerrit-acceptance-tests/
  7. gerrit-antlr/
  8. gerrit-cache-h2/
  9. gerrit-common/
  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-launcher/
  18. gerrit-lucene/
  19. gerrit-main/
  20. gerrit-oauth/
  21. gerrit-openid/
  22. gerrit-patch-commonsnet/
  23. gerrit-patch-jgit/
  24. gerrit-pgm/
  25. gerrit-plugin-api/
  26. gerrit-plugin-archetype/
  27. gerrit-plugin-gwt-archetype/
  28. gerrit-plugin-gwtui/
  29. gerrit-plugin-js-archetype/
  30. gerrit-prettify/
  31. gerrit-reviewdb/
  32. gerrit-server/
  33. gerrit-sshd/
  34. gerrit-util-cli/
  35. gerrit-util-http/
  36. gerrit-util-ssl/
  37. gerrit-war/
  38. lib/
  39. plugins/
  40. polygerrit-ui/
  41. ReleaseNotes/
  42. tools/
  43. website/
  44. .bazelrc
  45. .buckconfig
  46. .buckversion
  47. .editorconfig
  48. .gitignore
  49. .gitmodules
  50. .mailmap
  51. .pydevproject
  52. .watchmanconfig
  53. BUCK
  54. BUILD
  55. COPYING
  56. INSTALL
  57. README.md
  58. SUBMITTING_PATCHES
  59. VERSION
  60. WORKSPACE
README.md

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 Buck and run the following:

    git clone --recursive https://gerrit.googlesource.com/gerrit
    cd gerrit && buck 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>]

NOTE: release is optional. Last released package of the version is installed if the release number is omitted.