Home
last modified time | relevance | path

Searched refs:mergeinfo (Results 1 – 25 of 37) sorted by relevance

12

/freebsd-10-stable/contrib/subversion/subversion/include/
Dsvn_mergeinfo.h174 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-10-stable/contrib/subversion/subversion/include/private/
Dsvn_mergeinfo_private.h86 svn_mergeinfo__canonicalize_ranges(svn_mergeinfo_t mergeinfo,
93 svn_mergeinfo__set_inheritance(svn_mergeinfo_t mergeinfo,
127 svn_mergeinfo__remove_empty_rangelists(svn_mergeinfo_t mergeinfo,
165 svn_mergeinfo_t mergeinfo,
196 svn_mergeinfo_t mergeinfo,
210 svn_mergeinfo_t mergeinfo,
238 svn_mergeinfo__is_noninheritable(svn_mergeinfo_t mergeinfo,
259 svn_mergeinfo_t mergeinfo,
283 svn_mergeinfo_t mergeinfo,
Dsvn_fs_private.h190 svn_fs__get_mergeinfo_for_path(svn_mergeinfo_t *mergeinfo,
/freebsd-10-stable/contrib/subversion/subversion/libsvn_subr/
Dmergeinfo.c778 svn_mergeinfo_parse(svn_mergeinfo_t *mergeinfo, in svn_mergeinfo_parse() argument
784 *mergeinfo = svn_hash__make(pool); in svn_mergeinfo_parse()
785 err = parse_top(&input, input + strlen(input), *mergeinfo, pool); in svn_mergeinfo_parse()
1268 svn_mergeinfo__set_inheritance(svn_mergeinfo_t mergeinfo, in svn_mergeinfo__set_inheritance() argument
1272 if (mergeinfo) in svn_mergeinfo__set_inheritance()
1276 for (hi = apr_hash_first(scratch_pool, mergeinfo); in svn_mergeinfo__set_inheritance()
1759 svn_mergeinfo_merge2(svn_mergeinfo_t mergeinfo, in svn_mergeinfo_merge2() argument
1780 target = apr_hash_get(mergeinfo, key, klen); in svn_mergeinfo_merge2()
1791 apr_hash_set(mergeinfo, key, klen, to_insert); in svn_mergeinfo_merge2()
1825 svn_mergeinfo_t mergeinfo = cat_elt.value; in svn_mergeinfo_catalog_merge() local
[all …]
Ddeprecated.c1221 svn_mergeinfo_t mergeinfo, in svn_mergeinfo_inheritable() argument
1227 return svn_error_trace(svn_mergeinfo_inheritable2(output, mergeinfo, path, in svn_mergeinfo_inheritable()
1269 svn_mergeinfo_merge(svn_mergeinfo_t mergeinfo, in svn_mergeinfo_merge() argument
1273 return svn_error_trace(svn_mergeinfo_merge2(mergeinfo, changes, pool, in svn_mergeinfo_merge()
1278 svn_mergeinfo_remove(svn_mergeinfo_t *mergeinfo, svn_mergeinfo_t eraser, in svn_mergeinfo_remove() argument
1281 return svn_mergeinfo_remove2(mergeinfo, eraser, whiteboard, TRUE, pool, in svn_mergeinfo_remove()
1286 svn_mergeinfo_intersect(svn_mergeinfo_t *mergeinfo, in svn_mergeinfo_intersect() argument
1291 return svn_mergeinfo_intersect2(mergeinfo, mergeinfo1, mergeinfo2, in svn_mergeinfo_intersect()
/freebsd-10-stable/contrib/subversion/subversion/libsvn_client/
Dmergeinfo.c84 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 …]
Dmergeinfo.h141 svn_client__get_wc_mergeinfo(svn_mergeinfo_t *mergeinfo,
323 svn_client__parse_mergeinfo(svn_mergeinfo_t *mergeinfo,
339 svn_mergeinfo_t mergeinfo,
Dcopy.c78 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()
1142 svn_string_t *mergeinfo; /* the new mergeinfo for the target */ member
1233 if (path_info->mergeinfo) in path_driver_cb_func()
1236 path_info->mergeinfo, in path_driver_cb_func()
1246 if (path_info->mergeinfo) in path_driver_cb_func()
1249 path_info->mergeinfo, in path_driver_cb_func()
1472 apr_hash_t *mergeinfo; in repos_to_repos_copy() local
[all …]
Dmerge.c628 svn_mergeinfo_t *mergeinfo, in split_mergeinfo_on_revision() argument
636 for (hi = apr_hash_first(pool, *mergeinfo); hi; hi = apr_hash_next(hi)) in split_mergeinfo_on_revision()
689 SVN_ERR(svn_mergeinfo_remove2(mergeinfo, *younger_mergeinfo, in split_mergeinfo_on_revision()
690 *mergeinfo, TRUE, pool, iterpool)); in split_mergeinfo_on_revision()
786 svn_mergeinfo_t mergeinfo, younger_mergeinfo; in filter_self_referential_mergeinfo() local
809 err = svn_mergeinfo_parse(&mergeinfo, prop->value->data, iterpool); in filter_self_referential_mergeinfo()
852 &mergeinfo, in filter_self_referential_mergeinfo()
966 if (mergeinfo) in filter_self_referential_mergeinfo()
978 mergeinfo, TRUE, iterpool, iterpool)); in filter_self_referential_mergeinfo()
5307 svn_mergeinfo_t mergeinfo; in update_wc_mergeinfo() local
[all …]
/freebsd-10-stable/contrib/subversion/subversion/libsvn_diff/
Dparse-diff.c501 svn_mergeinfo_t mergeinfo = NULL; in parse_mergeinfo() local
527 err = svn_mergeinfo_parse(&mergeinfo, input->data, result_pool); in parse_mergeinfo()
531 mergeinfo = NULL; in parse_mergeinfo()
536 if (mergeinfo) in parse_mergeinfo()
542 if (patch->mergeinfo == NULL) in parse_mergeinfo()
543 patch->mergeinfo = mergeinfo; in parse_mergeinfo()
545 SVN_ERR(svn_mergeinfo_merge2(patch->mergeinfo, in parse_mergeinfo()
546 mergeinfo, in parse_mergeinfo()
553 patch->reverse_mergeinfo = mergeinfo; in parse_mergeinfo()
556 mergeinfo, in parse_mergeinfo()
[all …]
/freebsd-10-stable/contrib/subversion/subversion/libsvn_repos/
Dload-fs-vtable.c202 apr_hash_t *prefixed_mergeinfo, *mergeinfo; in prefix_mergeinfo_paths() local
205 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, mergeinfo_orig->data, pool)); in prefix_mergeinfo_paths()
207 for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi)) in prefix_mergeinfo_paths()
244 svn_mergeinfo_t mergeinfo, predates_stream_mergeinfo; in renumber_mergeinfo_revs() local
248 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, initial_val->data, subpool)); in renumber_mergeinfo_revs()
260 &predates_stream_mergeinfo, mergeinfo, in renumber_mergeinfo_revs()
265 &mergeinfo, mergeinfo, in renumber_mergeinfo_revs()
277 for (hi = apr_hash_first(subpool, mergeinfo); hi; hi = apr_hash_next(hi)) in renumber_mergeinfo_revs()
Dlog.c821 svn_mergeinfo_t prev_mergeinfo = NULL, mergeinfo = NULL; in fs_mergeinfo_changed() local
826 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, in fs_mergeinfo_changed()
832 mergeinfo, FALSE, result_pool, in fs_mergeinfo_changed()
922 svn_mergeinfo_t prev_mergeinfo, mergeinfo, deleted, added, in get_combined_mergeinfo_changes() local
990 SVN_ERR(svn_fs__get_mergeinfo_for_path(&mergeinfo, in get_combined_mergeinfo_changes()
1002 if (!prev_mergeinfo && !mergeinfo) in get_combined_mergeinfo_changes()
1032 mergeinfo, FALSE, result_pool, iterpool)); in get_combined_mergeinfo_changes()
1542 svn_mergeinfo_t mergeinfo, in combine_mergeinfo_path_lists() argument
1551 rangelist_paths = apr_array_make(subpool, apr_hash_count(mergeinfo), in combine_mergeinfo_path_lists()
1553 for (hi = apr_hash_first(subpool, mergeinfo); hi; in combine_mergeinfo_path_lists()
[all …]
Dfs-wrap.c269 svn_mergeinfo_t mergeinfo; in verify_mergeinfo() local
283 err = svn_mergeinfo_parse(&mergeinfo, value->data, scratch_pool); in verify_mergeinfo()
898 svn_repos_fs_get_mergeinfo(svn_mergeinfo_catalog_t *mergeinfo, in svn_repos_fs_get_mergeinfo() argument
954 SVN_ERR(svn_fs_get_mergeinfo2(mergeinfo, root, readable_paths, inherit, in svn_repos_fs_get_mergeinfo()
957 *mergeinfo = apr_hash_make(pool); in svn_repos_fs_get_mergeinfo()
Ddump.c851 svn_mergeinfo_t mergeinfo, old_mergeinfo; in verify_mergeinfo_revisions() local
853 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, mergeinfo_str, pool)); in verify_mergeinfo_revisions()
855 &old_mergeinfo, mergeinfo, in verify_mergeinfo_revisions()
992 svn_mergeinfo_t mergeinfo; in check_mergeinfo_normalization() local
998 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, new_mergeinfo, pool)); in check_mergeinfo_normalization()
1003 SVN_ERR(svn_iter_apr_hash(NULL, mergeinfo, in check_mergeinfo_normalization()
/freebsd-10-stable/contrib/subversion/subversion/libsvn_fs_x/
Dtemp_serializer.c1220 svn_mergeinfo_t mergeinfo = in; in svn_fs_x__serialize_mergeinfo() local
1230 merges.count = apr_hash_count(mergeinfo); in svn_fs_x__serialize_mergeinfo()
1239 for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi), ++i) in svn_fs_x__serialize_mergeinfo()
1252 for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi)) in svn_fs_x__serialize_mergeinfo()
1308 svn_mergeinfo_t mergeinfo; in svn_fs_x__deserialize_mergeinfo() local
1318 mergeinfo = svn_hash__make(pool); in svn_fs_x__deserialize_mergeinfo()
1329 apr_hash_set(mergeinfo, merges->keys[i], merges->key_lengths[i], ranges); in svn_fs_x__deserialize_mergeinfo()
1333 *out = mergeinfo; in svn_fs_x__deserialize_mergeinfo()
Dtree.c3968 get_mergeinfo_for_path_internal(svn_mergeinfo_t *mergeinfo, in get_mergeinfo_for_path_internal() argument
4030 svn_error_t *err = svn_mergeinfo_parse(mergeinfo, in get_mergeinfo_for_path_internal()
4039 *mergeinfo = NULL; in get_mergeinfo_for_path_internal()
4053 SVN_ERR(svn_mergeinfo_inheritable2(&tmp_mergeinfo, *mergeinfo, in get_mergeinfo_for_path_internal()
4057 SVN_ERR(svn_fs__append_to_merged_froms(mergeinfo, tmp_mergeinfo, in get_mergeinfo_for_path_internal()
4070 get_mergeinfo_for_path(svn_mergeinfo_t *mergeinfo, in get_mergeinfo_for_path() argument
4083 *mergeinfo = NULL; in get_mergeinfo_for_path()
4093 SVN_ERR(svn_cache__get((void **)mergeinfo, &found, in get_mergeinfo_for_path()
4100 SVN_ERR(get_mergeinfo_for_path_internal(mergeinfo, rev_root, path, in get_mergeinfo_for_path()
4106 mergeinfo_exists = svn_stringbuf_create(*mergeinfo ? "1" : "0", in get_mergeinfo_for_path()
[all …]
/freebsd-10-stable/contrib/subversion/subversion/libsvn_fs_fs/
Dtemp_serializer.c1237 svn_mergeinfo_t mergeinfo = in; in svn_fs_fs__serialize_mergeinfo() local
1247 merges.count = apr_hash_count(mergeinfo); in svn_fs_fs__serialize_mergeinfo()
1256 for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi), ++i) in svn_fs_fs__serialize_mergeinfo()
1269 for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi)) in svn_fs_fs__serialize_mergeinfo()
1325 svn_mergeinfo_t mergeinfo; in svn_fs_fs__deserialize_mergeinfo() local
1335 mergeinfo = svn_hash__make(pool); in svn_fs_fs__deserialize_mergeinfo()
1346 apr_hash_set(mergeinfo, merges->keys[i], merges->key_lengths[i], ranges); in svn_fs_fs__deserialize_mergeinfo()
1350 *out = mergeinfo; in svn_fs_fs__deserialize_mergeinfo()
Dtree.c3970 get_mergeinfo_for_path_internal(svn_mergeinfo_t *mergeinfo, in get_mergeinfo_for_path_internal() argument
4032 svn_error_t *err = svn_mergeinfo_parse(mergeinfo, in get_mergeinfo_for_path_internal()
4041 *mergeinfo = NULL; in get_mergeinfo_for_path_internal()
4055 SVN_ERR(svn_mergeinfo_inheritable2(&tmp_mergeinfo, *mergeinfo, in get_mergeinfo_for_path_internal()
4059 SVN_ERR(svn_fs__append_to_merged_froms(mergeinfo, tmp_mergeinfo, in get_mergeinfo_for_path_internal()
4072 get_mergeinfo_for_path(svn_mergeinfo_t *mergeinfo, in get_mergeinfo_for_path() argument
4085 *mergeinfo = NULL; in get_mergeinfo_for_path()
4095 SVN_ERR(svn_cache__get((void **)mergeinfo, &found, in get_mergeinfo_for_path()
4102 SVN_ERR(get_mergeinfo_for_path_internal(mergeinfo, rev_root, path, in get_mergeinfo_for_path()
4108 mergeinfo_exists = svn_stringbuf_create(*mergeinfo ? "1" : "0", in get_mergeinfo_for_path()
[all …]
/freebsd-10-stable/usr.bin/svn/lib/libsvn_ra_serf/
DMakefile13 inherited_props.c lock.c log.c merge.c mergeinfo.c \
/freebsd-10-stable/usr.bin/svn/lib/libsvn_client/
DMakefile15 mergeinfo.c mtcc.c patch.c log.c prop_commands.c \
/freebsd-10-stable/contrib/subversion/subversion/svnsync/
Dsync.c562 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-10-stable/contrib/subversion/
DCHANGES232 * mergeinfo: new '--log' option (r1492168)
255 * merge and mergeinfo: use fewer RA sessions (r1552265)
305 * speed up mergeinfo parsing (r1483292, r1483309 et al)
306 * optimize hash lookups used in mergeinfo and caching (r1483434 et al)
417 * mergeinfo: allow to work on a moved target (issue #4301)
472 * mergeinfo parsing: allow source path to be empty (issue #4537)
631 info, and mergeinfo commands (r1569021)
1074 * avoid unnecessary subtree mergeinfo recording (r1666690)
1080 * svnadmin load: tolerate invalid mergeinfo at r0 (r1643074, issue #4476)
1081 * svnadmin load: strip references to r1 from mergeinfo (issue #4538)
[all …]
/freebsd-10-stable/usr.bin/svn/lib/libsvn_subr/
DMakefile17 macos_keychain.c magic.c md5.c mergeinfo.c mutex.c nls.c \
/freebsd-10-stable/contrib/subversion/subversion/svndumpfilter/
Dsvndumpfilter.c671 apr_hash_t *mergeinfo; in adjust_mergeinfo() local
676 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, initial_val->data, subpool)); in adjust_mergeinfo()
698 &mergeinfo, mergeinfo, in adjust_mergeinfo()
702 for (hi = apr_hash_first(subpool, mergeinfo); hi; hi = apr_hash_next(hi)) in adjust_mergeinfo()
/freebsd-10-stable/usr.bin/svn/svn/
DMakefile16 mergeinfo-cmd.c mkdir-cmd.c move-cmd.c notify.c patch-cmd.c \

12