74 #include <apr_pools.h>
75 #include <apr_tables.h>
78 #include <apr_file_io.h>
125 #define SVN_WC_TRANSLATE_FROM_NF 0x00000000
132 #define SVN_WC_TRANSLATE_TO_NF 0x00000001
139 #define SVN_WC_TRANSLATE_FORCE_EOL_REPAIR 0x00000002
142 #define SVN_WC_TRANSLATE_NO_OUTPUT_CLEANUP 0x00000004
148 #define SVN_WC_TRANSLATE_FORCE_COPY 0x00000008
155 #define SVN_WC_TRANSLATE_USE_GLOBAL_TMP 0x00000010
203 apr_pool_t *result_pool,
204 apr_pool_t *scratch_pool);
535 apr_pool_t *scratch_pool);
593 const char *local_abspath,
594 apr_pool_t *scratch_pool);
624 #define SVN_WC_ADM_DIR_NAME ".svn"
689 const char *local_abspath,
693 apr_pool_t *scratch_pool);
746 apr_hash_t **externals_new,
916 const char *parent_directory,
934 const char *parent_directory,
949 const char *parent_directory,
1266 svn_wc_notify_state_inapplicable = 0,
1301 svn_wc_notify_lock_state_inapplicable = 0,
1303 svn_wc_notify_lock_state_unknown,
1519 const char *mime_type,
1635 svn_wc_operation_none = 0,
1636 svn_wc_operation_update,
1637 svn_wc_operation_switch,
1638 svn_wc_operation_merge
1706 const char *repos_uuid,
1707 const char *repos_relpath,
1710 apr_pool_t *result_pool);
1721 const char *path_in_repos,
1947 apr_pool_t *result_pool);
1979 const char *property_name,
1980 apr_pool_t *result_pool);
1993 const char *property_name,
2014 const char *local_abspath,
2019 apr_pool_t *result_pool);
2048 apr_pool_t *result_pool);
2120 const char *merged_file,
2154 apr_pool_t *result_pool,
2155 apr_pool_t *scratch_pool);
2210 apr_pool_t *scratch_pool);
2233 const char *tmpfile1,
2234 const char *tmpfile2,
2237 const char *mimetype1,
2238 const char *mimetype2,
2239 const apr_array_header_t *propchanges,
2240 apr_hash_t *originalprops,
2242 apr_pool_t *scratch_pool);
2267 const char *tmpfile1,
2268 const char *tmpfile2,
2271 const char *mimetype1,
2272 const char *mimetype2,
2273 const char *copyfrom_path,
2275 const apr_array_header_t *propchanges,
2276 apr_hash_t *originalprops,
2278 apr_pool_t *scratch_pool);
2294 const char *tmpfile1,
2295 const char *tmpfile2,
2296 const char *mimetype1,
2297 const char *mimetype2,
2298 apr_hash_t *originalprops,
2300 apr_pool_t *scratch_pool);
2309 apr_pool_t *scratch_pool);
2326 apr_pool_t *scratch_pool);
2345 const char *copyfrom_path,
2348 apr_pool_t *scratch_pool);
2363 const apr_array_header_t *propchanges,
2364 apr_hash_t *original_props,
2366 apr_pool_t *scratch_pool);
2381 apr_pool_t *scratch_pool);
2401 const char *tmpfile1,
2402 const char *tmpfile2,
2405 const char *mimetype1,
2406 const char *mimetype2,
2407 const apr_array_header_t *propchanges,
2408 apr_hash_t *originalprops,
2418 const char *tmpfile1,
2419 const char *tmpfile2,
2422 const char *mimetype1,
2423 const char *mimetype2,
2424 const apr_array_header_t *propchanges,
2425 apr_hash_t *originalprops,
2433 const char *tmpfile1,
2434 const char *tmpfile2,
2435 const char *mimetype1,
2436 const char *mimetype2,
2437 apr_hash_t *originalprops,
2461 const apr_array_header_t *propchanges,
2462 apr_hash_t *original_props,
2496 const char *tmpfile1,
2497 const char *tmpfile2,
2500 const char *mimetype1,
2501 const char *mimetype2,
2502 const apr_array_header_t *propchanges,
2503 apr_hash_t *originalprops,
2511 const char *tmpfile1,
2512 const char *tmpfile2,
2515 const char *mimetype1,
2516 const char *mimetype2,
2517 const apr_array_header_t *propchanges,
2518 apr_hash_t *originalprops,
2525 const char *tmpfile1,
2526 const char *tmpfile2,
2527 const char *mimetype1,
2528 const char *mimetype2,
2529 apr_hash_t *originalprops,
2549 const apr_array_header_t *propchanges,
2550 apr_hash_t *original_props,
2569 const char *tmpfile1,
2570 const char *tmpfile2,
2573 const char *mimetype1,
2574 const char *mimetype2,
2582 const char *tmpfile1,
2583 const char *tmpfile2,
2586 const char *mimetype1,
2587 const char *mimetype2,
2595 const char *tmpfile1,
2596 const char *tmpfile2,
2597 const char *mimetype1,
2598 const char *mimetype2,
2619 const apr_array_header_t *propchanges,
2620 apr_hash_t *original_props,
2639 const char *local_abspath,
2640 apr_pool_t *scratch_pool);
2691 const char *local_abspath,
2693 apr_pool_t *scratch_pool);
2703 const char *filename,
2717 const char *local_abspath,
2718 apr_pool_t *scratch_pool);
2768 #define SVN_WC_ENTRY_WORKING_SIZE_UNKNOWN (-1)
3014 #define SVN_WC_ENTRY_THIS_DIR ""
3205 const char *local_abspath,
3206 apr_pool_t *scratch_pool);
3244 const char *dir_path,
3426 const char *local_abspath,
3428 const char *repos_root_url,
3429 const char *repos_uuid,
3432 apr_pool_t *scratch_pool);
3965 const char *local_abspath,
3966 apr_pool_t *result_pool,
3967 apr_pool_t *scratch_pool);
4009 const char *local_abspath,
4011 apr_pool_t *scratch_pool);
4093 const char *local_abspath,
4098 const apr_array_header_t *ignore_patterns,
4103 apr_pool_t *scratch_pool);
4177 void **set_locks_baton,
4180 const char *anchor_abspath,
4181 const char *target_basename,
4187 const apr_array_header_t *ignore_patterns,
4192 apr_pool_t *result_pool,
4193 apr_pool_t *scratch_pool);
4210 void **set_locks_baton,
4217 const apr_array_header_t *ignore_patterns,
4236 void **set_locks_baton,
4243 const apr_array_header_t *ignore_patterns,
4265 void **set_locks_baton,
4321 const char *repos_root,
4356 const char *src_abspath,
4357 const char *dst_abspath,
4363 apr_pool_t *scratch_pool);
4375 const char *dst_basename,
4391 const char *dst_basename,
4431 const char *src_abspath,
4432 const char *dst_abspath,
4438 apr_pool_t *scratch_pool);
4481 const char *local_abspath,
4488 apr_pool_t *scratch_pool);
4568 const char *local_abspath,
4569 const apr_hash_t *props,
4572 apr_pool_t *scratch_pool);
4590 const char *local_abspath,
4593 apr_pool_t *scratch_pool);
4640 const char *local_abspath,
4642 const char *copyfrom_url,
4648 apr_pool_t *scratch_pool);
4661 const char *copyfrom_url,
4680 const char *copyfrom_url,
4697 const char *copyfrom_url,
4751 const char *local_abspath,
4754 apr_hash_t *new_base_props,
4755 apr_hash_t *new_props,
4756 const char *copyfrom_url,
4760 apr_pool_t *scratch_pool);
4776 apr_hash_t *new_base_props,
4777 apr_hash_t *new_props,
4778 const char *copyfrom_url,
4784 apr_pool_t *scratch_pool);
4797 const char *new_text_base_path,
4798 const char *new_text_path,
4799 apr_hash_t *new_base_props,
4800 apr_hash_t *new_props,
4801 const char *copyfrom_url,
4814 const char *new_text_path,
4815 apr_hash_t *new_props,
4816 const char *copyfrom_url,
4854 const char *local_abspath,
4938 const char *local_abspath,
4941 const char *resolve_prop,
4948 apr_pool_t *scratch_pool);
5115 const char *local_abspath,
5117 const apr_array_header_t *wcprop_changes,
5121 apr_pool_t *scratch_pool);
5137 const apr_array_header_t *wcprop_changes,
5141 apr_pool_t *scratch_pool);
5160 const apr_array_header_t *wcprop_changes,
5163 const unsigned char *digest,
5181 const char *rev_date,
5182 const char *rev_author,
5185 apr_pool_t *scratch_pool);
5197 const char *rev_date,
5198 const char *rev_author,
5217 const char *rev_date,
5218 const char *rev_author,
5219 const apr_array_header_t *wcprop_changes,
5222 const unsigned char *digest,
5236 const char *rev_date,
5237 const char *rev_author,
5238 const apr_array_header_t *wcprop_changes,
5240 const unsigned char *digest,
5254 const char *rev_date,
5255 const char *rev_author,
5256 const apr_array_header_t *wcprop_changes,
5271 const char *rev_date,
5272 const char *rev_author,
5273 const apr_array_header_t *wcprop_changes,
5341 const char *local_abspath,
5353 apr_pool_t *scratch_pool);
5469 const char *local_abspath,
5470 apr_pool_t *scratch_pool);
5493 const char *local_abspath,
5494 apr_pool_t *scratch_pool);
5542 const char **target,
5545 apr_pool_t *result_pool,
5546 apr_pool_t *scratch_pool);
5557 const char **anchor,
5558 const char **target,
5601 apr_hash_t **dirents,
5602 const char *repos_root_url,
5603 const char *repos_relpath,
5604 apr_pool_t *result_pool,
5605 apr_pool_t *scratch_pool);
5698 const char *anchor_abspath,
5699 const char *target_basename,
5707 const char *diff3_cmd,
5708 const apr_array_header_t *preserved_exts,
5710 void *fetch_dirents_baton,
5712 void *conflict_baton,
5714 void *external_baton,
5719 apr_pool_t *result_pool,
5720 apr_pool_t *scratch_pool);
5761 void *conflict_baton,
5764 const char *diff3_cmd,
5765 const apr_array_header_t *preserved_exts,
5793 const char *diff3_cmd,
5816 const char *diff3_cmd,
5845 const char *anchor_abspath,
5846 const char *target_basename,
5847 const char *switch_url,
5853 const char *diff3_cmd,
5854 const apr_array_header_t *preserved_exts,
5856 void *fetch_dirents_baton,
5858 void *conflict_baton,
5860 void *external_baton,
5865 apr_pool_t *result_pool,
5866 apr_pool_t *scratch_pool);
5894 const char *switch_url,
5904 void *conflict_baton,
5905 const char *diff3_cmd,
5906 const apr_array_header_t *preserved_exts,
5927 const char *switch_url,
5934 const char *diff3_cmd,
5951 const char *switch_url,
5958 const char *diff3_cmd,
5986 const char *local_abspath,
5987 apr_pool_t *result_pool,
5988 apr_pool_t *scratch_pool);
6036 const char *local_abspath,
6037 apr_pool_t *result_pool,
6038 apr_pool_t *scratch_pool);
6055 const char *local_abspath,
6057 apr_pool_t *result_pool,
6058 apr_pool_t *scratch_pool);
6132 const char *local_abspath,
6137 const apr_array_header_t *changelist_filter,
6142 apr_pool_t *scratch_pool);
6303 const char *propname,
6388 const char *anchor_abspath,
6397 const apr_array_header_t *changelist_filter,
6399 void *callback_baton,
6402 apr_pool_t *result_pool,
6403 apr_pool_t *scratch_pool);
6422 void *callback_baton,
6429 const apr_array_header_t *changelist_filter,
6445 void *callback_baton,
6452 const apr_array_header_t *changelist_filter,
6471 void *callback_baton,
6494 void *callback_baton,
6517 void *callback_baton,
6570 const char *target_abspath,
6572 void *callback_baton,
6577 const apr_array_header_t *changelist_filter,
6580 apr_pool_t *scratch_pool);
6596 void *callback_baton,
6599 const apr_array_header_t *changelist_filter,
6614 void *callback_baton,
6617 const apr_array_header_t *changelist_filter,
6633 void *callback_baton,
6650 void *callback_baton,
6666 void *callback_baton,
6689 apr_hash_t **original_props,
6691 const char *local_abspath,
6692 apr_pool_t *result_pool,
6693 apr_pool_t *scratch_pool);
6703 apr_hash_t **original_props,
6835 const char *left_abspath,
6836 const char *right_abspath,
6837 const char *target_abspath,
6838 const char *left_label,
6839 const char *right_label,
6840 const char *target_label,
6844 const char *diff3_cmd,
6845 const apr_array_header_t *merge_options,
6846 apr_hash_t *original_props,
6847 const apr_array_header_t *prop_diff,
6849 void *conflict_baton,
6852 apr_pool_t *scratch_pool);
6868 const char *left_abspath,
6869 const char *right_abspath,
6870 const char *target_abspath,
6871 const char *left_label,
6872 const char *right_label,
6873 const char *target_label,
6877 const char *diff3_cmd,
6878 const apr_array_header_t *merge_options,
6879 const apr_array_header_t *prop_diff,
6881 void *conflict_baton,
6884 apr_pool_t *scratch_pool);
6905 const char *merge_target,
6907 const char *left_label,
6908 const char *right_label,
6909 const char *target_label,
6911 const char *diff3_cmd,
6912 const apr_array_header_t *merge_options,
6913 const apr_array_header_t *prop_diff,
6915 void *conflict_baton,
6929 const char *merge_target,
6931 const char *left_label,
6932 const char *right_label,
6933 const char *target_label,
6935 const char *diff3_cmd,
6936 const apr_array_header_t *merge_options,
6948 const char *merge_target,
6950 const char *left_label,
6951 const char *right_label,
6952 const char *target_label,
6955 const char *diff3_cmd,
6992 const char *local_abspath,
6995 apr_hash_t *baseprops,
6996 const apr_array_header_t *propchanges,
6999 void *conflict_baton,
7002 apr_pool_t *scratch_pool);
7029 apr_hash_t *baseprops,
7030 const apr_array_header_t *propchanges,
7034 void *conflict_baton,
7050 apr_hash_t *baseprops,
7051 const apr_array_header_t *propchanges,
7073 const apr_array_header_t *propchanges,
7104 const char *local_abspath,
7105 apr_pool_t *result_pool,
7106 apr_pool_t *scratch_pool);
7118 apr_pool_t *result_pool,
7119 apr_pool_t *scratch_pool);
7140 const char **pristine_path,
7160 const char *local_abspath,
7163 apr_pool_t *scratch_pool);
7175 const char *diff3_cmd,
7190 const char *diff3_cmd,
7204 const char **repos_root,
7205 const char **repos_uuid,
7208 apr_pool_t *result_pool,
7209 apr_pool_t *scratch_pool);
7234 const char *local_abspath,
7236 void *repos_info_baton,
7241 apr_pool_t *scratch_pool);
7261 const char *root_url,
7303 const char *wcroot_abspath,
7307 void *validator_baton,
7308 apr_pool_t *scratch_pool);
7328 void *validator_baton,
7343 void *validator_baton,
7357 void *validator_baton,
7402 const char *local_abspath,
7405 const apr_array_header_t *changelist_filter,
7410 apr_pool_t *scratch_pool);
7423 const apr_array_header_t *changelist_filter,
7486 const char *local_abspath,
7488 apr_pool_t *scratch_pool);
7509 const char **new_name,
7574 const char *versioned_file,
7615 const char *versioned_file,
7658 const char *local_abspath,
7662 apr_pool_t *result_pool,
7663 apr_pool_t *scratch_pool);
7683 unsigned char digest[],
7702 const char **tempfile,
7714 const char *local_abspath,
7717 apr_pool_t *scratch_pool);
7739 const char **tempfile,
7770 const char *local_abspath,
7772 apr_pool_t *result_pool,
7773 apr_pool_t *scratch_pool);
7795 const apr_array_header_t *list,
7814 const char *abspath,
7816 apr_pool_t *scratch_pool);
7841 const char *local_abspath,
7842 apr_pool_t *scratch_pool);
7918 const char *local_abspath,
7919 const char *trail_url,
7923 apr_pool_t *result_pool,
7924 apr_pool_t *scratch_pool);
7936 const char *wc_path,
7937 const char *trail_url,
7978 const char *local_abspath,
7979 const char *changelist,
7981 const apr_array_header_t *changelist_filter,
7986 apr_pool_t *scratch_pool);
7997 const char *changelist,
8018 const char *changelist,
8029 const char *local_abspath,
8031 const apr_array_header_t *changelist_filter,
8033 void *callback_baton,
8036 apr_pool_t *scratch_pool);
8069 const char *local_abspath,
8075 apr_pool_t *scratch_pool);
8119 const char *local_abspath,
8124 apr_pool_t *scratch_pool);
8158 const char *local_abspath,
8161 apr_pool_t *scratch_pool);
8173 const char *abspath,
8175 apr_pool_t *scratch_pool);
A file in the working copy was patched.
svn_error_t * svn_wc_upgrade(svn_wc_context_t *wc_ctx, const char *local_abspath, svn_wc_upgrade_get_repos_info_t repos_info_func, void *repos_info_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *scratch_pool)
Upgrade the working copy at local_abspath to the latest metadata storage format.
svn_linenum_t hunk_original_start
These fields are used by svn patch to identify the hunk the notification is for.
svn_error_t * svn_wc_relocate4(svn_wc_context_t *wc_ctx, const char *wcroot_abspath, const char *from, const char *to, svn_wc_relocation_validator3_t validator, void *validator_baton, apr_pool_t *scratch_pool)
Recursively change repository references at wcroot_abspath (which is the root directory of a working ...
Pristine state was modified.
svn_error_t * svn_wc_check_wc2(int *wc_format, svn_wc_context_t *wc_ctx, const char *local_abspath, apr_pool_t *scratch_pool)
Set *wc_format to local_abspath's working copy format version number if local_abspath is a valid work...
svn_error_t * svn_wc_prop_set(const char *name, const svn_string_t *value, const char *path, svn_wc_adm_access_t *adm_access, apr_pool_t *pool)
Like svn_wc_prop_set2(), but with skip_checks always FALSE.
const char * target_dir
The name of the subdirectory into which this external should be checked out.
enum svn_wc_status_kind prop_status
The status of the entry's properties.
const char * merged_file
If not NULL, this is a path to a file which contains the client's (or more likely, the user's) merging of the three values in conflict.
svn_opt_revision_t file_external_rev
The entry is an intra-repository file external and this is the operative revision number specified in...
Counted-length strings for Subversion, plus some C string goodies.
svn_error_t * svn_wc_diff4(svn_wc_adm_access_t *anchor, const char *target, const svn_wc_diff_callbacks2_t *callbacks, void *callback_baton, svn_depth_t depth, svn_boolean_t ignore_ancestry, const apr_array_header_t *changelist_filter, apr_pool_t *pool)
Similar to svn_wc_diff5(), but with a svn_wc_diff_callbacks2_t argument instead of svn_wc_diff_callba...
svn_revnum_t cmt_rev
last revision this was changed
svn_error_t * svn_wc_add_repos_file(const char *dst_path, svn_wc_adm_access_t *adm_access, const char *new_text_path, apr_hash_t *new_props, const char *copyfrom_url, svn_revnum_t copyfrom_rev, apr_pool_t *pool)
Same as svn_wc_add_repos_file3(), except that it doesn't have the BASE arguments or cancellation...
Reverting a modified path.
svn_error_t * svn_wc_revert4(svn_wc_context_t *wc_ctx, const char *local_abspath, svn_depth_t depth, svn_boolean_t use_commit_times, const apr_array_header_t *changelist_filter, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *scratch_pool)
Revert changes to local_abspath.
const char * lock_owner
lock owner, or NULL if not locked in this WC
apr_time_t ood_last_cmt_date
Set to the most recent commit date, or 0 if not out of date.
Modified state had mods merged in.
svn_error_t * svn_wc_copy3(svn_wc_context_t *wc_ctx, const char *src_abspath, const char *dst_abspath, svn_boolean_t metadata_only, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *scratch_pool)
Copy src_abspath to dst_abspath, and schedule dst_abspath for addition to the repository, remembering the copy history.
svn_error_t * svn_wc_adm_open(svn_wc_adm_access_t **adm_access, svn_wc_adm_access_t *associated, const char *path, svn_boolean_t write_lock, svn_boolean_t tree_lock, apr_pool_t *pool)
Similar to svn_wc_adm_open2(), but with tree_lock instead of levels_to_lock.
A hunk from a patch was applied.
void svn_wc_edited_externals(apr_hash_t **externals_old, apr_hash_t **externals_new, svn_wc_traversal_info_t *traversal_info)
Set *externals_old and *externals_new to hash tables representing changes to values of the svn:extern...
svn_boolean_t is_binary
Whether svn thinks ('my' version of) path is a 'binary' file.
svn_error_t * svn_wc_transmit_text_deltas(const char *path, svn_wc_adm_access_t *adm_access, svn_boolean_t fulltext, const svn_delta_editor_t *editor, void *file_baton, const char **tempfile, apr_pool_t *pool)
Similar to svn_wc_transmit_text_deltas2(), but with digest set to NULL.
svn_error_t * svn_wc_remove_lock(const char *path, svn_wc_adm_access_t *adm_access, apr_pool_t *pool)
Similar to svn_wc_remove_lock2(), but with a svn_wc_adm_access_t / relative path parameter pair...
local mods received repos mods (### unused)
svn_error_t * svn_wc_merge5(enum svn_wc_merge_outcome_t *merge_content_outcome, enum svn_wc_notify_state_t *merge_props_state, svn_wc_context_t *wc_ctx, const char *left_abspath, const char *right_abspath, const char *target_abspath, const char *left_label, const char *right_label, const char *target_label, const svn_wc_conflict_version_t *left_version, const svn_wc_conflict_version_t *right_version, svn_boolean_t dry_run, const char *diff3_cmd, const apr_array_header_t *merge_options, apr_hash_t *original_props, const apr_array_header_t *prop_diff, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool)
Given absolute paths to three fulltexts, merge the differences between left_abspath and right_abspath...
const char * their_file
their version of the file
svn_revnum_t changed_rev
Last revision this was changed.
A working copy entry – that is, revision control information about one versioned entity.
svn_wc_conflict_choice_t
The way in which the conflict callback chooses a course of action.
svn_error_t * svn_wc_get_pristine_contents2(svn_stream_t **contents, svn_wc_context_t *wc_ctx, const char *local_abspath, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
Given a path to a wc file, return in *contents a readonly stream to the pristine contents of the file...
svn_boolean_t modified
Is anything modified?
under v.c., but is missing
svn_error_t * svn_wc_remove_lock2(svn_wc_context_t *wc_ctx, const char *local_abspath, apr_pool_t *scratch_pool)
Remove any lock from local_abspath.
const svn_lock_t * lock
Points to the lock structure received from the repository when action is svn_wc_notify_locked.
svn_depth_t
The concept of depth for directories.
svn_error_t * svn_wc_add_repos_file2(const char *dst_path, svn_wc_adm_access_t *adm_access, const char *new_text_base_path, const char *new_text_path, apr_hash_t *new_base_props, apr_hash_t *new_props, const char *copyfrom_url, svn_revnum_t copyfrom_rev, apr_pool_t *pool)
Same as svn_wc_add_repos_file3(), except that it has pathnames rather than streams for the text base...
svn_error_t * svn_wc_get_actual_target2(const char **anchor, const char **target, svn_wc_context_t *wc_ctx, const char *path, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
Conditionally split path into an anchor and target for the purpose of updating and committing...
Updating an external module.
void(* svn_wc_status_func2_t)(void *baton, const char *path, svn_wc_status2_t *status)
Same as svn_wc_status_func3_t, but without a provided pool or the ability to propagate errors...
A revert operation has failed.
Similar to svn_wc_diff_callbacks3_t, but without the dir_opened and dir_closed functions, and without the tree_conflicted argument to the functions.
void svn_wc_traversed_depths(apr_hash_t **depths, svn_wc_traversal_info_t *traversal_info)
Set *depths to a hash table mapping const char * directory names (directories traversed by traversal_...
void(* svn_wc_notify_func_t)(void *baton, const char *path, svn_wc_notify_action_t action, svn_node_kind_t kind, const char *mime_type, svn_wc_notify_state_t content_state, svn_wc_notify_state_t prop_state, svn_revnum_t revision)
Similar to svn_wc_notify_func2_t, but takes the information as arguments instead of struct fields...
svn_error_t * svn_wc_get_switch_editor3(svn_revnum_t *target_revision, svn_wc_adm_access_t *anchor, const char *target, const char *switch_url, svn_boolean_t use_commit_times, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t allow_unver_obstructions, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_conflict_resolver_func_t conflict_func, void *conflict_baton, const char *diff3_cmd, const apr_array_header_t *preserved_exts, const svn_delta_editor_t **editor, void **edit_baton, svn_wc_traversal_info_t *ti, apr_pool_t *pool)
Similar to svn_wc_get_switch_editor4, but uses access batons and relative path instead of a working c...
const char * path_in_repos
path within repos; must not start with '/'
struct svn_wc_diff_callbacks2_t svn_wc_diff_callbacks2_t
Similar to svn_wc_diff_callbacks3_t, but without the dir_opened and dir_closed functions, and without the tree_conflicted argument to the functions.
const char * repos_root_url
The URL of the repository.
svn_revnum_t copyfrom_rev
If copied, the revision from which the copy was made, else SVN_INVALID_REVNUM.
enum svn_wc_status_kind prop_status
The status of the entries properties.
svn_error_t * svn_wc_is_wc_root2(svn_boolean_t *wc_root, svn_wc_context_t *wc_ctx, const char *local_abspath, apr_pool_t *scratch_pool)
Set *wc_root to TRUE if local_abspath represents a "working copy root", FALSE otherwise. Here, local_abspath is a "working copy root" if its parent directory is not a WC or if it is switched.
svn_wc_conflict_choice_t choice
A choice to either delay the conflict resolution or select a particular file to resolve the conflict...
svn_error_t * svn_wc_create_tmp_file(apr_file_t **fp, const char *path, svn_boolean_t delete_on_close, apr_pool_t *pool)
Same as svn_wc_create_tmp_file2(), but with new_name set to NULL, and without the ability to delete t...
svn_error_t * svn_wc_diff2(svn_wc_adm_access_t *anchor, const char *target, const svn_wc_diff_callbacks_t *callbacks, void *callback_baton, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, apr_pool_t *pool)
Similar to svn_wc_diff3(), but with a svn_wc_diff_callbacks_t argument instead of svn_wc_diff_callbac...
svn_error_t * svn_wc_text_modified_p2(svn_boolean_t *modified_p, svn_wc_context_t *wc_ctx, const char *local_abspath, svn_boolean_t unused, apr_pool_t *scratch_pool)
Set *modified_p to non-zero if local_abspath's text is modified with regard to the base revision...
const char * repos_relpath
The in-repository path relative to the repository root.
enum svn_wc_status_kind pristine_prop_status
The actual status of the properties compared to the pristine base of the node.
svn_error_t * svn_wc_relocate(const char *path, svn_wc_adm_access_t *adm_access, const char *from, const char *to, svn_boolean_t recurse, svn_wc_relocation_validator_t validator, void *validator_baton, apr_pool_t *pool)
Similar to svn_wc_relocate2(), but uses svn_wc_relocation_validator_t.
svn_error_t * svn_wc_diff6(svn_wc_context_t *wc_ctx, const char *target_abspath, const svn_wc_diff_callbacks4_t *callbacks, void *callback_baton, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t show_copies_as_adds, svn_boolean_t use_git_diff_format, const apr_array_header_t *changelist_filter, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool)
Compare working copy against the text-base.
svn_error_t * svn_wc_parse_externals_description2(apr_array_header_t **externals_p, const char *parent_directory, const char *desc, apr_pool_t *pool)
Similar to svn_wc_parse_externals_description3() with canonicalize_url set to TRUE, but returns an array of svn_wc_external_item_t * objects instead of svn_wc_external_item2_t * objects.
This struct contains information about a working copy node.
const svn_checksum_t * checksum
The checksum of the node, if it is a file.
svn_error_t *(* svn_wc_status_func3_t)(void *baton, const char *path, svn_wc_status2_t *status, apr_pool_t *pool)
Same as svn_wc_status_func4_t, but with a non-const status and a relative path.
The current operation left local changes of something that was deleted The changes are available on (...
Transmitting post-fix text-delta data for a file.
Structure used in the svn_wc_notify_func2_t function.
svn_error_t * svn_wc_entries_read(apr_hash_t **entries, svn_wc_adm_access_t *adm_access, svn_boolean_t show_hidden, apr_pool_t *pool)
Parse the `entries' file for adm_access and return a hash entries, whose keys are (const char *) entr...
Starting an update operation.
svn_error_t *(* svn_changelist_receiver_t)(void *baton, const char *path, const char *changelist, apr_pool_t *pool)
The callback type used by svn_wc_get_changelists() and svn_client_get_changelists().
svn_wc_conflict_reason_t reason
The state of the target node or property, relative to its merge-left source, that is the reason for t...
struct svn_wc_conflict_version_t svn_wc_conflict_version_t
Info about one of the conflicting versions of a node.
const char * copyfrom_url
If copied, the URL from which the copy was made, else NULL.
svn_boolean_t is_binary
Whether svn thinks ('my' version of) path is a 'binary' file.
svn_error_t * svn_wc_prop_get2(const svn_string_t **value, svn_wc_context_t *wc_ctx, const char *local_abspath, const char *name, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
Set *value to the value of property name for local_abspath, allocating *value in result_pool.
const char * mime_type
The svn:mime-type property of ('my' version of) path, if available, else NULL.
const char * ood_changed_author
Set to the user name of the youngest commit, or NULL if not out of date or non-existent.
enum svn_wc_status_kind repos_prop_status
The entry's property status in the repository.
svn_linenum_t hunk_fuzz
The fuzz factor the hunk was applied with.
struct svn_wc_revision_status_t svn_wc_revision_status_t
A structure to report a summary of a working copy, including the mix of revisions found within it...
Conflict resolver is starting.
Similar to svn_ra_reporter2_t, but without support for lock tokens.
svn_error_t * svn_wc_transmit_text_deltas2(const char **tempfile, unsigned char digest[], const char *path, svn_wc_adm_access_t *adm_access, svn_boolean_t fulltext, const svn_delta_editor_t *editor, void *file_baton, apr_pool_t *pool)
Similar to svn_wc_transmit_text_deltas3(), but with a relative path and adm_access baton...
svn_error_t * svn_wc_get_prop_diffs(apr_array_header_t **propchanges, apr_hash_t **original_props, const char *path, svn_wc_adm_access_t *adm_access, apr_pool_t *pool)
Similar to svn_wc_get_prop_diffs2(), but with a svn_wc_adm_access_t / relative path parameter pair...
General file I/O for Subversion.
svn_boolean_t locked
This directory has a working copy lock.
svn_boolean_t deleted
The directory containing this entry had a versioned child of this name, but this entry represents a d...
Subversion checksum routines.
svn_error_t * svn_wc_remove_from_revision_control2(svn_wc_context_t *wc_ctx, const char *local_abspath, svn_boolean_t destroy_wf, svn_boolean_t instant_error, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool)
Remove local_abspath from revision control.
is scheduled for addition
svn_error_t *(* svn_wc_external_update_t)(void *baton, const char *local_abspath, const svn_string_t *old_val, const svn_string_t *new_val, svn_depth_t depth, apr_pool_t *scratch_pool)
Callback for external definitions updates.
const char * svn_wc_adm_access_path(const svn_wc_adm_access_t *adm_access)
Return the path used to open the access baton adm_access.
an unversioned directory path populated by an svn:externals property; this status is not used for fil...
svn_error_t * svn_wc_adm_open_anchor(svn_wc_adm_access_t **anchor_access, svn_wc_adm_access_t **target_access, const char **target, const char *path, svn_boolean_t write_lock, int levels_to_lock, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool)
Open access batons for path and return in *anchor_access and *target the anchor and target required t...
svn_boolean_t keep_local
Whether a local copy of this entry should be kept in the working copy after a deletion has been commi...
svn_revnum_t min_rev
Lowest revision found.
struct svn_wc_context_t svn_wc_context_t
The context for all working copy interactions.
All diffs are not yet known.
svn_wc_traversal_info_t * svn_wc_init_traversal_info(apr_pool_t *pool)
Return a new, empty traversal info object, allocated in pool.
A copy from a foreign repository has started.
struct svn_wc_external_item_t svn_wc_external_item_t
One external item.
enum svn_wc_status_kind repos_prop_status
The entry's property status in the repository.
Committing a replacement.
const svn_lock_t * lock
The repository file lock.
A hunk from a patch was rejected.
Info about one of the conflicting versions of a node.
const char * property_name
The name of the property whose conflict is being described.
svn_boolean_t file_external
If the item is a file that was added to the working copy with an svn:externals; if file_external is T...
svn_boolean_t svn_wc_is_adm_dir(const char *name, apr_pool_t *pool)
Return TRUE if name is the name of the WC administrative directory.
svn_wc_status2_t * svn_wc_dup_status2(const svn_wc_status2_t *orig_stat, apr_pool_t *pool)
Same as svn_wc_dup_status3(), but for older svn_wc_status_t structures.
svn_error_t * svn_wc_adm_probe_try2(svn_wc_adm_access_t **adm_access, svn_wc_adm_access_t *associated, const char *path, svn_boolean_t write_lock, int levels_to_lock, apr_pool_t *pool)
Similar to svn_wc_adm_probe_try3() without the cancel functionality.
svn_wc_notify_t * svn_wc_dup_notify(const svn_wc_notify_t *notify, apr_pool_t *pool)
Return a deep copy of notify, allocated in pool.
svn_error_t * svn_wc_get_status_editor3(const svn_delta_editor_t **editor, void **edit_baton, void **set_locks_baton, svn_revnum_t *edit_revision, svn_wc_adm_access_t *anchor, const char *target, svn_depth_t depth, svn_boolean_t get_all, svn_boolean_t no_ignore, const apr_array_header_t *ignore_patterns, svn_wc_status_func2_t status_func, void *status_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_traversal_info_t *traversal_info, apr_pool_t *pool)
Same as svn_wc_get_status_editor4(), but using svn_wc_status_func2_t instead of svn_wc_status_func3_t...
svn_io_file_del_t
Used as an argument when creating temporary files to indicate when a file should be removed...
svn_error_t * svn_wc_process_committed4(const char *path, svn_wc_adm_access_t *adm_access, svn_boolean_t recurse, svn_revnum_t new_revnum, const char *rev_date, const char *rev_author, const apr_array_header_t *wcprop_changes, svn_boolean_t remove_lock, svn_boolean_t remove_changelist, const unsigned char *digest, apr_pool_t *pool)
The source to copy the file from is missing.
const char * prop_name
If action relates to properties, specifies the name of the property.
const char * path_prefix
If non-NULL, specifies an absolute path prefix that can be subtracted from the start of the absolute ...
struct svn_wc_entry_t svn_wc_entry_t
A working copy entry – that is, revision control information about one versioned entity.
Object is unknown or missing.
const char * conflict_new
new version of conflicted file.
svn_wc_status3_t * svn_wc_dup_status3(const svn_wc_status3_t *orig_stat, apr_pool_t *pool)
Return a deep copy of the orig_stat status structure, allocated in pool.
svn_boolean_t save_merged
If true, save a backup copy of merged_file (or the original merged_file from the conflict description...
svn_error_t * svn_wc_props_modified_p(svn_boolean_t *modified_p, const char *path, svn_wc_adm_access_t *adm_access, apr_pool_t *pool)
Similar to svn_wc_props_modified_p2(), but with a relative path and adm_access baton.
svn_error_t * svn_wc_get_diff_editor6(const svn_delta_editor_t **editor, void **edit_baton, svn_wc_context_t *wc_ctx, const char *anchor_abspath, const char *target, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t show_copies_as_adds, svn_boolean_t use_git_diff_format, svn_boolean_t use_text_base, svn_boolean_t reverse_order, svn_boolean_t server_performs_filtering, const apr_array_header_t *changelist_filter, const svn_wc_diff_callbacks4_t *callbacks, void *callback_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
DEPRECATED – please use APIs from svn_client.h.
svn_error_t * svn_wc_get_diff_editor(svn_wc_adm_access_t *anchor, const char *target, const svn_wc_diff_callbacks_t *callbacks, void *callback_baton, svn_boolean_t recurse, svn_boolean_t use_text_base, svn_boolean_t reverse_order, svn_cancel_func_t cancel_func, void *cancel_baton, const svn_delta_editor_t **editor, void **edit_baton, apr_pool_t *pool)
Similar to svn_wc_get_diff_editor2(), but with ignore_ancestry always set to FALSE.
attempting to change text or props
svn_boolean_t has_prop_mods
Whether this entry has property modifications.
const char * cachable_props
A space-separated list of all properties whose presence/absence is cached in this entry...
svn_error_t * svn_wc_add(const char *path, svn_wc_adm_access_t *parent_access, const char *copyfrom_url, svn_revnum_t copyfrom_rev, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func_t notify_func, void *notify_baton, apr_pool_t *pool)
Similar to svn_wc_add2(), but takes an svn_wc_notify_func_t instead.
svn_error_t * svn_wc_status3(svn_wc_status3_t **status, svn_wc_context_t *wc_ctx, const char *local_abspath, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
Fill *status for local_abspath, allocating in result_pool.
enum svn_wc_status_kind text_status
The status of the entry itself, including its text if it is a file.
const char * mime_type
If non-NULL, indicates the mime-type of path.
svn_error_t * svn_wc_create_tmp_file2(apr_file_t **fp, const char **new_name, const char *path, svn_io_file_del_t delete_when, apr_pool_t *pool)
Create a unique temporary file in administrative tmp/ area of directory path.
A structure full of callback functions the delta source will invoke as it produces the delta...
Committing a non-overwriting copy (path is the target of the copy, not the source).
A node below an existing node was added during update.
svn_wc_conflict_action_t
The type of action being attempted on an object.
svn_wc_notify_action_t
The type of action occurring.
textual conflict (on a file)
Operation failed because an added node is missing.
svn_error_t * svn_wc_merge3(enum svn_wc_merge_outcome_t *merge_outcome, const char *left, const char *right, const char *merge_target, svn_wc_adm_access_t *adm_access, const char *left_label, const char *right_label, const char *target_label, svn_boolean_t dry_run, const char *diff3_cmd, const apr_array_header_t *merge_options, const apr_array_header_t *prop_diff, svn_wc_conflict_resolver_func_t conflict_func, void *conflict_baton, apr_pool_t *pool)
Similar to svn_wc_merge4() but takes relative paths and an access baton.
Running status on an external module.
svn_error_t * svn_wc_remove_from_revision_control(svn_wc_adm_access_t *adm_access, const char *name, svn_boolean_t destroy_wf, svn_boolean_t instant_error, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool)
Similar to svn_wc_remove_from_revision_control2() but with a name and access baton.
Another object is in the way.
const char * changelist
A changelist the item is in, NULL if this node is not in a changelist.
const char * moved_to_abspath
The path the node was moved to, if it was moved away.
svn_error_t * svn_wc_get_default_ignores(apr_array_header_t **patterns, apr_hash_t *config, apr_pool_t *pool)
Get the run-time configured list of ignore patterns from the svn_config_t's in the config hash...
svn_error_t * svn_wc_adm_open3(svn_wc_adm_access_t **adm_access, svn_wc_adm_access_t *associated, const char *path, svn_boolean_t write_lock, int levels_to_lock, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool)
Return, in *adm_access, a pointer to a new access baton for the working copy administrative area asso...
svn_lock_t * repos_lock
The entry's lock in the repository, if any.
The operation skipped the path because it was conflicted.
svn_error_t * svn_wc_is_wc_root(svn_boolean_t *wc_root, const char *path, svn_wc_adm_access_t *adm_access, apr_pool_t *pool)
Similar to svn_wc_is_wc_root2(), but with an access baton and relative path.
svn_error_t * svn_wc_relocate3(const char *path, svn_wc_adm_access_t *adm_access, const char *from, const char *to, svn_boolean_t recurse, svn_wc_relocation_validator3_t validator, void *validator_baton, apr_pool_t *pool)
Similar to svn_wc_relocate4(), but with a svn_wc_adm_access_t / relative path parameter pair...
svn_error_t * svn_wc_delete(const char *path, svn_wc_adm_access_t *adm_access, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func_t notify_func, void *notify_baton, apr_pool_t *pool)
Similar to svn_wc_delete2(), but takes an svn_wc_notify_func_t instead.
incoming (for conflicted hunks)
svn_error_t * svn_wc_resolved_conflict4(const char *path, svn_wc_adm_access_t *adm_access, svn_boolean_t resolve_text, svn_boolean_t resolve_props, svn_boolean_t resolve_tree, svn_depth_t depth, svn_wc_conflict_choice_t conflict_choice, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool)
Similar to svn_wc_resolved_conflict5, but takes an absolute path and an access baton.
svn_merge_range_t * merge_range
When action is svn_wc_notify_merge_begin or svn_wc_notify_foreign_merge_begin or svn_wc_notify_merge_...
enum svn_wc_status_kind node_status
The status of the node itself.
apr_time_t changed_date
Date of last commit.
svn_revnum_t peg_rev
revision at which to look up path_in_repos
Mergeinfo representing a merge of a range of revisions.
svn_error_t * svn_wc_get_ignores2(apr_array_header_t **patterns, svn_wc_context_t *wc_ctx, const char *local_abspath, apr_hash_t *config, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
Get the list of ignore patterns from the svn_config_t's in the config hash and the local ignore patte...
svn_wc_entry_t * svn_wc_entry_dup(const svn_wc_entry_t *entry, apr_pool_t *pool)
Return a duplicate of entry, allocated in pool.
svn_opt_revision_t revision
Same as svn_wc_external_item2_t.revision.
const svn_wc_entry_t * entry
Can be NULL if not under version control.
The state did not change.
svn_error_t * err
Points to an error describing the reason for the failure when action is one of the following: svn_wc_...
svn_error_t * svn_wc_restore(svn_wc_context_t *wc_ctx, const char *local_abspath, svn_boolean_t use_commit_times, apr_pool_t *scratch_pool)
Restores a missing node, local_abspath using the wc_ctx.
attempting to replace object,
const apr_array_header_t * conflicts
Array of const svn_wc_conflict_description2_t * which contains info on any conflict of which this nod...
svn_wc_schedule_t schedule
scheduling (add, delete, replace ...)
Just the lock on a file was removed during update.
svn_error_t * svn_wc_merge2(enum svn_wc_merge_outcome_t *merge_outcome, const char *left, const char *right, const char *merge_target, svn_wc_adm_access_t *adm_access, const char *left_label, const char *right_label, const char *target_label, svn_boolean_t dry_run, const char *diff3_cmd, const apr_array_header_t *merge_options, apr_pool_t *pool)
Similar to svn_wc_merge3(), but with prop_diff, conflict_func, conflict_baton set to NULL...
const char * ood_last_cmt_author
Set to the user name of the youngest commit, or NULL if not out of date or non-existent.
Tried adding a path that already exists.
svn_error_t * svn_wc_crawl_revisions2(const char *path, svn_wc_adm_access_t *adm_access, const svn_ra_reporter2_t *reporter, void *report_baton, svn_boolean_t restore_files, svn_boolean_t recurse, svn_boolean_t use_commit_times, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_wc_traversal_info_t *traversal_info, apr_pool_t *pool)
Similar to svn_wc_crawl_revisions3, but taking svn_ra_reporter2_t instead of svn_ra_reporter3_t, and therefore only able to report svn_depth_infinity for depths; and taking recurse instead of depth; and with depth_compatibility_trick always false.
Structure for holding the "status" of a working copy item.
svn_error_t * svn_wc_read_kind(svn_node_kind_t *kind, svn_wc_context_t *wc_ctx, const char *abspath, svn_boolean_t show_hidden, apr_pool_t *scratch_pool)
Similar to svn_wc_read_kind2() but with show_deleted always passed as TRUE.
A lock object, for client & server to share.
const char * repos
canonical repository URL or NULL if not known
Object is already replaced.
A merge operation (to path) from a foreign repository has begun.
struct svn_wc_status3_t svn_wc_status3_t
Structure for holding the "status" of a working copy item.
svn_error_t * svn_wc_adm_probe_try(svn_wc_adm_access_t **adm_access, svn_wc_adm_access_t *associated, const char *path, svn_boolean_t write_lock, svn_boolean_t tree_lock, apr_pool_t *pool)
Similar to svn_wc_adm_probe_try2(), but with tree_lock instead of levels_to_lock. ...
svn_error_t * svn_wc_get_pristine_copy_path(const char *path, const char **pristine_path, apr_pool_t *pool)
Set *pristine_path to the path of the "normal" pristine text file for the versioned file path...
svn_wc_notify_t * svn_wc_create_notify(const char *path, svn_wc_notify_action_t action, apr_pool_t *pool)
Allocate an svn_wc_notify_t structure in pool, initialize and return it.
svn_error_t * svn_wc_prop_list(apr_hash_t **props, const char *path, svn_wc_adm_access_t *adm_access, apr_pool_t *pool)
Similar to svn_wc_prop_list2() but with a svn_wc_adm_access_t / relative path parameter pair...
const char * url
Same as svn_wc_external_item2_t.url.
svn_wc_notify_lock_state_t
What happened to a lock during an operation.
const char * base_abspath
If this is text-conflict and involves the merging of two files descended from a common ancestor...
Removing a path by excluding it.
The last notification in a status (including status on externals).
The path is a tree-conflict victim of the intended action (not a persistent tree-conflict from an ear...
svn_error_t * svn_wc_adm_probe_open3(svn_wc_adm_access_t **adm_access, svn_wc_adm_access_t *associated, const char *path, svn_boolean_t write_lock, int levels_to_lock, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool)
Checks the working copy to determine the node type of path.
svn_node_kind_t
The various types of nodes in the Subversion filesystem.
const char * changelist
Which changelist this item is part of, or NULL if not part of any.
is not a versioned thing in this wc
An update tried to add a file or directory at a path where a separate working copy was found...
svn_error_t *(* svn_wc_upgrade_get_repos_info_t)(const char **repos_root, const char **repos_uuid, void *baton, const char *url, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
Callback for retrieving a repository root for a url from upgrade.
struct svn_wc_notify_t svn_wc_notify_t
Structure used in the svn_wc_notify_func2_t function.
An explicit update tried to update a file or directory that doesn't live in the repository and can't ...
svn_wc_conflict_version_t * svn_wc_conflict_version_create2(const char *repos_root_url, const char *repos_uuid, const char *repos_relpath, svn_revnum_t revision, svn_node_kind_t kind, apr_pool_t *result_pool)
Allocate an svn_wc_conflict_version_t structure in pool, initialize to contain a conflict origin...
svn_error_t * svn_wc_resolved_conflict5(svn_wc_context_t *wc_ctx, const char *local_abspath, svn_depth_t depth, svn_boolean_t resolve_text, const char *resolve_prop, svn_boolean_t resolve_tree, svn_wc_conflict_choice_t conflict_choice, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *scratch_pool)
Assuming local_abspath is under version control or a tree conflict victim and in a state of conflict...
svn_error_t * svn_wc_walk_entries2(const char *path, svn_wc_adm_access_t *adm_access, const svn_wc_entry_callbacks_t *walk_callbacks, void *walk_baton, svn_boolean_t show_hidden, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool)
Similar to svn_wc_walk_entries3(), but without cancellation support or error handling from walk_callb...
struct svn_wc_committed_queue_t svn_wc_committed_queue_t
Storage type for queued post-commit data.
const char * url
url in repository
svn_error_t * svn_wc_crop_tree2(svn_wc_context_t *wc_ctx, const char *local_abspath, svn_depth_t depth, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *scratch_pool)
Crop local_abspath according to depth.
svn_linenum_t hunk_matched_line
The line at which a hunk was matched (and applied).
No merge was performed, probably because the target file was either absent or not under version contr...
svn_node_kind_t node_kind
The node kind.
A revision, specified in one of svn_opt_revision_kind ways.
svn_error_t * svn_wc_adm_open2(svn_wc_adm_access_t **adm_access, svn_wc_adm_access_t *associated, const char *path, svn_boolean_t write_lock, int levels_to_lock, apr_pool_t *pool)
Similar to svn_wc_adm_open3(), but without cancellation support.
const char * tree_conflict_data
Serialized data for all of the tree conflicts detected in this_dir.
const char * url
Set to the URI (actual or expected) of the item.
const char * target_dir
Same as svn_wc_external_item2_t.target_dir.
svn_error_t * svn_wc_crawl_revisions5(svn_wc_context_t *wc_ctx, const char *local_abspath, const svn_ra_reporter3_t *reporter, void *report_baton, svn_boolean_t restore_files, svn_depth_t depth, svn_boolean_t honor_depth_exclude, svn_boolean_t depth_compatibility_trick, svn_boolean_t use_commit_times, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *scratch_pool)
Do a depth-first crawl in a working copy, beginning at local_abspath, using wc_ctx for accessing the ...
enum svn_wc_status_kind repos_node_status
The status of the node, based on the text status if the node has no restructuring changes...
svn_error_t * svn_wc_adm_probe_try3(svn_wc_adm_access_t **adm_access, svn_wc_adm_access_t *associated, const char *path, svn_boolean_t write_lock, int levels_to_lock, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool)
Try various ways to obtain an access baton for path.
svn_boolean_t copied
a file or directory can be 'copied' if it's scheduled for addition-with-history (or part of a subtree...
svn_wc_conflict_description_t * tree_conflict
Non-NULL if the entry is the victim of a tree conflict.
svn_error_t * svn_wc_get_pristine_contents(svn_stream_t **contents, const char *path, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
Similar to svn_wc_get_pristine_contents2, but takes no working copy context and a path that can be re...
own (for conflicted hunks)
const char * changelist_name
If action pertains to a changelist, this is the changelist name.
svn_error_t * svn_wc_get_switch_editor2(svn_revnum_t *target_revision, svn_wc_adm_access_t *anchor, const char *target, const char *switch_url, svn_boolean_t use_commit_times, svn_boolean_t recurse, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, const char *diff3_cmd, const svn_delta_editor_t **editor, void **edit_baton, svn_wc_traversal_info_t *ti, apr_pool_t *pool)
Similar to svn_wc_get_switch_editor3() but with the allow_unver_obstructions parameter always set to ...
svn_error_t *(* svn_wc_canonicalize_svn_prop_get_file_t)(const svn_string_t **mime_type, svn_stream_t *stream, void *baton, apr_pool_t *pool)
Callback type used by svn_wc_canonicalize_svn_prop.
const svn_lock_t * repos_lock
The entry's lock in the repository, if any.
svn_error_t * svn_wc_get_pristine_props(apr_hash_t **props, svn_wc_context_t *wc_ctx, const char *local_abspath, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
Return the set of "pristine" properties for local_abspath.
apr_off_t working_size
Size of the file after being translated into local representation, or SVN_WC_ENTRY_WORKING_SIZE_UNKNO...
svn_error_t * svn_wc_status2(svn_wc_status2_t **status, const char *path, svn_wc_adm_access_t *adm_access, apr_pool_t *pool)
Similar to svn_wc_status3(), but with a adm_access baton and absolute path.
exists, but uninteresting
const char * moved_from_abspath
Set to the local absolute path that this node was moved from, if this file or directory has been move...
svn_error_t * svn_wc_get_diff_editor2(svn_wc_adm_access_t *anchor, const char *target, const svn_wc_diff_callbacks_t *callbacks, void *callback_baton, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t use_text_base, svn_boolean_t reverse_order, svn_cancel_func_t cancel_func, void *cancel_baton, const svn_delta_editor_t **editor, void **edit_baton, apr_pool_t *pool)
Similar to svn_wc_get_diff_editor3(), but with an svn_wc_diff_callbacks_t instead of svn_wc_diff_call...
svn_error_t * svn_wc_adm_close(svn_wc_adm_access_t *adm_access)
Similar to svn_wc_adm_close2(), but with the internal pool of adm_access used for temporary allocatio...
svn_wc_notify_state_t
The type of notification that is occurring.
svn_node_kind_t kind
Node kind of path.
svn_error_t * svn_wc_process_committed_queue(svn_wc_committed_queue_t *queue, svn_wc_adm_access_t *adm_access, svn_revnum_t new_revnum, const char *rev_date, const char *rev_author, apr_pool_t *pool)
svn_boolean_t svn_wc_is_normal_prop(const char *name)
Return TRUE iff name is a 'normal' property name.
const char * name
entry's name
svn_error_t * svn_wc_check_wc(const char *path, int *wc_format, apr_pool_t *pool)
Similar to svn_wc_check_wc2(), but with a relative path and no supplied working copy context...
Mergeinfo was removed due to elision.
was deleted and then re-added
svn_boolean_t copied
a file or directory can be 'copied' if it's scheduled for addition-with-history (or part of a subtree...
svn_error_t * svn_wc_process_committed2(const char *path, svn_wc_adm_access_t *adm_access, svn_boolean_t recurse, svn_revnum_t new_revnum, const char *rev_date, const char *rev_author, const apr_array_header_t *wcprop_changes, svn_boolean_t remove_lock, apr_pool_t *pool)
svn_error_t * svn_wc_mark_missing_deleted(const char *path, svn_wc_adm_access_t *parent, apr_pool_t *pool)
Mark missing path as 'deleted' in its parent's list of entries.
A move in the working copy has been broken, i.e.
svn_boolean_t switched
Is anything switched?
svn_error_t * svn_wc_adm_probe_retrieve(svn_wc_adm_access_t **adm_access, svn_wc_adm_access_t *associated, const char *path, apr_pool_t *pool)
Check the working copy to determine the node type of path.
svn_filesize_t recorded_size
The size of the file after being translated into its local representation, or SVN_INVALID_FILESIZE if...
apr_time_t ood_changed_date
Set to the most recent commit date, or 0 if not out of date.
The final result returned by svn_wc_conflict_resolver_func_t.
text or props have been modified
svn_error_t * svn_wc_locked(svn_boolean_t *locked, const char *path, apr_pool_t *pool)
Set *locked to non-zero if path is locked, else set it to zero.
svn_error_t * svn_wc_merge(const char *left, const char *right, const char *merge_target, svn_wc_adm_access_t *adm_access, const char *left_label, const char *right_label, const char *target_label, svn_boolean_t dry_run, enum svn_wc_merge_outcome_t *merge_outcome, const char *diff3_cmd, apr_pool_t *pool)
Similar to svn_wc_merge2(), but with merge_options set to NULL.
apr_int64_t svn_filesize_t
The size of a file in the Subversion FS.
svn_error_t * svn_wc_process_committed3(const char *path, svn_wc_adm_access_t *adm_access, svn_boolean_t recurse, svn_revnum_t new_revnum, const char *rev_date, const char *rev_author, const apr_array_header_t *wcprop_changes, svn_boolean_t remove_lock, const unsigned char *digest, apr_pool_t *pool)
svn_wc_notify_lock_state_t lock_state
Reflects the addition or removal of a lock token in the working copy.
struct svn_wc_diff_callbacks_t svn_wc_diff_callbacks_t
Similar to svn_wc_diff_callbacks2_t, but with file additions/content changes and property changes spl...
svn_error_t * svn_wc_ensure_adm2(const char *path, const char *uuid, const char *url, const char *repos, svn_revnum_t revision, apr_pool_t *pool)
Similar to svn_wc_ensure_adm3(), but with depth set to svn_depth_infinity.
A struct that describes a conflict that has occurred in the working copy.
svn_wc_schedule_t
The schedule states an entry can be in.
svn_error_t * svn_wc_diff5(svn_wc_adm_access_t *anchor, const char *target, const svn_wc_diff_callbacks3_t *callbacks, void *callback_baton, svn_depth_t depth, svn_boolean_t ignore_ancestry, const apr_array_header_t *changelist_filter, apr_pool_t *pool)
Similar to svn_wc_diff6(), but with a svn_wc_diff_callbacks3_t argument instead of svn_wc_diff_callba...
svn_error_t *(* svn_wc_conflict_resolver_func_t)(svn_wc_conflict_result_t **result, const svn_wc_conflict_description_t *description, void *baton, apr_pool_t *pool)
Similar to svn_wc_conflict_resolver_func2_t, but using svn_wc_conflict_description_t instead of svn_w...
Operation failed because the node remains in conflict.
svn_wc_conflict_version_t * svn_wc_conflict_version_create(const char *repos_url, const char *path_in_repos, svn_revnum_t peg_rev, svn_node_kind_t node_kind, apr_pool_t *pool)
Similar to svn_wc_conflict_version_create2(), but doesn't set all required values.
const char * changelist
which changelist this item is part of, or NULL if not part of any.
const svn_wc_entry_t * entry
Can be NULL if not under version control.
svn_error_t * svn_wc_set_adm_dir(const char *name, apr_pool_t *pool)
Use name for the administrative directory in the working copy.
struct svn_config_t svn_config_t
Opaque structure describing a set of configuration options.
svn_error_t * svn_wc_transmit_text_deltas3(const svn_checksum_t **new_text_base_md5_checksum, const svn_checksum_t **new_text_base_sha1_checksum, svn_wc_context_t *wc_ctx, const char *local_abspath, svn_boolean_t fulltext, const svn_delta_editor_t *editor, void *file_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
Send the local modifications for versioned file local_abspath (with matching file_baton) through edit...
Got a delete in an update.
svn_wc_conflict_action_t action
The action being attempted on the conflicted node or property.
svn_error_t * svn_wc_has_binary_prop(svn_boolean_t *has_binary_prop, const char *path, svn_wc_adm_access_t *adm_access, apr_pool_t *pool)
Set *has_binary_prop to TRUE iff path has been marked with a property indicating that it is non-text ...
svn_error_t * svn_wc_add_lock2(svn_wc_context_t *wc_ctx, const char *abspath, const svn_lock_t *lock, apr_pool_t *scratch_pool)
Add lock to the working copy for local_abspath.
enum svn_wc_status_kind pristine_text_status
The actual status of the text compared to the pristine base of the file.
svn_error_t * svn_wc_adm_retrieve(svn_wc_adm_access_t **adm_access, svn_wc_adm_access_t *associated, const char *path, apr_pool_t *pool)
Return, in *adm_access, a pointer to an existing access baton associated with path.
Similar to svn_wc_conflict_description2_t, but with relative paths and adm_access batons...
Operation failed because a node is locked by another user and/or working copy.
svn_error_t * svn_wc_diff3(svn_wc_adm_access_t *anchor, const char *target, const svn_wc_diff_callbacks2_t *callbacks, void *callback_baton, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, apr_pool_t *pool)
Similar to svn_wc_diff4(), but with changelist_filter passed NULL, and depth set to svn_depth_infinit...
svn_wc_conflict_description_t * svn_wc_conflict_description_create_text(const char *path, svn_wc_adm_access_t *adm_access, apr_pool_t *pool)
Similar to svn_wc_conflict_description_create_text2(), but returns a svn_wc_conflict_description_t *...
void(* svn_wc_notify_func2_t)(void *baton, const svn_wc_notify_t *notify, apr_pool_t *pool)
Notify the world that notify->action has happened to notify->path.
const char * merged_file
merged version; may contain conflict markers
Notifier doesn't know or isn't saying.
svn_node_kind_t kind
node kind (file, dir, ...)
A hunk from a patch was found to already be applied.
struct svn_wc_adm_access_t svn_wc_adm_access_t
Baton for access to a working copy administrative area.
const svn_wc_conflict_version_t * src_left_version
Info on the "merge-left source" or "older" version of incoming change.
const char * property_name
The name of the property whose conflict is being described.
svn_error_t * svn_wc_read_kind2(svn_node_kind_t *kind, svn_wc_context_t *wc_ctx, const char *local_abspath, svn_boolean_t show_deleted, svn_boolean_t show_hidden, apr_pool_t *scratch_pool)
Set kind to the svn_node_kind_t of abspath.
svn_error_t * svn_wc_add2(const char *path, svn_wc_adm_access_t *parent_access, const char *copyfrom_url, svn_revnum_t copyfrom_rev, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *pool)
Similar to svn_wc_add3(), but with the depth parameter always svn_depth_infinity. ...
svn_error_t * svn_wc_prop_set2(const char *name, const svn_string_t *value, const char *path, svn_wc_adm_access_t *adm_access, svn_boolean_t skip_checks, apr_pool_t *pool)
Like svn_wc_prop_set3(), but without the notification callbacks.
const char * lock_token
lock token or NULL if path not locked in this WC
const char * changed_author
Last commit author of this item.
Operation failed because a node is out of date.
svn_error_t * svn_wc_external_item2_create(svn_wc_external_item2_t **item, apr_pool_t *pool)
Initialize an external item.
const char * prejfile
property reject file.
svn_error_t * svn_wc_get_switch_editor4(const svn_delta_editor_t **editor, void **edit_baton, svn_revnum_t *target_revision, svn_wc_context_t *wc_ctx, const char *anchor_abspath, const char *target_basename, const char *switch_url, svn_boolean_t use_commit_times, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t allow_unver_obstructions, svn_boolean_t server_performs_filtering, const char *diff3_cmd, const apr_array_header_t *preserved_exts, svn_wc_dirents_func_t fetch_dirents_func, void *fetch_dirents_baton, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_wc_external_update_t external_func, void *external_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
DEPRECATED – please use APIs from svn_client.h.
const char * conflict_old
old version of conflicted file.
svn_error_t * svn_wc_merge_props3(svn_wc_notify_state_t *state, svn_wc_context_t *wc_ctx, const char *local_abspath, const svn_wc_conflict_version_t *left_version, const svn_wc_conflict_version_t *right_version, apr_hash_t *baseprops, const apr_array_header_t *propchanges, svn_boolean_t dry_run, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool)
Given a local_abspath under version control, merge an array of propchanges into the path's existing p...
svn_error_t * svn_wc_parse_externals_description(apr_hash_t **externals_p, const char *parent_directory, const char *desc, apr_pool_t *pool)
Similar to svn_wc_parse_externals_description2(), but returns the parsed externals in a hash instead ...
const char * their_abspath
their version of the file
svn_wc_conflict_kind_t kind
What sort of conflict are we describing?
A node below an existing node was deleted during update.
svn_wc_conflict_description2_t * svn_wc__conflict_description2_dup(const svn_wc_conflict_description2_t *conflict, apr_pool_t *result_pool)
Return a duplicate of conflict, allocated in result_pool.
svn_error_t * svn_wc_get_diff_editor4(svn_wc_adm_access_t *anchor, const char *target, const svn_wc_diff_callbacks2_t *callbacks, void *callback_baton, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t use_text_base, svn_boolean_t reverse_order, svn_cancel_func_t cancel_func, void *cancel_baton, const apr_array_header_t *changelist_filter, const svn_delta_editor_t **editor, void **edit_baton, apr_pool_t *pool)
Similar to svn_wc_get_diff_editor5(), but with an svn_wc_diff_callbacks2_t instead of svn_wc_diff_cal...
svn_error_t * svn_wc_ensure_adm3(const char *path, const char *uuid, const char *url, const char *repos, svn_revnum_t revision, svn_depth_t depth, apr_pool_t *pool)
Similar to svn_wc_ensure_adm4(), but without the wc context parameter.
svn_error_t * svn_wc_get_status_editor2(const svn_delta_editor_t **editor, void **edit_baton, void **set_locks_baton, svn_revnum_t *edit_revision, svn_wc_adm_access_t *anchor, const char *target, apr_hash_t *config, svn_boolean_t recurse, svn_boolean_t get_all, svn_boolean_t no_ignore, svn_wc_status_func2_t status_func, void *status_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_traversal_info_t *traversal_info, apr_pool_t *pool)
Like svn_wc_get_status_editor3(), but with ignore_patterns provided from the corresponding value in c...
svn_wc_status_t * svn_wc_dup_status(const svn_wc_status_t *orig_stat, apr_pool_t *pool)
Same as svn_wc_dup_status2(), but for older svn_wc_status_t structures.
svn_wc_conflict_kind_t
The type of conflict being described by an svn_wc_conflict_description2_t (see below).
The last notification in an update (including updates of externals).
svn_error_t * svn_wc_copy(const char *src, svn_wc_adm_access_t *dst_parent, const char *dst_basename, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func_t notify_func, void *notify_baton, apr_pool_t *pool)
Similar to svn_wc_copy2(), but takes an svn_wc_notify_func_t instead.
svn_error_t * svn_wc_merge_prop_diffs(svn_wc_notify_state_t *state, const char *path, svn_wc_adm_access_t *adm_access, const apr_array_header_t *propchanges, svn_boolean_t base_merge, svn_boolean_t dry_run, apr_pool_t *pool)
Similar to svn_wc_merge_props(), but no baseprops are given.
enum svn_wc_status_kind prop_status
The status of the entry's properties.
svn_error_t * svn_wc_external_item_create(const svn_wc_external_item2_t **item, apr_pool_t *pool)
Same as svn_wc_external_item2_create() except the pointer to the new empty item is 'const' which is s...
svn_wc_operation_t
The user operation that exposed a conflict.
Slated for replacement (delete + add)
svn_error_t * svn_wc_get_diff_editor3(svn_wc_adm_access_t *anchor, const char *target, const svn_wc_diff_callbacks2_t *callbacks, void *callback_baton, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t use_text_base, svn_boolean_t reverse_order, svn_cancel_func_t cancel_func, void *cancel_baton, const svn_delta_editor_t **editor, void **edit_baton, apr_pool_t *pool)
Similar to svn_wc_get_diff_editor4(), but with changelist_filter passed as NULL, and depth set to svn...
svn_error_t * svn_wc_add_repos_file3(const char *dst_path, svn_wc_adm_access_t *adm_access, svn_stream_t *new_base_contents, svn_stream_t *new_contents, apr_hash_t *new_base_props, apr_hash_t *new_props, const char *copyfrom_url, svn_revnum_t copyfrom_rev, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *scratch_pool)
Similar to svn_wc_add_repos_file4, but uses access batons and a relative path instead of a working co...
svn_error_t * svn_wc_context_create(svn_wc_context_t **wc_ctx, const svn_config_t *config, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
Create a context for the working copy, and return it in *wc_ctx.
A working copy directory was upgraded to the latest format.
apr_hash_t * rev_props
If action is svn_wc_notify_blame_revision, contains a list of revision properties for the specified r...
const char * repos_url
URL of repository root.
svn_wc_conflict_description_t * svn_wc_conflict_description_create_tree(const char *path, svn_wc_adm_access_t *adm_access, svn_node_kind_t node_kind, svn_wc_operation_t operation, svn_wc_conflict_version_t *src_left_version, svn_wc_conflict_version_t *src_right_version, apr_pool_t *pool)
Similar to svn_wc_conflict_description_create_tree(), but returns a svn_wc_conflict_description_t *...
svn_error_t * svn_wc_locked2(svn_boolean_t *locked_here, svn_boolean_t *locked, svn_wc_context_t *wc_ctx, const char *local_abspath, apr_pool_t *scratch_pool)
Gets up to two booleans indicating whether a path is locked for writing.
Committing a modification.
unsigned long svn_linenum_t
A line number, such as in a file or a stream.
svn_error_t * svn_wc_get_update_editor4(const svn_delta_editor_t **editor, void **edit_baton, svn_revnum_t *target_revision, svn_wc_context_t *wc_ctx, const char *anchor_abspath, const char *target_basename, svn_boolean_t use_commit_times, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t allow_unver_obstructions, svn_boolean_t adds_as_modification, svn_boolean_t server_performs_filtering, svn_boolean_t clean_checkout, const char *diff3_cmd, const apr_array_header_t *preserved_exts, svn_wc_dirents_func_t fetch_dirents_func, void *fetch_dirents_baton, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_wc_external_update_t external_func, void *external_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
DEPRECATED – please use APIs from svn_client.h.
svn_error_t * svn_wc_get_ancestry(char **url, svn_revnum_t *rev, const char *path, svn_wc_adm_access_t *adm_access, apr_pool_t *pool)
Set *url and *rev to the ancestor URL and revision for path, allocating in pool.
Conflict resolver is done.
svn_error_t * svn_wc_get_update_editor(svn_revnum_t *target_revision, svn_wc_adm_access_t *anchor, const char *target, svn_boolean_t use_commit_times, svn_boolean_t recurse, svn_wc_notify_func_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, const char *diff3_cmd, const svn_delta_editor_t **editor, void **edit_baton, svn_wc_traversal_info_t *ti, apr_pool_t *pool)
Similar to svn_wc_get_update_editor2(), but takes an svn_wc_notify_func_t instead.
const char * repos_uuid
UUID of the repository (or NULL if unknown.)
struct svn_wc_conflict_description_t svn_wc_conflict_description_t
Similar to svn_wc_conflict_description2_t, but with relative paths and adm_access batons...
Local edits are already present.
svn_error_t * svn_wc_prop_get(const svn_string_t **value, const char *name, const char *path, svn_wc_adm_access_t *adm_access, apr_pool_t *pool)
Similar to svn_wc_prop_get2(), but with a svn_wc_adm_access_t / relative path parameter pair...
svn_error_t * svn_wc_delete3(const char *path, svn_wc_adm_access_t *adm_access, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_boolean_t keep_local, apr_pool_t *pool)
Similar to svn_wc_delete4, but uses an access baton and relative path instead of a working copy conte...
svn_error_t * svn_wc_maybe_set_repos_root(svn_wc_adm_access_t *adm_access, const char *path, const char *repos, apr_pool_t *pool)
Set the repository root URL of path to repos, if possible.
svn_boolean_t copied
in a copied state (possibly because the entry is a child of a path that is svn_wc_schedule_add or svn...
struct svn_stream_t svn_stream_t
An abstract stream of bytes–either incoming or outgoing or both.
svn_error_t * svn_wc_status(svn_wc_status_t **status, const char *path, svn_wc_adm_access_t *adm_access, apr_pool_t *pool)
Same as svn_wc_status2(), but for older svn_wc_status_t structures.
svn_boolean_t conflicted
Set to TRUE if the item is the victim of a conflict.
svn_wc_conflict_result_t * svn_wc_create_conflict_result(svn_wc_conflict_choice_t choice, const char *merged_file, apr_pool_t *pool)
Allocate an svn_wc_conflict_result_t structure in pool, initialize and return it. ...
const char * uuid
repository uuid
Deleting a versioned path.
svn_error_t * svn_wc_queue_committed(svn_wc_committed_queue_t **queue, const char *path, svn_wc_adm_access_t *adm_access, svn_boolean_t recurse, const apr_array_header_t *wcprop_changes, svn_boolean_t remove_lock, svn_boolean_t remove_changelist, const unsigned char *digest, apr_pool_t *pool)
Same as svn_wc_queue_committed2() but the queue parameter has an extra indirection and digest is supp...
svn_error_t * svn_wc_get_status_editor(const svn_delta_editor_t **editor, void **edit_baton, svn_revnum_t *edit_revision, svn_wc_adm_access_t *anchor, const char *target, apr_hash_t *config, svn_boolean_t recurse, svn_boolean_t get_all, svn_boolean_t no_ignore, svn_wc_status_func_t status_func, void *status_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_traversal_info_t *traversal_info, apr_pool_t *pool)
Same as svn_wc_get_status_editor2(), but with set_locks_baton set to NULL, and taking a deprecated sv...
const char * svn_wc_get_adm_dir(apr_pool_t *pool)
Return the name of the administrative directory.
Subversion's data types.
svn_error_t *(* svn_wc_get_file_t)(void *baton, const char *path, svn_revnum_t revision, svn_stream_t *stream, svn_revnum_t *fetched_rev, apr_hash_t **props, apr_pool_t *pool)
A simple callback type to wrap svn_ra_get_file(); see that docstring for more information.
svn_error_t * svn_wc_cleanup2(const char *path, const char *diff3_cmd, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool)
Similar to svn_wc_cleanup3() but uses relative paths and creates its own svn_wc_context_t.
svn_boolean_t file_external
TRUE iff the item is a file brought in by an svn:externals definition.
const char * lock_comment
lock comment or NULL if not locked in this WC or no comment
svn_error_t * svn_wc_props_modified_p2(svn_boolean_t *modified_p, svn_wc_context_t *wc_ctx, const char *local_abspath, apr_pool_t *scratch_pool)
Set *modified_p to non-zero if path's properties are modified with regard to the base revision...
svn_error_t * svn_wc_crawl_revisions(const char *path, svn_wc_adm_access_t *adm_access, const svn_ra_reporter_t *reporter, void *report_baton, svn_boolean_t restore_files, svn_boolean_t recurse, svn_boolean_t use_commit_times, svn_wc_notify_func_t notify_func, void *notify_baton, svn_wc_traversal_info_t *traversal_info, apr_pool_t *pool)
Similar to svn_wc_crawl_revisions2(), but takes an svn_wc_notify_func_t and a svn_ra_reporter_t inste...
void(* svn_wc_status_func_t)(void *baton, const char *path, svn_wc_status_t *status)
Same as svn_wc_status_func2_t, but for older svn_wc_status_t structures.
svn_error_t * svn_wc_get_ignores(apr_array_header_t **patterns, apr_hash_t *config, svn_wc_adm_access_t *adm_access, apr_pool_t *pool)
Similar to svn_wc_get_ignores2(), but with a svn_wc_adm_access_t parameter in place of svn_wc_context...
svn_error_t * svn_wc_get_prop_diffs2(apr_array_header_t **propchanges, apr_hash_t **original_props, svn_wc_context_t *wc_ctx, const char *local_abspath, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
Given a local_abspath to a file or directory under version control, discover any local changes made t...
svn_error_t * svn_wc_get_diff_editor5(svn_wc_adm_access_t *anchor, const char *target, const svn_wc_diff_callbacks3_t *callbacks, void *callback_baton, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t use_text_base, svn_boolean_t reverse_order, svn_cancel_func_t cancel_func, void *cancel_baton, const apr_array_header_t *changelist_filter, const svn_delta_editor_t **editor, void **edit_baton, apr_pool_t *pool)
Similar to svn_wc_get_diff_editor6(), but with an access baton and relative path. ...
svn_revnum_t ood_changed_rev
Set to the youngest committed revision, or SVN_INVALID_REVNUM if not out of date. ...
svn_error_t * svn_wc_get_status_editor4(const svn_delta_editor_t **editor, void **edit_baton, void **set_locks_baton, svn_revnum_t *edit_revision, svn_wc_adm_access_t *anchor, const char *target, svn_depth_t depth, svn_boolean_t get_all, svn_boolean_t no_ignore, const apr_array_header_t *ignore_patterns, svn_wc_status_func3_t status_func, void *status_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_traversal_info_t *traversal_info, apr_pool_t *pool)
Same as svn_wc_get_status_editor5, but using svn_wc_status_func3_t instead of svn_wc_status_func4_t.
svn_depth_t depth
The depth of this entry.
svn_wc_conflict_version_t * src_right_version
Info on the "merge-right source" or "their" version of incoming change.
svn_error_t * svn_wc_revert3(const char *path, svn_wc_adm_access_t *parent_access, svn_depth_t depth, svn_boolean_t use_commit_times, const apr_array_header_t *changelist_filter, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *pool)
Similar to svn_wc_revert4() but takes a relative path and access baton.
svn_error_t * svn_wc_resolved_conflict2(const char *path, svn_wc_adm_access_t *adm_access, svn_boolean_t resolve_text, svn_boolean_t resolve_props, svn_boolean_t recurse, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool)
Similar to svn_wc_resolved_conflict3(), but without automatic conflict resolution support...
Operation failed because an added parent is not selected.
Same as svn_wc_status2_t, but without the svn_lock_t 'repos_lock', const char 'url', svn_revnum_t 'ood_last_cmt_rev', apr_time_t 'ood_last_cmt_date', svn_node_kind_t 'ood_kind', const char 'ood_last_cmt_author', svn_wc_conflict_description_t 'tree_conflict', svn_boolean_t 'file_external', svn_wc_status_kind 'pristine_text_status', and svn_wc_status_kind 'pristine_prop_status' fields.
apr_time_t lock_creation_date
Lock creation date or 0 if not locked in this WC.
A generic checksum representation.
A merge operation (to path) has begun.
svn_error_t * svn_wc_add4(svn_wc_context_t *wc_ctx, const char *local_abspath, svn_depth_t depth, const char *copyfrom_url, svn_revnum_t copyfrom_rev, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *scratch_pool)
Put local_abspath under version control by registering it as addition or copy in the database contain...
const svn_version_t * svn_wc_version(void)
Get libsvn_wc version information.
svn_revnum_t revision
When action is svn_wc_notify_update_completed, target revision of the update, or SVN_INVALID_REVNUM i...
const char * url
Where to check out from.
svn_node_kind_t node_kind
The node type of the path being operated on (for a tree conflict, which version?)
svn_error_t * svn_wc_text_modified_p(svn_boolean_t *modified_p, const char *filename, svn_boolean_t force_comparison, svn_wc_adm_access_t *adm_access, apr_pool_t *pool)
Similar to svn_wc_text_modified_p2(), but with a relative path and adm_access baton?
svn_error_t * svn_wc_merge_props2(svn_wc_notify_state_t *state, const char *path, svn_wc_adm_access_t *adm_access, apr_hash_t *baseprops, const apr_array_header_t *propchanges, svn_boolean_t base_merge, svn_boolean_t dry_run, svn_wc_conflict_resolver_func_t conflict_func, void *conflict_baton, apr_pool_t *pool)
Similar to svn_wc_merge_props3, but takes an access baton and relative path, no cancel_function, and no left and right version.
svn_error_t * svn_wc_revision_status(svn_wc_revision_status_t **result_p, const char *wc_path, const char *trail_url, svn_boolean_t committed, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool)
Similar to svn_wc_revision_status2(), but with a (possibly) local path and no wc_ctx parameter...
struct svn_wc_diff_callbacks3_t svn_wc_diff_callbacks3_t
Similar to svn_wc_diff_callbacks4_t, but without copyfrom_path and copyfrom_revision arguments to fil...
svn_boolean_t switched
a file or directory can be 'switched' if the switch command has been used.
struct svn_wc_traversal_info_t svn_wc_traversal_info_t
Traversal information is information gathered by a working copy crawl or update.
Warn user that a path has moved from one changelist to another.
If there were files to choose from, select one as a way of resolving the conflict here and now...
const char * wcroot_abspath
The local absolute path of the working copy root.
The mergeinfo on path was updated.
svn_wc_notify_state_t prop_state
The type of notification that is occurring about node properties.
svn_boolean_t switched
a file or directory can be 'switched' if the switch command has been used.
svn_error_t * svn_wc_resolved_conflict3(const char *path, svn_wc_adm_access_t *adm_access, svn_boolean_t resolve_text, svn_boolean_t resolve_props, svn_depth_t depth, svn_wc_conflict_choice_t conflict_choice, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool)
Similar to svn_wc_resolved_conflict4(), but without tree-conflict resolution support.
Adding a path to revision control.
svn_error_t * svn_wc_translated_file2(const char **xlated_path, const char *src, const char *versioned_file, svn_wc_adm_access_t *adm_access, apr_uint32_t flags, apr_pool_t *pool)
Set xlated_path to a translated copy of src or to src itself if no translation is necessary...
const char * path
The path that is in conflict (for a tree conflict, it is the victim)
#define SVN_DEPRECATED
Macro used to mark deprecated functions.
svn_error_t * svn_wc_canonicalize_svn_prop(const svn_string_t **propval_p, const char *propname, const svn_string_t *propval, const char *path, svn_node_kind_t kind, svn_boolean_t skip_some_checks, svn_wc_canonicalize_svn_prop_get_file_t prop_getter, void *getter_baton, apr_pool_t *pool)
Canonicalize the value of an svn:* property propname with value propval.
Mergeinfo describing a merge was recorded.
svn_error_t *(* svn_wc_dirents_func_t)(void *baton, apr_hash_t **dirents, const char *repos_root_url, const char *repos_relpath, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
A simple callback type to wrap svn_ra_get_dir2() for avoiding issue #3569, where a directory is updat...
apr_time_t prop_time
last up-to-date time for properties (0 means no information available)
svn_error_t *(* svn_wc_relocation_validator_t)(void *baton, const char *uuid, const char *url)
Similar to svn_wc_relocation_validator2_t, but without the root and pool arguments.
svn_error_t *(* svn_wc_conflict_resolver_func2_t)(svn_wc_conflict_result_t **result, const svn_wc_conflict_description2_t *description, void *baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
A callback used in merge, update and switch for resolving conflicts during the application of a tree ...
svn_error_t * svn_wc_transmit_prop_deltas2(svn_wc_context_t *wc_ctx, const char *local_abspath, const svn_delta_editor_t *editor, void *baton, apr_pool_t *scratch_pool)
Given a local_abspath, transmit all local property modifications using the appropriate editor method ...
svn_error_t * svn_wc_conflicted_p3(svn_boolean_t *text_conflicted_p, svn_boolean_t *prop_conflicted_p, svn_boolean_t *tree_conflicted_p, svn_wc_context_t *wc_ctx, const char *local_abspath, apr_pool_t *scratch_pool)
Given local_abspath in a dir under version control, decide if it is in a state of conflict; return th...
struct svn_wc_diff_callbacks4_t svn_wc_diff_callbacks4_t
A callback vtable invoked by our diff-editors, as they receive diffs from the server.
svn_error_t * svn_wc_prop_set4(svn_wc_context_t *wc_ctx, const char *local_abspath, const char *name, const svn_string_t *value, svn_depth_t depth, svn_boolean_t skip_checks, const apr_array_header_t *changelist_filter, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *scratch_pool)
Set property name to value for local_abspath, or if value is NULL, remove property name from local_ab...
svn_error_t * svn_wc_exclude(svn_wc_context_t *wc_ctx, const char *local_abspath, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *scratch_pool)
Remove the local node for local_abspath from the working copy and add an excluded node placeholder in...
svn_error_t * svn_wc_adm_probe_open2(svn_wc_adm_access_t **adm_access, svn_wc_adm_access_t *associated, const char *path, svn_boolean_t write_lock, int levels_to_lock, apr_pool_t *pool)
Similar to svn_wc_adm_probe_open3() without the cancel functionality.
svn_error_t * svn_wc_set_changelist2(svn_wc_context_t *wc_ctx, const char *local_abspath, const char *changelist, svn_depth_t depth, const apr_array_header_t *changelist_filter, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *scratch_pool)
Set local_abspath's 'changelist' attribute to changelist iff changelist is not NULL; otherwise...
struct svn_wc_external_item2_t svn_wc_external_item2_t
One external item.
svn_wc_info_t * svn_wc_info_dup(const svn_wc_info_t *info, apr_pool_t *pool)
Return a duplicate of info, allocated in pool.
The working copy has been (or would be) changed.
svn_opt_revision_t file_external_peg_rev
The entry is a intra-repository file external and this is the peg revision number specified in the ex...
apr_time_t recorded_time
The time at which the file had the recorded size recorded_size and was considered unmodified...
const char * base_file
If this is text-conflict and involves the merging of two files descended from a common ancestor...
property conflict (on a file or dir)
svn_opt_revision_t peg_revision
The peg revision to use when checking out.
svn_error_t * svn_wc_conflicted_p2(svn_boolean_t *text_conflicted_p, svn_boolean_t *prop_conflicted_p, svn_boolean_t *tree_conflicted_p, const char *path, svn_wc_adm_access_t *adm_access, apr_pool_t *pool)
Similar to svn_wc_conflicted_p3(), but with a path/adm_access parameter pair in place of a wc_ctx/loc...
apr_time_t cmt_date
last date this was changed
svn_error_t * svn_wc_process_committed_queue2(svn_wc_committed_queue_t *queue, svn_wc_context_t *wc_ctx, svn_revnum_t new_revnum, const char *rev_date, const char *rev_author, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool)
Bump all items in queue to new_revnum after a commit succeeds.
const char * moved_from_abspath
The path the node was moved from, if it was moved here.
svn_error_t * svn_wc_conflicted_p(svn_boolean_t *text_conflicted_p, svn_boolean_t *prop_conflicted_p, const char *dir_path, const svn_wc_entry_t *entry, apr_pool_t *pool)
Given a dir_path under version control, decide if one of its entries (entry) is in a state of conflic...
svn_error_t *(* svn_wc_status_func4_t)(void *baton, const char *local_abspath, const svn_wc_status3_t *status, apr_pool_t *scratch_pool)
A callback for reporting a status about local_abspath.
An update tried to update a file or directory to which access could not be obtained.
svn_error_t * svn_wc_process_committed(const char *path, svn_wc_adm_access_t *adm_access, svn_boolean_t recurse, svn_revnum_t new_revnum, const char *rev_date, const char *rev_author, const apr_array_header_t *wcprop_changes, apr_pool_t *pool)
const char * repos_uuid
The UUID of the repository.
enum svn_wc_status_kind text_status
The status of the entries text.
Object is already added or schedule-add.
svn_wc_notify_t * svn_wc_create_notify_url(const char *url, svn_wc_notify_action_t action, apr_pool_t *pool)
Allocate an svn_wc_notify_t structure in pool, initialize and return it.
svn_error_t * svn_wc_crawl_revisions3(const char *path, svn_wc_adm_access_t *adm_access, const svn_ra_reporter3_t *reporter, void *report_baton, svn_boolean_t restore_files, svn_depth_t depth, svn_boolean_t depth_compatibility_trick, svn_boolean_t use_commit_times, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_wc_traversal_info_t *traversal_info, apr_pool_t *pool)
Similar to svn_wc_crawl_revisions4, but with honor_depth_exclude always set to false.
svn_error_t * svn_wc_delete2(const char *path, svn_wc_adm_access_t *adm_access, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *pool)
Similar to svn_wc_delete3(), but with keep_local always set to FALSE.
svn_error_t * svn_wc_resolved_conflict(const char *path, svn_wc_adm_access_t *adm_access, svn_boolean_t resolve_text, svn_boolean_t resolve_props, svn_boolean_t recurse, svn_wc_notify_func_t notify_func, void *notify_baton, apr_pool_t *pool)
Similar to svn_wc_resolved_conflict2(), but takes an svn_wc_notify_func_t and doesn't have cancellati...
struct svn_wc_entry_callbacks_t svn_wc_entry_callbacks_t
enum svn_wc_status_kind text_status
The status of the entry's text.
svn_error_t * svn_wc_walk_entries(const char *path, svn_wc_adm_access_t *adm_access, const svn_wc_entry_callbacks_t *walk_callbacks, void *walk_baton, svn_boolean_t show_hidden, apr_pool_t *pool)
Similar to svn_wc_walk_entries2(), but without cancellation support.
The lock wasn't changed.
svn_error_t * svn_wc_get_update_editor2(svn_revnum_t *target_revision, svn_wc_adm_access_t *anchor, const char *target, svn_boolean_t use_commit_times, svn_boolean_t recurse, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, const char *diff3_cmd, const svn_delta_editor_t **editor, void **edit_baton, svn_wc_traversal_info_t *ti, apr_pool_t *pool)
Similar to svn_wc_get_update_editor3() but with the allow_unver_obstructions parameter always set to ...
svn_revnum_t ood_last_cmt_rev
Set to the youngest committed revision, or SVN_INVALID_REVNUM if not out of date. ...
svn_boolean_t svn_wc_is_wc_prop(const char *name)
Return TRUE iff name is a 'wc' property name.
Copying a versioned path.
svn_wc_conflict_version_t * svn_wc_conflict_version_dup(const svn_wc_conflict_version_t *version, apr_pool_t *pool)
Return a duplicate of version, allocated in pool.
Similar to svn_wc_diff_callbacks4_t, but without copyfrom_path and copyfrom_revision arguments to fil...
svn_error_t *(* svn_cancel_func_t)(void *cancel_baton)
A user defined callback that subversion will call with a user defined baton to see if the current ope...
svn_revnum_t old_revision
If action is svn_wc_notify_update_update or svn_wc_notify_update_add, contains the revision before th...
svn_revnum_t copyfrom_rev
copyfrom revision
long int svn_revnum_t
About Special Files in Subversion.
const char * merged_file
merged version; may contain conflict markers
svn_wc_conflict_description2_t * svn_wc_conflict_description_create_tree2(const char *local_abspath, svn_node_kind_t node_kind, svn_wc_operation_t operation, const svn_wc_conflict_version_t *src_left_version, const svn_wc_conflict_version_t *src_right_version, apr_pool_t *result_pool)
Allocate an svn_wc_conflict_description_t structure in pool, initialize to represent a tree conflict...
Operation failed because the operation was forbidden by the server.
const char * file_external_path
The entry is a intra-repository file external and this is the repository root relative path to the fi...
The path is a subdirectory referenced in an externals definition which is unable to be operated on...
svn_boolean_t incomplete
for THIS_DIR entry, implies whole entries file is incomplete
The last notification in a merge.
svn_boolean_t svn_wc_adm_locked(const svn_wc_adm_access_t *adm_access)
Return TRUE is the access baton adm_access has a write lock, FALSE otherwise.
a directory doesn't contain a complete entries list
svn_opt_revision_t revision
What revision to check out.
svn_error_t * svn_wc_walk_entries3(const char *path, svn_wc_adm_access_t *adm_access, const svn_wc_entry_callbacks2_t *walk_callbacks, void *walk_baton, svn_depth_t depth, svn_boolean_t show_hidden, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool)
A generic entry-walker.
svn_wc_schedule_t schedule
The schedule of this item Do we still need schedule?
svn_error_t * svn_wc_prop_list2(apr_hash_t **props, svn_wc_context_t *wc_ctx, const char *local_abspath, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
Set *props to a hash table mapping char * names onto svn_string_t * values for all the regular proper...
svn_error_t * svn_wc_get_switch_editor(svn_revnum_t *target_revision, svn_wc_adm_access_t *anchor, const char *target, const char *switch_url, svn_boolean_t use_commit_times, svn_boolean_t recurse, svn_wc_notify_func_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, const char *diff3_cmd, const svn_delta_editor_t **editor, void **edit_baton, svn_wc_traversal_info_t *ti, apr_pool_t *pool)
Similar to svn_wc_get_switch_editor2(), but takes an svn_wc_notify_func_t instead.
The item wasn't present.
svn_error_t * svn_wc_merge_props(svn_wc_notify_state_t *state, const char *path, svn_wc_adm_access_t *adm_access, apr_hash_t *baseprops, const apr_array_header_t *propchanges, svn_boolean_t base_merge, svn_boolean_t dry_run, apr_pool_t *pool)
Same as svn_wc_merge_props2(), but with a conflict_func (and baton) of NULL.
svn_filesize_t filesize
The actual size of the working file on disk, or SVN_INVALID_FILESIZE if unknown (or if the item isn't...
svn_error_t * svn_wc_add_repos_file4(svn_wc_context_t *wc_ctx, const char *local_abspath, svn_stream_t *new_base_contents, svn_stream_t *new_contents, apr_hash_t *new_base_props, apr_hash_t *new_props, const char *copyfrom_url, svn_revnum_t copyfrom_rev, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool)
Add a file to a working copy at local_abspath, obtaining the text-base's contents from new_base_conte...
attempting to delete object
const char * path
Path, either absolute or relative to the current working directory (i.e., not relative to an anchor)...
an unversioned resource is in the way of the versioned resource
struct svn_wc_conflict_result_t svn_wc_conflict_result_t
The final result returned by svn_wc_conflict_resolver_func_t.
svn_wc_adm_access_t * access
If not NULL, an open working copy access baton to either the path itself (if path is a directory)...
enum svn_wc_status_kind repos_text_status
The entry's text status in the repository.
A callback vtable invoked by the generic entry-walker function.
Operation failed because a node is obstructed.
svn_error_t *(* svn_wc_relocation_validator2_t)(void *baton, const char *uuid, const char *url, svn_boolean_t root, apr_pool_t *pool)
Similar to svn_wc_relocation_validator3_t, but with the root argument.
svn_error_t * svn_wc_add_from_disk(svn_wc_context_t *wc_ctx, const char *local_abspath, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *scratch_pool)
Similar to svn_wc_add_from_disk2(), but always passes NULL for props.
const char * conflict_wrk
working version of conflicted file.
svn_wc_external_item_t * svn_wc_external_item_dup(const svn_wc_external_item_t *item, apr_pool_t *pool)
Return a duplicate of item, allocated in pool.
The working copy is (or would be) unchanged.
struct svn_wc_entry_callbacks2_t svn_wc_entry_callbacks2_t
A callback vtable invoked by the generic entry-walker function.
const svn_wc_conflict_version_t * src_right_version
Info on the "merge-right source" or "their" version of incoming change.
svn_boolean_t switched
a file or directory can be 'switched' if the switch command has been used.
The operation was attempted on a path which doesn't exist.
svn_error_t * svn_wc_translated_file(const char **xlated_p, const char *vfile, svn_wc_adm_access_t *adm_access, svn_boolean_t force_repair, apr_pool_t *pool)
Same as svn_wc_translated_file2, but will never clean up temporary files.
svn_wc_conflict_description2_t * svn_wc_conflict_description_create_text2(const char *local_abspath, apr_pool_t *result_pool)
Allocate an svn_wc_conflict_description_t structure in result_pool, initialize to represent a text co...
svn_error_t * svn_wc_queue_committed2(svn_wc_committed_queue_t *queue, const char *path, svn_wc_adm_access_t *adm_access, svn_boolean_t recurse, const apr_array_header_t *wcprop_changes, svn_boolean_t remove_lock, svn_boolean_t remove_changelist, const svn_checksum_t *md5_checksum, apr_pool_t *scratch_pool)
Same as svn_wc_queue_committed3() except path doesn't have to be an abspath and adm_access is unused ...
The server has instructed the client to follow a URL redirection.
svn_error_t * svn_wc_adm_close2(svn_wc_adm_access_t *adm_access, apr_pool_t *scratch_pool)
Give up the access baton adm_access, and its lock if any.
svn_boolean_t versioned
If the path is under version control, versioned is TRUE, otherwise FALSE.
svn_error_t * svn_wc_ensure_adm(const char *path, const char *uuid, const char *url, svn_revnum_t revision, apr_pool_t *pool)
Similar to svn_wc_ensure_adm2(), but with repos set to NULL.
svn_wc_operation_t operation
The operation that exposed the conflict.
A callback vtable invoked by our diff-editors, as they receive diffs from the server.
svn_error_t * svn_wc_move(svn_wc_context_t *wc_ctx, const char *src_abspath, const char *dst_abspath, svn_boolean_t metadata_only, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *scratch_pool)
Move src_abspath to dst_abspath, by scheduling dst_abspath for addition to the repository, remembering the history.
svn_boolean_t locked
a directory can be 'locked' if a working copy update was interrupted.
svn_error_t * svn_wc_revert2(const char *path, svn_wc_adm_access_t *parent_access, svn_boolean_t recursive, svn_boolean_t use_commit_times, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *pool)
Similar to svn_wc_revert3(), but with changelist_filter passed as NULL, and depth set according to re...
struct svn_wc_conflict_description2_t svn_wc_conflict_description2_t
A struct that describes a conflict that has occurred in the working copy.
svn_wc_conflict_reason_t reason
The state of the target node or property, relative to its merge-left source, that is the reason for t...
svn_error_t * svn_wc_prop_set3(const char *name, const svn_string_t *value, const char *path, svn_wc_adm_access_t *adm_access, svn_boolean_t skip_checks, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *pool)
Similar to svn_wc_prop_set4(), but with a svn_wc_adm_access_t / relative path parameter pair...
svn_node_kind_t ood_kind
Set to the node kind of the youngest commit, or svn_node_none if not out of date. ...
const char * my_file
my locally-edited version of the file
Similar to svn_wc_diff_callbacks2_t, but with file additions/content changes and property changes spl...
Got any other action in an update.
Nonexistent property deleted.
local mods received conflicting repos mods
svn_wc_operation_t operation
The operation that exposed the conflict.
const char * copyfrom_url
copyfrom location
svn_boolean_t copied
a file or directory can be 'copied' if it's scheduled for addition-with-history (or part of a subtree...
svn_boolean_t absent
absent – we know an entry of this name exists, but that's all (usually this happens because of authz ...
svn_error_t * svn_wc_diff(svn_wc_adm_access_t *anchor, const char *target, const svn_wc_diff_callbacks_t *callbacks, void *callback_baton, svn_boolean_t recurse, apr_pool_t *pool)
Similar to svn_wc_diff2(), but with ignore_ancestry always set to FALSE.
const char * moved_to_abspath
Set to the local absolute path that this node was moved to, if this file or directory has been moved ...
svn_wc_conflict_kind_t kind
What sort of conflict are we describing?
svn_error_t * svn_wc_cleanup3(svn_wc_context_t *wc_ctx, const char *local_abspath, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool)
Recurse from local_abspath, cleaning up unfinished log business.
const char * local_abspath
The path that is in conflict (for a tree conflict, it is the victim)
svn_revnum_t revision
Base revision.
An update operation removed an external working copy.
const char * checksum
Hex MD5 checksum for the untranslated text base file, can be NULL for backwards compatibility.
svn_wc_merge_outcome_t
The outcome of a merge carried out (or tried as a dry-run) by svn_wc_merge()
const char * mime_type
The svn:mime-type property of ('my' version of) path, if available, else NULL.
svn_wc_notify_state_t content_state
The type of notification that is occurring about node content.
int svn_boolean_t
YABT: Yet Another Boolean Type.
Option and argument parsing for Subversion command lines.
svn_error_t * svn_wc_revision_status2(svn_wc_revision_status_t **result_p, svn_wc_context_t *wc_ctx, const char *local_abspath, const char *trail_url, svn_boolean_t committed, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
Set *result_p to point to a new svn_wc_revision_status_t structure containing a summary of the revisi...
svn_error_t * svn_wc_queue_committed3(svn_wc_committed_queue_t *queue, svn_wc_context_t *wc_ctx, const char *local_abspath, svn_boolean_t recurse, const apr_array_header_t *wcprop_changes, svn_boolean_t remove_lock, svn_boolean_t remove_changelist, const svn_checksum_t *sha1_checksum, apr_pool_t *scratch_pool)
Queue committed items to be processed later by svn_wc_process_committed_queue2(). ...
svn_error_t * svn_wc_entry(const svn_wc_entry_t **entry, const char *path, svn_wc_adm_access_t *adm_access, svn_boolean_t show_hidden, apr_pool_t *pool)
Set *entry to an entry for path, allocated in the access baton pool.
svn_error_t * svn_wc_add_from_disk2(svn_wc_context_t *wc_ctx, const char *local_abspath, const apr_hash_t *props, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *scratch_pool)
Schedule the single node that exists on disk at local_abspath for addition to the working copy...
A structure to report a summary of a working copy, including the mix of revisions found within it...
svn_error_t * svn_wc_delete4(svn_wc_context_t *wc_ctx, const char *local_abspath, svn_boolean_t keep_local, svn_boolean_t delete_unversioned_target, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *scratch_pool)
Schedule local_abspath for deletion.
svn_boolean_t sparse_checkout
Whether any WC paths are at a depth other than svn_depth_infinity.
Modified state got conflicting mods.
svn_error_t * svn_wc_check_root(svn_boolean_t *is_wcroot, svn_boolean_t *is_switched, svn_node_kind_t *kind, svn_wc_context_t *wc_ctx, const char *local_abspath, apr_pool_t *scratch_pool)
If is_wcroot is not NULL, set *is_wcroot to TRUE if local_abspath is the root of the working copy...
apr_pool_t * svn_wc_adm_access_pool(const svn_wc_adm_access_t *adm_access)
Return the pool used by access baton adm_access.
A node below an existing node was updated during update.
const char * my_abspath
my locally-edited version of the file
is unversioned but configured to be ignored
apr_time_t text_time
last up-to-date time for text contents (0 means no information available)
svn_error_t * svn_wc_adm_probe_open(svn_wc_adm_access_t **adm_access, svn_wc_adm_access_t *associated, const char *path, svn_boolean_t write_lock, svn_boolean_t tree_lock, apr_pool_t *pool)
Similar to svn_wc_adm_probe_open2(), but with tree_lock instead of levels_to_lock.
Committing an overwriting (replace) copy (path is the target of the copy, not the source)...
svn_error_t * svn_wc_cleanup(const char *path, svn_wc_adm_access_t *optional_adm_access, const char *diff3_cmd, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool)
Similar to svn_wc_cleanup2().
struct svn_wc_info_t svn_wc_info_t
This struct contains information about a working copy node.
Processed a single revision's blame.
svn_wc_external_item2_t * svn_wc_external_item2_dup(const svn_wc_external_item2_t *item, apr_pool_t *pool)
Return a duplicate of item, allocated in pool.
svn_error_t * svn_wc_get_actual_target(const char *path, const char **anchor, const char **target, apr_pool_t *pool)
Similar to svn_wc_get_actual_target2(), but without the wc context, and with a absolute path...
const char * present_props
Cached property existence for this entry.
const char * cmt_author
last commit author of this item
svn_node_kind_t node_kind
The node type of the path being operated on (for a tree conflict, which version?)
struct svn_wc_status_t svn_wc_status_t
Same as svn_wc_status2_t, but without the svn_lock_t 'repos_lock', const char 'url', svn_revnum_t 'ood_last_cmt_rev', apr_time_t 'ood_last_cmt_date', svn_node_kind_t 'ood_kind', const char 'ood_last_cmt_author', svn_wc_conflict_description_t 'tree_conflict', svn_boolean_t 'file_external', svn_wc_status_kind 'pristine_text_status', and svn_wc_status_kind 'pristine_prop_status' fields.
svn_wc_status_kind
The type of status for the working copy.
svn_boolean_t svn_wc_is_entry_prop(const char *name)
Return TRUE iff name is a 'entry' property name.
struct svn_wc_status2_t svn_wc_status2_t
All diffs are not yet known.
svn_error_t * svn_wc_parse_externals_description3(apr_array_header_t **externals_p, const char *parent_directory, const char *desc, svn_boolean_t canonicalize_url, apr_pool_t *pool)
If externals_p is non-NULL, set *externals_p to an array of svn_wc_external_item2_t * objects based o...
svn_revnum_t revision
base revision
svn_wc_committed_queue_t * svn_wc_committed_queue_create(apr_pool_t *pool)
Create a queue for use with svn_wc_queue_committed() and svn_wc_process_committed_queue().
svn_error_t * svn_wc_transmit_prop_deltas(const char *path, svn_wc_adm_access_t *adm_access, const svn_wc_entry_t *entry, const svn_delta_editor_t *editor, void *baton, const char **tempfile, apr_pool_t *pool)
Similar to svn_wc_transmit_prop_deltas2(), but with a relative path, adm_access baton and tempfile...
svn_error_t * svn_wc_add3(const char *path, svn_wc_adm_access_t *parent_access, svn_depth_t depth, const char *copyfrom_url, svn_revnum_t copyfrom_rev, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *pool)
Similar to svn_wc_add4(), but with an access baton and relative path instead of a context and absolut...
svn_error_t * svn_wc_set_changelist(const char *path, const char *changelist, svn_wc_adm_access_t *adm_access, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *pool)
Similar to svn_wc_set_changelist2(), but with an access baton and relative path.
svn_error_t * svn_wc_status_set_repos_locks(void *set_locks_baton, apr_hash_t *locks, const char *repos_root, apr_pool_t *pool)
Associate locks, a hash table mapping const char* absolute repository paths to svn_lock_t objects...
The working copy has been (or would be) changed, but there was (or would be) a conflict.
svn_error_t * svn_wc_merge4(enum svn_wc_merge_outcome_t *merge_outcome, svn_wc_context_t *wc_ctx, const char *left_abspath, const char *right_abspath, const char *target_abspath, const char *left_label, const char *right_label, const char *target_label, const svn_wc_conflict_version_t *left_version, const svn_wc_conflict_version_t *right_version, svn_boolean_t dry_run, const char *diff3_cmd, const apr_array_header_t *merge_options, const apr_array_header_t *prop_diff, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool)
Similar to svn_wc_merge5() but with merge_props_state and original_props always passed as NULL...
svn_node_kind_t kind
The kind of node as recorded in the working copy.
Restoring a missing path from the pristine text-base.
svn_error_t * svn_wc_get_status_editor5(const svn_delta_editor_t **editor, void **edit_baton, void **set_locks_baton, svn_revnum_t *edit_revision, svn_wc_context_t *wc_ctx, const char *anchor_abspath, const char *target_basename, svn_depth_t depth, svn_boolean_t get_all, svn_boolean_t no_ignore, svn_boolean_t depth_as_sticky, svn_boolean_t server_performs_filtering, const apr_array_header_t *ignore_patterns, svn_wc_status_func4_t status_func, void *status_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool)
DEPRECATED – please use APIs from svn_client.h.
svn_node_kind_t ood_kind
Set to the node kind of the youngest commit, or svn_node_none if not out of date. ...
svn_boolean_t svn_wc_match_ignore_list(const char *str, const apr_array_header_t *list, apr_pool_t *pool)
Return TRUE iff str matches any of the elements of list, a list of zero or more ignore patterns...
svn_wc_conflict_reason_t
The pre-existing condition which is causing a state of conflict.
svn_error_t *(* svn_wc_relocation_validator3_t)(void *baton, const char *uuid, const char *url, const char *root_url, apr_pool_t *pool)
Relocation validation callback typedef.
Object is already schedule-delete.
svn_revnum_t max_rev
Highest revision found.
svn_error_t * svn_wc_crawl_revisions4(const char *path, svn_wc_adm_access_t *adm_access, const svn_ra_reporter3_t *reporter, void *report_baton, svn_boolean_t restore_files, svn_depth_t depth, svn_boolean_t honor_depth_exclude, svn_boolean_t depth_compatibility_trick, svn_boolean_t use_commit_times, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_wc_traversal_info_t *traversal_info, apr_pool_t *pool)
Similar to svn_wc_crawl_revisions5, but with a relative path and access baton instead of an absolute ...
svn_wc_conflict_action_t action
The action being attempted on the conflicted node or property.
svn_error_t * svn_wc_context_destroy(svn_wc_context_t *wc_ctx)
Destroy the working copy context described by wc_ctx, releasing any acquired resources.
svn_wc_notify_action_t action
Action that describes what happened to svn_wc_notify_t.path.
svn_error_t * svn_wc_add_lock(const char *path, const svn_lock_t *lock, svn_wc_adm_access_t *adm_access, apr_pool_t *pool)
Similar to svn_wc_add_lock2(), but with a svn_wc_adm_access_t / relative path parameter pair...
svn_error_t * svn_wc_get_changelists(svn_wc_context_t *wc_ctx, const char *local_abspath, svn_depth_t depth, const apr_array_header_t *changelist_filter, svn_changelist_receiver_t callback_func, void *callback_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool)
TODO: Doc string, please.
svn_error_t * svn_wc_walk_status(svn_wc_context_t *wc_ctx, const char *local_abspath, svn_depth_t depth, svn_boolean_t get_all, svn_boolean_t no_ignore, svn_boolean_t ignore_text_mods, const apr_array_header_t *ignore_patterns, svn_wc_status_func4_t status_func, void *status_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool)
Walk the working copy status of local_abspath using wc_ctx, by creating svn_wc_status3_t structures a...
svn_error_t * svn_wc_get_update_editor3(svn_revnum_t *target_revision, svn_wc_adm_access_t *anchor, const char *target, svn_boolean_t use_commit_times, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t allow_unver_obstructions, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_conflict_resolver_func_t conflict_func, void *conflict_baton, svn_wc_get_file_t fetch_func, void *fetch_baton, const char *diff3_cmd, const apr_array_header_t *preserved_exts, const svn_delta_editor_t **editor, void **edit_baton, svn_wc_traversal_info_t *ti, apr_pool_t *pool)
Similar to svn_wc_get_update_editor4, but uses access batons and relative path instead of a working c...
enum svn_wc_status_kind repos_prop_status
The entry's property status in the repository.
svn_error_t * svn_wc_translated_stream(svn_stream_t **stream, const char *path, const char *versioned_file, svn_wc_adm_access_t *adm_access, apr_uint32_t flags, apr_pool_t *pool)
Returns a stream allocated in pool with access to the given path taking the file properties from vers...
enum svn_wc_status_kind repos_text_status
The entry's text status in the repository.
svn_error_t * svn_wc_revert(const char *path, svn_wc_adm_access_t *parent_access, svn_boolean_t recursive, svn_boolean_t use_commit_times, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func_t notify_func, void *notify_baton, apr_pool_t *pool)
Similar to svn_wc_revert2(), but takes an svn_wc_notify_func_t instead.
svn_boolean_t has_props
Whether this entry has any working properties.
svn_error_t * svn_wc_relocate2(const char *path, svn_wc_adm_access_t *adm_access, const char *from, const char *to, svn_boolean_t recurse, svn_wc_relocation_validator2_t validator, void *validator_baton, apr_pool_t *pool)
Similar to svn_wc_relocate3(), but uses svn_wc_relocation_validator2_t.
const char * url
Similar to path, but if non-NULL the notification is about a url.
svn_error_t * svn_wc_copy2(const char *src, svn_wc_adm_access_t *dst_parent, const char *dst_basename, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *pool)
Similar to svn_wc_copy3(), but takes access batons and a relative path and a basename instead of abso...
svn_error_t * svn_wc_ensure_adm4(svn_wc_context_t *wc_ctx, const char *local_abspath, const char *url, const char *repos_root_url, const char *repos_uuid, svn_revnum_t revision, svn_depth_t depth, apr_pool_t *scratch_pool)
Ensure that an administrative area exists for local_abspath, so that local_abspath is a working copy ...
svn_wc_conflict_description2_t * svn_wc_conflict_description_create_prop2(const char *local_abspath, svn_node_kind_t node_kind, const char *property_name, apr_pool_t *result_pool)
Allocate an svn_wc_conflict_description_t structure in result_pool, initialize to represent a propert...
svn_depth_t depth
The depth of the node as recorded in the working copy (svn_depth_unknown for files or when no depth i...
svn_wc_conflict_version_t * src_left_version
Info on the "merge-left source" or "older" version of incoming change.
svn_wc_conflict_description_t * svn_wc_conflict_description_create_prop(const char *path, svn_wc_adm_access_t *adm_access, svn_node_kind_t node_kind, const char *property_name, apr_pool_t *pool)
Similar to svn_wc_conflict_descriptor_create_prop(), but returns a svn_wc_conflict_description_t *...
svn_error_t * svn_wc_crop_tree(svn_wc_adm_access_t *anchor, const char *target, svn_depth_t depth, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool)
Similar to svn_wc_crop_tree2(), but uses an access baton and target.
svn_boolean_t locked
a directory can be 'locked' if a working copy update was interrupted.
svn_depth_t depth
The depth of the item, see svn_depth_t.
enum svn_wc_status_kind repos_text_status
The entry's text status in the repository.
An unversioned item obstructed work.
Don't resolve the conflict now.
Similar to svn_ra_reporter3_t, but without support for depths.