diff --git a/NEWS b/NEWS index eecd49b8..d4e0e808 100644 --- a/NEWS +++ b/NEWS @@ -16,28 +16,22 @@ - added cat -e, to cat a file through a link. 'cat -e -r 3' expands through the third revision of the _link. - added subcmd bco as alias for branch -c - - added default project to branch subcommand. .oscrc:branch_project = OpenSUSE:Factory - added primitive experimental support for .oscrc:checkout_no_colon = 1 - suggest using svn when .svn found. - alias submitpac submitrequest - osc bco now continues to checkout after branch target exists error. - added .oscrc:plaintext_passwd=1 for backwards compatibility - moved core.py:exclude_stuff to .oscrc:exclude_glob and expand it to catch *.orig etc. - - allowed req as alias for request. - - bugfix get_request_list: use 'or' with multiple states, not 'and'. - - added osc req list -s all; a shorthand for enumerating all states - - osc req list no longer confuses creator with approver. - - osc req list -D nnn limit to requests nnn days old. - - osc req list now also shows requests from the the given package, not only to. + - added osc rq list -a; a shorthand for enumerating all states + - osc rq list -D nnn limit to requests nnn days old. - improved help texts with repairlink to point to osc resolved. - improved passx code when creating oscrc. - - osc sr -l is now a shortcut for 'osc req list -M -a -t submit -D 0' - osc metafromspec allows editing before send - allow handling of other roles than "maintainer" with maintainer command (-r role) - fix and improve request list and show output - new osc rremove command for remote source files removal - - handle _service\* files correctly + - first part of support to handle _service\* files correctly - osc commit asks if some file has a '?' status (can be skipped by --force option) - fixed request list for multiple states - new option --overlay diff --git a/osc/commandline.py b/osc/commandline.py index 5a7461f9..272a2bc0 100755 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -498,10 +498,6 @@ class Osc(cmdln.Cmdln): @cmdln.option('--nodevelproject', action='store_true', help='do not follow a defined devel project ' \ '(primary project where a package is developed)') - @cmdln.option('-d', '--diff', action='store_true', - help='show diff only instead of creating the actual request') - @cmdln.option('-l', '--list', action='store_true', - help='show submitrequests. Same as \'osc req list -M -s all -t submit -D 0\'') @cmdln.alias("sr") @cmdln.alias("submitreq") @cmdln.alias("submitpac") @@ -520,14 +516,6 @@ class Osc(cmdln.Cmdln): ${cmd_option_list} """ - if opts.list: - opts.state = "all" - opts.user = "" - opts.all = True - opts.type = "submit" - opts.mine = True - return self.do_request('list', opts, *args) - args = slash_split(args) # remove this block later again @@ -631,7 +619,7 @@ Please submit there instead, or use --nodevelproject to force direct submission. if repl == 'y': for req in myreqs: change_request_state(apiurl, str(req.reqid), 'revoked', - 'superseded by %s' % result) + 'superseeded by %s' % result) print 'created request id', result @@ -730,7 +718,6 @@ Please submit there instead, or use --nodevelproject to force direct submission. @cmdln.option('-M', '--mine', action='store_true', help='only show requests created by yourself') @cmdln.alias("rq") - @cmdln.alias("req") def do_request(self, subcmd, opts, *args): """${cmd_name}: Show and modify requests @@ -1220,12 +1207,7 @@ Please submit there instead, or use --nodevelproject to force direct submission. home:USERNAME:branches:PROJECT/PACKAGE if nothing else specified. - The branched package will come from - %(branch_project)s - if nothing else specified. - usage: - osc branch SOURCEPACKAGE osc branch SOURCEPROJECT SOURCEPACKAGE osc branch SOURCEPROJECT SOURCEPACKAGE TARGETPROJECT osc branch SOURCEPROJECT SOURCEPACKAGE TARGETPROJECT TARGETPACKAGE @@ -1237,12 +1219,6 @@ Please submit there instead, or use --nodevelproject to force direct submission. args = slash_split(args) tproject = tpackage = None - if len(args) == 1: - print >>sys.stderr, 'defaulting to %s/%s' % (conf.config['branch_project'], args[0]) - # python has no args.unshift ??? - args = [ conf.config['branch_project'], args[0] ] - - if not (len(args) >= 2 and len(args) <= 4): raise oscerr.WrongArgs('Wrong number of arguments.') if len(args) >= 3: @@ -2147,10 +2123,10 @@ Please submit there instead, or use --nodevelproject to force direct submission. else: raise e -# @cmdln.hide(1) -# def do_req(self, subcmd, opts, *args): -# print "Command req is obsolete. Please use 'osc api'" -# sys.exit(1) + @cmdln.hide(1) + def do_req(self, subcmd, opts, *args): + print "Command req is obsolete. Please use 'osc api'" + sys.exit(1) @cmdln.alias('r') @cmdln.option('-l', '--last-build', action='store_true', diff --git a/osc/conf.py b/osc/conf.py index 5928cf74..e3366405 100644 --- a/osc/conf.py +++ b/osc/conf.py @@ -72,8 +72,6 @@ DEFAULTS = { 'apiurl': 'https://api.opensuse.org', 'extra-pkgs': 'vim gdb strace', # default platform 'build_platform': 'openSUSE_Factory', - # default project for branch or bco - 'branch_project': 'openSUSE:Factory', # alternate filesystem layout: have multiple subdirs, where colons were. 'checkout_no_colon': '0', # local files to ignore with status, addremove, ....