mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-08-23 06:48:51 +02:00
Code Activity

Fix patch direction in 'log' command

Browse Source
This commit is contained in:
Daniel Mach
2024-04-18 13:23:28 +02:00
parent 42e529f346
commit da41f0fe07
2 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
behave/features/log.feature
View File

@@ -68,11 +68,11 @@ Scenario: Run `osc log --patch` on revision range of a package
--- test-pkgA.changes --- test-pkgA.changes
\+\+\+ test-pkgA.changes \+\+\+ test-pkgA.changes
@@ -2 \+2 @@ @@ -2 \+2 @@
-Tue Jan 4 11:22:33 UTC 2022 - Geeko Packager <email@example.com> -Mon Jan 3 11:22:33 UTC 2022 - Geeko Packager <email@example.com>
\+Mon Jan 3 11:22:33 UTC 2022 - Geeko Packager <email@example.com> \+Tue Jan 4 11:22:33 UTC 2022 - Geeko Packager <email@example.com>
@@ -4 \+4 @@ @@ -4 \+4 @@
-- Release upstream version 2 -- Release upstream version 1
\+- Release upstream version 1 \+- Release upstream version 2
spec files: spec files:
----------- -----------
@@ -80,8 +80,8 @@ Scenario: Run `osc log --patch` on revision range of a package
\+\+\+ test-pkgA.spec \+\+\+ test-pkgA.spec
@@ -1,5 \+1,5 @@ @@ -1,5 \+1,5 @@
Name: test-pkgA Name: test-pkgA
-Version: 2 -Version: 1
\+Version: 1 \+Version: 2
Release: 1 Release: 1
License: GPL-2.0 License: GPL-2.0
Summary: Test package Summary: Test package
@@ -95,10 +95,16 @@ Scenario: Run `osc log --patch` on revision range of a package
changes files: changes files:
-------------- --------------
\+\+\+\+\+\+ deleted changes files: \+\+\+\+\+\+ new changes file:
--- test-pkgA.changes --- test-pkgA.changes
\+\+\+ test-pkgA.changes
@@ -0,0 \+1,4 @@
\+-------------------------------------------------------------------
\+Mon Jan 3 11:22:33 UTC 2022 - Geeko Packager <email@example.com>
\+
\+- Release upstream version 1
old: new:
---- ----
test-pkgA.changes test-pkgA.changes
test-pkgA.spec test-pkgA.spec
@@ -106,8 +112,34 @@ Scenario: Run `osc log --patch` on revision range of a package
spec files: spec files:
----------- -----------
\+\+\+\+\+\+ deleted spec files: \+\+\+\+\+\+ new spec file:
--- test-pkgA.spec --- test-pkgA.spec
\+\+\+ test-pkgA.spec
@@ -0,0 \+1,25 @@
\+Name: test-pkgA
\+Version: 1
\+Release: 1
\+License: GPL-2.0
\+Summary: Test package
\+URL: https://example.com/test-package/
\+
\+
\+BuildArch: noarch
\+
\+
\+%description
\+desc
\+
\+
\+%prep
\+
\+
\+%install
\+
\+
\+%files
\+
\+
\+%changelog
""" """

4
osc/core.py
View File

@@ -4753,10 +4753,10 @@ def get_commitlog(
apiurl, apiurl,
prj, prj,
package, package,
revision.rev, revision.rev - 1,
prj, prj,
package, package,
revision.rev - 1, revision.rev,
) )
yield highlight_diff(rdiff).decode("utf-8", errors="replace") yield highlight_diff(rdiff).decode("utf-8", errors="replace")
return return