def resolve(a, b):
a_name = self.config_a['instance_name']
b_name = self.config_b['instance_name']
command = conflict_resolution[1:]
def inner():
return _resolve_conflict_via_command(a, b, command, a_name,
b_name)
ui_worker = get_ui_worker()
return ui_worker.put(inner)
def __init__(self, token_file, client_id, client_secret, url=None):
# Required for discovering collections
if url is not None:
self.url = url
self.useragent = client_id
self._settings = {}
if not have_oauth2:
raise exceptions.UserError('requests-oauthlib not installed')
token_file = utils.expand_path(token_file)
ui_worker = get_ui_worker()
f = lambda: self._init_token(token_file, client_id, client_secret)
ui_worker.put(f)
def __init__(self, token_file, client_id, client_secret, url=None):
# Required for discovering collections
if url is not None:
self.url = url
self.useragent = client_id
self._settings = {}
if not have_oauth2:
raise exceptions.UserError('requests-oauthlib not installed')
token_file = expand_path(token_file)
ui_worker = get_ui_worker()
f = lambda: self._init_token(token_file, client_id, client_secret)
ui_worker.put(f)
