mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-12 00:46:14 +01:00
Code

Merge pull request #1540 from dmach/fix-log-patch-direction

Browse Source 
Fix patch direction in 'log' command
This commit is contained in:
Daniel Mach 2024-04-22 09:36:02 +02:00 committed by GitHub
commit 9fd02ec493
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 44 additions and 12 deletions
Show Stats 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
@@ -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 @@
-- Release upstream version 2
\+- Release upstream version 1
-- Release upstream version 1
\+- Release upstream version 2
spec files:
-----------
@ -80,8 +80,8 @@ Scenario: Run `osc log --patch` on revision range of a package
\+\+\+ test-pkgA.spec
@@ -1,5 \+1,5 @@
Name: test-pkgA
-Version: 2
\+Version: 1
-Version: 1
\+Version: 2
Release: 1
License: GPL-2.0
Summary: Test package
@ -95,10 +95,16 @@ Scenario: Run `osc log --patch` on revision range of a package
changes files:
--------------
\+\+\+\+\+\+ deleted changes files:
\+\+\+\+\+\+ new changes file:
--- 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.spec
@ -106,8 +112,34 @@ Scenario: Run `osc log --patch` on revision range of a package
spec files:
-----------
\+\+\+\+\+\+ deleted spec files:
\+\+\+\+\+\+ new spec file:
--- 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

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