commit osc for openSUSE:Factory
Hello community, here is the log from the commit of package osc for openSUSE:Factory checked in at 2014-09-12 11:19:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osc (Old) and /work/SRC/openSUSE:Factory/.osc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "osc" Changes: -------- --- /work/SRC/openSUSE:Factory/osc/osc.changes 2014-08-27 07:46:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.osc.new/osc.changes 2014-09-12 11:19:22.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Sep 12 07:03:37 UTC 2014 - adrian@suse.de + +- 0.148.1 + - fixes crash regression + +------------------------------------------------------------------- +Thu Sep 11 10:35:57 UTC 2014 - adrian@suse.de + +- 0.148.0 + - support new history including review history of OBS 2.6 + - display request priorities, if important or critical + - add "osc rq priorize" command to re-priorize existing requests + - allow also "osc rq ls" shortcut + - fish shell completion support + +------------------------------------------------------------------- @@ -4 +20 @@ -- 0.147 +- 0.147.0 Old: ---- osc-0.147.0.tar.gz New: ---- osc-0.148.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.EIAhaS/_old 2014-09-12 11:19:23.000000000 +0200 +++ /var/tmp/diff_new_pack.EIAhaS/_new 2014-09-12 11:19:23.000000000 +0200 @@ -17,7 +17,7 @@ Name: osc -Version: 0.147.0 +Version: 0.148.1 Release: 0 Summary: openSUSE Build Service Commander License: GPL-2.0+ ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.EIAhaS/_old 2014-09-12 11:19:23.000000000 +0200 +++ /var/tmp/diff_new_pack.EIAhaS/_new 2014-09-12 11:19:23.000000000 +0200 @@ -1,5 +1,5 @@ pkgname=osc -pkgver=0.147.0 +pkgver=0.148.1 pkgrel=0 pkgdesc="Open Build Service client" arch=('i686' 'x86_64') @@ -8,7 +8,7 @@ groups=('base-devel') depends=('python2' 'python2-m2crypto' 'urlgrabber') source=(osc-${pkgver}.tar.gz) -md5sums=('a0a5d3abb52b62ea616c8a209a336096') +md5sums=('afe87fa0c93848a0492da4505d56725b') package() { msg "Installing osc ..." ++++++ _service ++++++ --- /var/tmp/diff_new_pack.EIAhaS/_old 2014-09-12 11:19:23.000000000 +0200 +++ /var/tmp/diff_new_pack.EIAhaS/_new 2014-09-12 11:19:23.000000000 +0200 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="version">0.147.0</param> - <param name="revision">0.147.0</param> + <param name="version">0.148.1</param> + <param name="revision">0.148</param> <param name="url">git://github.com/openSUSE/osc.git</param> <param name="scm">git</param> </service> ++++++ osc-0.147.0.tar.gz -> osc-0.148.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.147.0/NEWS new/osc-0.148.1/NEWS --- old/osc-0.147.0/NEWS 2014-08-26 09:51:39.000000000 +0200 +++ new/osc-0.148.1/NEWS 2014-09-12 09:13:58.000000000 +0200 @@ -1,3 +1,10 @@ +0.148 + - support new history including review history of OBS 2.6 + - display request priorities, if important or critical + - add "osc rq priorize" command to re-priorize existing requests + - allow also "osc rq ls" shortcut + - fish shell completion support + 0.147 - support groups in maintainership requests - fixing listing of review requests @@ -8,6 +15,7 @@ - handle ppc64le for debian as well - fix buildlog --strip-time - some more minor bugfixes + - speedup update of a project working copy (in some cases) 0.146 - support maintenance release request with acceptinfo data (OBS 2.6) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.147.0/osc/build.py new/osc-0.148.1/osc/build.py --- old/osc-0.147.0/osc/build.py 2014-08-26 09:51:39.000000000 +0200 +++ new/osc-0.148.1/osc/build.py 2014-09-12 09:13:58.000000000 +0200 @@ -268,6 +268,7 @@ b_built = subprocess.Popen(['find', os.path.join(pacdir, 'KIWI'), '-type', 'f'], stdout=subprocess.PIPE).stdout.read().strip() + s_built = '' elif buildtype == 'dsc': b_built = subprocess.Popen(['find', os.path.join(pacdir, 'DEBS'), '-name', '*.deb'], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.147.0/osc/commandline.py new/osc-0.148.1/osc/commandline.py --- old/osc-0.147.0/osc/commandline.py 2014-08-26 09:51:39.000000000 +0200 +++ new/osc-0.148.1/osc/commandline.py 2014-09-12 09:13:58.000000000 +0200 @@ -1958,6 +1958,9 @@ "checkout" will checkout the request's source package ("submit" requests only). + "priorize" change the prioritity of a request to either "critical", "important", "moderate" or "low" + + The 'review' command has the following sub commands: "list" lists open requests that need to be reviewed by the @@ -1982,6 +1985,7 @@ osc request setincident [-m TEXT] ID INCIDENT osc request supersede [-m TEXT] ID SUPERSEDING_ID osc request approvenew [-m TEXT] PROJECT + osc request priorize [-m TEXT] ID PRIORITY osc request checkout/co ID osc request clone [-m TEXT] ID @@ -2021,7 +2025,7 @@ if args[0] == 'help': return self.do_help(['help', 'request']) - cmds = ['list', 'log', 'show', 'decline', 'reopen', 'clone', 'accept', 'approvenew', 'wipe', 'setincident', 'supersede', 'revoke', 'checkout', 'co'] + cmds = ['list', 'ls', 'log', 'show', 'decline', 'reopen', 'clone', 'accept', 'approvenew', 'wipe', 'setincident', 'supersede', 'revoke', 'checkout', 'co', 'priorize'] if subcmd != 'review' and args[0] not in cmds: raise oscerr.WrongArgs('Unknown request action %s. Choose one of %s.' \ % (args[0], ', '.join(cmds))) @@ -2032,12 +2036,14 @@ cmd = args[0] del args[0] + if cmd == 'ls': + cmd = "list" apiurl = self.get_api_url() if cmd in ['list']: min_args, max_args = 0, 2 - elif cmd in ['supersede', 'setincident']: + elif cmd in ['supersede', 'setincident', 'priorize']: min_args, max_args = 2, 2 else: min_args, max_args = 1, 1 @@ -2074,6 +2080,9 @@ elif cmd == 'setincident': reqid = args[0] incident = args[1] + elif cmd == 'priorize': + reqid = args[0] + priority = args[1] elif cmd in ['log', 'add', 'show', 'decline', 'reopen', 'clone', 'accept', 'wipe', 'revoke', 'checkout', 'co']: reqid = args[0] @@ -2088,6 +2097,13 @@ url = makeurl(apiurl, ['request', reqid], query) r = http_POST(url, data=opts.message) print(ET.parse(r).getroot().get('code')) + + # change priority + elif cmd == 'priorize': + query = { 'cmd': 'setpriority', 'priority': priority } + url = makeurl(apiurl, ['request', reqid], query) + r = http_POST(url, data=opts.message) + print(ET.parse(r).getroot().get('code')) # add new reviewer to existing request elif cmd in ['add'] and subcmd == 'review': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.147.0/osc/core.py new/osc-0.148.1/osc/core.py --- old/osc-0.147.0/osc/core.py 2014-08-26 09:51:39.000000000 +0200 +++ new/osc-0.148.1/osc/core.py 2014-09-12 09:13:58.000000000 +0200 @@ -5,7 +5,7 @@ from __future__ import print_function -__version__ = '0.147' +__version__ = '0.148' # __store_version__ is to be incremented when the format of the working copy # "store" changes in an incompatible way. Please add any needed migration @@ -2357,6 +2357,10 @@ """return data from <comment /> tag""" raise NotImplementedError() + def get_description(self): + """return data from <description /> tag""" + raise NotImplementedError() + def to_xml(self): """serialize object to XML""" root = ET.Element(self.get_node_name()) @@ -2364,6 +2368,8 @@ val = getattr(self, attr) if not val is None: root.set(attr, val) + if self.get_description(): + ET.SubElement(root, 'description').text = self.get_description() if self.get_comment(): ET.SubElement(root, 'comment').text = self.get_comment() return root @@ -2400,6 +2406,37 @@ def get_comment(self): return self.comment + def get_description(self): + return None + + +class RequestHistory(AbstractState): + """Represents a history element of a request""" + def __init__(self, history_node): + AbstractState.__init__(self, history_node.tag) + self.who = history_node.get('who') + self.when = history_node.get('when') + if not history_node.find('description') is None and \ + history_node.find('description').text: + # OBS 2.6 + self.description = history_node.find('description').text.strip() + else: + # OBS 2.5 and before + self.description = history_node.get('name') + self.comment = '' + if not history_node.find('comment') is None and \ + history_node.find('comment').text: + self.comment = history_node.find('comment').text.strip() + + def get_node_attrs(self): + return ('who', 'when') + + def get_description(self): + return self.description + + def get_comment(self): + return self.comment + class RequestState(AbstractState): """Represents the state of a request""" @@ -2411,6 +2448,9 @@ self.name = state_node.get('name') self.who = state_node.get('who') self.when = state_node.get('when') + if state_node.find('description') is None: + # OBS 2.6 has it always, before it did not exist + self.description = state_node.get('description') self.comment = '' if not state_node.find('comment') is None and \ state_node.find('comment').text: @@ -2422,6 +2462,9 @@ def get_comment(self): return self.comment + def get_description(self): + return None + class Action: """ @@ -2553,6 +2596,7 @@ self.reqid = None self.title = '' self.description = '' + self.priority = None self.state = None self.accept_at = None self.actions = [] @@ -2578,8 +2622,10 @@ self.actions.append(Action.from_xml(action)) for review in root.findall('review'): self.reviews.append(ReviewState(review)) - for hist_state in root.findall('history'): - self.statehistory.append(RequestState(hist_state)) + for history_element in root.findall('history'): + self.statehistory.append(RequestHistory(history_element)) + if not root.find('priority') is None and root.find('priority').text: + self.priority = root.find('priority').text.strip() if not root.find('accept_at') is None and root.find('accept_at').text: self.accept_at = root.find('accept_at').text.strip() if not root.find('title') is None: @@ -2625,6 +2671,8 @@ ET.SubElement(root, 'description').text = self.description if self.accept_at: ET.SubElement(root, 'accept_at').text = self.accept_at + if self.priority: + ET.SubElement(root, 'priority').text = self.priority return root def to_str(self): @@ -2751,7 +2799,7 @@ tmpl = ' Review by %(type)-10s is %(state)-10s %(by)-50s' for review in self.reviews: lines.append(tmpl % Request.format_review(review)) - history = ['%s(%s)' % (hist.name, hist.who) for hist in self.statehistory] + history = ['%s: %s' % (hist.description, hist.who) for hist in self.statehistory] if history: lines.append(' From: %s' % ' -> '.join(history)) if self.description: @@ -2766,6 +2814,8 @@ lines = ['Request: #%s\n' % self.reqid] if self.accept_at and self.state.name in [ 'new', 'review' ]: lines.append(' *** This request will get automatically accepted after '+self.accept_at+' ! ***\n') + if self.priority in [ 'critical', 'important' ] and self.state.name in [ 'new', 'review' ]: + lines.append(' *** This request has classified as '+self.priority+' ! ***\n') for action in self.actions: tmpl = ' %(type)-13s %(source)s %(target)s' @@ -2802,11 +2852,10 @@ if reviews: lines.append('\nReview: %s' % indent.join(reviews)) - tmpl = '%(name)-10s %(when)-12s %(who)s' + tmpl = '%(when)-10s %(who)-12s %(desc)s' histories = [] for hist in reversed(self.statehistory): - d = {'name': hist.name, 'when': hist.when, - 'who': hist.who} + d = {'when': hist.when, 'who': hist.who, 'desc': hist.description} histories.append(tmpl % d) if histories: lines.append('\nHistory: %s' % indent.join(histories)) @@ -3921,7 +3970,7 @@ def get_request(apiurl, reqid): - u = makeurl(apiurl, ['request', reqid]) + u = makeurl(apiurl, ['request', reqid], {'withfullhistory': '1'}) f = http_GET(u) root = ET.parse(f).getroot() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.147.0/osc.fish new/osc-0.148.1/osc.fish --- old/osc-0.147.0/osc.fish 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.148.1/osc.fish 2014-09-12 09:13:58.000000000 +0200 @@ -0,0 +1,116 @@ +# fish completion for git +# vim: smartindent:expandtab:ts=2:sw=2 + +function __fish_osc_needs_command + set cmd (commandline -opc) + if contains "$cmd" 'osc' 'osc help' + return 0 + end + return 1 +end + +function __fish_osc_using_command + set cmd (commandline -opc) + if [ (count $cmd) -gt 1 ] + for arg in $argv + if [ $arg = $cmd[2] ] + return 0 + end + end + end + return 1 +end + +# general options +complete -f -c osc -n 'not __fish_osc_needs_command' -s A -l apiurl -d 'specify URL to access API server at or an alias' +complete -f -c osc -n 'not __fish_osc_needs_command' -s c -l config -d 'specify alternate configuration file' +complete -f -c osc -n 'not __fish_osc_needs_command' -s d -l debug -d 'print info useful for debugging' +complete -f -c osc -n 'not __fish_osc_needs_command' -l debugger -d 'jump into the debugger before executing anything' +complete -f -c osc -n 'not __fish_osc_needs_command' -s h -l help -d 'show this help message and exit' +complete -f -c osc -n 'not __fish_osc_needs_command' -s H -l http-debug -d 'debug HTTP traffic (filters some headers)' +complete -f -c osc -n 'not __fish_osc_needs_command' -l http-full-debug -d 'debug HTTP traffic (filters no headers)' +complete -f -c osc -n 'not __fish_osc_needs_command' -l no-gnome-keyring -d 'disable usage of GNOME Keyring' +complete -f -c osc -n 'not __fish_osc_needs_command' -l no-keyring -d 'disable usage of desktop keyring system' +complete -f -c osc -n 'not __fish_osc_needs_command' -l post-mortem -d 'jump into the debugger in case of errors' +complete -f -c osc -n 'not __fish_osc_needs_command' -s q -l quiet -d 'be quiet, not verbose' +complete -f -c osc -n 'not __fish_osc_needs_command' -s t -l traceback -d 'print call trace in case of errors' +complete -f -c osc -n 'not __fish_osc_needs_command' -s v -l verbose -d 'increase verbosity' +complete -f -c osc -n 'not __fish_osc_needs_command' -l version -d 'show program\'s version number and exit' + +# osc commands +complete -f -c osc -n '__fish_osc_needs_command' -a 'add' -d 'Mark files to be added upon the next commit' +complete -f -c osc -n '__fish_osc_needs_command' -a 'addremove ar' -d 'Adds new files, removes disappeared files' +complete -f -c osc -n '__fish_osc_needs_command' -a 'aggregatepac' -d '"Aggregate" a package to another package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'api' -d 'Issue an arbitrary request to the API' +complete -f -c osc -n '__fish_osc_needs_command' -a 'branch bco branchco getpac' -d 'Branch a package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'chroot' -d 'into the buildchroot' +complete -f -c osc -n '__fish_osc_needs_command' -a 'clean' -d 'removes all untracked files from the package working ...' +complete -f -c osc -n '__fish_osc_needs_command' -a 'commit checkin ci' -d 'Upload content to the repository server' +complete -f -c osc -n '__fish_osc_needs_command' -a 'config' -d 'get/set a config option' +complete -f -c osc -n '__fish_osc_needs_command' -a 'copypac' -d 'Copy a package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'createincident' -d 'Create a maintenance incident' +complete -f -c osc -n '__fish_osc_needs_command' -a 'createrequest creq' -d 'create multiple requests with a single command' +complete -f -c osc -n '__fish_osc_needs_command' -a 'delete del remove rm' -d 'Mark files or package directories to be deleted upon ...' +complete -f -c osc -n '__fish_osc_needs_command' -a 'deleterequest deletereq dr dropreq droprequest' -d 'Request to delete (or "drop") a package or project' +complete -f -c osc -n '__fish_osc_needs_command' -a 'dependson whatdependson' -d 'Show the build dependencies' +complete -f -c osc -n '__fish_osc_needs_command' -a 'detachbranch' -d 'replace a link with its expanded sources' +complete -f -c osc -n '__fish_osc_needs_command' -a 'develproject bsdevelproject dp' -d 'print the devel project / package of a package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'diff di ldiff linkdiff' -d 'Generates a diff' +complete -f -c osc -n '__fish_osc_needs_command' -a 'distributions dists' -d 'Shows all available distributions' +complete -f -c osc -n '__fish_osc_needs_command' -a 'getbinaries' -d 'Download binaries to a local directory' +complete -f -c osc -n '__fish_osc_needs_command' -a 'help ? h' -d 'give detailed help on a specific sub-command' +complete -f -c osc -n '__fish_osc_needs_command' -a 'importsrcpkg' -d 'Import a new package from a src.rpm' +complete -f -c osc -n '__fish_osc_needs_command' -a 'info' -d 'Print information about a working copy' +complete -f -c osc -n '__fish_osc_needs_command' -a 'init' -d 'Initialize a directory as working copy' +complete -f -c osc -n '__fish_osc_needs_command' -a 'jobhistory jobhist' -d 'Shows the job history of a project' +complete -f -c osc -n '__fish_osc_needs_command' -a 'linkpac' -d '"Link" a package to another package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'linktobranch' -d 'Convert a package containing a classic link with patc...' +complete -f -c osc -n '__fish_osc_needs_command' -a 'list LL lL ll ls' -d 'List sources or binaries on the server' +complete -f -c osc -n '__fish_osc_needs_command' -a 'localbuildlog lbl' -d 'Shows the build log of a local buildchroot' +complete -f -c osc -n '__fish_osc_needs_command' -a 'log' -d 'Shows the commit log of a package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'maintainer bugowner' -d 'Show maintainers according to server side configuration' +complete -f -c osc -n '__fish_osc_needs_command' -a 'maintenancerequest mr' -d 'Create a request for starting a maintenance incident.' +complete -f -c osc -n '__fish_osc_needs_command' -a 'man' -d 'generates a man page' +complete -f -c osc -n '__fish_osc_needs_command' -a 'mbranch maintained sm' -d 'Search or banch multiple instances of a package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'meta' -d 'Show meta information, or edit it' +complete -f -c osc -n '__fish_osc_needs_command' -a 'mkpac' -d 'Create a new package under version control' +complete -f -c osc -n '__fish_osc_needs_command' -a 'mv' -d 'Move SOURCE file to DEST and keep it under version co...' +complete -f -c osc -n '__fish_osc_needs_command' -a 'my' -d 'show waiting work, packages, projects or requests inv...' +complete -f -c osc -n '__fish_osc_needs_command' -a 'patchinfo' -d 'Generate and edit a patchinfo file.' +complete -f -c osc -n '__fish_osc_needs_command' -a 'pdiff' -d 'Quick alias to diff the content of a package with its...' +complete -f -c osc -n '__fish_osc_needs_command' -a 'prdiff projdiff projectdiff' -d 'Server-side diff of two projects' +complete -f -c osc -n '__fish_osc_needs_command' -a 'prjresults pr' -d 'Shows project-wide build results' +complete -f -c osc -n '__fish_osc_needs_command' -a 'pull' -d 'merge the changes of the link target into your workin...' +complete -f -c osc -n '__fish_osc_needs_command' -a 'rdelete' -d 'Delete a project or packages on the server.' +complete -f -c osc -n '__fish_osc_needs_command' -a 'rdiff' -d 'Server-side "pretty" diff of two packages' +complete -f -c osc -n '__fish_osc_needs_command' -a 'rebuild rebuildpac' -d 'Trigger package rebuilds' +complete -f -c osc -n '__fish_osc_needs_command' -a 'release' -d 'Release sources and binaries' +complete -f -c osc -n '__fish_osc_needs_command' -a 'releaserequest' -d 'Create a request for releasing a maintenance update.' +complete -f -c osc -n '__fish_osc_needs_command' -a 'remotebuildlog rbl rblt rbuildlog rbuildlogtail remotebuildlogtail' -d 'Shows the build log of a package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'repairlink' -d 'Repair a broken source link' +complete -f -c osc -n '__fish_osc_needs_command' -a 'repairwc' -d 'try to repair an inconsistent working copy' +complete -f -c osc -n '__fish_osc_needs_command' -a 'repositories platforms repos' -d 'shows repositories configured for a project. It skips...' +complete -f -c osc -n '__fish_osc_needs_command' -a 'repourls' -d 'Shows URLs of .repo files' +complete -f -c osc -n '__fish_osc_needs_command' -a 'request review rq' -d 'Show or modify requests and reviews' +complete -f -c osc -n '__fish_osc_needs_command' -a 'requestmaintainership reqbs reqbugownership reqmaintainership reqms requestbugownership' -d 'requests to add user as maintainer or bugowner' +complete -f -c osc -n '__fish_osc_needs_command' -a 'resolved' -d 'Remove "conflicted" state on working copy files' +complete -f -c osc -n '__fish_osc_needs_command' -a 'restartbuild abortbuild' -d 'Restart the build of a certain project or package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'results r' -d 'Shows the build results of a package or project' +complete -f -c osc -n '__fish_osc_needs_command' -a 'revert' -d 'Restore changed files or the entire working copy.' +complete -f -c osc -n '__fish_osc_needs_command' -a 'rremove' -d 'Remove source files from selected package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'search bse se' -d 'Search for a project and/or package.' +complete -f -c osc -n '__fish_osc_needs_command' -a 'service' -d 'Handle source services' +complete -f -c osc -n '__fish_osc_needs_command' -a 'setdevelproject sdp' -d 'Set the devel project / package of a package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'setlinkrev' -d 'Updates a revision number in a source link.' +complete -f -c osc -n '__fish_osc_needs_command' -a 'signkey' -d 'Manage Project Signing Key' +complete -f -c osc -n '__fish_osc_needs_command' -a 'status st' -d 'Show status of files in working copy' +complete -f -c osc -n '__fish_osc_needs_command' -a 'submitrequest sr submitpac submitreq' -d 'Create request to submit source into another Project' +complete -f -c osc -n '__fish_osc_needs_command' -a 'token' -d 'Show and manage authentication token' +complete -f -c osc -n '__fish_osc_needs_command' -a 'triggerreason tr' -d 'Show reason why a package got triggered to build' +complete -f -c osc -n '__fish_osc_needs_command' -a 'undelete' -d 'Restores a deleted project or package on the server.' +complete -f -c osc -n '__fish_osc_needs_command' -a 'unlock' -d 'Unlocks a project or package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'update up' -d 'Update a working copy' +complete -f -c osc -n '__fish_osc_needs_command' -a 'updatepacmetafromspec metafromspec updatepkgmetafromspec' -d 'Update package meta information from a specfile' +complete -f -c osc -n '__fish_osc_needs_command' -a 'vc' -d 'Edit the changes file' +complete -f -c osc -n '__fish_osc_needs_command' -a 'whois user who' -d 'Show fullname and email of a buildservice user' +complete -f -c osc -n '__fish_osc_needs_command' -a 'wipebinaries' -d 'Delete all binary packages of a certain project/package' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.147.0/tests/request_fixtures/test_read_request1.xml new/osc-0.148.1/tests/request_fixtures/test_read_request1.xml --- old/osc-0.147.0/tests/request_fixtures/test_read_request1.xml 2014-08-26 09:51:39.000000000 +0200 +++ new/osc-0.148.1/tests/request_fixtures/test_read_request1.xml 2014-09-12 09:13:58.000000000 +0200 @@ -7,7 +7,8 @@ <target project="deleteme" /> </action> <state name="accepted" when="2010-12-27T01:36:29" who="user1" /> - <history name="new" when="2010-12-13T13:02:03" who="creator"> + <history when="2010-12-13T13:02:03" who="creator"> + <description>Create Request</description> <comment>foobar</comment> </history> <title>title of the request</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.147.0/tests/request_fixtures/test_read_request2.xml new/osc-0.148.1/tests/request_fixtures/test_read_request2.xml --- old/osc-0.147.0/tests/request_fixtures/test_read_request2.xml 2014-08-26 09:51:39.000000000 +0200 +++ new/osc-0.148.1/tests/request_fixtures/test_read_request2.xml 2014-09-12 09:13:58.000000000 +0200 @@ -15,5 +15,7 @@ <review by_group="group1" state="new" when="2010-12-28T00:11:22" who="abc"> <comment>review start</comment> </review> - <history name="new" when="2010-12-11T00:00:00" who="creator" /> + <history when="2010-12-11T00:00:00" who="creator"> + <description>Created request</description> + </history> </request> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.147.0/tests/request_fixtures/test_request_list_view2.xml new/osc-0.148.1/tests/request_fixtures/test_request_list_view2.xml --- old/osc-0.147.0/tests/request_fixtures/test_request_list_view2.xml 2014-08-26 09:51:39.000000000 +0200 +++ new/osc-0.148.1/tests/request_fixtures/test_request_list_view2.xml 2014-09-12 09:13:58.000000000 +0200 @@ -4,8 +4,12 @@ <person name="buguser" /> </action> <state name="accepted" when="2010-12-29T16:37:45" who="foobar" /> - <history name="new" when="2010-12-28T16:37:45" who="user" /> - <history name="review" when="2010-12-28T18:37:45" who="foobar" /> + <history when="2010-12-28T16:37:45" who="user" > + <description>Created Request</description> + </history> + <history when="2010-12-28T18:37:45" who="foobar" > + <description>Review Approved</description> + </history> <description>This is a simple request with a lot of ... ... text and other stuff. This request also contains a description. This is useful to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.147.0/tests/test_request.py new/osc-0.148.1/tests/test_request.py --- old/osc-0.147.0/tests/test_request.py 2014-08-26 09:51:39.000000000 +0200 +++ new/osc-0.148.1/tests/test_request.py 2014-09-12 09:13:58.000000000 +0200 @@ -342,7 +342,6 @@ self.assertEqual(r.state.when, '2010-12-27T01:36:29') self.assertEqual(r.state.who, 'user1') self.assertEqual(r.state.comment, '') - self.assertEqual(r.statehistory[0].name, 'new') self.assertEqual(r.statehistory[0].when, '2010-12-13T13:02:03') self.assertEqual(r.statehistory[0].who, 'creator') self.assertEqual(r.statehistory[0].comment, 'foobar') @@ -382,7 +381,6 @@ self.assertEqual(r.reviews[0].who, 'abc') self.assertEqual(r.reviews[0].comment, 'review start') self.assertTrue(r.reviews[0].by_user is None) - self.assertEqual(r.statehistory[0].name, 'new') self.assertEqual(r.statehistory[0].when, '2010-12-11T00:00:00') self.assertEqual(r.statehistory[0].who, 'creator') self.assertEqual(r.statehistory[0].comment, '') @@ -455,7 +453,7 @@ exp = """\ 21 State:accepted By:foobar When:2010-12-29T16:37:45 set_bugowner: buguser foo - From: new(user) -> review(foobar) + From: Created Request: user -> Review Approved: foobar Descr: This is a simple request with a lot of ... ... text and other stuff. This request also contains a description. This is useful to describe the request. blabla blabla\n""" @@ -488,8 +486,8 @@ Review: accepted Group: group1 2010-12-29T00:11:22 abc accepted new Group: group1 2010-12-28T00:11:22 abc review start -History: revoked 2010-12-12T00:00:00 creator - new 2010-12-11T00:00:00 creator""" +History: 2010-12-12T00:00:00 creator revoked + 2010-12-11T00:00:00 creator new""" self.assertEqual(exp, str(r)) def test_request_str2(self): ++++++ osc.dsc ++++++ --- /var/tmp/diff_new_pack.EIAhaS/_old 2014-09-12 11:19:24.000000000 +0200 +++ /var/tmp/diff_new_pack.EIAhaS/_new 2014-09-12 11:19:24.000000000 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.147.0 +Version: 0.148.1 Binary: osc Maintainer: Adrian Schroeter <adrian@suse.de> Architecture: any -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de