From ae2726990435ea376bea3b695268c0b7f4fcd753 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Fri, 29 May 2020 10:47:19 -0700 Subject: [PATCH 1/7] Update to 0.2.9 --- .gitignore | 1 + python-vcstool-0.2.8-old-git-syntax.patch | 61 ----------------------- python-vcstool.spec | 8 +-- sources | 2 +- 4 files changed, 6 insertions(+), 66 deletions(-) delete mode 100644 python-vcstool-0.2.8-old-git-syntax.patch diff --git a/.gitignore b/.gitignore index bbbcfc6..c97e291 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /vcstool-0.2.4.tar.gz /vcstool-0.2.7.tar.gz /vcstool-0.2.8.tar.gz +/vcstool-0.2.9.tar.gz diff --git a/python-vcstool-0.2.8-old-git-syntax.patch b/python-vcstool-0.2.8-old-git-syntax.patch deleted file mode 100644 index 3bcb00a..0000000 --- a/python-vcstool-0.2.8-old-git-syntax.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 247a7480aaa4b0d71289855f8fd8e1ae566b092b Mon Sep 17 00:00:00 2001 -From: Scott K Logan -Date: Sun, 10 May 2020 02:24:12 -0700 -Subject: [PATCH] Make tests compatible with git back to 1.8.3.1 - ---- - test/test_commands.py | 26 ++++++++++++++++++++++++-- - 1 file changed, 24 insertions(+), 2 deletions(-) - -diff --git a/test/test_commands.py b/test/test_commands.py -index 6374b3d..eff1b82 100644 ---- a/test/test_commands.py -+++ b/test/test_commands.py -@@ -92,7 +92,11 @@ def test_pull(self): - with self.assertRaises(subprocess.CalledProcessError) as e: - run_command('pull', args=['--workers', '1']) - expected = get_expected_output('pull') -- self.assertEqual(e.exception.output, expected) -+ # replace message from older git versions -+ output = e.exception.output.replace( -+ b'anch. Please specify which\nbranch you want to merge with. See', -+ b'anch.\nPlease specify which branch you want to merge with.\nSee') -+ self.assertEqual(output, expected) - - def test_pull_api(self): - try: -@@ -131,8 +135,12 @@ def test_pull_api(self): - os.chdir(cwd_bck) - - assert rc == 1 -+ # replace message from older git versions -+ output = stdout_stderr.getvalue().replace( -+ 'anch. Please specify which\nbranch you want to merge with. See', -+ 'anch.\nPlease specify which branch you want to merge with.\nSee') - expected = get_expected_output('pull').decode() -- assert stdout_stderr.getvalue() == expected -+ assert output == expected - - def test_reimport(self): - cwd_vcstool = os.path.join(TEST_WORKSPACE, 'vcstool') -@@ -261,6 +269,20 @@ def run_command(command, args=None, subfolder=None): - [sys.executable, script] + (args or []), - stderr=subprocess.STDOUT, cwd=cwd, env=env) - # replace message from older git versions -+ output = output.replace( -+ b'git checkout -b new_branch_name', -+ b'git checkout -b ') -+ output = output.replace( -+ b'(detached from ', b'(HEAD detached at ') -+ output = output.replace( -+ b"ady on 'master'\n=", -+ b"ady on 'master'\nYour branch is up-to-date with 'origin/master'.\n=") -+ output = output.replace( -+ b'# HEAD detached at ', -+ b'HEAD detached at ') -+ output = output.replace( -+ b'# On branch master', -+ b"On branch master\nYour branch is up-to-date with 'origin/master'.\n") - # the following seems to have changed between git 2.17.1 and 2.25.1 - output = output.replace( - b"Note: checking out '", b"Note: switching to '") diff --git a/python-vcstool.spec b/python-vcstool.spec index 3c9da37..8689925 100644 --- a/python-vcstool.spec +++ b/python-vcstool.spec @@ -4,7 +4,7 @@ %global srcname vcstool Name: python-%{srcname} -Version: 0.2.8 +Version: 0.2.9 Release: 1%{?dist} Summary: Tool to invoke vcs commands on multiple repositories @@ -12,9 +12,6 @@ License: ASL 2.0 URL: https://github.com/dirk-thomas/%{srcname} Source0: https://github.com/dirk-thomas/%{srcname}/archive/%{version}/%{srcname}-%{version}.tar.gz -# Submitted upstream as dirk-thomas/vcstool#138 -Patch0: %{name}-0.2.8-old-git-syntax.patch - BuildArch: noarch %description @@ -209,6 +206,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers %changelog +* Fri May 29 2020 Scott K Logan - 0.2.9-1 +- Update to 0.2.9 (rhbz#1838404) + * Sun May 10 2020 Scott K Logan - 0.2.8-1 - Update to 0.2.8 (rhbz#1833742) diff --git a/sources b/sources index 088d874..9c1a9cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcstool-0.2.8.tar.gz) = 251acbfe6122206b0ececb5306b963eec9089c20aac39da8ff0ab7f5b0512d56a153636731f376014912df9d06126392bac9a0fcdaa992938e83e270991afa3f +SHA512 (vcstool-0.2.9.tar.gz) = d243360402d695385d36a3a325075a9524f4f771e84a0c013d39e08d25c4114740a4c6135a395771e795ec5fc23118422afd305159841c4dedfe4b50ddad1aa4 From 734e5b748003bd0e280032ac24d9213dc0b01fa0 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Mon, 15 Jun 2020 17:07:34 -0700 Subject: [PATCH 2/7] Update to 0.2.10 --- .gitignore | 1 + python-vcstool.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c97e291..836e15f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /vcstool-0.2.7.tar.gz /vcstool-0.2.8.tar.gz /vcstool-0.2.9.tar.gz +/vcstool-0.2.10.tar.gz diff --git a/python-vcstool.spec b/python-vcstool.spec index 8689925..43aff39 100644 --- a/python-vcstool.spec +++ b/python-vcstool.spec @@ -4,7 +4,7 @@ %global srcname vcstool Name: python-%{srcname} -Version: 0.2.9 +Version: 0.2.10 Release: 1%{?dist} Summary: Tool to invoke vcs commands on multiple repositories @@ -206,6 +206,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers %changelog +* Mon Jun 15 2020 Scott K Logan - 0.2.10-1 +- Update to 0.2.10 (rhbz#1846217) + * Fri May 29 2020 Scott K Logan - 0.2.9-1 - Update to 0.2.9 (rhbz#1838404) diff --git a/sources b/sources index 9c1a9cc..35dcbea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcstool-0.2.9.tar.gz) = d243360402d695385d36a3a325075a9524f4f771e84a0c013d39e08d25c4114740a4c6135a395771e795ec5fc23118422afd305159841c4dedfe4b50ddad1aa4 +SHA512 (vcstool-0.2.10.tar.gz) = 9d0284d71515338d94cf7564b47ca0c5c10097a2ffbad19a895df20b6e59f68da5730fd120feddd3f996fcedefc1e2b7a303ee6d1f62c6489378c5002e09340f From 16e38ad11c5e57b672d50590637919dca17ee36a Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Thu, 18 Jun 2020 11:44:47 -0700 Subject: [PATCH 3/7] Update to 0.2.11 --- .gitignore | 1 + python-vcstool.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 836e15f..bf49602 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /vcstool-0.2.8.tar.gz /vcstool-0.2.9.tar.gz /vcstool-0.2.10.tar.gz +/vcstool-0.2.11.tar.gz diff --git a/python-vcstool.spec b/python-vcstool.spec index 43aff39..8d024d1 100644 --- a/python-vcstool.spec +++ b/python-vcstool.spec @@ -4,7 +4,7 @@ %global srcname vcstool Name: python-%{srcname} -Version: 0.2.10 +Version: 0.2.11 Release: 1%{?dist} Summary: Tool to invoke vcs commands on multiple repositories @@ -206,6 +206,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers %changelog +* Thu Jun 18 2020 Scott K Logan - 0.2.11-1 +- Update to 0.2.11 (rhbz#1847809) + * Mon Jun 15 2020 Scott K Logan - 0.2.10-1 - Update to 0.2.10 (rhbz#1846217) diff --git a/sources b/sources index 35dcbea..eb3735b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcstool-0.2.10.tar.gz) = 9d0284d71515338d94cf7564b47ca0c5c10097a2ffbad19a895df20b6e59f68da5730fd120feddd3f996fcedefc1e2b7a303ee6d1f62c6489378c5002e09340f +SHA512 (vcstool-0.2.11.tar.gz) = 1b4c79b2e25be9aff6e04f5b73bab937c7a48a0a2e4c89450ff24509e1acdc6f35e61d685b0b3083abdccf51abfdf4cdc9c1f0ba00eb4fab16e2b6810f584581 From eabaa3ca7e830780c1c542bc207f8ddd06989143 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Thu, 2 Jul 2020 08:41:59 -0700 Subject: [PATCH 4/7] Update to 0.2.12 --- .gitignore | 1 + python-vcstool.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bf49602..74e0eef 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /vcstool-0.2.9.tar.gz /vcstool-0.2.10.tar.gz /vcstool-0.2.11.tar.gz +/vcstool-0.2.12.tar.gz diff --git a/python-vcstool.spec b/python-vcstool.spec index 8d024d1..b993cad 100644 --- a/python-vcstool.spec +++ b/python-vcstool.spec @@ -4,7 +4,7 @@ %global srcname vcstool Name: python-%{srcname} -Version: 0.2.11 +Version: 0.2.12 Release: 1%{?dist} Summary: Tool to invoke vcs commands on multiple repositories @@ -206,6 +206,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers %changelog +* Thu Jul 02 2020 Scott K Logan - 0.2.12-1 +- Update to 0.2.12 (rhbz#1853214) + * Thu Jun 18 2020 Scott K Logan - 0.2.11-1 - Update to 0.2.11 (rhbz#1847809) diff --git a/sources b/sources index eb3735b..7363d7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcstool-0.2.11.tar.gz) = 1b4c79b2e25be9aff6e04f5b73bab937c7a48a0a2e4c89450ff24509e1acdc6f35e61d685b0b3083abdccf51abfdf4cdc9c1f0ba00eb4fab16e2b6810f584581 +SHA512 (vcstool-0.2.12.tar.gz) = 0e95b93c1548fd6b47027f872d909a00f4cd29f735f36da1d0475e6394e099ee7d64a1836d2ab931adff0b91833f306000510431ac9b9e71e557ca0bb8cf853b From ae57ca39813e05d14bd79e5a7e56538993c86d96 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Mon, 27 Jul 2020 10:25:23 -0700 Subject: [PATCH 5/7] Update to 0.2.13 --- .gitignore | 1 + python-vcstool.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 74e0eef..79d79ed 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /vcstool-0.2.10.tar.gz /vcstool-0.2.11.tar.gz /vcstool-0.2.12.tar.gz +/vcstool-0.2.13.tar.gz diff --git a/python-vcstool.spec b/python-vcstool.spec index b993cad..1c4fa83 100644 --- a/python-vcstool.spec +++ b/python-vcstool.spec @@ -4,7 +4,7 @@ %global srcname vcstool Name: python-%{srcname} -Version: 0.2.12 +Version: 0.2.13 Release: 1%{?dist} Summary: Tool to invoke vcs commands on multiple repositories @@ -206,6 +206,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers %changelog +* Mon Jul 27 2020 Scott K Logan - 0.2.13-1 +- Update to 0.2.13 (rhbz#1859022) + * Thu Jul 02 2020 Scott K Logan - 0.2.12-1 - Update to 0.2.12 (rhbz#1853214) diff --git a/sources b/sources index 7363d7d..2ace9a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcstool-0.2.12.tar.gz) = 0e95b93c1548fd6b47027f872d909a00f4cd29f735f36da1d0475e6394e099ee7d64a1836d2ab931adff0b91833f306000510431ac9b9e71e557ca0bb8cf853b +SHA512 (vcstool-0.2.13.tar.gz) = 953e232e917aeba4a2014259764b152b3fabe81e46a657cc6814b5580f7db24d1c239e0704120de654e0f5e274f6f3bf2131f56b11f6098d1ec0629488e5cd0b From 04b98d83e6bb44eaf2f7544b814d5bc0fac93cac Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Sun, 16 Aug 2020 14:23:04 -0700 Subject: [PATCH 6/7] Update to 0.2.14 --- .gitignore | 1 + python-vcstool.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 79d79ed..27fd9ed 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /vcstool-0.2.11.tar.gz /vcstool-0.2.12.tar.gz /vcstool-0.2.13.tar.gz +/vcstool-0.2.14.tar.gz diff --git a/python-vcstool.spec b/python-vcstool.spec index 1c4fa83..68ee91c 100644 --- a/python-vcstool.spec +++ b/python-vcstool.spec @@ -4,7 +4,7 @@ %global srcname vcstool Name: python-%{srcname} -Version: 0.2.13 +Version: 0.2.14 Release: 1%{?dist} Summary: Tool to invoke vcs commands on multiple repositories @@ -206,6 +206,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers %changelog +* Sun Aug 16 2020 Scott K Logan - 0.2.14-1 +- Update to 0.2.14 (rhbz#1862412) + * Mon Jul 27 2020 Scott K Logan - 0.2.13-1 - Update to 0.2.13 (rhbz#1859022) diff --git a/sources b/sources index 2ace9a5..9913376 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcstool-0.2.13.tar.gz) = 953e232e917aeba4a2014259764b152b3fabe81e46a657cc6814b5580f7db24d1c239e0704120de654e0f5e274f6f3bf2131f56b11f6098d1ec0629488e5cd0b +SHA512 (vcstool-0.2.14.tar.gz) = ce01a7cad03286fa12e959ba4698d1eb4f2944424aa9839ad6d0a92c000a1e3d73e12c76f0cdbddd53ae1ce3d3d58bde1c65eab9618e4c58059409f6fcd32196 From 02daad060be04381de3e619047750e4588f32fe4 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Mon, 2 Nov 2020 12:04:29 -0800 Subject: [PATCH 7/7] Update to 0.2.15 --- .gitignore | 1 + python-vcstool.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 27fd9ed..002b912 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /vcstool-0.2.12.tar.gz /vcstool-0.2.13.tar.gz /vcstool-0.2.14.tar.gz +/vcstool-0.2.15.tar.gz diff --git a/python-vcstool.spec b/python-vcstool.spec index 68ee91c..a766b1a 100644 --- a/python-vcstool.spec +++ b/python-vcstool.spec @@ -4,7 +4,7 @@ %global srcname vcstool Name: python-%{srcname} -Version: 0.2.14 +Version: 0.2.15 Release: 1%{?dist} Summary: Tool to invoke vcs commands on multiple repositories @@ -206,6 +206,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers %changelog +* Mon Nov 02 2020 Scott K Logan - 0.2.15-1 +- Update to 0.2.15 (rhbz#1891662) + * Sun Aug 16 2020 Scott K Logan - 0.2.14-1 - Update to 0.2.14 (rhbz#1862412) diff --git a/sources b/sources index 9913376..330b1bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcstool-0.2.14.tar.gz) = ce01a7cad03286fa12e959ba4698d1eb4f2944424aa9839ad6d0a92c000a1e3d73e12c76f0cdbddd53ae1ce3d3d58bde1c65eab9618e4c58059409f6fcd32196 +SHA512 (vcstool-0.2.15.tar.gz) = be4817ff466687e57b04254cee5b5cf9b6759b2d1e01e5f756e7d2f1294ca485a172aaab98ba09fc33a3bf0fb86e8798d95f097a15d5491ef544fb2a8825e691