jp (merge-request/set): if service and node are not specified, URIFinder is now used + ask confirmation before publishing
This commit is contained in:
parent
60eab27872
commit
f4a15b0ffb
1 changed files with 54 additions and 4 deletions
|
|
@ -22,6 +22,7 @@ import base
|
|||
from sat.core.i18n import _
|
||||
from sat_frontends.jp.constants import Const as C
|
||||
from sat_frontends.jp import xmlui_manager
|
||||
from sat_frontends.jp import common
|
||||
from functools import partial
|
||||
import os.path
|
||||
|
||||
|
|
@ -31,12 +32,15 @@ __commands__ = ["MergeRequest"]
|
|||
class Set(base.CommandBase):
|
||||
|
||||
def __init__(self, host):
|
||||
base.CommandBase.__init__(self, host, 'set', use_pubsub=True, help=_(u'publish or update a merge request'))
|
||||
base.CommandBase.__init__(self, host, 'set', use_pubsub=True,
|
||||
pubsub_defaults = {u'service': _(u'auto'), u'node': _(u'auto')},
|
||||
help=_(u'publish or update a merge request'))
|
||||
self.need_loop=True
|
||||
|
||||
def add_parser_options(self):
|
||||
self.parser.add_argument("-i", "--item", type=base.unicode_decoder, default=u'', help=_(u"id or URL of the request to update, or nothing for a new one"))
|
||||
self.parser.add_argument("-r", "--repository", metavar="PATH", type=base.unicode_decoder, default=u'.', help=_(u"path of the repository (DEFAULT: current directory)"))
|
||||
self.parser.add_argument("-f", "--force", action="store_true", help=_(u"publish merge request without confirmation"))
|
||||
|
||||
def mergeRequestSetCb(self, published_id):
|
||||
if published_id:
|
||||
|
|
@ -45,13 +49,12 @@ class Set(base.CommandBase):
|
|||
self.disp(u"Merge request published")
|
||||
self.host.quit(C.EXIT_OK)
|
||||
|
||||
def start(self):
|
||||
repository = os.path.expanduser(os.path.abspath(self.args.repository))
|
||||
def sendRequest(self):
|
||||
extra = {'update': 'true'} if self.args.item else {}
|
||||
self.host.bridge.mergeRequestSet(
|
||||
self.args.service,
|
||||
self.args.node,
|
||||
repository,
|
||||
self.repository,
|
||||
u'auto',
|
||||
{},
|
||||
u'',
|
||||
|
|
@ -63,6 +66,17 @@ class Set(base.CommandBase):
|
|||
msg=_(u"can't create merge request: {}"),
|
||||
exit_code=C.EXIT_BRIDGE_ERRBACK))
|
||||
|
||||
def askConfirmation(self):
|
||||
if not self.args.force:
|
||||
message = _(u"You are going to publish your changes to service [{service}], are you sure ?").format(
|
||||
service=self.args.service)
|
||||
self.host.confirmOrQuit(message, _(u"merge request publication cancelled"))
|
||||
self.sendRequest()
|
||||
|
||||
def start(self):
|
||||
self.repository = os.path.expanduser(os.path.abspath(self.args.repository))
|
||||
common.URIFinder(self, self.repository, 'merge requests', self.askConfirmation)
|
||||
|
||||
|
||||
class Get(base.CommandBase):
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue