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

Merge branch 'master' of gitorious.org:opensuse/osc

Browse Source
This commit is contained in:
Juergen Weigert 2010-06-29 14:34:10 +02:00
commit 2ec85b7548
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -1,5 +1,6 @@
0.128 0.128
- better default commands selection for editor/pager - better default commands selection for editor/pager
- support "osc rq reopen" to set a request in new state again
0.127 0.127
- add size limit mode, files can be ignored on checkout or update given a certain size limit. - add size limit mode, files can be ignored on checkout or update given a certain size limit.

9
osc/commandline.py
View File

@ -1485,6 +1485,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
osc request log ID osc request log ID
osc request [show] [-d] [-b] ID osc request [show] [-d] [-b] ID
osc request accept [-m TEXT] ID osc request accept [-m TEXT] ID
osc request reopen [-m TEXT] ID
osc request approvenew [-m TEXT] PROJECT osc request approvenew [-m TEXT] PROJECT
osc request decline [-m TEXT] ID osc request decline [-m TEXT] ID
osc request revoke [-m TEXT] ID osc request revoke [-m TEXT] ID
@ -1517,7 +1518,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if opts.state == '': if opts.state == '':
opts.state = 'new' opts.state = 'new'
cmds = ['list', 'log', 'show', 'decline', 'accept', 'approvenew', 'wipe', 'revoke', 'checkout', 'co', 'help'] cmds = ['list', 'log', 'show', 'decline', 'reopen', 'accept', 'approvenew', 'wipe', 'revoke', 'checkout', 'co', 'help']
if not args or args[0] not in cmds: if not args or args[0] not in cmds:
raise oscerr.WrongArgs('Unknown request action %s. Choose one of %s.' \ raise oscerr.WrongArgs('Unknown request action %s. Choose one of %s.' \
% (args[0],', '.join(cmds))) % (args[0],', '.join(cmds)))
@ -1553,7 +1554,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if len(args) > 1: if len(args) > 1:
package = args[1] package = args[1]
elif cmd in ['log', 'show', 'decline', 'accept', 'wipe', 'revoke', 'checkout', 'co']: elif cmd in ['log', 'show', 'decline', 'reopen', 'accept', 'wipe', 'revoke', 'checkout', 'co']:
reqid = args[0] reqid = args[0]
# list and approvenew # list and approvenew
@ -1679,7 +1680,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
else: else:
if not opts.message: if not opts.message:
opts.message = edit_message() opts.message = edit_message()
state_map = {'accept' : 'accepted', 'decline' : 'declined', 'wipe' : 'deleted', 'revoke' : 'revoked'} state_map = {'reopen' : 'new', 'accept' : 'accepted', 'decline' : 'declined', 'wipe' : 'deleted', 'revoke' : 'revoked'}
# Change review state only # Change review state only
if subcmd == 'review': if subcmd == 'review':
if cmd in ['accept', 'decline', 'new']: if cmd in ['accept', 'decline', 'new']:
@ -1687,7 +1688,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
reqid, state_map[cmd], conf.config['user'], '', opts.message or '') reqid, state_map[cmd], conf.config['user'], '', opts.message or '')
print r print r
# Change state of entire request # Change state of entire request
elif cmd in ['accept', 'decline', 'wipe', 'revoke']: elif cmd in ['reopen', 'accept', 'decline', 'wipe', 'revoke']:
r = change_request_state(conf.config['apiurl'], r = change_request_state(conf.config['apiurl'],
reqid, state_map[cmd], opts.message or '') reqid, state_map[cmd], opts.message or '')
print r print r