| /freebsd-12-stable/contrib/subversion/subversion/include/ |
| D | svn_mergeinfo.h | 174 svn_mergeinfo_parse(svn_mergeinfo_t *mergeinfo, const char *input,
237 svn_mergeinfo_merge2(svn_mergeinfo_t mergeinfo,
248 svn_mergeinfo_merge(svn_mergeinfo_t mergeinfo,
273 svn_mergeinfo_remove(svn_mergeinfo_t *mergeinfo, svn_mergeinfo_t eraser,
288 svn_mergeinfo_remove2(svn_mergeinfo_t *mergeinfo,
390 svn_mergeinfo_intersect2(svn_mergeinfo_t *mergeinfo,
403 svn_mergeinfo_intersect(svn_mergeinfo_t *mergeinfo,
525 svn_mergeinfo_t mergeinfo,
541 svn_mergeinfo_t mergeinfo,
570 svn_mergeinfo_sort(svn_mergeinfo_t mergeinfo, apr_pool_t *pool);
[all …]
|
| /freebsd-12-stable/contrib/subversion/subversion/include/private/ |
| D | svn_mergeinfo_private.h | 89 svn_mergeinfo__canonicalize_ranges(svn_mergeinfo_t mergeinfo,
96 svn_mergeinfo__set_inheritance(svn_mergeinfo_t mergeinfo,
130 svn_mergeinfo__remove_empty_rangelists(svn_mergeinfo_t mergeinfo,
168 svn_mergeinfo_t mergeinfo,
199 svn_mergeinfo_t mergeinfo,
213 svn_mergeinfo_t mergeinfo,
241 svn_mergeinfo__is_noninheritable(svn_mergeinfo_t mergeinfo,
262 svn_mergeinfo_t mergeinfo,
286 svn_mergeinfo_t mergeinfo,
|
| D | svn_fs_private.h | 190 svn_fs__get_mergeinfo_for_path(svn_mergeinfo_t *mergeinfo,
|
| /freebsd-12-stable/contrib/subversion/subversion/libsvn_subr/ |
| D | mergeinfo.c | 802 svn_mergeinfo_parse(svn_mergeinfo_t *mergeinfo, in svn_mergeinfo_parse() argument
808 *mergeinfo = svn_hash__make(pool); in svn_mergeinfo_parse()
809 err = parse_top(&input, input + strlen(input), *mergeinfo, pool); in svn_mergeinfo_parse()
1207 svn_mergeinfo__set_inheritance(svn_mergeinfo_t mergeinfo, in svn_mergeinfo__set_inheritance() argument
1211 if (mergeinfo) in svn_mergeinfo__set_inheritance()
1215 for (hi = apr_hash_first(scratch_pool, mergeinfo); in svn_mergeinfo__set_inheritance()
1703 svn_mergeinfo_merge2(svn_mergeinfo_t mergeinfo, in svn_mergeinfo_merge2() argument
1724 target = apr_hash_get(mergeinfo, key, klen); in svn_mergeinfo_merge2()
1735 apr_hash_set(mergeinfo, key, klen, to_insert); in svn_mergeinfo_merge2()
1769 svn_mergeinfo_t mergeinfo = cat_elt.value; in svn_mergeinfo_catalog_merge() local
[all …]
|
| D | deprecated.c | 1670 svn_mergeinfo_t mergeinfo, in svn_mergeinfo_inheritable() argument
1676 return svn_error_trace(svn_mergeinfo_inheritable2(output, mergeinfo, path, in svn_mergeinfo_inheritable()
1718 svn_mergeinfo_merge(svn_mergeinfo_t mergeinfo, in svn_mergeinfo_merge() argument
1722 return svn_error_trace(svn_mergeinfo_merge2(mergeinfo, changes, pool, in svn_mergeinfo_merge()
1727 svn_mergeinfo_remove(svn_mergeinfo_t *mergeinfo, svn_mergeinfo_t eraser, in svn_mergeinfo_remove() argument
1730 return svn_mergeinfo_remove2(mergeinfo, eraser, whiteboard, TRUE, pool, in svn_mergeinfo_remove()
1735 svn_mergeinfo_intersect(svn_mergeinfo_t *mergeinfo, in svn_mergeinfo_intersect() argument
1740 return svn_mergeinfo_intersect2(mergeinfo, mergeinfo1, mergeinfo2, in svn_mergeinfo_intersect()
|
| /freebsd-12-stable/contrib/subversion/subversion/libsvn_client/ |
| D | mergeinfo.c | 84 svn_client__parse_mergeinfo(svn_mergeinfo_t *mergeinfo, in svn_client__parse_mergeinfo() argument
92 *mergeinfo = NULL; in svn_client__parse_mergeinfo()
100 SVN_ERR(svn_mergeinfo_parse(mergeinfo, propval->data, result_pool)); in svn_client__parse_mergeinfo()
107 svn_mergeinfo_t mergeinfo, in svn_client__record_wc_mergeinfo() argument
118 if (mergeinfo) in svn_client__record_wc_mergeinfo()
119 SVN_ERR(svn_mergeinfo_to_string(&mergeinfo_str, mergeinfo, scratch_pool)); in svn_client__record_wc_mergeinfo()
203 svn_client__get_wc_mergeinfo(svn_mergeinfo_t *mergeinfo, in svn_client__get_wc_mergeinfo() argument
331 *mergeinfo = wc_mergeinfo; in svn_client__get_wc_mergeinfo()
339 SVN_ERR(svn_mergeinfo__add_suffix_to_mergeinfo(mergeinfo, in svn_client__get_wc_mergeinfo()
348 *mergeinfo = NULL; in svn_client__get_wc_mergeinfo()
[all …]
|
| D | mergeinfo.h | 139 svn_client__get_wc_mergeinfo(svn_mergeinfo_t *mergeinfo,
321 svn_client__parse_mergeinfo(svn_mergeinfo_t *mergeinfo,
337 svn_mergeinfo_t mergeinfo,
|
| D | copy.c | 78 apr_hash_t *mergeinfo, in extend_wc_mergeinfo() argument
90 if (wc_mergeinfo && mergeinfo) in extend_wc_mergeinfo()
91 SVN_ERR(svn_mergeinfo_merge2(wc_mergeinfo, mergeinfo, pool, pool)); in extend_wc_mergeinfo()
93 wc_mergeinfo = mergeinfo; in extend_wc_mergeinfo()
1151 svn_string_t *mergeinfo; /* the new mergeinfo for the target */ member
1240 if (path_info->mergeinfo) in path_driver_cb_func()
1243 path_info->mergeinfo, in path_driver_cb_func()
1253 if (path_info->mergeinfo) in path_driver_cb_func()
1256 path_info->mergeinfo, in path_driver_cb_func()
1479 apr_hash_t *mergeinfo; in repos_to_repos_copy() local
[all …]
|
| D | merge.c | 622 svn_mergeinfo_t *mergeinfo, in split_mergeinfo_on_revision() argument
630 for (hi = apr_hash_first(pool, *mergeinfo); hi; hi = apr_hash_next(hi)) in split_mergeinfo_on_revision()
683 SVN_ERR(svn_mergeinfo_remove2(mergeinfo, *younger_mergeinfo, in split_mergeinfo_on_revision()
684 *mergeinfo, TRUE, pool, iterpool)); in split_mergeinfo_on_revision()
780 svn_mergeinfo_t mergeinfo, younger_mergeinfo; in filter_self_referential_mergeinfo() local
803 err = svn_mergeinfo_parse(&mergeinfo, prop->value->data, iterpool); in filter_self_referential_mergeinfo()
846 &mergeinfo, in filter_self_referential_mergeinfo()
960 if (mergeinfo) in filter_self_referential_mergeinfo()
972 mergeinfo, TRUE, iterpool, iterpool)); in filter_self_referential_mergeinfo()
5339 svn_mergeinfo_t mergeinfo; in update_wc_mergeinfo() local
[all …]
|
| /freebsd-12-stable/contrib/subversion/subversion/libsvn_diff/ |
| D | parse-diff.c | 948 svn_mergeinfo_t mergeinfo = NULL; in parse_pretty_mergeinfo_line() local
974 err = svn_mergeinfo_parse(&mergeinfo, input->data, result_pool); in parse_pretty_mergeinfo_line()
978 mergeinfo = NULL; in parse_pretty_mergeinfo_line()
983 if (mergeinfo) in parse_pretty_mergeinfo_line()
989 if (patch->mergeinfo == NULL) in parse_pretty_mergeinfo_line()
990 patch->mergeinfo = mergeinfo; in parse_pretty_mergeinfo_line()
992 SVN_ERR(svn_mergeinfo_merge2(patch->mergeinfo, in parse_pretty_mergeinfo_line()
993 mergeinfo, in parse_pretty_mergeinfo_line()
1000 patch->reverse_mergeinfo = mergeinfo; in parse_pretty_mergeinfo_line()
1003 mergeinfo, in parse_pretty_mergeinfo_line()
[all …]
|
| /freebsd-12-stable/contrib/subversion/subversion/libsvn_repos/ |
| D | log.c | 850 svn_mergeinfo_t prev_mergeinfo = NULL, mergeinfo = NULL; in fs_mergeinfo_changed() local
855 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, in fs_mergeinfo_changed()
861 mergeinfo, FALSE, result_pool, in fs_mergeinfo_changed()
948 svn_mergeinfo_t prev_mergeinfo, mergeinfo, deleted, added, in get_combined_mergeinfo_changes() local
1016 SVN_ERR(svn_fs__get_mergeinfo_for_path(&mergeinfo, in get_combined_mergeinfo_changes()
1028 if (!prev_mergeinfo && !mergeinfo) in get_combined_mergeinfo_changes()
1058 mergeinfo, FALSE, result_pool, iterpool)); in get_combined_mergeinfo_changes()
1565 svn_mergeinfo_t mergeinfo, in combine_mergeinfo_path_lists() argument
1574 rangelist_paths = apr_array_make(subpool, apr_hash_count(mergeinfo), in combine_mergeinfo_path_lists()
1576 for (hi = apr_hash_first(subpool, mergeinfo); hi; in combine_mergeinfo_path_lists()
[all …]
|
| D | load-fs-vtable.c | 215 apr_hash_t *prefixed_mergeinfo, *mergeinfo; in prefix_mergeinfo_paths() local
218 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, mergeinfo_orig->data, pool)); in prefix_mergeinfo_paths()
220 for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi)) in prefix_mergeinfo_paths()
259 svn_mergeinfo_t mergeinfo, predates_stream_mergeinfo; in renumber_mergeinfo_revs() local
263 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, initial_val->data, subpool)); in renumber_mergeinfo_revs()
275 &predates_stream_mergeinfo, mergeinfo, in renumber_mergeinfo_revs()
280 &mergeinfo, mergeinfo, in renumber_mergeinfo_revs()
292 for (hi = apr_hash_first(subpool, mergeinfo); hi; hi = apr_hash_next(hi)) in renumber_mergeinfo_revs()
|
| D | deprecated.c | 513 svn_mergeinfo_t mergeinfo, in mergeinfo_receiver() argument
524 svn_mergeinfo_dup(mergeinfo, result_pool)); in mergeinfo_receiver()
530 svn_repos_fs_get_mergeinfo(svn_mergeinfo_catalog_t *mergeinfo, in svn_repos_fs_get_mergeinfo() argument
546 *mergeinfo = result_catalog; in svn_repos_fs_get_mergeinfo()
|
| D | dump.c | 886 svn_mergeinfo_t mergeinfo, old_mergeinfo; in verify_mergeinfo_revisions() local
888 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, mergeinfo_str, pool)); in verify_mergeinfo_revisions()
890 &old_mergeinfo, mergeinfo, in verify_mergeinfo_revisions()
1027 svn_mergeinfo_t mergeinfo; in check_mergeinfo_normalization() local
1033 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, new_mergeinfo, pool)); in check_mergeinfo_normalization()
1038 SVN_ERR(svn_iter_apr_hash(NULL, mergeinfo, in check_mergeinfo_normalization()
|
| /freebsd-12-stable/contrib/subversion/subversion/libsvn_fs_fs/ |
| D | temp_serializer.c | 1312 svn_mergeinfo_t mergeinfo = in; in svn_fs_fs__serialize_mergeinfo() local
1322 merges.count = apr_hash_count(mergeinfo); in svn_fs_fs__serialize_mergeinfo()
1331 for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi), ++i) in svn_fs_fs__serialize_mergeinfo()
1344 for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi)) in svn_fs_fs__serialize_mergeinfo()
1400 svn_mergeinfo_t mergeinfo; in svn_fs_fs__deserialize_mergeinfo() local
1410 mergeinfo = svn_hash__make(pool); in svn_fs_fs__deserialize_mergeinfo()
1421 apr_hash_set(mergeinfo, merges->keys[i], merges->key_lengths[i], ranges); in svn_fs_fs__deserialize_mergeinfo()
1425 *out = mergeinfo; in svn_fs_fs__deserialize_mergeinfo()
|
| D | tree.c | 4281 get_mergeinfo_for_path_internal(svn_mergeinfo_t *mergeinfo, in get_mergeinfo_for_path_internal() argument
4343 svn_error_t *err = svn_mergeinfo_parse(mergeinfo, in get_mergeinfo_for_path_internal()
4352 *mergeinfo = NULL; in get_mergeinfo_for_path_internal()
4366 SVN_ERR(svn_mergeinfo_inheritable2(&tmp_mergeinfo, *mergeinfo, in get_mergeinfo_for_path_internal()
4370 SVN_ERR(svn_fs__append_to_merged_froms(mergeinfo, tmp_mergeinfo, in get_mergeinfo_for_path_internal()
4383 get_mergeinfo_for_path(svn_mergeinfo_t *mergeinfo, in get_mergeinfo_for_path() argument
4396 *mergeinfo = NULL; in get_mergeinfo_for_path()
4406 SVN_ERR(svn_cache__get((void **)mergeinfo, &found, in get_mergeinfo_for_path()
4413 SVN_ERR(get_mergeinfo_for_path_internal(mergeinfo, rev_root, path, in get_mergeinfo_for_path()
4419 mergeinfo_exists = svn_stringbuf_create(*mergeinfo ? "1" : "0", in get_mergeinfo_for_path()
[all …]
|
| /freebsd-12-stable/contrib/subversion/subversion/libsvn_fs/ |
| D | deprecated.c | 136 svn_mergeinfo_t mergeinfo, in mergeinfo_receiver() argument
147 svn_mergeinfo_dup(mergeinfo, result_pool)); in mergeinfo_receiver()
|
| D | fs-loader.c | 1400 svn_mergeinfo_t *mergeinfo; member
1406 svn_mergeinfo_t mergeinfo, in mergeinfo_receiver() argument
1411 *b->mergeinfo = svn_mergeinfo_dup(mergeinfo, b->result_pool); in mergeinfo_receiver()
1417 svn_fs__get_mergeinfo_for_path(svn_mergeinfo_t *mergeinfo, in svn_fs__get_mergeinfo_for_path() argument
1429 baton.mergeinfo = mergeinfo; in svn_fs__get_mergeinfo_for_path()
1434 *mergeinfo = NULL; in svn_fs__get_mergeinfo_for_path()
|
| /freebsd-12-stable/usr.bin/svn/lib/libsvn_ra_serf/ |
| D | Makefile | 26 mergeinfo.c \
|
| /freebsd-12-stable/usr.bin/svn/lib/libsvn_client/ |
| D | Makefile | 39 mergeinfo.c \
|
| /freebsd-12-stable/contrib/subversion/ |
| D | CHANGES | 11 * Fix non-deterministic generation of mergeinfo (issue #4862)
12 * Fix merge removing a folder with non-inheritable mergeinfo (issue #4859)
194 * Fix: foreign repo copy of file adding mergeinfo (#4792)
231 * 'patch' can now read non-pretty-printed svn:mergeinfo diffs (r1822151)
274 * Fix non-deterministic generation of mergeinfo (issue #4862)
276 * Fix merge removing a folder with non-inheritable mergeinfo (issue #4859)
332 * Fix: foreign repo copy of file adding mergeinfo (#4792)
512 * Speed up processing of mergeinfo (r1802470 et al)
543 + Parse any properties following svn:mergeinfo (r1706825)
599 * Fix integer overflow check with >= 1G mergeinfo ranges per path (r1714380)
[all …]
|
| /freebsd-12-stable/contrib/subversion/subversion/svnsync/ |
| D | sync.c | 562 svn_mergeinfo_t mergeinfo; in change_dir_prop() local
593 err = svn_mergeinfo_parse(&mergeinfo, mergeinfo_buf->data, pool); in change_dir_prop()
599 SVN_ERR(svn_mergeinfo_to_string(&new_value, mergeinfo, pool)); in change_dir_prop()
|
| /freebsd-12-stable/contrib/subversion/subversion/svndumpfilter/ |
| D | svndumpfilter.c | 639 apr_hash_t *mergeinfo; in adjust_mergeinfo() local
644 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, initial_val->data, subpool)); in adjust_mergeinfo()
666 &mergeinfo, mergeinfo, in adjust_mergeinfo()
670 for (hi = apr_hash_first(subpool, mergeinfo); hi; hi = apr_hash_next(hi)) in adjust_mergeinfo()
|
| /freebsd-12-stable/usr.bin/svn/lib/libsvn_subr/ |
| D | Makefile | 52 mergeinfo.c \
|
| /freebsd-12-stable/usr.bin/svn/svn/ |
| D | Makefile | 33 mergeinfo-cmd.c \
|