Home
last modified time | relevance | path

Searched refs:hunk (Results 1 – 25 of 27) sorted by relevance

12

/NextBSD/contrib/subversion/subversion/libsvn_diff/
HDdiff4.c113 svn_diff_t *hunk; in adjust_diff() local
128 for (hunk = diff; hunk; hunk = hunk->next) in adjust_diff()
133 if (hunk->modified_start >= range_end) in adjust_diff()
135 hunk->modified_start += adjustment; in adjust_diff()
142 if (hunk->modified_start + hunk->modified_length <= range_start) in adjust_diff()
149 if (hunk->type == svn_diff__type_diff_modified) in adjust_diff()
151 hunk->modified_length += adjustment; in adjust_diff()
160 hunk->type = svn_diff__type_conflict; in adjust_diff()
163 hunk->modified_length -= adjustment; in adjust_diff()
186 svn_diff_t *hunk; in svn_diff_diff4_2() local
[all …]
HDparse-diff.c86 svn_diff_hunk_reset_diff_text(svn_diff_hunk_t *hunk) in svn_diff_hunk_reset_diff_text() argument
88 hunk->diff_text_range.current = hunk->diff_text_range.start; in svn_diff_hunk_reset_diff_text()
92 svn_diff_hunk_reset_original_text(svn_diff_hunk_t *hunk) in svn_diff_hunk_reset_original_text() argument
94 if (hunk->patch->reverse) in svn_diff_hunk_reset_original_text()
95 hunk->modified_text_range.current = hunk->modified_text_range.start; in svn_diff_hunk_reset_original_text()
97 hunk->original_text_range.current = hunk->original_text_range.start; in svn_diff_hunk_reset_original_text()
101 svn_diff_hunk_reset_modified_text(svn_diff_hunk_t *hunk) in svn_diff_hunk_reset_modified_text() argument
103 if (hunk->patch->reverse) in svn_diff_hunk_reset_modified_text()
104 hunk->original_text_range.current = hunk->original_text_range.start; in svn_diff_hunk_reset_modified_text()
106 hunk->modified_text_range.current = hunk->modified_text_range.start; in svn_diff_hunk_reset_modified_text()
[all …]
HDdiff3.c38 svn_diff__resolve_conflict(svn_diff_t *hunk, in svn_diff__resolve_conflict() argument
44 apr_off_t modified_start = hunk->modified_start + 1; in svn_diff__resolve_conflict()
45 apr_off_t latest_start = hunk->latest_start + 1; in svn_diff__resolve_conflict()
47 apr_off_t modified_length = hunk->modified_length; in svn_diff__resolve_conflict()
48 apr_off_t latest_length = hunk->latest_length; in svn_diff__resolve_conflict()
54 svn_diff_t **diff_ref = &hunk->resolved_diff; in svn_diff__resolve_conflict()
88 hunk->type = svn_diff__type_diff_common; in svn_diff__resolve_conflict()
89 hunk->resolved_diff = NULL; in svn_diff__resolve_conflict()
97 hunk->type = svn_diff__type_conflict; in svn_diff__resolve_conflict()
204 (*diff_ref)->original_start = hunk->original_start; in svn_diff__resolve_conflict()
[all …]
HDdiff_memory.c365 svn_stringbuf_t *hunk; /* in-progress hunk data */ member
409 svn_stringbuf_appendcstr(btn->hunk, btn->prefix_str[type]); in output_unified_token_range()
410 svn_stringbuf_appendbytes(btn->hunk, token->data, token->len); in output_unified_token_range()
438 svn_stringbuf_appendcstr(btn->hunk, out_str); in output_unified_token_range()
459 if (svn_stringbuf_isempty(baton->hunk)) in output_unified_flush_hunk()
491 hunk_len = baton->hunk->len; in output_unified_flush_hunk()
493 baton->hunk->data, &hunk_len)); in output_unified_flush_hunk()
500 svn_stringbuf_setempty(baton->hunk); in output_unified_flush_hunk()
636 baton.hunk = svn_stringbuf_create_empty(scratch_pool); in svn_diff_mem_string_output_unified3()
HDdiff_file.c1406 svn_stringbuf_t *hunk; member
1467 svn_stringbuf_appendcstr(baton->hunk, baton->context_str); in output_unified_line()
1472 svn_stringbuf_appendcstr(baton->hunk, baton->delete_str); in output_unified_line()
1476 svn_stringbuf_appendcstr(baton->hunk, baton->insert_str); in output_unified_line()
1517 svn_stringbuf_appendbytes(baton->hunk, curp, len); in output_unified_line()
1536 svn_stringbuf_appendbytes(baton->hunk, curp, length); in output_unified_line()
1560 svn_stringbuf_appendbyte(baton->hunk, *curp); in output_unified_line()
1588 baton->hunk, baton->header_encoding, baton->pool)); in output_unified_line()
1618 if (svn_stringbuf_isempty(baton->hunk)) in output_unified_flush_hunk()
1651 hunk_len = baton->hunk->len; in output_unified_flush_hunk()
[all …]
HDdiff.h162 svn_diff__resolve_conflict(svn_diff_t *hunk,
/NextBSD/contrib/diff/src/
HDed.c40 print_ed_hunk (struct change *hunk) in print_ed_hunk() argument
46 debug_script (hunk); in print_ed_hunk()
50 changes = analyze_hunk (hunk, &f0, &l0, &f1, &l1); in print_ed_hunk()
93 pr_forward_ed_hunk (struct change *hunk) in pr_forward_ed_hunk() argument
98 enum changes changes = analyze_hunk (hunk, &f0, &l0, &f1, &l1); in pr_forward_ed_hunk()
135 print_rcs_hunk (struct change *hunk) in print_rcs_hunk() argument
141 enum changes changes = analyze_hunk (hunk, &f0, &l0, &f1, &l1); in print_rcs_hunk()
HDcontext.c157 pr_context_hunk (struct change *hunk) in pr_context_hunk() argument
166 enum changes changes = analyze_hunk (hunk, &first0, &last0, &first1, &last1); in pr_context_hunk()
203 struct change *next = hunk; in pr_context_hunk()
232 struct change *next = hunk; in pr_context_hunk()
287 pr_unidiff_hunk (struct change *hunk) in pr_unidiff_hunk() argument
297 if (! analyze_hunk (hunk, &first0, &last0, &first1, &last1)) in pr_unidiff_hunk()
333 next = hunk; in pr_unidiff_hunk()
HDnormal.c41 print_normal_hunk (struct change *hunk) in print_normal_hunk() argument
47 enum changes changes = analyze_hunk (hunk, &first0, &last0, &first1, &last1); in print_normal_hunk()
HDutil.c653 analyze_hunk (struct change *hunk, in analyze_hunk() argument
673 *first0 = hunk->line0; in analyze_hunk()
674 *first1 = hunk->line1; in analyze_hunk()
676 next = hunk; in analyze_hunk()
HDside.c235 print_sdiff_hunk (struct change *hunk) in print_sdiff_hunk() argument
242 analyze_hunk (hunk, &first0, &last0, &first1, &last1); in print_sdiff_hunk()
HDifdef.c69 print_ifdef_hunk (struct change *hunk) in print_ifdef_hunk() argument
74 enum changes changes = analyze_hunk (hunk, &first0, &last0, &first1, &last1); in print_ifdef_hunk()
/NextBSD/contrib/subversion/subversion/libsvn_client/
HDpatch.c55 svn_diff_hunk_t *hunk; member
1344 svn_diff_hunk_t *hunk, svn_linenum_t fuzz, in match_hunk() argument
1367 leading_context = svn_diff_hunk_get_leading_context(hunk); in match_hunk()
1368 trailing_context = svn_diff_hunk_get_trailing_context(hunk); in match_hunk()
1371 svn_diff_hunk_reset_modified_text(hunk); in match_hunk()
1372 hunk_length = svn_diff_hunk_get_modified_length(hunk); in match_hunk()
1376 svn_diff_hunk_reset_original_text(hunk); in match_hunk()
1377 hunk_length = svn_diff_hunk_get_original_length(hunk); in match_hunk()
1387 SVN_ERR(svn_diff_hunk_readline_modified_text(hunk, &hunk_line, in match_hunk()
1391 SVN_ERR(svn_diff_hunk_readline_original_text(hunk, &hunk_line, in match_hunk()
[all …]
/NextBSD/contrib/subversion/subversion/include/
HDsvn_diff.h1102 svn_diff_hunk_readline_diff_text(svn_diff_hunk_t *hunk,
1122 svn_diff_hunk_readline_original_text(svn_diff_hunk_t *hunk,
1137 svn_diff_hunk_readline_modified_text(svn_diff_hunk_t *hunk,
1147 svn_diff_hunk_reset_diff_text(svn_diff_hunk_t *hunk);
1152 svn_diff_hunk_reset_original_text(svn_diff_hunk_t *hunk);
1157 svn_diff_hunk_reset_modified_text(svn_diff_hunk_t *hunk);
1163 svn_diff_hunk_get_original_start(const svn_diff_hunk_t *hunk);
1169 svn_diff_hunk_get_original_length(const svn_diff_hunk_t *hunk);
1175 svn_diff_hunk_get_modified_start(const svn_diff_hunk_t *hunk);
1181 svn_diff_hunk_get_modified_length(const svn_diff_hunk_t *hunk);
[all …]
/NextBSD/usr.bin/patch/
HDpatch.c149 int error = 0, hunk, failed, i, fd; in main() local
250 hunk = 0; in main()
255 hunk++; in main()
263 if (hunk == 1 && where == 0 && !force && !reverse_seen) { in main()
327 hunk, newwhere); in main()
333 hunk, newwhere); in main()
338 hunk, newwhere); in main()
362 if (hunk == 0) in main()
412 failed, hunk, skip_rest_of_patch ? "ignored" : "failed", rejname); in main()
415 failed, hunk, skip_rest_of_patch ? "ignored" : "failed", filearg[0]); in main()
/NextBSD/contrib/diff/doc/
HDdiff.texi246 entirely different files yields no common lines and one large hunk that
249 the total hunk size by finding large sequences of common lines
367 contain the regular expression if every changed line in the hunk---every
556 In this example, the first hunk contains just the first two lines of
557 @file{lao}, the second hunk contains the fourth line of @file{lao}
558 opposing the second and third lines of @file{tzu}, and the last hunk
709 Next come one or more hunks of differences; each hunk shows one area
722 If a hunk contains two or more lines, its line numbers look like
724 appears. An empty hunk is considered to end at the line that precedes
725 the hunk.
[all …]
/NextBSD/contrib/diff/
HDNEWS80 --inhibit-hunk-merge (omit; it has no effect)
HDChangeLog550 Deprecate diff -h, -H, -L, -P, --inhibit-hunk-merge.
585 --horizon-lines, --inhibit-hunk-merge, -H.
1426 Do not pass --inhibit-hunk-merge.
1530 Ignore --inhibit-hunk-merge.
1592 (shift_boundaries): Do not inhibit hunk merges.
1912 (read_diff): Invoke diff with --inhibit-hunk-merge.
/NextBSD/contrib/ntp/
HDconfigure.ac3745 # be better to simply remove the hunk above, I did not want
/NextBSD/contrib/libstdc++/
DChangeLog-2000290 2000-11-12 hunk.
/NextBSD/contrib/gcc/
HDFSFChangeLog.116814 * m68k/lb1sf68.asm (udivsi3): Fix hunk from previous patch that
11360 (print_operand): Collapse 'F' and 'M' into a single hunk of code.
HDChangeLog-200123363 * cse.c (cse_insn): Mostly remove first hunk of code which collapsed
23365 In second hunk of code for collapsing computed and conditional jumps
27571 * i386.c: Commit forgotten hunk in previous patch.
HDChangeLog-20035378 host_integerp and tree_low_cst directly. Move misapplied hunk
31937 * toplev.c (rest_of_compilation): Apply fotgotten hunk
HDChangeLog-20051022 * loop-invariant.c (move_loop_invariants): Add missing hunk from
24716 Forgotten hunk from my last merge patch:
HDChangeLog-200437360 * doc/invoke.texi: Apply missed hunk from 2004-03-03 change.
42214 incorrect, hunk.

12