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

- simplify "setlinkrev" call and do the right thing by default.

Browse Source
This commit is contained in:
Adrian Schröter 2012-02-29 11:51:40 +01:00
parent 793d9ec961
commit 96042a3194
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osc/commandline.py
View File

@ -2176,8 +2176,6 @@ Please submit there instead, or use --nodevelproject to force direct submission.
help='use the specified revision.') help='use the specified revision.')
@cmdln.option('-R', '--use-plain-revision', action='store_true', @cmdln.option('-R', '--use-plain-revision', action='store_true',
help='Don\'t expand revsion based on baserev, the revision which was used when commit happened.') help='Don\'t expand revsion based on baserev, the revision which was used when commit happened.')
@cmdln.option('-b', '--use-baserev', action='store_true',
help='Use the revisions which exists when the original commit happend and don\'t try to merge later commits.')
@cmdln.option('-u', '--unset', action='store_true', @cmdln.option('-u', '--unset', action='store_true',
help='remove revision in link, it will point always to latest revision') help='remove revision in link, it will point always to latest revision')
def do_setlinkrev(self, subcmd, opts, *args): def do_setlinkrev(self, subcmd, opts, *args):
@ -2196,11 +2194,10 @@ Please submit there instead, or use --nodevelproject to force direct submission.
apiurl = self.get_api_url() apiurl = self.get_api_url()
package = None package = None
expand = True expand = True
baserev = False baserev = True
if opts.use_plain_revision: if opts.use_plain_revision:
expand = False expand = False
if opts.use_baserev: baserev = False
baserev = True
rev = parseRevisionOption(opts.revision)[0] or '' rev = parseRevisionOption(opts.revision)[0] or ''
if opts.unset: if opts.unset: