/freebsd-10.0-release/contrib/subversion/subversion/libsvn_diff/ |
H A D | diff4.c | 72 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 D | parse-diff.c | 58 /* The patch this hunk belongs to. */ 61 /* APR file handle to the patch file this hunk came from. */ 64 /* Ranges used to keep track of this hunk's texts positions within 77 /* Number of lines of leading and trailing hunk context. */ 83 svn_diff_hunk_reset_diff_text(svn_diff_hunk_t *hunk) argument 85 hunk->diff_text_range.current = hunk->diff_text_range.start; 89 svn_diff_hunk_reset_original_text(svn_diff_hunk_t *hunk) argument 91 if (hunk->patch->reverse) 92 hunk 98 svn_diff_hunk_reset_modified_text(svn_diff_hunk_t *hunk) argument 107 svn_diff_hunk_get_original_start(const svn_diff_hunk_t *hunk) argument 113 svn_diff_hunk_get_original_length(const svn_diff_hunk_t *hunk) argument 119 svn_diff_hunk_get_modified_start(const svn_diff_hunk_t *hunk) argument 125 svn_diff_hunk_get_modified_length(const svn_diff_hunk_t *hunk) argument 131 svn_diff_hunk_get_leading_context(const svn_diff_hunk_t *hunk) argument 137 svn_diff_hunk_get_trailing_context(const svn_diff_hunk_t *hunk) argument 207 parse_hunk_header(const char *header, svn_diff_hunk_t *hunk, const char *atat, apr_pool_t *pool) argument 345 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 363 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 381 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 483 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 1108 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 1169 svn_diff_hunk_t *hunk; local [all...] |
H A D | diff3.c | 38 svn_diff__resolve_conflict(svn_diff_t *hunk, argument 44 apr_off_t modified_start = hunk->modified_start + 1; 45 apr_off_t latest_start = hunk->latest_start + 1; 47 apr_off_t modified_length = hunk->modified_length; 48 apr_off_t latest_length = hunk->latest_length; 54 svn_diff_t **diff_ref = &hunk->resolved_diff; 88 hunk->type = svn_diff__type_diff_common; 89 hunk->resolved_diff = NULL; 97 hunk->type = svn_diff__type_conflict; 204 (*diff_ref)->original_start = hunk [all...] |
H A D | diff.h | 162 svn_diff__resolve_conflict(svn_diff_t *hunk, 196 /* Write a unidiff hunk header to OUTPUT_STREAM.
|
H A D | diff_memory.c | 363 svn_stringbuf_t *hunk; /* in-progress hunk data */ member in struct:unified_output_baton_t 367 /* The delimiters of the hunk header, '@@' for text hunks and '##' for 382 to the current hunk. 407 svn_stringbuf_appendcstr(btn->hunk, btn->prefix_str[type]); 408 svn_stringbuf_appendbytes(btn->hunk, token->data, token->len); 436 svn_stringbuf_appendcstr(btn->hunk, out_str); 444 /* Flush the hunk currently built up in BATON 457 if (svn_stringbuf_isempty(baton->hunk)) 481 /* Write the hunk heade [all...] |
H A D | diff_file.c | 1390 svn_stringbuf_t *hunk; 1399 /* Extra context for the current hunk. */ 1449 svn_stringbuf_appendcstr(baton->hunk, baton->context_str); 1454 svn_stringbuf_appendcstr(baton->hunk, baton->delete_str); 1458 svn_stringbuf_appendcstr(baton->hunk, baton->insert_str); 1499 svn_stringbuf_appendbytes(baton->hunk, curp, len); 1518 svn_stringbuf_appendbytes(baton->hunk, curp, length); 1542 svn_stringbuf_appendbyte(baton->hunk, *curp); 1570 baton->hunk, baton->header_encoding, baton->pool)); 1600 if (svn_stringbuf_isempty(baton->hunk)) 1389 svn_stringbuf_t *hunk; member in struct:svn_diff__file_output_baton_t [all...] |
/freebsd-10.0-release/contrib/diff/src/ |
H A D | ed.c | 38 /* 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 D | normal.c | 36 /* 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 D | context.c | 160 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 D | util.c | 500 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 D | ifdef.c | 64 /* 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 D | side.c | 230 /* Print a hunk of an sdiff diff. 235 print_sdiff_hunk (struct change *hunk) argument 242 analyze_hunk (hunk, &first0, &last0, &first1, &last1);
|
/freebsd-10.0-release/contrib/subversion/subversion/include/ |
H A D | svn_diff.h | 764 * Outputs the header and hunk delimiters in @a header_encoding. 766 * If @a hunk_delimiter is NULL, use the default hunk delimiter "@@". 768 * As a special case, if the hunk delimiter is "##", then for an incomplete 879 * A single hunk inside a patch. 881 * The lines of text comprising the hunk can be interpreted in three ways: 882 * - diff text The hunk as it appears in the unidiff patch file, 883 * including the hunk header line ("@@ ... @@") 887 * For example, consider a hunk with the following diff text: 897 * The original text of this hunk is: 922 * of the diff text of @a hunk [all...] |
/freebsd-10.0-release/contrib/subversion/subversion/libsvn_client/ |
H A D | patch.c | 54 /* The hunk. */ member in struct:hunk_info_t 55 svn_diff_hunk_t *hunk; 57 /* The line where the hunk matched in the target file. */ 60 /* Whether this hunk has been rejected. */ 63 /* Whether this hunk has already been applied (either manually 67 /* The fuzz factor used when matching this hunk, i.e. how many 215 /* True if at least one hunk was rejected. */ 218 /* True if at least one property hunk was rejected. */ 1268 * have changed. If MATCH_MODIFIED is TRUE, match the modified hunk text, 1269 * rather than the original hunk tex 1271 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 1384 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 1455 match_existing_target(svn_boolean_t *match, target_content_t *content, svn_diff_hunk_t *hunk, apr_pool_t *scratch_pool) argument 1522 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_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 1743 reject_hunk(patch_target_t *target, target_content_t *content, svn_diff_hunk_t *hunk, const char *prop_name, apr_pool_t *pool) argument 2114 svn_diff_hunk_t *hunk; local 2196 svn_diff_hunk_t *hunk; local [all...] |
/freebsd-10.0-release/usr.bin/patch/ |
H A D | patch.c | 147 int error = 0, hunk, failed, i, fd; local 247 /* apply each hunk of patch */ 248 hunk = 0; 253 hunk++; 261 if (hunk == 1 && where == 0 && !force && !reverse_seen) { 265 say("Not enough memory to try swapped hunk! Assuming unswapped.\n"); 275 fatal("lost hunk on alloc error!\n"); 280 fatal("lost hunk on alloc error!\n"); 303 fatal("lost hunk on alloc error!\n"); 325 hunk, newwher [all...] |