mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-15 06:47:15 +01:00
Code

Merge pull request #1582 from dmach/sr-supersede-message

Browse Source 
Improve 'submitrequest' command to inherit description from superseded request
This commit is contained in:
Daniel Mach 2024-06-25 08:32:11 +02:00 committed by GitHub
commit b972c1db21
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osc/commandline.py
View File

@ -2418,6 +2418,12 @@ Please submit there instead, or use --nodevelproject to force direct submission.
dst_project, None, dst_project, None,
not opts.yes) not opts.yes)
if not opts.message: if not opts.message:
msg = ""
if opts.supersede:
from .obs_api import Request
req = Request.from_api(apiurl, opts.supersede)
msg = req.description + "\n"
difflines = [] difflines = []
doappend = False doappend = False
changes_re = re.compile(r'^--- .*\.changes ') changes_re = re.compile(r'^--- .*\.changes ')
@ -2429,7 +2435,9 @@ Please submit there instead, or use --nodevelproject to force direct submission.
doappend = False doappend = False
if doappend: if doappend:
difflines.append(line) difflines.append(line)
opts.message = edit_message(footer=rdiff, template='\n'.join(parse_diff_for_commit_message('\n'.join(difflines))))
diff = "\n".join(parse_diff_for_commit_message("\n".join(difflines)))
opts.message = edit_message(footer=rdiff, template=f"{msg}{diff}")
result = create_submit_request(apiurl, result = create_submit_request(apiurl,
src_project, src_package, src_project, src_package,