Searched refs:mergeinfo (Results 1 - 25 of 30) sorted by relevance

12

/freebsd-10.2-release/contrib/subversion/subversion/include/private/
H A Dsvn_mergeinfo_private.h24 * @brief Subversion-internal mergeinfo APIs.
72 svn_mergeinfo__set_inheritance(svn_mergeinfo_t mergeinfo,
106 svn_mergeinfo__remove_empty_rangelists(svn_mergeinfo_t mergeinfo,
144 svn_mergeinfo_t mergeinfo,
150 The hash keys of CATALOG and the merge source paths of each key's mergeinfo
159 Any relative merge source paths in the mergeinfo in CATALOG are converted
175 svn_mergeinfo_t mergeinfo,
189 svn_mergeinfo_t mergeinfo,
196 /* Filter each mergeinfo in CATALOG as per
198 result in *FILTERED_CATALOG, allocated in RESULT_POOL. If any mergeinfo
[all...]
/freebsd-10.2-release/contrib/subversion/subversion/include/
H A Dsvn_mergeinfo.h24 * @brief mergeinfo handling and processing
48 * path's parent, grand-parent, etc.. A path may have empty mergeinfo which
50 * to the path were reversed. Note that a path may have no mergeinfo, this
51 * is not the same as empty mergeinfo.
58 * the path's mergeinfo can elide to its nearest grand-parent,
62 * If a path has no @c SVN_PROP_MERGEINFO of its own, it inherits mergeinfo
70 * between a path and its nearest parent with mergeinfo is at the same
75 * (representing empty mergeinfo) or a non-empty string consisting of
109 /** Terminology for data structures that contain mergeinfo.
112 * mergeinfo i
[all...]
/freebsd-10.2-release/contrib/subversion/subversion/libsvn_subr/
H A Dmergeinfo.c2 * mergeinfo.c: Mergeinfo parsing and handling
705 /* Handle any funky mergeinfo with relative merge source paths that
707 the creation of mergeinfo with path keys that differ only by a
741 svn_mergeinfo_parse(svn_mergeinfo_t *mergeinfo, argument
747 *mergeinfo = svn_hash__make(pool);
748 err = parse_top(&input, input + strlen(input), *mergeinfo, pool);
753 _("Could not parse mergeinfo string '%s'"),
1231 svn_mergeinfo__set_inheritance(svn_mergeinfo_t mergeinfo, argument
1235 if (mergeinfo)
1239 for (hi = apr_hash_first(scratch_pool, mergeinfo);
1722 svn_mergeinfo_merge2(svn_mergeinfo_t mergeinfo, svn_mergeinfo_t changes, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1788 svn_mergeinfo_t mergeinfo = cat_elt.value; local
1826 svn_mergeinfo_intersect2(svn_mergeinfo_t *mergeinfo, svn_mergeinfo_t mergeinfo1, svn_mergeinfo_t mergeinfo2, svn_boolean_t consider_inheritance, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1867 svn_mergeinfo_remove2(svn_mergeinfo_t *mergeinfo, svn_mergeinfo_t eraser, svn_mergeinfo_t whiteboard, svn_boolean_t consider_inheritance, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1998 svn_mergeinfo_dup(svn_mergeinfo_t mergeinfo, apr_pool_t *pool) argument
2017 svn_mergeinfo_inheritable2(svn_mergeinfo_t *output, svn_mergeinfo_t mergeinfo, const char *path, svn_revnum_t start, svn_revnum_t end, svn_boolean_t inheritable, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
2111 svn_mergeinfo__remove_empty_rangelists(svn_mergeinfo_t mergeinfo, apr_pool_t *pool) argument
2191 svn_mergeinfo__add_suffix_to_mergeinfo(svn_mergeinfo_t *out_mergeinfo, svn_mergeinfo_t mergeinfo, const char *suffix_relpath, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
2282 svn_mergeinfo_t mergeinfo; local
2322 svn_mergeinfo__get_range_endpoints(svn_revnum_t *youngest_rev, svn_revnum_t *oldest_rev, svn_mergeinfo_t mergeinfo, apr_pool_t *pool) argument
2372 svn_mergeinfo_t mergeinfo = svn__apr_hash_index_val(hi); local
2391 svn_mergeinfo__filter_mergeinfo_by_ranges(svn_mergeinfo_t *filtered_mergeinfo, svn_mergeinfo_t mergeinfo, svn_revnum_t youngest_rev, svn_revnum_t oldest_rev, svn_boolean_t include_range, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
2437 svn_mergeinfo__adjust_mergeinfo_rangelists(svn_mergeinfo_t *adjusted_mergeinfo, svn_mergeinfo_t mergeinfo, svn_revnum_t offset, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
2489 svn_mergeinfo__is_noninheritable(svn_mergeinfo_t mergeinfo, apr_pool_t *scratch_pool) argument
2537 svn_mergeinfo_t mergeinfo = apr_hash_make(pool); local
[all...]
H A Ddeprecated.c1103 /*** From mergeinfo.c ***/
1107 svn_mergeinfo_t mergeinfo,
1113 return svn_error_trace(svn_mergeinfo_inheritable2(output, mergeinfo, path,
1155 svn_mergeinfo_merge(svn_mergeinfo_t mergeinfo,
1159 return svn_error_trace(svn_mergeinfo_merge2(mergeinfo, changes, pool,
1164 svn_mergeinfo_remove(svn_mergeinfo_t *mergeinfo, svn_mergeinfo_t eraser,
1167 return svn_mergeinfo_remove2(mergeinfo, eraser, whiteboard, TRUE, pool,
1172 svn_mergeinfo_intersect(svn_mergeinfo_t *mergeinfo,
1177 return svn_mergeinfo_intersect2(mergeinfo, mergeinfo1, mergeinfo2,
1104 svn_mergeinfo_inheritable(svn_mergeinfo_t *output, svn_mergeinfo_t mergeinfo, const char *path, svn_revnum_t start, svn_revnum_t end, apr_pool_t *pool) argument
1153 svn_mergeinfo_merge(svn_mergeinfo_t mergeinfo, svn_mergeinfo_t changes, apr_pool_t *pool) argument
1162 svn_mergeinfo_remove(svn_mergeinfo_t *mergeinfo, svn_mergeinfo_t eraser, svn_mergeinfo_t whiteboard, apr_pool_t *pool) argument
1170 svn_mergeinfo_intersect(svn_mergeinfo_t *mergeinfo, svn_mergeinfo_t mergeinfo1, svn_mergeinfo_t mergeinfo2, apr_pool_t *pool) argument
/freebsd-10.2-release/contrib/subversion/subversion/libsvn_client/
H A Dmergeinfo.c2 * mergeinfo.c : merge history functions for the libsvn_client library
48 #include "mergeinfo.h"
83 svn_client__parse_mergeinfo(svn_mergeinfo_t *mergeinfo, argument
91 *mergeinfo = NULL;
99 SVN_ERR(svn_mergeinfo_parse(mergeinfo, propval->data, result_pool));
106 svn_mergeinfo_t mergeinfo,
117 if (mergeinfo)
118 SVN_ERR(svn_mergeinfo_to_string(&mergeinfo_str, mergeinfo, scratch_pool));
124 /* Record the new mergeinfo in the WC. */
165 /* Write the mergeinfo ou
105 svn_client__record_wc_mergeinfo(const char *local_abspath, svn_mergeinfo_t mergeinfo, svn_boolean_t do_notification, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
202 svn_client__get_wc_mergeinfo(svn_mergeinfo_t *mergeinfo, svn_boolean_t *inherited_p, svn_mergeinfo_inheritance_t inherit, const char *local_abspath, const char *limit_abspath, const char **walked_path, svn_boolean_t ignore_invalid_mergeinfo, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
386 svn_mergeinfo_t mergeinfo; local
923 svn_mergeinfo_t mergeinfo = NULL; local
1596 mergeinfo_relpaths_to_urls(apr_hash_t **out_mergeinfo, svn_mergeinfo_t mergeinfo, const char *repos_root_url, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1637 svn_mergeinfo_t mergeinfo; local
2231 svn_mergeinfo_t mergeinfo; local
[all...]
H A Dmergeinfo.h2 * mergeinfo.h : Client library-internal mergeinfo APIs.
37 consideration during a mergeinfo aware merge -- See the
49 svn_boolean_t has_noninheritable; /* ABSPATH has svn:mergeinfo set on it
56 svn_boolean_t child_of_noninheritable; /* ABSPATH has no explicit mergeinfo
59 mergeinfo. */
71 svn_mergeinfo_t pre_merge_mergeinfo; /* Explicit or inherited mergeinfo
74 svn_mergeinfo_t implicit_mergeinfo; /* Implicit mergeinfo on ABSPATH
82 has no explicit mergeinfo prior
89 svn_boolean_t record_noninheritable; /* Non-inheritable mergeinfo need
[all...]
H A Dcopy.c45 #include "mergeinfo.h"
76 /* Extend the mergeinfo for the single WC path TARGET_WCPATH, adding
77 MERGEINFO to any mergeinfo pre-existing in the WC. */ argument
80 apr_hash_t *mergeinfo,
86 /* Get a fresh copy of the pre-existing state of the WC's mergeinfo
91 /* Combine the provided mergeinfo with any mergeinfo from the WC. */
92 if (wc_mergeinfo && mergeinfo)
93 SVN_ERR(svn_mergeinfo_merge2(wc_mergeinfo, mergeinfo, pool, pool));
95 wc_mergeinfo = mergeinfo;
596 svn_string_t *mergeinfo; /* the new mergeinfo for the target */ member in struct:path_driver_info_t
836 apr_hash_t *mergeinfo; local
1414 apr_hash_t *mergeinfo, *wc_mergeinfo; local
[all...]
H A Dmerge.c56 #include "mergeinfo.h"
78 * 1. that mergeinfo is not being recorded at all for this
148 * (recorded in svn:mergeinfo as /trunk:859501-859597)
151 * (recorded in svn:mergeinfo as /branches/1.4.x:859598-865262)
154 * (recorded in svn:mergeinfo as /tags/1.4.4:865263-866419)
158 * (recorded in svn:mergeinfo as /branches/1.4.5:866420-866424)
161 * (recorded in svn:mergeinfo as /tags/1.4.5:866425-866500)
176 * | -c | mergeinfo-driven | |
180 * | | mergeinfo-driven | unsupported |
186 * | -r | mergeinfo
624 split_mergeinfo_on_revision(svn_mergeinfo_t *younger_mergeinfo, svn_mergeinfo_t *mergeinfo, svn_revnum_t revision, apr_pool_t *pool) argument
783 svn_mergeinfo_t mergeinfo, younger_mergeinfo; local
5169 svn_mergeinfo_t mergeinfo; local
6237 svn_mergeinfo_t mergeinfo; local
6350 svn_mergeinfo_t mergeinfo = svn__apr_hash_index_val(hi); local
6685 svn_mergeinfo_t mergeinfo; local
10609 mergeinfo_in_catalog(svn_boolean_t *in_catalog, const char **cat_key_path, const char *repos_rel_path, svn_mergeinfo_t mergeinfo, svn_mergeinfo_catalog_t catalog, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
10841 svn_mergeinfo_t mergeinfo = svn__apr_hash_index_val(hi_catalog); local
[all...]
/freebsd-10.2-release/usr.bin/svn/lib/libsvn_client/
H A DMakefile15 mergeinfo.c patch.c log.c prop_commands.c \
/freebsd-10.2-release/usr.bin/svn/lib/libsvn_ra_serf/
H A DMakefile12 inherited_props.c locks.c log.c merge.c mergeinfo.c options.c \
/freebsd-10.2-release/contrib/subversion/subversion/libsvn_repos/
H A Dload-fs-vtable.c74 /* A hash mapping copy-from revisions and mergeinfo range revisions
190 /* Prepend the mergeinfo source paths in MERGEINFO_ORIG with PARENT_DIR, and
200 apr_hash_t *prefixed_mergeinfo, *mergeinfo;
204 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, mergeinfo_orig->data, pool));
206 for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi))
214 /* The svn:mergeinfo property syntax demands a repos abspath */
224 /* Examine the mergeinfo in INITIAL_VAL, renumber revisions in rangelists
225 as appropriate, and return the (possibly new) mergeinfo in *FINAL_VAL
236 svn_mergeinfo_t mergeinfo, predates_stream_mergeinfo;
240 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, initial_va
199 apr_hash_t *prefixed_mergeinfo, *mergeinfo; local
235 svn_mergeinfo_t mergeinfo, predates_stream_mergeinfo; local
[all...]
H A Dfs-wrap.c244 /* Verify the mergeinfo property value VALUE and return an error if it
253 svn_mergeinfo_t mergeinfo;
255 /* It's okay to delete svn:mergeinfo. */
263 _("Commit rejected because mergeinfo on '%s' "
267 err = svn_mergeinfo_parse(&mergeinfo, value->data, scratch_pool);
270 _("Commit rejected because mergeinfo on '%s' "
678 svn_repos_fs_get_mergeinfo(svn_mergeinfo_catalog_t *mergeinfo,
734 SVN_ERR(svn_fs_get_mergeinfo2(mergeinfo, root, readable_paths, inherit,
737 *mergeinfo = apr_hash_make(pool);
250 svn_mergeinfo_t mergeinfo; local
675 svn_repos_fs_get_mergeinfo(svn_mergeinfo_catalog_t *mergeinfo, svn_repos_t *repos, const apr_array_header_t *paths, svn_revnum_t rev, svn_mergeinfo_inheritance_t inherit, svn_boolean_t include_descendants, svn_repos_authz_func_t authz_read_func, void *authz_read_baton, apr_pool_t *pool) argument
H A Dlog.c565 catalogs describing how mergeinfo values on paths (which are the
589 /* Revision 0 has no mergeinfo and no mergeinfo changes. */
604 svn:mergeinfo change and is one of our paths of interest, or a
688 /* If there was a base location, fetch its mergeinfo property value. */
696 /* Now fetch the current (as of REV) mergeinfo property value. */
700 /* No mergeinfo on either the new or previous location? Just
702 inherited mergeinfo only, which should be picked up by the
708 /* If mergeinfo was explicitly added or removed on this path, we
710 meaning. So, fill in the "missing" mergeinfo valu
755 svn_mergeinfo_t prev_mergeinfo = NULL, mergeinfo = NULL; local
858 svn_mergeinfo_t prev_mergeinfo, mergeinfo, deleted, added, local
1472 combine_mergeinfo_path_lists(apr_array_header_t **combined_list, svn_mergeinfo_t mergeinfo, svn_boolean_t reverse_merge, apr_pool_t *pool) argument
1833 svn_mergeinfo_t mergeinfo = svn_hash__make(scratch_pool); local
[all...]
H A Drev_hunt.c986 /* Get the mergeinfo for PATH in REPOS at REVNUM and store it in MERGEINFO. */
988 get_path_mergeinfo(apr_hash_t **mergeinfo,
1010 *mergeinfo = svn_hash_gets(tmp_catalog, path);
1011 if (!*mergeinfo)
1012 *mergeinfo = apr_hash_make(result_pool);
1043 the mergeinfo difference in *MERGED_MERGEINFO, allocated in POOL. The
1058 /* Getting/parsing/diffing svn:mergeinfo is expensive, so only do it
1076 /* First, find the mergeinfo difference for old_path_rev->revnum, and
1085 /* Issue #3896: If invalid mergeinfo is encountered the
1087 no mergeinfo difference
987 get_path_mergeinfo(apr_hash_t **mergeinfo, svn_fs_t *fs, const char *path, svn_revnum_t revnum, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
[all...]
H A Ddump.c128 /* If not NULL, set to true if any mergeinfo was dumped which contains
222 /* If the mergeinfo in MERGEINFO_STR refers to any revisions older than
234 svn_mergeinfo_t mergeinfo, old_mergeinfo;
236 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, mergeinfo_str, pool));
238 &old_mergeinfo, mergeinfo,
253 "mergeinfo."),
514 /* If this is a partial dump, then issue a warning if we dump mergeinfo
523 /* An error in verifying the mergeinfo must not prevent dumping
1302 in dumped mergeinfo. */
1309 "contained mergeinfo "
232 svn_mergeinfo_t mergeinfo, old_mergeinfo; local
[all...]
/freebsd-10.2-release/contrib/subversion/subversion/svnrdump/
H A Dload_editor.c176 /* Prepend the mergeinfo source paths in MERGEINFO_ORIG with
186 apr_hash_t *prefixed_mergeinfo, *mergeinfo;
190 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, mergeinfo_orig->data, pool));
192 for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi))
200 /* The svn:mergeinfo property syntax demands a repos abspath */
210 /* Examine the mergeinfo in INITIAL_VAL, renumber revisions in rangelists
211 as appropriate, and return the (possibly new) mergeinfo in *FINAL_VAL
222 svn_mergeinfo_t mergeinfo, predates_stream_mergeinfo;
226 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, initial_val->data, subpool));
230 Remove mergeinfo olde
184 apr_hash_t *prefixed_mergeinfo, *mergeinfo; local
220 svn_mergeinfo_t mergeinfo, predates_stream_mergeinfo; local
[all...]
/freebsd-10.2-release/usr.bin/svn/lib/libsvn_subr/
H A DMakefile16 md5.c mergeinfo.c mutex.c named_atomic.c nls.c opt.c path.c \
/freebsd-10.2-release/contrib/subversion/subversion/libsvn_fs_fs/
H A Dtemp_serializer.c1221 svn_mergeinfo_t mergeinfo = in; local
1231 merges.count = apr_hash_count(mergeinfo);
1240 for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi), ++i)
1253 for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi))
1312 svn_mergeinfo_t mergeinfo; local
1322 mergeinfo = svn_hash__make(pool);
1333 apr_hash_set(mergeinfo, merges->keys[i], merges->key_lengths[i], ranges);
1337 *out = mergeinfo;
H A Dtree.c2319 /* Update mergeinfo counts for parents */
3761 /* mergeinfo queries */
3764 /* DIR_DAG is a directory DAG node which has mergeinfo in its
3766 child with immediate mergeinfo, it adds its mergeinfo to
3768 descendants with mergeinfo, it recurses. Note that it does *not*
3771 POOL is used for temporary allocations, including the mergeinfo
3772 hashes passed to actions; RESULT_POOL is used for the mergeinfo added
3809 /* Save this particular node's mergeinfo. */
3822 _("Node-revision #'%s' claims to have mergeinfo bu
3870 get_mergeinfo_for_path_internal(svn_mergeinfo_t *mergeinfo, svn_fs_root_t *rev_root, const char *path, svn_mergeinfo_inheritance_t inherit, svn_boolean_t adjust_inherited_mergeinfo, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
3972 get_mergeinfo_for_path(svn_mergeinfo_t *mergeinfo, svn_fs_root_t *rev_root, const char *path, svn_mergeinfo_inheritance_t inherit, svn_boolean_t adjust_inherited_mergeinfo, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
[all...]
/freebsd-10.2-release/contrib/subversion/subversion/svnsync/
H A Dsync.c156 svn_boolean_t strip_mergeinfo; /* Are we stripping svn:mergeinfo? */
158 svn_boolean_t mergeinfo_stripped; /* Did we strip svn:mergeinfo? */
392 /* Maybe drop svn:mergeinfo. */
440 /* Maybe drop svn:mergeinfo. */
447 /* Maybe convert svnmerge-integrated data into svn:mergeinfo. (We
450 ### merge svn:mergeinfo, svnmerge-integrated, and svnmerge-blocked. */
455 /* svnmerge-integrated differs from svn:mergeinfo in a pair
458 are relative URLs, whereas svn:mergeinfo uses relative
462 svn_mergeinfo_t mergeinfo; local
479 /* Append this source's mergeinfo dat
[all...]
/freebsd-10.2-release/usr.bin/svn/svn/
H A DMakefile15 lock-cmd.c log-cmd.c merge-cmd.c mergeinfo-cmd.c mkdir-cmd.c \
/freebsd-10.2-release/contrib/subversion/subversion/svndumpfilter/
H A Dsvndumpfilter.c773 /* Examine the mergeinfo in INITIAL_VAL, omitting missing merge
775 return the (possibly new) mergeinfo in *FINAL_VAL (allocated from
781 apr_hash_t *mergeinfo;
786 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, initial_val->data, subpool));
789 filter mergeinfo ranges as old or older than the oldest revision in the
794 result with --skip-missing-merge-sources, any mergeinfo with revision
802 &mergeinfo, mergeinfo,
806 for (hi = apr_hash_first(subpool, mergeinfo); hi; hi = apr_hash_next(hi))
779 apr_hash_t *mergeinfo; local
/freebsd-10.2-release/contrib/subversion/subversion/libsvn_ra/
H A Dra_loader.h133 svn_mergeinfo_catalog_t *mergeinfo,
/freebsd-10.2-release/contrib/subversion/subversion/libsvn_wc/
H A Dprops.c97 /* Parse FROM_PROP_VAL and TO_PROP_VAL into mergeinfo hashes, and
106 /* Don't bothering parsing identical mergeinfo. */
121 /* Parse the mergeinfo from PROP_VAL1 and PROP_VAL2, combine it, then
122 reconstitute it into *OUTPUT. Call when the WC's mergeinfo has
123 been modified to combine it with incoming mergeinfo from the
144 /* Perform a 3-way merge operation on mergeinfo. FROM_PROP_VAL is
804 We only merge mergeinfo; other props conflict */
814 /* Issue #3896 'mergeinfo syntax errors should be treated
815 gracefully': If bogus mergeinfo is present we can't
904 /* Merge a change to the mergeinfo propert
2161 apr_hash_t *mergeinfo; local
[all...]
/freebsd-10.2-release/contrib/subversion/
H A Dbuild.conf844 [mergeinfo-test]
845 description = Test mergeinfo library
848 sources = mergeinfo-test.c
1223 checksum-test compat-test config-test hashdump-test mergeinfo-test

Completed in 495 milliseconds

12