def post(self):
base_nb = self.get_notebook_argument("base")
local_nb = self.get_notebook_argument("local")
remote_nb = self.get_notebook_argument("remote")
try:
decisions = decide_notebook_merge(base_nb,
local_nb,
remote_nb,
args=merge_args)
except Exception as e:
raise web.HTTPError(
400, "Error while attempting to merge documents: %s" % e)
data = {"base": base_nb, "merge_decisions": decisions}
self.finish(data)
def post(self):
base_nb = self.get_notebook_argument('base')
local_nb = self.get_notebook_argument('local')
remote_nb = self.get_notebook_argument('remote')
merge_args = self.settings.get('merge_args')
if merge_args is None:
merge_args = build_merge_parser().parse_args(['', '', ''])
merge_args.merge_strategy = 'mergetool'
self.settings['merge_args'] = merge_args
try:
decisions = decide_notebook_merge(base_nb,
local_nb,
remote_nb,
args=merge_args)
except Exception:
nbdime.log.exception('Error merging documents:')
raise web.HTTPError(500,
'Error while attempting to merge documents')
data = {'base': base_nb, 'merge_decisions': decisions}
self.finish(data)
def post(self):
base_nb = self.get_notebook_argument("base")
local_nb = self.get_notebook_argument("local")
remote_nb = self.get_notebook_argument("remote")
merge_args = self.settings.get('merge_args')
if merge_args is None:
merge_args = build_merge_parser().parse_args(["", "", ""])
merge_args.merge_strategy = 'mergetool'
self.settings['merge_args'] = merge_args
try:
decisions = decide_notebook_merge(base_nb, local_nb, remote_nb,
args=merge_args)
except Exception:
nbdime.log.exception("Error merging documents:")
raise web.HTTPError(500, "Error while attempting to merge documents")
data = {
"base": base_nb,
"merge_decisions": decisions
}
self.finish(data)
def post(self):
base_nb = self.get_notebook_argument("base")
local_nb = self.get_notebook_argument("local")
remote_nb = self.get_notebook_argument("remote")
merge_args = self.settings.get('merge_args')
if merge_args is None:
merge_args = build_merge_parser().parse_args(["", "", ""])
merge_args.merge_strategy = 'mergetool'
self.settings['merge_args'] = merge_args
try:
decisions = decide_notebook_merge(base_nb,
local_nb,
remote_nb,
args=merge_args)
except Exception:
nbdime.log.exception("Error merging documents:")
raise web.HTTPError(500,
"Error while attempting to merge documents")
data = {"base": base_nb, "merge_decisions": decisions}
self.finish(data)
def post(self):
base_nb = self.get_notebook_argument('base')
local_nb = self.get_notebook_argument('local')
remote_nb = self.get_notebook_argument('remote')
merge_args = self.settings.get('merge_args')
if merge_args is None:
merge_args = build_merge_parser().parse_args(['', '', ''])
merge_args.merge_strategy = 'mergetool'
self.settings['merge_args'] = merge_args
try:
decisions = decide_notebook_merge(base_nb, local_nb, remote_nb,
args=merge_args)
except Exception:
nbdime.log.exception('Error merging documents:')
raise web.HTTPError(500, 'Error while attempting to merge documents')
data = {
'base': base_nb,
'merge_decisions': decisions
}
self.finish(data)
def test_validate_matching_notebook_merge(matching_nb_triplets,
merge_validator, reset_log):
base, local, remote = matching_nb_triplets
decisions = decide_notebook_merge(base, local, remote)
merge_validator.validate(decisions)
def test_validate_matching_notebook_merge(matching_nb_triplets, validator):
base, local, remote = matching_nb_triplets
decisions = decide_notebook_merge(base, local, remote)
validator.validate(decisions)
