Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package git-review for openSUSE:Factory checked in at 2022-04-19 09:58:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git-review (Old) and /work/SRC/openSUSE:Factory/.git-review.new.1941 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git-review" Tue Apr 19 09:58:54 2022 rev:17 rq:970662 version:2.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/git-review/git-review.changes 2021-12-08 22:10:45.962913542 +0100 +++ /work/SRC/openSUSE:Factory/.git-review.new.1941/git-review.changes 2022-04-19 09:59:53.587691299 +0200 @@ -1,0 +2,19 @@ +Tue Apr 19 05:41:47 UTC 2022 - Steve Kowalik <steven.kowa...@suse.com> + +- Update to 2.3.0: + * Python 3.5 is no longer supported. + * Git 2.10.0 or later is required as git-review now needs the + --no-show-signature option for git-log. + * Git???s log.ShowSignature option is now supported. Previously, setting it + would confuse git-review into thinking there were twice as many changes + to push. + * 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. 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. Future git-review versions may change the fallback + behavior once an SFTP subsystem is implemented and available for a new + Gerrit release. +- Remove now unneeded BuildRequires on mock. + +------------------------------------------------------------------- Old: ---- git-review-2.2.0.tar.gz New: ---- git-review-2.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git-review.spec ++++++ --- /var/tmp/diff_new_pack.vFY1N6/_old 2022-04-19 09:59:53.927691741 +0200 +++ /var/tmp/diff_new_pack.vFY1N6/_new 2022-04-19 09:59:53.935691751 +0200 @@ -1,7 +1,7 @@ # # spec file for package git-review # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,11 +17,10 @@ Name: git-review -Version: 2.2.0 +Version: 2.3.0 Release: 0 Summary: Tool to submit code to Gerrit License: Apache-2.0 -Group: Development/Languages/Python URL: https://git.openstack.org/cgit/openstack-infra/git-review Source: https://files.pythonhosted.org/packages/source/g/%{name}/%{name}-%{version}.tar.gz BuildRequires: fdupes @@ -30,7 +29,6 @@ # build a python2.x version of it anymore in 2019. BuildRequires: python-rpm-macros BuildRequires: python3-fixtures >= 0.3.14 -BuildRequires: python3-mock BuildRequires: python3-pbr BuildRequires: python3-requests >= 1.1 BuildRequires: python3-setuptools ++++++ git-review-2.2.0.tar.gz -> git-review-2.3.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-review-2.2.0/.zuul.yaml new/git-review-2.3.0/.zuul.yaml --- old/git-review-2.2.0/.zuul.yaml 2021-11-24 03:35:50.000000000 +0100 +++ new/git-review-2.3.0/.zuul.yaml 2022-04-18 21:02:11.000000000 +0200 @@ -7,8 +7,6 @@ jobs: &jobs - build-python-release - tox-linters - - tox-py35: - nodeset: ubuntu-xenial - tox-py36: nodeset: ubuntu-bionic - tox-py37: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-review-2.2.0/AUTHORS new/git-review-2.3.0/AUTHORS --- old/git-review-2.2.0/AUTHORS 2021-11-24 03:37:33.000000000 +0100 +++ new/git-review-2.3.0/AUTHORS 2022-04-18 21:03:25.000000000 +0200 @@ -32,6 +32,7 @@ Dina Belova <dbel...@mirantis.com> Dmitry Ratushnyy <dratu...@cisco.com> Doug Hellmann <d...@doughellmann.com> +Dr. Jens Harbott <harb...@osism.tech> Eric Harney <ehar...@redhat.com> Fabio Porcedda <fabio.porce...@gmail.com> Florian Haas <flor...@citynetwork.eu> @@ -50,6 +51,7 @@ Jens Harbott <j.harb...@x-ion.de> Jeremy Stanley <fu...@yuggoth.org> John Vandenberg <jay...@gmail.com> +Jonathan Rosser <jonathan.ros...@rd.bbc.co.uk> Julien Danjou <jul...@danjou.info> K Jonathan Harker <c...@gentlydownthe.net> Khai Do <zaro0...@gmail.com> @@ -83,6 +85,7 @@ Sorin Sbarnea <ssbar...@redhat.com> Stephen Finucane <stephen...@redhat.com> Steve Kowalik <ste...@wedontsleep.org> +Sunyeop Lee <sunyeo...@gmail.com> Swapnil Kulkarni (coolsvap) <m...@coolsvap.net> Thomas Goirand <tho...@goirand.fr> Thomas Hisch <t.hi...@gmail.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-review-2.2.0/ChangeLog new/git-review-2.3.0/ChangeLog --- old/git-review-2.2.0/ChangeLog 2021-11-24 03:37:33.000000000 +0100 +++ new/git-review-2.3.0/ChangeLog 2022-04-18 21:03:25.000000000 +0200 @@ -1,6 +1,18 @@ CHANGES ======= +2.3.0 +----- + +* Enforce minimum git version +* Fix submitting signed patches +* Drop support for Python 3.5 +* Fix git\_review.cmd.CommandFailed: <exception str() failed> +* Clean up package metadata +* Force use of scp rather than sftp when possible +* Treat ^C as "no" at confirmation prompt +* Switch to unittest.mock + 2.2.0 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-review-2.2.0/PKG-INFO new/git-review-2.3.0/PKG-INFO --- old/git-review-2.2.0/PKG-INFO 2021-11-24 03:37:33.261706400 +0100 +++ new/git-review-2.3.0/PKG-INFO 2022-04-18 21:03:25.609055800 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: git-review -Version: 2.2.0 +Version: 2.3.0 Summary: Tool to submit code to Gerrit Home-page: http://docs.opendev.org/opendev/git-review Author: OpenDev Contributors @@ -34,12 +34,11 @@ Classifier: License :: OSI Approved :: Apache Software License Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.5 Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: 3.9 Classifier: Programming Language :: Python Classifier: Topic :: Utilities -Requires-Python: >= 3.5 +Requires-Python: >= 3.6 Description-Content-Type: text/x-rst; charset=UTF-8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-review-2.2.0/git_review/cmd.py new/git-review-2.3.0/git_review/cmd.py --- old/git-review-2.2.0/git_review/cmd.py 2021-11-24 03:35:50.000000000 +0100 +++ new/git-review-2.3.0/git_review/cmd.py 2022-04-18 21:02:11.000000000 +0200 @@ -44,6 +44,7 @@ DEFAULTS = dict(scheme='ssh', hostname=False, port=None, project=False, branch='master', remote="gerrit", rebase="1", track="0", usepushurl="0", notopic=False, branchauthor="name") +LOCAL_GIT_VERSION = (0, 0, 0) COPYRIGHT = """\ Copyright OpenStack Foundation and OpenDev Contributors @@ -62,6 +63,10 @@ limitations under the License. """ +# Bump this if a feature of a more recent git is unconditionally +# required +MINIMUM_GIT_VERSION = (2, 10, 0) + _branch_name = None _has_color = None @@ -94,7 +99,7 @@ ("output", self.output)]) def __str__(self): - return self.__doc__ + """ + return """ The following command failed with exit code %(rc)d "%(argv)s" ----------------------- @@ -109,7 +114,7 @@ self.e = str(e) def __str__(self): - return self.__doc__ % self.e + return self.e def printwrap(unwrapped): @@ -219,6 +224,23 @@ return provider.version +def get_git_version(): + global LOCAL_GIT_VERSION + output = run_command("git version") + if "git version" in output: + try: + v = output.rsplit(None, 1)[1] + LOCAL_GIT_VERSION = tuple(map(int, v.split('.')[:3])) + except Exception: + printwrap("Could not determine git version!") + sys.exit(1) + if LOCAL_GIT_VERSION < MINIMUM_GIT_VERSION: + printwrap("Local git version %s < required git version %s" % + '.'.join(map(str, LOCAL_GIT_VERSION)), + '.'.join(map(str, MINIMUM_GIT_VERSION))) + sys.exit(1) + + def git_directories(): """Determine (absolute git work directory path, .git subdirectory path).""" cmd = ("git", "rev-parse", "--show-toplevel", "--git-dir") @@ -373,9 +395,17 @@ userhost = hostname # OS independent target file scp_target_file = target_file.replace(os.sep, "/") + + # Get scp options + scp_out = run_command("scp") + scp_opts = scp_out[scp_out.index("[") + 2:scp_out.index("]")] + cmd = ["scp", userhost + ":hooks/commit-msg", scp_target_file] if port is not None: cmd.insert(1, "-P%s" % port) + # Force scp protocol if the -O option is available + if "O" in scp_opts: + cmd.insert(1, "-O") if VERBOSE: hook_url = 'scp://%s%s/hooks/commit-msg' \ @@ -909,20 +939,9 @@ "re-run with the '-R' option enabled." % (branch, remote)) sys.exit(1) - # Determine git version to set rebase flags below. - output = run_command("git version") - rebase_flag = "--rebase-merges" - if "git version" in output: - try: - v = output.rsplit(None, 1)[1] - gitv = tuple(map(int, v.split('.')[:3])) - if gitv < (2, 18, 0): - rebase_flag = "--preserve-merges" - except Exception: - # We tried to determine the version and failed. Use current git - # flag as fallback. - warn("Could not determine git version. " - "Using modern git rebase flags.") + rebase_flag = '--rebase-merges' + if LOCAL_GIT_VERSION < (2, 18, 0): + rebase_flag = "--preserve-merges" interactive_flag = interactive and '-i' or '' @@ -976,8 +995,8 @@ use_color = "--color=always" else: use_color = "--color=never" - cmd = ("git log %s --decorate --oneline HEAD --not --remotes=%s" % ( - use_color, remote)) + cmd = ("git log %s --decorate --oneline --no-show-signature " + "HEAD --not --remotes=%s" % (use_color, remote)) (status, output) = run_command_status(cmd) if status != 0: print("Had trouble running %s" % cmd) @@ -1005,7 +1024,10 @@ "branches (for independent changes).") print("\nThe outstanding commits are:\n\n%s\n\n" "Do you really want to submit the above commits?" % output) - yes_no = input("Type 'yes' to confirm, other to cancel: ") + try: + yes_no = input("Type 'yes' to confirm, other to cancel: ") + except KeyboardInterrupt: + yes_no = "no" if yes_no.lower().strip() != "yes": print("Aborting.") sys.exit(1) @@ -1666,6 +1688,8 @@ branch = options.branch options.track = False + get_git_version() + global VERBOSE global UPDATE VERBOSE = options.verbose diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-review-2.2.0/git_review/tests/test_unit.py new/git-review-2.3.0/git_review/tests/test_unit.py --- old/git-review-2.2.0/git_review/tests/test_unit.py 2021-11-24 03:35:50.000000000 +0100 +++ new/git-review-2.3.0/git_review/tests/test_unit.py 2022-04-18 21:02:11.000000000 +0200 @@ -21,9 +21,9 @@ import os import sys import textwrap +from unittest import mock import fixtures -import mock import testtools from git_review import cmd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-review-2.2.0/git_review.egg-info/PKG-INFO new/git-review-2.3.0/git_review.egg-info/PKG-INFO --- old/git-review-2.2.0/git_review.egg-info/PKG-INFO 2021-11-24 03:37:33.000000000 +0100 +++ new/git-review-2.3.0/git_review.egg-info/PKG-INFO 2022-04-18 21:03:25.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: git-review -Version: 2.2.0 +Version: 2.3.0 Summary: Tool to submit code to Gerrit Home-page: http://docs.opendev.org/opendev/git-review Author: OpenDev Contributors @@ -34,12 +34,11 @@ Classifier: License :: OSI Approved :: Apache Software License Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.5 Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: 3.9 Classifier: Programming Language :: Python Classifier: Topic :: Utilities -Requires-Python: >= 3.5 +Requires-Python: >= 3.6 Description-Content-Type: text/x-rst; charset=UTF-8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-review-2.2.0/git_review.egg-info/SOURCES.txt new/git-review-2.3.0/git_review.egg-info/SOURCES.txt --- old/git-review-2.2.0/git_review.egg-info/SOURCES.txt 2021-11-24 03:37:33.000000000 +0100 +++ new/git-review-2.3.0/git_review.egg-info/SOURCES.txt 2022-04-18 21:03:25.000000000 +0200 @@ -28,6 +28,7 @@ git_review.egg-info/dependency_links.txt git_review.egg-info/entry_points.txt git_review.egg-info/not-zip-safe +git_review.egg-info/pbr.json git_review.egg-info/requires.txt git_review.egg-info/top_level.txt git_review/tests/__init__.py @@ -41,8 +42,10 @@ releasenotes/notes/commit-hook-submodules-121f76901305ff98.yaml releasenotes/notes/default-notopic-3f854006482616cd.yaml releasenotes/notes/discontinue-draft-support-031e1fe3453ca839.yaml +releasenotes/notes/drop-py35-a078f1c6f3c4fff4.yaml releasenotes/notes/drop-python27-support-37e1602a03d602ab.yaml releasenotes/notes/fix-exit-code-5ab7f6314976319f.yaml +releasenotes/notes/fix-show-signatures-5e9c12d43b7051f0.yaml releasenotes/notes/fix-usepushurl-c4a234689d808ece.yaml releasenotes/notes/git-credentials-bytes-6fcecd405dc4ed29.yaml releasenotes/notes/ignore-topic-for-master-patches-9ba01c0762d3df65.yaml @@ -52,6 +55,7 @@ releasenotes/notes/push-no-follow-tags-3f366ecee85b508d.yaml releasenotes/notes/refuse-unstaged-changes-61600bd33adf3a45.yaml releasenotes/notes/remove-automatic-branch-naming-8e3e2f6487637b86.yaml +releasenotes/notes/scp-subsystem-c8d78aa8f7f69f66.yaml releasenotes/notes/support-core-hooks-path-ea5402d5d6204f70.yaml releasenotes/notes/use-rebase-merges-2550c9573cfbf39a.yaml releasenotes/notes/user-notifications-0276f6c14d119225.yaml \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-review-2.2.0/git_review.egg-info/pbr.json new/git-review-2.3.0/git_review.egg-info/pbr.json --- old/git-review-2.2.0/git_review.egg-info/pbr.json 1970-01-01 01:00:00.000000000 +0100 +++ new/git-review-2.3.0/git_review.egg-info/pbr.json 2022-04-18 21:03:25.000000000 +0200 @@ -0,0 +1 @@ +{"git_version": "82a2c8d", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-review-2.2.0/releasenotes/notes/drop-py35-a078f1c6f3c4fff4.yaml new/git-review-2.3.0/releasenotes/notes/drop-py35-a078f1c6f3c4fff4.yaml --- old/git-review-2.2.0/releasenotes/notes/drop-py35-a078f1c6f3c4fff4.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/git-review-2.3.0/releasenotes/notes/drop-py35-a078f1c6f3c4fff4.yaml 2022-04-18 21:02:11.000000000 +0200 @@ -0,0 +1,3 @@ +--- +upgrade: + - Python 3.5 is no longer supported. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-review-2.2.0/releasenotes/notes/fix-show-signatures-5e9c12d43b7051f0.yaml new/git-review-2.3.0/releasenotes/notes/fix-show-signatures-5e9c12d43b7051f0.yaml --- old/git-review-2.2.0/releasenotes/notes/fix-show-signatures-5e9c12d43b7051f0.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/git-review-2.3.0/releasenotes/notes/fix-show-signatures-5e9c12d43b7051f0.yaml 2022-04-18 21:02:11.000000000 +0200 @@ -0,0 +1,10 @@ +--- +fixes: + - | + Git's log.ShowSignature option is now supported. Previously, + setting it would confuse git-review into thinking there were + twice as many changes to push. +upgrade: + - | + Git 2.10.0 or later is required as git-review now needs the + ``--no-show-signature`` option for git-log. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-review-2.2.0/releasenotes/notes/scp-subsystem-c8d78aa8f7f69f66.yaml new/git-review-2.3.0/releasenotes/notes/scp-subsystem-c8d78aa8f7f69f66.yaml --- old/git-review-2.2.0/releasenotes/notes/scp-subsystem-c8d78aa8f7f69f66.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/git-review-2.3.0/releasenotes/notes/scp-subsystem-c8d78aa8f7f69f66.yaml 2022-04-18 21:02:11.000000000 +0200 @@ -0,0 +1,15 @@ +--- +fixes: + - | + 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. Future git-review versions may change the fallback + behavior once an SFTP subsystem is implemented and available for + a new Gerrit release. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-review-2.2.0/setup.cfg new/git-review-2.3.0/setup.cfg --- old/git-review-2.2.0/setup.cfg 2021-11-24 03:37:33.261706400 +0100 +++ new/git-review-2.3.0/setup.cfg 2022-04-18 21:03:25.609055800 +0200 @@ -4,7 +4,7 @@ long_description = file: README.rst long_description_content_type = text/x-rst; charset=UTF-8 author = OpenDev Contributors -author-email = service-disc...@lists.opendev.org +author_email = service-disc...@lists.opendev.org url = http://docs.opendev.org/opendev/git-review project_urls = Browse Source = https://opendev.org/opendev/git-review @@ -15,9 +15,6 @@ Release Notes = https://docs.opendev.org/opendev/git-review/latest/releasenotes.html keywords = git gerrit review commandline license = Apache License, Version 2.0 -license_files = - AUTHORS - LICENSE classifiers = Development Status :: 5 - Production/Stable Environment :: Console @@ -26,14 +23,13 @@ License :: OSI Approved :: Apache Software License Operating System :: OS Independent Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python Topic :: Utilities -python-requires = >= 3.5 +python_requires = >= 3.6 [files] packages = @@ -46,7 +42,6 @@ [pbr] manpages = git-review.1 -warnerrors = True [egg_info] tag_build = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-review-2.2.0/test-requirements.txt new/git-review-2.3.0/test-requirements.txt --- old/git-review-2.2.0/test-requirements.txt 2021-11-24 03:35:50.000000000 +0100 +++ new/git-review-2.3.0/test-requirements.txt 2022-04-18 21:02:11.000000000 +0200 @@ -3,7 +3,6 @@ # due to non SNI TLS connections being disabled. pbr ; python_version >= "3" and python_version <= "3.5" hacking>=2.0.0,<2.1.0 -mock fixtures>=0.3.14 stestr>=2.2.0,<3.0.0 testtools>=0.9.34
