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

parse server diff to generate submitrequest message template

Browse Source
This commit is contained in:
Ludwig Nussel 2010-02-02 14:38:35 +01:00
parent f29ffcdaef
commit 010b55020e
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
osc/commandline.py
View File

@ -855,11 +855,17 @@ of the package %s primarily takes place.
Please submit there instead, or use --nodevelproject to force direct submission.""" \ Please submit there instead, or use --nodevelproject to force direct submission.""" \
% (devloc, dst_package) % (devloc, dst_package)
sys.exit(1) sys.exit(1)
rdiff = None
if opts.diff or not opts.message:
try:
rdiff = 'old: %s/%s\nnew: %s/%s' %(dst_project, dst_package, src_project, src_package)
rdiff += server_diff(apiurl,
dst_project, dst_package, opts.revision,
src_project, src_package, None, True)
except:
rdiff = ''
if opts.diff: if opts.diff:
print 'old: %s/%s\nnew: %s/%s' %(dst_project, dst_package, src_project, src_package)
rdiff = server_diff(apiurl,
dst_project, dst_package, None,
src_project, src_package, None, True)
print rdiff print rdiff
else: else:
reqs = get_request_list(apiurl, dst_project, dst_package, req_type='submit') reqs = get_request_list(apiurl, dst_project, dst_package, req_type='submit')
@ -872,7 +878,18 @@ Please submit there instead, or use --nodevelproject to force direct submission.
repl = raw_input('Revoke the old requests? (y/N) ') repl = raw_input('Revoke the old requests? (y/N) ')
if not opts.message: if not opts.message:
opts.message = edit_message() difflines = []
doappend = False
changes_re = re.compile(r'^--- .*\.changes ')
for line in rdiff.split('\n'):
if line.startswith('--- '):
if changes_re.match(line):
doappend = True
else:
doappend = False
if doappend:
difflines.append(line)
opts.message = edit_message(footer=rdiff, template='\n'.join(parse_diff_for_commit_message('\n'.join(difflines))))
result = create_submit_request(apiurl, result = create_submit_request(apiurl,
src_project, src_package, src_project, src_package,