mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-10-30 19:12:15 +01:00
Code Activity

- "osc review": only show new reviews if by_user, by_group etc. is specified

Browse Source 
The current implementation is so ugly...
This commit is contained in:
Marcus Huewe
2012-04-03 19:19:54 +02:00
parent 8df38af7e3
commit e65bd21c3b
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osc/commandline.py
View File

@@ -1973,7 +1973,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if opts.all: if opts.all:
state_list = ['all'] state_list = ['all']
if subcmd == 'review': if subcmd == 'review':
state_list = ['review'] # is there a special reason why we do not respect the passed states?
state_list = ['new']
elif opts.state == 'all': elif opts.state == 'all':
state_list = ['all'] state_list = ['all']
else: else:

23
osc/core.py
View File

@@ -3597,19 +3597,34 @@ def change_request_state_template(req, newstate):
return '' return ''
def get_review_list(apiurl, project='', package='', byuser='', bygroup='', byproject='', bypackage='', states=('new')): def get_review_list(apiurl, project='', package='', byuser='', bygroup='', byproject='', bypackage='', states=('new')):
# this is so ugly...
def build_by(xpath, val):
if 'all' in states:
return xpath_join(xpath, 'review/%s' % val, op='and')
elif states:
s_xp = ''
for state in states:
s_xp = xpath_join(s_xp, '@state=\'%s\'' % state, inner=True)
val = val.strip('[').strip(']')
return xpath_join(xpath, 'review[%s and (%s)]' % (val, s_xp), op='and')
return ''
xpath = '' xpath = ''
xpath = xpath_join(xpath, 'state/@name=\'review\'', inner=True) xpath = xpath_join(xpath, 'state/@name=\'review\'', inner=True)
if not 'all' in states: if not 'all' in states:
for state in states: for state in states:
xpath = xpath_join(xpath, 'review/@state=\'%s\'' % state, inner=True) xpath = xpath_join(xpath, 'review/@state=\'%s\'' % state, inner=True)
if byuser or bygroup or bypackage or byproject:
# discard constructed xpath...
xpath = ''
if byuser: if byuser:
xpath = xpath_join(xpath, 'review/@by_user=\'%s\'' % byuser, op='and') xpath = build_by(xpath, '@by_user=\'%s\'' % byuser)
if bygroup: if bygroup:
xpath = xpath_join(xpath, 'review/@by_group=\'%s\'' % bygroup, op='and') xpath = build_by(xpath, '@by_group=\'%s\'' % bygroup)
if bypackage: if bypackage:
xpath = xpath_join(xpath, 'review/[@by_project=\'%s\' and @by_package=\'%s\']' % (byproject, bypackage), op='and') xpath = build_by(xpath, '@by_project=\'%s\' and @by_package=\'%s\'' % (byproject, bypackage))
elif byproject: elif byproject:
xpath = xpath_join(xpath, 'review/@by_project=\'%s\'' % byproject, op='and') xpath = build_by(xpath, '@by_project=\'%s\'' % byproject)
# XXX: we cannot use the '|' in the xpath expression because it is not supported # XXX: we cannot use the '|' in the xpath expression because it is not supported
# in the backend # in the backend