| /freebsd-13.1/contrib/subversion/subversion/libsvn_diff/ |
| H A D | diff3.c | 48 apr_off_t modified_length = hunk->modified_length; in svn_diff__resolve_conflict() local
74 common_length = modified_length < latest_length in svn_diff__resolve_conflict()
75 ? modified_length : latest_length; in svn_diff__resolve_conflict()
87 && modified_length == latest_length) in svn_diff__resolve_conflict()
120 common_length = (modified_length < latest_length in svn_diff__resolve_conflict()
138 modified_length -= common_length; in svn_diff__resolve_conflict()
151 if (modified_length == 0) in svn_diff__resolve_conflict()
158 while (--modified_length) in svn_diff__resolve_conflict()
336 apr_off_t modified_length; in svn_diff_diff3_2() local
445 (*diff_ref)->modified_length = modified_length; in svn_diff_diff3_2()
[all …]
|
| H A D | diff4.c | 121 range_end = range_start + adjust->modified_length; in adjust_diff()
122 adjustment = adjust->original_length - adjust->modified_length; in adjust_diff()
142 if (hunk->modified_start + hunk->modified_length <= range_start) in adjust_diff()
151 hunk->modified_length += adjustment; in adjust_diff()
163 hunk->modified_length -= adjustment; in adjust_diff()
262 hunk->latest_length = hunk->modified_length; in svn_diff_diff4_2()
264 hunk->modified_length = hunk->original_length; in svn_diff_diff4_2()
|
| H A D | diff_memory.c | 511 apr_off_t modified_length, in output_unified_diff_modified() argument
538 && (original_length > 0 || modified_length > 0)) in output_unified_diff_modified()
597 modified_start + modified_length)); in output_unified_diff_modified()
864 modified_start, modified_length); in output_common_modified()
870 apr_off_t modified_start, apr_off_t modified_length, in output_latest() argument
880 apr_off_t modified_start, apr_off_t modified_length,
896 apr_off_t modified_start, apr_off_t modified_length, in output_conflict() argument
918 modified_start, modified_length)); in output_conflict()
969 apr_off_t modified_length, in output_conflict_with_context() argument
991 modified_length)); in output_conflict_with_context()
[all …]
|
| H A D | diff_file.c | 1680 apr_off_t modified_start, apr_off_t modified_length, in output_unified_diff_modified() argument
1706 && (original_length > 0 || modified_length > 0)) in output_unified_diff_modified()
1807 modified_start + modified_length, in output_unified_diff_modified()
2208 apr_off_t modified_start, apr_off_t modified_length, in output_common() argument
2211 return output_hunk(baton, 1, modified_start, modified_length); in output_common()
2220 return output_hunk(baton, 1, modified_start, modified_length); in output_diff_modified()
2235 apr_off_t modified_start, apr_off_t modified_length,
2273 apr_off_t modified_length, in output_conflict_with_context() argument
2314 apr_off_t modified_start, apr_off_t modified_length, in output_conflict() argument
2346 SVN_ERR(output_hunk(baton, 1, modified_start, modified_length)); in output_conflict()
[all …]
|
| H A D | diff.c | 86 (*diff_ref)->modified_length = in svn_diff__diff()
109 (*diff_ref)->modified_length = lcs->length; in svn_diff__diff()
|
| H A D | parse-diff.c | 88 svn_linenum_t modified_length; member
164 hunk->modified_length = 1; in add_or_delete_single_line()
182 hunk->modified_length = 0; /* setting to '1' works too */ in add_or_delete_single_line()
270 return hunk->patch->reverse ? hunk->modified_length : hunk->original_length; in svn_diff_hunk_get_original_length()
282 return hunk->patch->reverse ? hunk->original_length : hunk->modified_length; in svn_diff_hunk_get_modified_length()
638 if (! parse_range(&hunk->modified_start, &hunk->modified_length, range->data)) in parse_hunk_header()
1257 (*hunk)->modified_length++; in parse_next_hunk()
1303 (*hunk)->modified_length++; in parse_next_hunk()
1338 modified_lines = (*hunk)->modified_length; in parse_next_hunk()
1351 modified_lines = (*hunk)->modified_length; in parse_next_hunk()
[all …]
|
| H A D | diff.h | 56 apr_off_t modified_length; member
|
| H A D | util.c | 120 diff->modified_start, diff->modified_length, in svn_diff_output2()
135 diff->modified_start, diff->modified_length, in svn_diff_output2()
|
| /freebsd-13.1/contrib/subversion/subversion/include/ |
| H A D | svn_diff.h | 311 apr_off_t modified_length,
330 apr_off_t modified_length,
344 apr_off_t modified_length,
356 apr_off_t modified_length,
373 apr_off_t modified_length,
|
| /freebsd-13.1/contrib/subversion/subversion/svn/ |
| H A D | file-merge.c | 157 apr_off_t modified_length, in file_merge_output_common() argument
183 apr_off_t modified_length, in file_merge_output_diff_modified() argument
196 modified_length, in file_merge_output_diff_modified()
210 apr_off_t modified_length, in file_merge_output_diff_latest() argument
237 apr_off_t modified_length, in file_merge_output_diff_common() argument
823 apr_off_t modified_length, in file_merge_output_conflict() argument
839 modified_length, in file_merge_output_conflict()
|
| /freebsd-13.1/contrib/subversion/subversion/libsvn_client/ |
| H A D | blame.c | 264 apr_off_t modified_length, in output_diff_modified() argument
273 if (modified_length) in output_diff_modified()
275 modified_length)); in output_diff_modified()
|