Home
last modified time | relevance | path

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

/freebsd/contrib/diff/src/
H A Ded.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()
H A Dcontext.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()
H A Dnormal.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()
H A Dutil.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()
H A Dside.c235 print_sdiff_hunk (struct change *hunk) in print_sdiff_hunk() argument
242 analyze_hunk (hunk, &first0, &last0, &first1, &last1); in print_sdiff_hunk()
H A Difdef.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()
/freebsd/usr.bin/patch/
H A Dpatch.c152 int error = 0, hunk, failed, i, fd; in main() local
273 hunk = 0; in main()
279 assert(!out_creating || hunk == 0); in main()
280 hunk++; in main()
305 if (hunk == 1 && where == 0 && !force && !reverse_seen) { in main()
369 hunk, newwhere); in main()
375 hunk, newwhere); in main()
380 hunk, newwhere); in main()
404 if (hunk == 0) in main()
464 failed, hunk, skip_rest_of_patch ? "ignored" : "failed", rejname); in main()
[all …]
/freebsd/contrib/diff/doc/
H A Ddiff.texi725 the hunk.
735 @samp{!} in the part of this hunk for the other file.
832 An empty hunk is considered to start at the line that follows the hunk.
837 the line that precedes the hunk.
1954 hunk's boundaries when this merges adjacent hunks, or shifts a hunk's
2093 hunk, the hunk is called a @dfn{three-way hunk}; if just two input files
2094 differ, it is a @dfn{two-way hunk}.
2521 @command{patch} rejects the hunk and skips to the next hunk. @command{patch}
2655 hunk of a patch fails, @command{patch} reverses the hunk to see if it can
2683 set of lines matching the context given in the hunk.
[all …]
/freebsd/contrib/googletest/googletest/src/
H A Dgtest.cc1500 Hunk hunk(l_i - prefix_context + 1, r_i - prefix_context + 1); in CreateUnifiedDiff() local
1502 hunk.PushLine(' ', left[l_i - i].c_str()); in CreateUnifiedDiff()
1525 hunk.PushLine(edit == kMatch ? ' ' : '-', left[l_i].c_str()); in CreateUnifiedDiff()
1528 hunk.PushLine('+', right[r_i].c_str()); in CreateUnifiedDiff()
1536 if (!hunk.has_edits()) { in CreateUnifiedDiff()
1541 hunk.PrintTo(&ss); in CreateUnifiedDiff()
/freebsd/contrib/diff/
H A DNEWS80 --inhibit-hunk-merge (omit; it has no effect)
H A DChangeLog550 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.
/freebsd/contrib/ntp/
H A Dconfigure.ac3744 # be better to simply remove the hunk above, I did not want
/freebsd/share/dict/
H A Dweb288298 hunk