Searched refs:hunk (Results 1 - 16 of 16) sorted by relevance

/freebsd-11-stable/contrib/subversion/subversion/libsvn_diff/
H A Ddiff4.c72 1. Out-range added line: decrement the line numbers in every hunk in P
76 2. Out-range deleted line: increment the line numbers in every hunk in P
105 corresponding line in the appropriate hunk in P, to obtain the version of
113 svn_diff_t *hunk; local
128 for (hunk = diff; hunk; hunk = hunk->next)
130 /* Changes are in the range before this hunk. Adjust the start
131 * of the hunk
186 svn_diff_t *hunk; local
[all...]
H A Dparse-diff.c66 /* The patch this hunk belongs to. */
69 /* APR file handle to the patch file this hunk came from. */
72 /* Whether the hunk was interpreted as pretty-print mergeinfo. If so,
73 the hunk content is in PATCH and the rest of this hunk object is
77 /* Ranges used to keep track of this hunk's texts positions within
90 /* Number of lines of leading and trailing hunk context. */
94 /* Did we see a 'file does not end with eol' marker in this hunk? */
104 /* The patch this hunk belongs to. */
107 /* APR file handle to the patch file this hunk cam
134 svn_diff_hunk_t *hunk = apr_pcalloc(result_pool, sizeof(*hunk)); local
238 svn_diff_hunk_reset_diff_text(svn_diff_hunk_t *hunk) argument
244 svn_diff_hunk_reset_original_text(svn_diff_hunk_t *hunk) argument
253 svn_diff_hunk_reset_modified_text(svn_diff_hunk_t *hunk) argument
262 svn_diff_hunk_get_original_start(const svn_diff_hunk_t *hunk) argument
268 svn_diff_hunk_get_original_length(const svn_diff_hunk_t *hunk) argument
274 svn_diff_hunk_get_modified_start(const svn_diff_hunk_t *hunk) argument
280 svn_diff_hunk_get_modified_length(const svn_diff_hunk_t *hunk) argument
286 svn_diff_hunk_get_leading_context(const svn_diff_hunk_t *hunk) argument
292 svn_diff_hunk_get_trailing_context(const svn_diff_hunk_t *hunk) argument
298 svn_diff_hunk__get_fuzz_penalty(const svn_diff_hunk_t *hunk) argument
578 parse_hunk_header(const char *header, svn_diff_hunk_t *hunk, const char *atat, apr_pool_t *pool) argument
752 svn_diff_hunk_readline_original_text(svn_diff_hunk_t *hunk, svn_stringbuf_t **stringbuf, const char **eol, svn_boolean_t *eof, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
773 svn_diff_hunk_readline_modified_text(svn_diff_hunk_t *hunk, svn_stringbuf_t **stringbuf, const char **eol, svn_boolean_t *eof, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
794 svn_diff_hunk_readline_diff_text(svn_diff_hunk_t *hunk, svn_stringbuf_t **stringbuf, const char **eol, svn_boolean_t *eof, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1050 parse_next_hunk(svn_diff_hunk_t **hunk, svn_boolean_t *is_property, const char **prop_name, svn_diff_operation_kind_t *prop_operation, svn_patch_t *patch, apr_file_t *apr_file, svn_boolean_t ignore_whitespace, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1926 add_property_hunk(svn_patch_t *patch, const char *prop_name, svn_diff_hunk_t *hunk, svn_diff_operation_kind_t operation, apr_pool_t *result_pool) argument
1987 svn_diff_hunk_t *hunk; local
[all...]
H A Ddiff3.c39 svn_diff__resolve_conflict(svn_diff_t *hunk, argument
45 apr_off_t modified_start = hunk->modified_start + 1;
46 apr_off_t latest_start = hunk->latest_start + 1;
48 apr_off_t modified_length = hunk->modified_length;
49 apr_off_t latest_length = hunk->latest_length;
55 svn_diff_t **diff_ref = &hunk->resolved_diff;
89 hunk->type = svn_diff__type_diff_common;
90 hunk->resolved_diff = NULL;
98 hunk->type = svn_diff__type_conflict;
205 (*diff_ref)->original_start = hunk
[all...]
H A Ddiff_memory.c365 svn_stringbuf_t *hunk; /* in-progress hunk data */ member in struct:unified_output_baton_t
369 /* The delimiters of the hunk header, '@@' for text hunks and '##' for
384 to the current hunk.
409 svn_stringbuf_appendcstr(btn->hunk, btn->prefix_str[type]);
410 svn_stringbuf_appendbytes(btn->hunk, token->data, token->len);
438 svn_stringbuf_appendcstr(btn->hunk, out_str);
446 /* Flush the hunk currently built up in BATON
459 if (svn_stringbuf_isempty(baton->hunk))
483 /* Write the hunk heade
[all...]
H A Ddiff.h162 svn_diff__resolve_conflict(svn_diff_t *hunk,
196 /* Write a unidiff hunk header to OUTPUT_STREAM.
H A Ddiff_file.c1409 svn_stringbuf_t *hunk;
1418 /* Extra context for the current hunk. */
1474 svn_stringbuf_appendcstr(baton->hunk, baton->context_str);
1479 svn_stringbuf_appendcstr(baton->hunk, baton->delete_str);
1483 svn_stringbuf_appendcstr(baton->hunk, baton->insert_str);
1524 svn_stringbuf_appendbytes(baton->hunk, curp, len);
1543 svn_stringbuf_appendbytes(baton->hunk, curp, length);
1567 svn_stringbuf_appendbyte(baton->hunk, *curp);
1595 baton->hunk, baton->header_encoding, baton->pool));
1630 if (svn_stringbuf_isempty(baton->hunk))
1408 svn_stringbuf_t *hunk; member in struct:svn_diff__file_output_baton_t
[all...]
/freebsd-11-stable/contrib/subversion/subversion/include/private/
H A Dsvn_diff_private.h52 /* The string used to mark a line in a hunk that doesn't end with a newline,
58 /* The string used to mark a line in a hunk that doesn't end with a newline,
118 /** Create a hunk object that adds a single line without newline. Return the
119 * new object in @a *hunk.
123 * The hunk will be associated with @a patch.
126 svn_diff_hunk__create_adds_single_line(svn_diff_hunk_t **hunk,
132 /** Create a hunk object that deletes a single line without newline. Return
133 * the new object in @a *hunk.
137 * The hunk will be associated with @a patch.
140 svn_diff_hunk__create_deletes_single_line(svn_diff_hunk_t **hunk,
[all...]
/freebsd-11-stable/contrib/diff/src/
H A Ded.c38 /* Print a hunk of an ed diff */
41 print_ed_hunk (struct change *hunk)
47 debug_script (hunk);
51 changes = analyze_hunk (hunk, &f0, &l0, &f1, &l1);
57 /* Print out the line number header for this hunk */
95 pr_forward_ed_hunk (struct change *hunk)
100 enum changes changes = analyze_hunk (hunk, &f0, &l0, &f1, &l1);
135 /* Print a hunk of an RCS diff */ argument
138 print_rcs_hunk (struct change *hunk)
144 enum changes changes = analyze_hunk (hunk,
40 print_ed_hunk(struct change *hunk) argument
93 pr_forward_ed_hunk(struct change *hunk) argument
[all...]
H A Dnormal.c36 /* Print a hunk of a normal diff.
41 print_normal_hunk (struct change *hunk) argument
47 enum changes changes = analyze_hunk (hunk, &first0, &last0, &first1, &last1);
53 /* Print out the line number header for this hunk */
H A Dcontext.c160 pr_context_hunk (struct change *hunk)
169 enum changes changes = analyze_hunk (hunk, &first0, &last0, &first1, &last1);
206 struct change *next = hunk;
235 struct change *next = hunk;
292 pr_unidiff_hunk (struct change *hunk)
302 if (! analyze_hunk (hunk, &first0, &last0, &first1, &last1))
338 next = hunk;
377 /* We're done with this hunk, so on to the next! */
437 /* Turn this change into a hunk: detach it from the others. */
157 pr_context_hunk(struct change *hunk) argument
287 pr_unidiff_hunk(struct change *hunk) argument
H A Dutil.c500 making them a hunk, and remember the rest for next iteration. */
507 /* Print this hunk. */
648 /* Look at a hunk of edit script and report the range of lines in each file
649 that it applies to. HUNK is the start of the hunk, which is a chain
662 analyze_hunk (struct change *hunk,
682 *first0 = hunk->line0;
683 *first1 = hunk->line1;
685 next = hunk;
729 tell the caller to ignore this hunk. */
653 analyze_hunk(struct change *hunk, lin *first0, lin *last0, lin *first1, lin *last1) argument
H A Difdef.c64 /* Print a hunk of an ifdef diff.
69 print_ifdef_hunk (struct change *hunk) argument
74 enum changes changes = analyze_hunk (hunk, &first0, &last0, &first1, &last1);
H A Dside.c230 /* Print a hunk of an sdiff diff.
235 print_sdiff_hunk (struct change *hunk) argument
242 analyze_hunk (hunk, &first0, &last0, &first1, &last1);
/freebsd-11-stable/contrib/subversion/subversion/libsvn_client/
H A Dpatch.c56 /* The hunk. */ member in struct:hunk_info_t
57 svn_diff_hunk_t *hunk;
59 /* The line where the hunk matched in the target file. */
62 /* Whether this hunk has been rejected. */
65 /* Whether this hunk has already been applied (either manually
69 /* The fuzz factor used when matching this hunk, i.e. how many
223 /* True if at least one hunk was rejected. */
226 /* True if at least one property hunk was rejected. */
229 /* True if at least one hunk was handled as already applied */
232 /* True if at least one property hunk wa
1054 svn_diff_hunk_t *hunk = APR_ARRAY_IDX(patch->hunks, 0, local
1376 svn_diff_hunk_t *hunk = APR_ARRAY_IDX(patch->hunks, 0, local
1414 svn_diff_hunk_t *hunk = APR_ARRAY_IDX(patch->hunks, 0, local
1562 match_hunk(svn_boolean_t *matched, target_content_t *content, svn_diff_hunk_t *hunk, svn_linenum_t fuzz, svn_boolean_t ignore_whitespace, svn_boolean_t match_modified, apr_pool_t *pool) argument
1683 scan_for_match(svn_linenum_t *matched_line, target_content_t *content, svn_diff_hunk_t *hunk, svn_boolean_t match_first, svn_linenum_t upper_line, svn_linenum_t fuzz, svn_boolean_t ignore_whitespace, svn_boolean_t match_modified, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool) argument
1754 match_existing_target(svn_boolean_t *match, target_content_t *content, svn_diff_hunk_t *hunk, apr_pool_t *scratch_pool) argument
1822 get_hunk_info(hunk_info_t **hi, patch_target_t *target, target_content_t *content, svn_diff_hunk_t *hunk, svn_linenum_t fuzz, svn_linenum_t previous_offset, svn_boolean_t ignore_whitespace, svn_boolean_t is_prop_hunk, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
2140 reject_hunk(patch_target_t *target, target_content_t *content, svn_diff_hunk_t *hunk, const char *prop_name, apr_pool_t *pool) argument
2560 svn_diff_hunk_t *hunk; local
2765 svn_diff_hunk_t *hunk; local
2801 svn_diff_hunk_t *hunk; local
2836 svn_diff_hunk_t *hunk; local
[all...]
/freebsd-11-stable/contrib/subversion/subversion/include/
H A Dsvn_diff.h793 /** Creates a git-like binary diff hunk describing the differences between
869 * Outputs the header and hunk delimiters in @a header_encoding.
871 * If @a hunk_delimiter is NULL, use the default hunk delimiter "@@".
873 * As a special case, if the hunk delimiter is "##", then for an incomplete
1046 * A single hunk inside a patch.
1048 * The lines of text comprising the hunk can be interpreted in three ways:
1049 * - diff text The hunk as it appears in the unidiff patch file,
1050 * including the hunk header line ("@@ ... @@")
1054 * For example, consider a hunk with the following diff text:
1064 * The original text of this hunk i
[all...]
/freebsd-11-stable/usr.bin/patch/
H A Dpatch.c153 int error = 0, hunk, failed, i, fd; local
243 * handling it until hunk processing because we want to swap
244 * the hunk if they opt to reverse it, but we want to make sure
245 * we *can* swap the hunk without running into memory issues
273 /* apply each hunk of patch */
274 hunk = 0;
280 assert(!out_creating || hunk == 0);
281 hunk++;
286 * results in us skipping hunk location, in order:
294 * also tied to this hunk processin
[all...]

Completed in 214 milliseconds