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

12

/freebsd-11-stable/contrib/subversion/subversion/include/private/
H A Dsvn_mergeinfo_private.h24 * @brief Subversion-internal mergeinfo APIs.
83 /** Canonicalize the revision range lists in the @a mergeinfo.
85 * Modify @a mergeinfo in place. Use @a scratch_pool for temporary
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,
174 The hash keys of CATALOG and the merge source paths of each key's mergeinfo
183 Any relative merge source paths in the mergeinfo in CATALOG are converted
199 svn_mergeinfo_t mergeinfo,
[all...]
H A Dsvn_fs_private.h183 /** Set @a *mergeinfo to the mergeinfo for @a path in @a root.
185 * If there is no mergeinfo, set @a *mergeinfo to NULL.
191 svn_fs__get_mergeinfo_for_path(svn_mergeinfo_t *mergeinfo,
/freebsd-11-stable/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-11-stable/contrib/subversion/subversion/libsvn_client/
H A Dmergeinfo.c2 * mergeinfo.c : merge history functions for the libsvn_client library
49 #include "mergeinfo.h"
84 svn_client__parse_mergeinfo(svn_mergeinfo_t *mergeinfo, argument
92 *mergeinfo = NULL;
100 SVN_ERR(svn_mergeinfo_parse(mergeinfo, propval->data, result_pool));
107 svn_mergeinfo_t mergeinfo,
118 if (mergeinfo)
119 SVN_ERR(svn_mergeinfo_to_string(&mergeinfo_str, mergeinfo, scratch_pool));
125 /* Record the new mergeinfo in the WC. */
166 /* Write the mergeinfo ou
106 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
203 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
1593 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
1634 svn_mergeinfo_t mergeinfo; local
2226 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
80 has no explicit mergeinfo prior
87 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;
1151 svn_string_t *mergeinfo; /* the new mergeinfo for the target */ member in struct:path_driver_info_t
1479 apr_hash_t *mergeinfo; local
2129 apr_hash_t *mergeinfo, *wc_mergeinfo; local
[all...]
H A Dmerge.c56 #include "mergeinfo.h"
77 * 1. that mergeinfo is not being recorded at all for this
147 * (recorded in svn:mergeinfo as /trunk:859501-859597)
150 * (recorded in svn:mergeinfo as /branches/1.4.x:859598-865262)
153 * (recorded in svn:mergeinfo as /tags/1.4.4:865263-866419)
157 * (recorded in svn:mergeinfo as /branches/1.4.5:866420-866424)
160 * (recorded in svn:mergeinfo as /tags/1.4.5:866425-866500)
175 * | -c | mergeinfo-driven | |
179 * | | mergeinfo-driven | unsupported |
185 * | -r | mergeinfo
621 split_mergeinfo_on_revision(svn_mergeinfo_t *younger_mergeinfo, svn_mergeinfo_t *mergeinfo, svn_revnum_t revision, apr_pool_t *pool) argument
780 svn_mergeinfo_t mergeinfo, younger_mergeinfo; local
5339 svn_mergeinfo_t mergeinfo; local
6401 svn_mergeinfo_t mergeinfo; local
6518 svn_mergeinfo_t mergeinfo = apr_hash_this_val(hi); local
6852 svn_mergeinfo_t mergeinfo; local
10759 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
10991 svn_mergeinfo_t mergeinfo = apr_hash_this_val(hi_catalog); local
[all...]
/freebsd-11-stable/contrib/subversion/subversion/libsvn_subr/
H A Dmergeinfo.c2 * mergeinfo.c: Mergeinfo parsing and handling
721 * Parse one line of mergeinfo starting at INPUT, not reading beyond END,
758 svn:mergeinfo will already be in normalized form and this will be quick.
762 /* Handle any funky mergeinfo with relative merge source paths that
764 the creation of mergeinfo with path keys that differ only by a
782 * Parse mergeinfo starting at INPUT, not reading beyond END, into HASH.
802 svn_mergeinfo_parse(svn_mergeinfo_t *mergeinfo, argument
808 *mergeinfo = svn_hash__make(pool);
809 err = parse_top(&input, input + strlen(input), *mergeinfo, pool);
814 _("Could not parse mergeinfo strin
1207 svn_mergeinfo__set_inheritance(svn_mergeinfo_t mergeinfo, svn_boolean_t inheritable, apr_pool_t *scratch_pool) argument
1703 svn_mergeinfo_merge2(svn_mergeinfo_t mergeinfo, svn_mergeinfo_t changes, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1769 svn_mergeinfo_t mergeinfo = cat_elt.value; local
1807 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
1848 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
1961 svn_mergeinfo__canonicalize_ranges(svn_mergeinfo_t mergeinfo, 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
2107 svn_mergeinfo__remove_empty_rangelists(svn_mergeinfo_t mergeinfo, apr_pool_t *scratch_pool) argument
2188 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
2294 svn_mergeinfo_t mergeinfo; local
2334 svn_mergeinfo__get_range_endpoints(svn_revnum_t *youngest_rev, svn_revnum_t *oldest_rev, svn_mergeinfo_t mergeinfo, apr_pool_t *pool) argument
2384 svn_mergeinfo_t mergeinfo = apr_hash_this_val(hi); local
2403 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
2449 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
2494 svn_mergeinfo__is_noninheritable(svn_mergeinfo_t mergeinfo, apr_pool_t *scratch_pool) argument
2542 svn_mergeinfo_t mergeinfo = apr_hash_make(pool); local
[all...]
H A Ddeprecated.c1668 /*** From mergeinfo.c ***/
1672 svn_mergeinfo_t mergeinfo,
1678 return svn_error_trace(svn_mergeinfo_inheritable2(output, mergeinfo, path,
1720 svn_mergeinfo_merge(svn_mergeinfo_t mergeinfo,
1724 return svn_error_trace(svn_mergeinfo_merge2(mergeinfo, changes, pool,
1729 svn_mergeinfo_remove(svn_mergeinfo_t *mergeinfo, svn_mergeinfo_t eraser,
1732 return svn_mergeinfo_remove2(mergeinfo, eraser, whiteboard, TRUE, pool,
1737 svn_mergeinfo_intersect(svn_mergeinfo_t *mergeinfo,
1742 return svn_mergeinfo_intersect2(mergeinfo, mergeinfo1, mergeinfo2,
1669 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
1718 svn_mergeinfo_merge(svn_mergeinfo_t mergeinfo, svn_mergeinfo_t changes, apr_pool_t *pool) argument
1727 svn_mergeinfo_remove(svn_mergeinfo_t *mergeinfo, svn_mergeinfo_t eraser, svn_mergeinfo_t whiteboard, apr_pool_t *pool) argument
1735 svn_mergeinfo_intersect(svn_mergeinfo_t *mergeinfo, svn_mergeinfo_t mergeinfo1, svn_mergeinfo_t mergeinfo2, apr_pool_t *pool) argument
/freebsd-11-stable/usr.bin/svn/lib/libsvn_ra_serf/
H A DMakefile26 mergeinfo.c \
/freebsd-11-stable/usr.bin/svn/lib/libsvn_client/
H A DMakefile39 mergeinfo.c \
/freebsd-11-stable/contrib/subversion/subversion/libsvn_diff/
H A Dparse-diff.c72 /* Whether the hunk was interpreted as pretty-print mergeinfo. If so,
896 /* A helper function to parse svn:mergeinfo diffs.
900 * Added: svn:mergeinfo
907 * The header is followed by a list of mergeinfo, one path per line.
915 * ":r", which in turn is followed by a mergeinfo revision range,
928 * If LINE is successfully parsed and counted, the resulting mergeinfo
929 * is added to PATCH->mergeinfo or PATCH->reverse_mergeinfo.
948 svn_mergeinfo_t mergeinfo = NULL; local
974 err = svn_mergeinfo_parse(&mergeinfo, input->data, result_pool);
978 mergeinfo
[all...]
/freebsd-11-stable/usr.bin/svn/lib/libsvn_subr/
H A DMakefile52 mergeinfo.c \
/freebsd-11-stable/contrib/subversion/subversion/libsvn_fs/
H A Ddeprecated.c137 svn_mergeinfo_t mergeinfo,
148 svn_mergeinfo_dup(mergeinfo, result_pool));
135 mergeinfo_receiver(const char *path, svn_mergeinfo_t mergeinfo, void *baton, apr_pool_t *scratch_pool) argument
H A Dfs-loader.c480 /* Raise an error if PATH contains a newline because svn:mergeinfo and
1406 svn_mergeinfo_t *mergeinfo;
1412 svn_mergeinfo_t mergeinfo,
1417 *b->mergeinfo = svn_mergeinfo_dup(mergeinfo, b->result_pool); argument
1423 svn_fs__get_mergeinfo_for_path(svn_mergeinfo_t *mergeinfo,
1435 baton.mergeinfo = mergeinfo;
1440 *mergeinfo = NULL;
1400 svn_mergeinfo_t *mergeinfo; member in struct:mergeinfo_receiver_baton_t
1405 mergeinfo_receiver(const char *path, svn_mergeinfo_t mergeinfo, void *baton, apr_pool_t *scratch_pool) argument
/freebsd-11-stable/contrib/subversion/subversion/libsvn_fs_fs/
H A Dtemp_serializer.c1312 svn_mergeinfo_t mergeinfo = in; local
1322 merges.count = apr_hash_count(mergeinfo);
1331 for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi), ++i)
1344 for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi))
1400 svn_mergeinfo_t mergeinfo; local
1410 mergeinfo = svn_hash__make(pool);
1421 apr_hash_set(mergeinfo, merges->keys[i], merges->key_lengths[i], ranges);
1425 *out = mergeinfo;
H A Dtree.c2612 /* Update mergeinfo counts for parents */
4179 /* mergeinfo queries */
4182 /* DIR_DAG is a directory DAG node which has mergeinfo in its
4184 child with immediate mergeinfo, call RECEIVER with it and BATON.
4185 For each child with descendants with mergeinfo, it recurses. Note
4188 SCRATCH_POOL is used for temporary allocations, including the mergeinfo
4221 /* Save this particular node's mergeinfo. */
4234 _("Node-revision #'%s' claims to have mergeinfo but doesn't"),
4238 /* Issue #3896: If a node has syntactically invalid mergeinfo, then
4239 treat it as if no mergeinfo i
4281 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
4383 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-11-stable/contrib/subversion/subversion/libsvn_repos/
H A Dlog.c614 catalogs describing how mergeinfo values on paths (which are the
637 /* Revision 0 has no mergeinfo and no mergeinfo changes. */
652 /* Look for copies and (potential) mergeinfo changes.
664 mergeinfo change happened, we must assume that it might have. */
675 /* No potential mergeinfo changes? We're done. */
688 svn:mergeinfo change and is one of our paths of interest, or a
706 /* No mergeinfo change? -> nothing to do here. */
788 /* If there was a base location, fetch its mergeinfo property value. */
796 /* Now fetch the current (as of REV) mergeinfo propert
850 svn_mergeinfo_t prev_mergeinfo = NULL, mergeinfo = NULL; local
948 svn_mergeinfo_t prev_mergeinfo, mergeinfo, deleted, added, local
1564 combine_mergeinfo_path_lists(apr_array_header_t **combined_list, svn_mergeinfo_t mergeinfo, svn_boolean_t reverse_merge, apr_pool_t *pool) argument
1915 svn_mergeinfo_t mergeinfo = svn_hash__make(scratch_pool); local
[all...]
H A Dload-fs-vtable.c75 /* A hash mapping copy-from revisions and mergeinfo range revisions
208 /* Prepend the mergeinfo source paths in MERGEINFO_ORIG with PARENT_DIR, and
216 apr_hash_t *prefixed_mergeinfo, *mergeinfo;
219 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, mergeinfo_orig->data, pool));
221 for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi))
231 /* The svn:mergeinfo property syntax demands a repos abspath */
241 /* Examine the mergeinfo in INITIAL_VAL, renumber revisions in rangelists
242 as appropriate, and return the (possibly new) mergeinfo in *FINAL_VAL
245 Adjust any mergeinfo revisions not older than OLDEST_DUMPSTREAM_REV by
248 Adjust any mergeinfo revision
215 apr_hash_t *prefixed_mergeinfo, *mergeinfo; local
259 svn_mergeinfo_t mergeinfo, predates_stream_mergeinfo; local
[all...]
H A Ddump.c690 /* If not NULL, set to true if any mergeinfo was dumped which contains
878 /* If the mergeinfo in MERGEINFO_STR refers to any revisions older than
890 svn_mergeinfo_t mergeinfo, old_mergeinfo;
892 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, mergeinfo_str, pool));
894 &old_mergeinfo, mergeinfo,
905 "mergeinfo."),
957 /* Compare two sets of denormalized paths from mergeinfo entries,
982 an svn:mergeinfo property. */
1003 /* Report path collision in mergeinfo */
1017 /* Check UCS normalization of mergeinfo fo
886 svn_mergeinfo_t mergeinfo, old_mergeinfo; local
1027 svn_mergeinfo_t mergeinfo; local
[all...]
H A Ddeprecated.c514 svn_mergeinfo_t mergeinfo,
525 svn_mergeinfo_dup(mergeinfo, result_pool));
531 svn_repos_fs_get_mergeinfo(svn_mergeinfo_catalog_t *mergeinfo,
547 *mergeinfo = result_catalog;
512 mergeinfo_receiver(const char *path, svn_mergeinfo_t mergeinfo, void *baton, apr_pool_t *scratch_pool) argument
530 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
/freebsd-11-stable/usr.bin/svn/svn/
H A DMakefile33 mergeinfo-cmd.c \
/freebsd-11-stable/contrib/subversion/subversion/svnsync/
H A Dsync.c88 /* Remove r0 references from the mergeinfo string *STR.
90 * r0 was never a valid mergeinfo reference and cannot be committed with
125 _("Missing colon in svn:mergeinfo "
244 svn_boolean_t mergeinfo_tweaked; /* Did we tweak svn:mergeinfo? */
245 svn_boolean_t strip_mergeinfo; /* Are we stripping svn:mergeinfo? */
247 svn_boolean_t mergeinfo_stripped; /* Did we strip svn:mergeinfo? */
481 /* Maybe drop svn:mergeinfo. */
511 /* Correct malformed mergeinfo. */
540 /* Maybe drop svn:mergeinfo. */
547 /* Maybe convert svnmerge-integrated data into svn:mergeinfo
562 svn_mergeinfo_t mergeinfo; local
[all...]
/freebsd-11-stable/contrib/subversion/subversion/svndumpfilter/
H A Dsvndumpfilter.c633 /* Examine the mergeinfo in INITIAL_VAL, omitting missing merge
635 return the (possibly new) mergeinfo in *FINAL_VAL (allocated from
641 apr_hash_t *mergeinfo;
646 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, initial_val->data, subpool));
649 filter mergeinfo ranges as old or older than the oldest revision in the
654 result with --skip-missing-merge-sources, any mergeinfo with revision
663 processed do follow on, then we might want to keep the mergeinfo
668 &mergeinfo, mergeinfo,
672 for (hi = apr_hash_first(subpool, mergeinfo); h
639 apr_hash_t *mergeinfo; local
[all...]
/freebsd-11-stable/contrib/subversion/
H A Dbuild.conf1026 [mergeinfo-test]
1027 description = Test mergeinfo library
1030 sources = mergeinfo-test.c
1578 checksum-test compat-test config-test hashdump-test mergeinfo-test
1607 svn-mergeinfo-normalizer svnconflict
1722 [svn-mergeinfo-normalizer]
1724 path = tools/client-side/svn-mergeinfo-normalizer

Completed in 252 milliseconds

12