- works with OpenSSH 9.X (Closes: #1012808).

Release 2.3.1

Change I40356ee81b98c1210de348e51335a20be48bec1d fixed this, but was
missing a release note. Also close the story task with this change
since the other one didn't.

Change-Id: Ia27d930bf0ecefe1c26c00d6a5e93136fd120964
Task: #45100

We normally publish documentation updates in the promote pipeline,
using documentation built in the gate. As a result, the published
docs tend to lag behind release events until the next post-release
change lands. Run a separate docs build and publish it on release,
so that release notes and version information included in the
documentation reflect the most recent tag prior to the next change
merging (which for stable projects like this one, could be a while).
Override the tag jobvar to force publication to the branch path
rather than using a version-specific tree.

Change-Id: Ibf1ecfa0420a3c170beb79c14a9a9ef13fea9046
Depends-On: https://review.opendev.org/838525

Apparently Apple's `git --version` provides different output than
Linux's. Improve the version parsing by splitting on all whitespace and
taking the exact element that should be the version out of that rather
than relying on the version we want being a suffix of the command
output.

Story: 2010002
Change-Id: I40356ee81b98c1210de348e51335a20be48bec1d

Id4528209f1cd500afd06e2e61eb5689022251118 introduced a minimum git
version.  Abstract our existing check and setup a global with the
local git version for tests.  Add a minimum version check.

Change-Id: I9d1de11269758a453ecc8dde0a4c631d8e762a91

Dr. Jens Harbott authored Jan 03, 2022 and Jeremy Stanley committed Apr 11, 2022

When a commit is signed and the git config contains the setting
log.ShowSignature=True, even the "--oneline" git log output for it will
include multiple lines (the output from gpg verifying the signature),
thus fooling us into assuming that multiple commits are to be submitted.
Override the option to make sure we always get one line per commit only.

Signed-off-by: Dr. Jens Harbott <harbott@osism.tech>
Change-Id: Id4528209f1cd500afd06e2e61eb5689022251118

An upcoming change needs a feature from Git 2.10, which Ubuntu 16.04
LTS lacks. Since Python 3.5 reached end of life with the 3.5.10
release on 2020-09-05, it's been unsupported by its maintainers for
nearly 2 years anyway.

Change-Id: I0369c29baa344c4dc76eaa47b3467b6117eb933c

Sunyeop Lee authored Dec 29, 2021 and Jeremy Stanley committed Apr 11, 2022

Neither the CommandFailed nor ChangeSetException classes have
docstrings, so self.__doc__ is initialized to None and can't be
trivially combined with other strings (nor would there be any point
in doing so). Just drop these unnecessary references.

Change-Id: I1f17325baa69522a4471f5bcf270a74038ad8642

The author-email and python-requires options are deprecated by
SetupTools in favor of author_email and setup_requires and trigger
warnings now, so update them. The license_files option (since its
introduction) automatically includes LICENSE and AUTHORS if not
specified, so was always redundant and unnecessary. The warnerrors
option for PBR was for Sphinx integration, which we don't use any
longer, and is ignored by modern PBR versions anyway so clean it up
too.

Change-Id: Ic5d1e17dd4926eea4e5b6fff47295fd8e9eb452d

Jonathan Rosser authored Jan 04, 2022 and Jeremy Stanley committed Apr 10, 2022

OpenSSH has deprecated its use of scp/rcp protocol in favor of SFTP,
which the embedded Apache mina-sshd in widely-deployed Gerrit
versions does not yet support. The default officially changed in
OpenSSH 9.0 (some distributions, such as Fedora and CentOS, switched
their default behavior to this as early as OpenSSH 8.7 or 8.8),
leading to a ``subsystem request failed on channel 0`` error during
commit-msg hook retrieval. Now git-review will attempt to detect
whether scp's -O option is available to force use of the legacy
scp/rcp protocol, and apply it if so.

Change-Id: Ib64c03c3e12a3a8390e38f6ca9393db3b3c2a9e3

The user intent is clear.

Change-Id: Ibdaa2f95e7417619f651d6f41fbf15a357839bf3

Since mock is a backport of the standard library, and we no longer
support Python 2, we can use the standard library, and drop one external
dependency.

Change-Id: I798c85f1581f4562908c10cd1b58134cdcb40281

    - works with newer Git releases (Closes: #1000666).

Release 2.2.0

Use --rebase-merges instead of --preserve-merges with newer Git,
support Git's core.hooksPath config setting, and ignore uncommitted
or unstaged changes in Git submodules.

In preparation for a new release, include a release note about an
important fix we added recently.

Change-Id: Icfe0594cc1a4526e0781ac47c0d5f60bbcdce0e3

The --preserve-merges (-p) option was replaced by --rebase-merges (-r).
This fixes the following error when using git version 2.34.0:

    Errors running git rebase -p -i remotes/gerrit/stable/xena
    fatal: --preserve-merges was replaced by --rebase-merges

In order to keep compatibility with git < 2.18.0 we detect the git
version and use the old --preserve-merges flag when the version is older
than 2.18.0.

Co-Authored-By: Clark Boylan <clark.boylan@gmail.com>
Change-Id: I04de3d0f20aa6bafcf746b7706d61dd9b9af296c

When checking for unstaged or uncommitted changes to avoid the test
rebase (which could cause data loss for users of git.autostash),
it's still fine if there are unstaged or uncommitted changes in
submodules since those won't be rebased. Have the git diff
invocations explicitly ignore submodules, and also add regression
tests which demonstrate it's working.

This fixes a regression originally introduced by change
Iabb8387c9db59a7d02ebfd43b688e7bb93d3159f.

Change-Id: I20d602e86537b573ac1f9788221215047a594f83

Couple of small follow-ups to Id8a3ac464ff75e6d8207f198089f018cc790eca5:

* Fix formatting in the reno (use monospace as applicable).
* Update "Installation and Configuration" to say that the local hook
  *normally* goes into .git/hooks.

Change-Id: I1b326bdcaed38d3a82a65f944431f3640652dd33

Previously, git-review would assume that the Git repository's hook
directory is .git/hooks, relative to the root of the checkout. This
assumption breaks if the user has set the core.hooksPath option on the
repository (or, for that matter, in ~/.gitconfig or /etc/gitconfig).

core.hooksPath can either be set to an absolute path, in which case it
is to be interpreted as-is, or to a relative path, in which case it
should be interpreted as relative to the root of the checkout.

Introduce a new convenience function to suss out the correct path, and
use it in places where the reference to .git/hooks was previously
hard-coded.

Reference:
https: //git-scm.com/docs/git-config#Documentation/git-config.txt-corehooksPath

Depends-on: I0f0f44e57a100420d8e6d2eaec7dbb5d77b654af
Change-Id: Id8a3ac464ff75e6d8207f198089f018cc790eca5

We now are using focal nodes by default, so we no longer need to
explicitly select those, instead we need bionic for py36+py37.

Change-Id: I0f0f44e57a100420d8e6d2eaec7dbb5d77b654af

We do this because easy_install on python3.5 is failing to find pbr. I
believe this is happening due to pypi's deprecation of non SNI tls
connections. They report that the version of 3.5 on xenial should be
able to do SNI but easy_install at least doesn't seem to do so.

Note we restrict this to python>=3 and <=3.5 as python 2.7 had
backported fixes. Also, this really only helps with unittesting via tox
as we instruct tox to explicitly install the requirements files before
creating/installing the package itself. This is the reason we stick this
in test-requirements.txt rather than requirements.txt.

Change-Id: Iac2c1f4f575de250ed0dba22d33b017322fd7562

There is a long standing issue with C Git pushing to Gerrit and Jgit
where the occasional push will fail because the negotiated packs are
missing a tree object. This happens very occasionally but when it does
it would be nice to be able to point users at an easy workaround.
Pushing with --no-thin is that workaround.

Note that --no-thin is much less efficient so shouldn't be used by
default.

This old bug, https://bugs.launchpad.net/git-review/+bug/1332549, has
details but it seems to affect current C git and Gerrit+Jgit.

Change-Id: Id6ba52a656a14c921acab1b14ef668e6251245da

- Change implementing the -h/--help option did not add corresponding
  manpage entry for it.
- Change removing the -c/--comaptible option did not remove
  corresponding manpage entry for it.
Correcting these oversights now.

Task: #41310
Change-Id: I548e63a778e36db65dd776aaf4e6d6a7fc103c2d

In preparation for the 2.0.0 release, move the release notes for
dropping Python 2.7 support and ceasing support for draft changes as
upgrade notes. This will make it a little more obvious that people
who rely on those features may need to hold off upgrading.

Change-Id: I6362ef2e878a855cb34e38487cef35ee3bcec75c