| /freebsd-12-stable/contrib/subversion/subversion/libsvn_diff/ |
| D | diff3.c | 45 apr_off_t modified_start = hunk->modified_start + 1; in svn_diff__resolve_conflict() local
65 while (start_position[0]->offset < modified_start) in svn_diff__resolve_conflict()
141 modified_start = start_position[0]->offset; in svn_diff__resolve_conflict()
199 if (modified_start < lcs->position[0]->offset in svn_diff__resolve_conflict()
207 (*diff_ref)->modified_start = modified_start - 1; in svn_diff__resolve_conflict()
209 - modified_start; in svn_diff__resolve_conflict()
222 modified_start = lcs->position[0]->offset; in svn_diff__resolve_conflict()
230 (*diff_ref)->modified_start = modified_start - 1; in svn_diff__resolve_conflict()
238 modified_start += lcs->length; in svn_diff__resolve_conflict()
330 apr_off_t modified_start = 1; in svn_diff_diff3_2() local
[all …]
|
| D | diff.c | 67 apr_off_t original_start, apr_off_t modified_start, in svn_diff__diff() argument
77 || modified_start < lcs->position[1]->offset) in svn_diff__diff()
85 (*diff_ref)->modified_start = modified_start - 1; in svn_diff__diff()
87 lcs->position[1]->offset - modified_start; in svn_diff__diff()
99 modified_start = lcs->position[1]->offset; in svn_diff__diff()
108 (*diff_ref)->modified_start = modified_start - 1; in svn_diff__diff()
117 modified_start += lcs->length; in svn_diff__diff()
|
| D | diff4.c | 120 range_start = adjust->modified_start; 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()
261 hunk->latest_start = hunk->modified_start; in svn_diff_diff4_2()
263 hunk->modified_start = hunk->original_start; in svn_diff_diff4_2()
|
| D | diff_memory.c | 510 apr_off_t modified_start, in output_unified_diff_modified() argument
578 output_baton->hunk_start[1] = modified_start - context_prefix_length; in output_unified_diff_modified()
584 modified_start)); in output_unified_diff_modified()
597 modified_start + modified_length)); in output_unified_diff_modified()
860 apr_off_t modified_start, apr_off_t modified_length, in output_common_modified() argument
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()
[all …]
|
| D | diff_file.c | 1680 apr_off_t modified_start, apr_off_t modified_length, in output_unified_diff_modified() argument
1752 output_baton->hunk_start[1] = modified_start - context_prefix_length; in output_unified_diff_modified()
1788 modified_start, 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()
2217 apr_off_t modified_start, apr_off_t modified_length, in output_diff_modified() argument
2220 return output_hunk(baton, 1, modified_start, modified_length); in output_diff_modified()
2226 apr_off_t modified_start, apr_off_t modified_length, in output_diff_latest() argument
2235 apr_off_t modified_start, apr_off_t modified_length,
[all …]
|
| D | diff.h | 55 apr_off_t modified_start; member
157 apr_off_t original_start, apr_off_t modified_start,
|
| 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()
|
| D | parse-diff.c | 87 svn_linenum_t modified_start; member
163 hunk->modified_start = 1; in add_or_delete_single_line()
181 hunk->modified_start = 0; in add_or_delete_single_line()
264 return hunk->patch->reverse ? hunk->modified_start : hunk->original_start; in svn_diff_hunk_get_original_start()
276 return hunk->patch->reverse ? hunk->original_start : hunk->modified_start; in svn_diff_hunk_get_modified_start()
638 if (! parse_range(&hunk->modified_start, &hunk->modified_length, range->data)) in parse_hunk_header()
|
| /freebsd-12-stable/contrib/subversion/subversion/include/ |
| D | svn_diff.h | 310 apr_off_t modified_start,
329 apr_off_t modified_start,
343 apr_off_t modified_start,
355 apr_off_t modified_start,
372 apr_off_t modified_start,
|
| /freebsd-12-stable/contrib/subversion/subversion/svn/ |
| D | file-merge.c | 156 apr_off_t modified_start, in file_merge_output_common() argument
182 apr_off_t modified_start, in file_merge_output_diff_modified() argument
195 modified_start, in file_merge_output_diff_modified()
209 apr_off_t modified_start, in file_merge_output_diff_latest() argument
236 apr_off_t modified_start, in file_merge_output_diff_common() argument
822 apr_off_t modified_start, in file_merge_output_conflict() argument
838 modified_start, in file_merge_output_conflict()
|
| /freebsd-12-stable/contrib/subversion/subversion/libsvn_client/ |
| D | patch.c | 1911 svn_linenum_t modified_start; in get_hunk_info() local
1914 modified_start = svn_diff_hunk_get_modified_start(hunk); in get_hunk_info()
1939 if (modified_start == 0 in get_hunk_info()
1951 if (modified_start == 0) in get_hunk_info()
1954 seek_to = modified_start; in get_hunk_info()
1959 modified_start + 1, in get_hunk_info()
1963 already_applied = (matched_line == modified_start); in get_hunk_info()
2065 SVN_ERR(seek_to_line(content, modified_start, scratch_pool)); in get_hunk_info()
2068 modified_start + 1, in get_hunk_info()
2075 already_applied = (reverse_matched_line == modified_start); in get_hunk_info()
|
| D | blame.c | 263 apr_off_t modified_start, in output_diff_modified() argument
271 SVN_ERR(blame_delete_range(db->chain, modified_start, original_length)); in output_diff_modified()
274 SVN_ERR(blame_insert_range(db->chain, db->rev, modified_start, in output_diff_modified()
|