/dports/devel/py-nbdime/nbdime-3.1.1/nbdime/merging/ |
H A D | decisions.py | 103 local_diff = as_list(local_diff) 120 local_diff=local_diff, 130 local_diff=local_diff, 146 local_diff=local_diff, 158 local_diff=local_diff, 170 local_diff=local_diff, 181 local_diff=local_diff, 229 local_diff=local_diff, 268 local_diff=local_diff, 280 local_diff=local_diff, [all …]
|
H A D | strategies.py | 67 local_diff = [] 72 local_diff.extend(ld) 74 local_diff = combine_patches(local_diff) 76 return local_diff, remote_diff 297 d0 = local_diff 365 assert len(local_diff) == 1 or local_diff[1].op == DiffOp.REMOVERANGE 376 lremove = local_diff[1].length if len(local_diff) > 1 else 0 379 start = local_diff[0].key 483 if local_diff is ParentDeleted: 546 d.local_diff, [all …]
|
H A D | generic.py | 171 local_diff = as_dict_based_diff(local_diff) 184 bldkeys = set(local_diff.keys()) 195 local_diff.get(key), 203 ld = local_diff[key] 638 def _merge_strings(base, local_diff, remote_diff, argument 662 [op_patch(linenumber, local_diff)], 710 base, local_diff, remote_diff, 714 base, local_diff, remote_diff, 718 base, local_diff, remote_diff, 735 base, local_diff, remote_diff, [all …]
|
H A D | autoresolve.py | 66 local_diff = build_diffs(resolved_base, decisions, 'local') 69 return callback(resolved_base, prefix, local_diff, remote_diff)
|
/dports/devel/py-nbdime/nbdime-3.1.1/nbdime/tests/ |
H A D | test_merge.py | 26 assert d.local_diff == diff 115 assert d.local_diff == [op_addrange(1, [2])] 128 assert d.local_diff == [op_addrange(1, [2])] 147 assert d.local_diff == [op_addrange(0, [2])] 261 assert d.local_diff == [op_addrange(0, [[2]])] 266 assert d.local_diff == [op_addrange(0, [[3]])] 284 assert d.local_diff == [op_addrange(1, l[2:])] 477 assert d.local_diff == [op_add("n", l["n"])] 508 assert d.local_diff == [op_replace("x", 2)] 520 assert d.local_diff == [op_add("y", 4), [all …]
|
H A D | test_apply_merge.py | 35 di = dec.local_diff 74 local_diff=None, remote_diff=None, custom_diff=None): argument 80 assert local_diff 86 assert local_diff 96 "local_diff": local_diff, 106 local_diff="" 141 local_diff=bld,
|
H A D | test_decision_tools.py | 76 assert b.decisions[0].local_diff == [op_remove("d")] 87 local_diff=[op_remove("c")], 99 local_diff=[op_patch("c", [op_remove("d")])], 105 assert dec.local_diff == [op_remove("d")] 114 local_diff=[op_patch("c", [op_patch("d", [op_remove("e")])])], 120 assert dec.local_diff == [op_remove("e")]
|
H A D | test_merge_notebooks_inline.py | 104 assert decisions[0].local_diff != [] 110 assert decisions[0].local_diff != [] 623 local_diff = diff(md_in[i]["conflicted"], md_in[j]["conflicted"]) 627 assert local_diff == sorted(local_diff, key=lambda x: x.key) 632 "local_diff": [op_patch("conflicted", local_diff)], 734 local_diff = diff(md_in[i]["conflicted"], md_in[j]["conflicted"]) 738 assert local_diff == sorted(local_diff, key=lambda x: x.key) 743 "local_diff": [op_patch("conflicted", local_diff)],
|
/dports/devel/py-nbdime/nbdime-3.1.1/packages/nbdime/test/src/merge/ |
H A D | decisions.spec.ts | 40 local_diff: [opAdd('two', 22)], 60 jsonStructure.local_diff, 130 jsonStructure.local_diff, 140 jsonStructure.local_diff!, 147 jsonStructure.local_diff!, 161 jsonStructure.local_diff, 636 local_diff: [opAddRange(0, ['top '])], 641 local_diff: [opAdd('foo', true)], 646 local_diff: [opRemoveRange(0, 1)], 650 local_diff: [opRemoveRange(1, 1)], [all …]
|
H A D | model.spec.ts | 103 local_diff: [opRemoveRange(0, 1)], 116 local_diff: [ 129 local_diff: [opPatch(0, [
|
/dports/net/pacemaker2/pacemaker-Pacemaker-2.1.1/lib/cib/ |
H A D | cib_utils.c | 231 xmlNode *local_diff = NULL; in cib_perform_op() local 407 if(local_diff) { in cib_perform_op() 408 patchset_process_digest(local_diff, current_cib, scratch, with_digest); in cib_perform_op() 410 xml_log_patchset(LOG_INFO, __func__, local_diff); in cib_perform_op() 411 crm_log_xml_trace(local_diff, "raw patch"); in cib_perform_op() 415 && local_diff in cib_perform_op() 422 crm_element_value_int(local_diff, "format", &format); in cib_perform_op() 423 test_rc = xml_apply_patchset(c, local_diff, manage_counters); in cib_perform_op() 429 save_xml_to_file(local_diff, "PatchApply:diff", NULL); in cib_perform_op() 503 *diff = local_diff; in cib_perform_op() [all …]
|
/dports/net/pacemaker1/pacemaker-Pacemaker-1.1.24/lib/cib/ |
H A D | cib_utils.c | 300 xmlNode *local_diff = NULL; in cib_perform_op() local 474 if(local_diff) { in cib_perform_op() 475 patchset_process_digest(local_diff, current_cib, scratch, with_digest); in cib_perform_op() 477 xml_log_patchset(LOG_INFO, __FUNCTION__, local_diff); in cib_perform_op() 478 crm_log_xml_trace(local_diff, "raw patch"); in cib_perform_op() 482 && local_diff in cib_perform_op() 489 crm_element_value_int(local_diff, "format", &format); in cib_perform_op() 490 test_rc = xml_apply_patchset(c, local_diff, manage_counters); in cib_perform_op() 496 save_xml_to_file(local_diff, "PatchApply:diff", NULL); in cib_perform_op() 577 *diff = local_diff; in cib_perform_op() [all …]
|
/dports/devel/p5-ShipIt/ShipIt-0.60/lib/ShipIt/Step/ |
H A D | Commit.pm | 13 $msg .= $vc->local_diff($f);
|
/dports/print/fontforge/fontforge-20201107/fontforge/ |
H A D | glyphcomp.c | 951 if ( !fd->local_diff ) { in GlyphDiffSCError() 1209 if ( !fd->local_diff ) { in comparefontglyphs() 1219 fd->local_diff = false; in comparefontglyphs() 1224 if ( !fd->local_diff ) { in comparefontglyphs() 1246 fd->local_diff = false; in comparefontglyphs() 1282 if ( !fd->local_diff ) { in comparebitmapglyphs() 1295 fd->local_diff = false; in comparebitmapglyphs() 1305 if ( !fd->local_diff ) { in comparebitmapglyphs() 1316 fd->local_diff = false; in comparebitmapglyphs() 1335 if ( !fd->local_diff ) { in comparebitmapglyphs() [all …]
|
/dports/devel/p5-ShipIt/ShipIt-0.60/lib/ShipIt/ |
H A D | VC.pm | 103 sub local_diff { subroutine
|
/dports/devel/p5-ShipIt/ShipIt-0.60/lib/ShipIt/VC/ |
H A D | Mercurial.pm | 56 sub local_diff { subroutine
|
H A D | Git.pm | 91 sub local_diff { subroutine
|
H A D | SVN.pm | 138 sub local_diff { subroutine
|
/dports/devel/py-nbdime/nbdime-3.1.1/docs/source/ |
H A D | merging.rst | 35 "local_diff": <diff object>, 63 - **local**: Use the ``local`` changes, as described by ``local_diff``.
|
/dports/net/pacemaker2/pacemaker-Pacemaker-2.1.1/lib/common/ |
H A D | patchset.c | 223 xml_repair_v1_diff(xmlNode *last, xmlNode *next, xmlNode *local_diff, in xml_repair_v1_diff() argument 238 if (local_diff == NULL) { in xml_repair_v1_diff() 244 diff_child = find_xml_node(local_diff, tag, FALSE); in xml_repair_v1_diff() 246 diff_child = create_xml_node(local_diff, tag); in xml_repair_v1_diff() 265 diff_child = find_xml_node(local_diff, tag, FALSE); in xml_repair_v1_diff() 267 diff_child = create_xml_node(local_diff, tag); in xml_repair_v1_diff() 288 crm_log_xml_explicit(local_diff, "Repaired-diff"); in xml_repair_v1_diff()
|
/dports/devel/py-nbdime/nbdime-3.1.1/packages/nbdime/src/merge/ |
H A D | decisions.ts | 33 local_diff?: IDiffEntry[] | null; property 123 localDiff = valueOrDefault(obj.local_diff, localDiff); 199 local_diff: stripSource(this.localDiff),
|
/dports/devel/py-nbdime/nbdime-3.1.1/nbdime/ |
H A D | nbmergeapp.py | 88 bld.agreement([], local_diff=diff, remote_diff=diff)
|
/dports/net/pacemaker1/pacemaker-Pacemaker-1.1.24/include/crm/cib/ |
H A D | internal.h | 75 void fix_cib_diff(xmlNode * last, xmlNode * next, xmlNode * local_diff, gboolean changed);
|
/dports/net/pacemaker1/pacemaker-Pacemaker-1.1.24/lib/common/ |
H A D | xml.c | 589 xml_repair_v1_diff(xmlNode * last, xmlNode * next, xmlNode * local_diff, gboolean changed) in xml_repair_v1_diff() argument 603 if (local_diff == NULL) { in xml_repair_v1_diff() 609 diff_child = find_xml_node(local_diff, tag, FALSE); in xml_repair_v1_diff() 611 diff_child = create_xml_node(local_diff, tag); in xml_repair_v1_diff() 630 diff_child = find_xml_node(local_diff, tag, FALSE); in xml_repair_v1_diff() 632 diff_child = create_xml_node(local_diff, tag); in xml_repair_v1_diff() 658 crm_log_xml_explicit(local_diff, "Repaired-diff"); in xml_repair_v1_diff()
|
/dports/java/openjdk13/jdk13u-jdk-13.0.10-1-1/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ |
H A D | ClassWriter.java | 1356 Type[] local_diff = new Type[-diff_length]; in getInstance() local 1358 local_diff[j] = locals[i]; in getInstance() 1362 local_diff); in getInstance()
|