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

show source revision in submit requests

Browse Source
This commit is contained in:
Ludwig Nussel 2014-02-27 11:13:10 +01:00 committed by Adrian Schröter
parent a33c40eb53
commit f065dc4765
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osc/core.py
View File

@ -2584,7 +2584,10 @@ class Request:
elif action.type == 'maintenance_incident':
d['source'] = '%s ->' % action.src_project
if action.src_package:
d['source'] = '%s ->' % prj_pkg_join(action.src_project, action.src_package)
d['source'] = '%s' % prj_pkg_join(action.src_project, action.src_package)
if action.src_rev:
d['source'] = d['source'] + '@%s' % action.src_rev
d['source'] = d['source'] + ' ->'
d['target'] = action.tgt_project
if action.tgt_releaseproject:
d['target'] += " (release in " + action.tgt_releaseproject + ")"
@ -2592,13 +2595,18 @@ class Request:
if action.opt_sourceupdate and show_srcupdate:
srcupdate = '(%s)' % action.opt_sourceupdate
elif action.type == 'maintenance_release':
d['source'] = '%s ->' % prj_pkg_join(action.src_project, action.src_package)
d['source'] = '%s' % prj_pkg_join(action.src_project, action.src_package)
if action.src_rev:
d['source'] = d['source'] + '@%s' % action.src_rev
d['source'] = d['source'] + ' ->'
d['target'] = prj_pkg_join(action.tgt_project, action.tgt_package)
elif action.type == 'submit':
srcupdate = ' '
d['source'] = '%s' % prj_pkg_join(action.src_project, action.src_package)
if action.src_rev:
d['source'] = d['source'] + '@%s' % action.src_rev
if action.opt_sourceupdate and show_srcupdate:
srcupdate = '(%s)' % action.opt_sourceupdate
d['source'] = '%s%s ->' % (prj_pkg_join(action.src_project, action.src_package), srcupdate)
d['source'] = d['source'] + '(%s)' % action.opt_sourceupdate
d['source'] = d['source'] + ' ->'
tgt_package = action.tgt_package
if action.src_package == action.tgt_package:
tgt_package = ''

2
tests/test_prdiff.py
View File

@ -237,7 +237,7 @@ identical: common-three
differs: common-two
148023 State:new By:user When:2013-01-11T11:04:14
submit: home:user:branches:some:project/common-two -> some:project
submit: home:user:branches:some:project/common-two@7 -> some:project
Descr: - Fix it to work - Improve support for something
differs: common-three

4
tests/test_request.py
View File

@ -438,8 +438,8 @@ class TestRequest(OscTestCase):
add_role: person: xyz as maintainer, group: group1 as reader foobar
add_role: person: abc as reviewer foo/bar
change_devel: foo/bar developed in devprj/devpkg
submit: srcprj/srcpackage -> tgtprj/tgtpackage
submit: foo/bar -> baz
submit: srcprj/srcpackage -> tgtprj/tgtpackage
submit: foo/bar -> baz
delete: deleteme
delete: foo/bar\n"""
r = osc.core.Request()