wc.h revision 299742
1290968Sngie/* 2290968Sngie * wc.h : shared stuff internal to the svn_wc library. 3293821Sngie * 4293821Sngie * ==================================================================== 5290968Sngie * Licensed to the Apache Software Foundation (ASF) under one 6290968Sngie * or more contributor license agreements. See the NOTICE file 7290968Sngie * distributed with this work for additional information 8290968Sngie * regarding copyright ownership. The ASF licenses this file 9290968Sngie * to you under the Apache License, Version 2.0 (the 10290968Sngie * "License"); you may not use this file except in compliance 11290968Sngie * with the License. You may obtain a copy of the License at 12293821Sngie * 13293821Sngie * http://www.apache.org/licenses/LICENSE-2.0 14293821Sngie * 15293821Sngie * Unless required by applicable law or agreed to in writing, 16290968Sngie * software distributed under the License is distributed on an 17 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 18 * KIND, either express or implied. See the License for the 19 * specific language governing permissions and limitations 20 * under the License. 21 * ==================================================================== 22 */ 23 24 25#ifndef SVN_LIBSVN_WC_H 26#define SVN_LIBSVN_WC_H 27 28#include <apr_pools.h> 29#include <apr_hash.h> 30 31#include "svn_types.h" 32#include "svn_error.h" 33#include "svn_wc.h" 34 35#include "private/svn_sqlite.h" 36#include "private/svn_wc_private.h" 37#include "private/svn_skel.h" 38 39#include "wc_db.h" 40 41#ifdef __cplusplus 42extern "C" { 43#endif /* __cplusplus */ 44 45 46#define SVN_WC__PROP_REJ_EXT ".prej" 47 48/* We can handle this format or anything lower, and we (should) error 49 * on anything higher. 50 * 51 * There is no format version 0; we started with 1. 52 * 53 * The bump to 2 introduced the ".svn-work" extension. For example, 54 * ".svn/props/foo" became ".svn/props/foo.svn-work". 55 * 56 * The bump to 3 introduced the entry attribute 57 * old-and-busted.c::ENTRIES_ATTR_ABSENT. 58 * 59 * The bump to 4 renamed the magic "svn:this_dir" entry name to "". 60 * 61 * == 1.0.x shipped with format 4 62 * == 1.1.x shipped with format 4 63 * == 1.2.x shipped with format 4 64 * == 1.3.x shipped with format 4 65 * 66 * The bump to 5 added support for replacing files with history (the 67 * "revert base"). This was introduced in 1.4.0, but buggy until 1.4.6. 68 * 69 * The bump to 6 introduced caching of property modification state and 70 * certain properties in the entries file. 71 * 72 * The bump to 7 changed the entries file format from XML to a custom 73 * text-based format. 74 * 75 * The bump to 8 placed wcprops in one file per directory (named 76 * upgrade.c::WCPROPS_ALL_DATA) 77 * 78 * == 1.4.x shipped with format 8 79 * 80 * The bump to 9 added changelists, keep-local, and sticky depth (for 81 * selective/sparse checkouts) to each entry. 82 * 83 * == 1.5.x shipped with format 9 84 * 85 * The bump to 10 added tree-conflicts, file externals and a different 86 * canonicalization of urls. 87 * 88 * == 1.6.x shipped with format 10 89 * 90 * The bump to 11 cleared the has_props, has_prop_mods, cachable_props, 91 * and present_props values in the entries file. Older clients expect 92 * proper values for these fields. 93 * 94 * The bump to 12 switched from 'entries' to the SQLite database 'wc.db'. 95 * 96 * The bump to 13 added the WORK_QUEUE table into 'wc.db', moved the 97 * wcprops into the 'dav_cache' column in BASE_NODE, and stopped using 98 * the 'incomplete_children' column of BASE_NODE. 99 * 100 * The bump to 14 added the WCLOCKS table (and migrated locks from the 101 * filesystem into wc.db), and some columns to ACTUAL_NODE for future 102 * use. 103 * 104 * The bump to 15 switched from depth='exclude' on directories to using 105 * presence='exclude' within the BASE_NODE and WORKING_NODE tables. 106 * This change also enabled exclude support on files and symlinks. 107 * 108 * The bump to 16 added 'locked_levels' to WC_LOCK, setting any existing 109 * locks to a level of 0. The 'md5_checksum' column was added to PRISTINE 110 * for future use. 111 * 112 * The bump to 17 added a '.svn/pristine' dir and moved the text bases into 113 * the Pristine Store (the PRISTINE table and '.svn/pristine' dir), and 114 * removed the '/.svn/text-base' dir. 115 * 116 * The bump to 18 moved the properties from separate files in the props and 117 * prop-base directory (and .svn for the dir itself) into the wc.db file, 118 * and then removed the props and prop-base dir. 119 * 120 * The bump to 19 introduced the 'single DB' per working copy. All metadata 121 * is held in a single '.svn/wc.db' in the root directory of the working 122 * copy. Bumped in r991236. 123 * 124 * The bump to 20 introduced NODES and drops BASE_NODE and WORKING_NODE, 125 * op_depth is always 0 or 2. Bumped in r1005388. 126 * 127 * The bump to 21 moved tree conflict storage from the parent to the 128 * conflicted node. Bumped in r1034436. 129 * 130 * The bump to 22 moved tree conflict storage from conflict_data column 131 * to the tree_conflict_data column. Bumped in r1040255. 132 * 133 * The bump to 23 introduced multi-layer op_depth processing for NODES. 134 * Bumped in r1044384. 135 * 136 * The bump to 24 started using the 'refcount' column of the PRISTINE table 137 * correctly, instead of always setting it to '1'. Bumped in r1058523. 138 * 139 * The bump to 25 introduced the NODES_CURRENT view. Bumped in r1071283. 140 * 141 * The bump to 26 introduced the NODES_BASE view. Bumped in r1076617. 142 * 143 * The bump to 27 stored conflict files as relpaths rather than basenames. 144 * Bumped in r1089593. 145 * 146 * The bump to 28 converted any remaining references to MD5 checksums 147 * to SHA1 checksums. Bumped in r1095214. 148 * 149 * The bump to 29 renamed the pristine files from '<SHA1>' to '<SHA1>.svn-base' 150 * and introduced the EXTERNALS store. Bumped in r1129286. 151 * 152 * == 1.7.x shipped with format 29 153 * 154 * The bump to 30 switched the conflict storage to a skel inside conflict_data. 155 * Also clears some known invalid state. Bumped in r1387742. 156 * 157 * The bump to 31 added the inherited_props column in the NODES table. 158 * Bumped in r1395109. 159 * 160 * == 1.8.x shipped with format 31 161 * 162 * Please document any further format changes here. 163 */ 164 165#define SVN_WC__VERSION 31 166 167 168/* Formats <= this have no concept of "revert text-base/props". */ 169#define SVN_WC__NO_REVERT_FILES 4 170 171/* A version <= this has wcprops stored in one file per entry. */ 172#define SVN_WC__WCPROPS_MANY_FILES_VERSION 7 173 174/* A version < this can have urls that aren't canonical according to the new 175 rules. See issue #2475. */ 176#define SVN_WC__CHANGED_CANONICAL_URLS 10 177 178/* The format number written to wc-ng working copies so that old clients 179 can recognize them as "newer Subversion"'s working copies. */ 180#define SVN_WC__NON_ENTRIES 12 181#define SVN_WC__NON_ENTRIES_STRING "12\n" 182 183/* A version < this uses the old 'entries' file mechanism. */ 184#define SVN_WC__WC_NG_VERSION 12 185 186/* In this version, the wcprops are "lost" between files and wc.db. We want 187 to ignore them in upgrades. */ 188#define SVN_WC__WCPROPS_LOST 12 189 190/* A version < this has no work queue (see workqueue.h). */ 191#define SVN_WC__HAS_WORK_QUEUE 13 192 193/* While we still have this DB version we should verify if there is 194 sqlite_stat1 table on opening */ 195#define SVN_WC__ENSURE_STAT1_TABLE 31 196 197/* Return a string indicating the released version (or versions) of 198 * Subversion that used WC format number WC_FORMAT, or some other 199 * suitable string if no released version used WC_FORMAT. 200 * 201 * ### It's not ideal to encode this sort of knowledge in this low-level 202 * library. On the other hand, it doesn't need to be updated often and 203 * should be easily found when it does need to be updated. */ 204const char * 205svn_wc__version_string_from_format(int wc_format); 206 207/* Return true iff error E indicates an "is not a working copy" type 208 of error, either because something wasn't a working copy at all, or 209 because it's a working copy from a previous version (in need of 210 upgrade). */ 211#define SVN_WC__ERR_IS_NOT_CURRENT_WC(e) \ 212 ((e->apr_err == SVN_ERR_WC_NOT_WORKING_COPY) || \ 213 (e->apr_err == SVN_ERR_WC_UPGRADE_REQUIRED)) 214 215 216 217/*** Context handling ***/ 218struct svn_wc_context_t 219{ 220 /* The wc_db handle for this working copy. */ 221 svn_wc__db_t *db; 222 223 /* Close the DB when we destroy this context? 224 (This is used inside backward compat wrappers, and should only be 225 modified by the proper create() functions. */ 226 svn_boolean_t close_db_on_destroy; 227 228 /* The state pool for this context. */ 229 apr_pool_t *state_pool; 230}; 231 232/** 233 * Just like svn_wc_context_create(), only use the provided DB to construct 234 * the context. 235 * 236 * Even though DB is not allocated from the same pool at *WC_CTX, it is 237 * expected to remain open throughout the life of *WC_CTX. 238 */ 239svn_error_t * 240svn_wc__context_create_with_db(svn_wc_context_t **wc_ctx, 241 svn_config_t *config, 242 svn_wc__db_t *db, 243 apr_pool_t *result_pool); 244 245 246/*** Committed Queue ***/ 247 248/** 249 * Return the pool associated with QUEUE. (This so we can keep some 250 * deprecated functions that need to peek inside the QUEUE struct in 251 * deprecated.c). 252 */ 253apr_pool_t * 254svn_wc__get_committed_queue_pool(const struct svn_wc_committed_queue_t *queue); 255 256 257/*** Update traversals. ***/ 258 259struct svn_wc_traversal_info_t 260{ 261 /* The pool in which this structure and everything inside it is 262 allocated. */ 263 apr_pool_t *pool; 264 265 /* The before and after values of the SVN_PROP_EXTERNALS property, 266 * for each directory on which that property changed. These have 267 * the same layout as those returned by svn_wc_edited_externals(). 268 * 269 * The hashes, their keys, and their values are allocated in the 270 * above pool. 271 */ 272 apr_hash_t *externals_old; 273 apr_hash_t *externals_new; 274 275 /* The ambient depths of the working copy directories. The keys are 276 working copy paths (as for svn_wc_edited_externals()), the values 277 are the result of svn_depth_to_word(depth_of_each_dir). */ 278 apr_hash_t *depths; 279}; 280 281 282/*** Names and file/dir operations in the administrative area. ***/ 283 284/** The files within the administrative subdir. **/ 285#define SVN_WC__ADM_FORMAT "format" 286#define SVN_WC__ADM_ENTRIES "entries" 287#define SVN_WC__ADM_TMP "tmp" 288#define SVN_WC__ADM_PRISTINE "pristine" 289#define SVN_WC__ADM_NONEXISTENT_PATH "nonexistent-path" 290 291/* The basename of the ".prej" file, if a directory ever has property 292 conflicts. This .prej file will appear *within* the conflicted 293 directory. */ 294#define SVN_WC__THIS_DIR_PREJ "dir_conflicts" 295 296 297/* A few declarations for stuff in util.c. 298 * If this section gets big, move it all out into a new util.h file. */ 299 300/* Ensure that DIR exists. */ 301svn_error_t *svn_wc__ensure_directory(const char *path, apr_pool_t *pool); 302 303 304/* Return a hash keyed by 'const char *' property names and with 305 'svn_string_t *' values built from PROPS (which is an array of 306 pointers to svn_prop_t's) or to NULL if PROPS is NULL or empty. 307 PROPS items which lack a value will be ignored. If PROPS contains 308 multiple properties with the same name, each successive such item 309 reached in a walk from the beginning to the end of the array will 310 overwrite the previous in the returned hash. 311 312 NOTE: While the returned hash will be allocated in RESULT_POOL, the 313 items it holds will share storage with those in PROPS. 314 315 ### This is rather the reverse of svn_prop_hash_to_array(), except 316 ### that function's arrays contains svn_prop_t's, whereas this 317 ### one's contains *pointers* to svn_prop_t's. So much for 318 ### consistency. */ 319apr_hash_t * 320svn_wc__prop_array_to_hash(const apr_array_header_t *props, 321 apr_pool_t *result_pool); 322 323 324/* Set *MODIFIED_P to non-zero if LOCAL_ABSPATH's text is modified with 325 * regard to the base revision, else set *MODIFIED_P to zero. 326 * 327 * If EXACT_COMPARISON is FALSE, translate LOCAL_ABSPATH's EOL 328 * style and keywords to repository-normal form according to its properties, 329 * and compare the result with the text base. 330 * Usually, EXACT_COMPARISON should be FALSE. 331 * 332 * If LOCAL_ABSPATH does not exist, consider it unmodified. If it exists 333 * but is not under revision control (not even scheduled for 334 * addition), return the error SVN_WC_PATH_NOT_FOUND. 335 * 336 * If the text is unmodified and a write-lock is held this function 337 * will ensure that the last-known-unmodified timestamp and 338 * filesize of the file as recorded in DB matches the corresponding 339 * attributes of the actual file. (This is often referred to as 340 * "timestamp repair", and serves to help future unforced is-modified 341 * checks return quickly if the file remains untouched.) 342 */ 343svn_error_t * 344svn_wc__internal_file_modified_p(svn_boolean_t *modified_p, 345 svn_wc__db_t *db, 346 const char *local_abspath, 347 svn_boolean_t exact_comparison, 348 apr_pool_t *scratch_pool); 349 350 351/* Prepare to merge a file content change into the working copy. 352 353 This does not merge properties; see svn_wc__merge_props() for that. 354 This does not necessarily change the file TARGET_ABSPATH on disk; it 355 may instead return work items that will replace the file on disk when 356 they are run. ### Can we be more consistent about this? 357 358 Merge the difference between LEFT_ABSPATH and RIGHT_ABSPATH into 359 TARGET_ABSPATH. 360 361 Set *WORK_ITEMS to the appropriate work queue operations. 362 363 If there are any conflicts, append a conflict description to 364 *CONFLICT_SKEL. (First allocate *CONFLICT_SKEL from RESULT_POOL if 365 it is initially NULL. CONFLICT_SKEL itself must not be NULL.) 366 Also, unless it is considered to be a 'binary' file, mark any 367 conflicts in the text of the file TARGET_ABSPATH using LEFT_LABEL, 368 RIGHT_LABEL and TARGET_LABEL. 369 370 Set *MERGE_OUTCOME to indicate the result. 371 372 When DRY_RUN is true, no actual changes are made to the working copy. 373 374 If DIFF3_CMD is specified, the given external diff3 tool will 375 be used instead of our built in diff3 routines. 376 377 When MERGE_OPTIONS are specified, they are used by the internal 378 diff3 routines, or passed to the external diff3 tool. 379 380 WRI_ABSPATH describes in which working copy information should be 381 retrieved. (Interesting for merging file externals). 382 383 OLD_ACTUAL_PROPS is the set of actual properties before merging; used for 384 detranslating the file before merging. This is necessary because, in 385 the case of updating, the update can have sent new properties, so we 386 cannot simply fetch and use the current actual properties. 387 388 ### Is OLD_ACTUAL_PROPS still necessary, now that we first prepare the 389 content change and property change and then apply them both to 390 the WC together? 391 392 Property changes sent by the update are provided in PROP_DIFF. 393 394 For a complete description, see svn_wc_merge5() for which this is 395 the (loggy) implementation. 396 397 *WORK_ITEMS will be allocated in RESULT_POOL. All temporary allocations 398 will be performed in SCRATCH_POOL. 399*/ 400svn_error_t * 401svn_wc__internal_merge(svn_skel_t **work_items, 402 svn_skel_t **conflict_skel, 403 enum svn_wc_merge_outcome_t *merge_outcome, 404 svn_wc__db_t *db, 405 const char *left_abspath, 406 const char *right_abspath, 407 const char *target_abspath, 408 const char *wri_abspath, 409 const char *left_label, 410 const char *right_label, 411 const char *target_label, 412 apr_hash_t *old_actual_props, 413 svn_boolean_t dry_run, 414 const char *diff3_cmd, 415 const apr_array_header_t *merge_options, 416 const apr_array_header_t *prop_diff, 417 svn_cancel_func_t cancel_func, 418 void *cancel_baton, 419 apr_pool_t *result_pool, 420 apr_pool_t *scratch_pool); 421 422/* A default error handler for svn_wc_walk_entries3(). Returns ERR in 423 all cases. */ 424svn_error_t * 425svn_wc__walker_default_error_handler(const char *path, 426 svn_error_t *err, 427 void *walk_baton, 428 apr_pool_t *pool); 429 430/* Set *EDITOR and *EDIT_BATON to an ambient-depth-based filtering 431 * editor that wraps WRAPPED_EDITOR and WRAPPED_BATON. This is only 432 * required for operations where the requested depth is @c 433 * svn_depth_unknown and the server's editor driver doesn't understand 434 * depth. It is safe for *EDITOR and *EDIT_BATON to start as 435 * WRAPPED_EDITOR and WRAPPED_BATON. 436 * 437 * ANCHOR, TARGET, and DB are as in svn_wc_get_update_editor3. 438 * 439 * @a requested_depth must be one of the following depth values: 440 * @c svn_depth_infinity, @c svn_depth_empty, @c svn_depth_files, 441 * @c svn_depth_immediates, or @c svn_depth_unknown. 442 * 443 * Allocations are done in POOL. 444 */ 445svn_error_t * 446svn_wc__ambient_depth_filter_editor(const svn_delta_editor_t **editor, 447 void **edit_baton, 448 svn_wc__db_t *db, 449 const char *anchor_abspath, 450 const char *target, 451 const svn_delta_editor_t *wrapped_editor, 452 void *wrapped_edit_baton, 453 apr_pool_t *result_pool); 454 455 456/* Similar to svn_wc_conflicted_p3(), but with a wc_db parameter in place of 457 * a wc_context. */ 458svn_error_t * 459svn_wc__internal_conflicted_p(svn_boolean_t *text_conflicted_p, 460 svn_boolean_t *prop_conflicted_p, 461 svn_boolean_t *tree_conflicted_p, 462 svn_wc__db_t *db, 463 const char *local_abspath, 464 apr_pool_t *scratch_pool); 465 466/* Similar to svn_wc__internal_conflicted_p(), but ignores 467 * moved-away-edit tree conflicts. If CONFLICT_IGNORED_P is not NULL 468 * then sets *CONFLICT_IGNORED_P TRUE if a tree-conflict is ignored 469 * and FALSE otherwise. Also ignores text and property conflicts if 470 * TREE_ONLY is TRUE */ 471svn_error_t * 472svn_wc__conflicted_for_update_p(svn_boolean_t *conflicted_p, 473 svn_boolean_t *conflict_ignored_p, 474 svn_wc__db_t *db, 475 const char *local_abspath, 476 svn_boolean_t tree_only, 477 apr_pool_t *scratch_pool); 478 479 480/* Internal version of svn_wc_transmit_text_deltas3(). */ 481svn_error_t * 482svn_wc__internal_transmit_text_deltas(const char **tempfile, 483 const svn_checksum_t **new_text_base_md5_checksum, 484 const svn_checksum_t **new_text_base_sha1_checksum, 485 svn_wc__db_t *db, 486 const char *local_abspath, 487 svn_boolean_t fulltext, 488 const svn_delta_editor_t *editor, 489 void *file_baton, 490 apr_pool_t *result_pool, 491 apr_pool_t *scratch_pool); 492 493/* Internal version of svn_wc_transmit_prop_deltas2(). */ 494svn_error_t * 495svn_wc__internal_transmit_prop_deltas(svn_wc__db_t *db, 496 const char *local_abspath, 497 const svn_delta_editor_t *editor, 498 void *baton, 499 apr_pool_t *scratch_pool); 500 501/* Library-internal version of svn_wc_ensure_adm4(). */ 502svn_error_t * 503svn_wc__internal_ensure_adm(svn_wc__db_t *db, 504 const char *local_abspath, 505 const char *url, 506 const char *repos_root_url, 507 const char *repos_uuid, 508 svn_revnum_t revision, 509 svn_depth_t depth, 510 apr_pool_t *scratch_pool); 511 512 513/* Library-internal version of svn_wc__changelist_match(). */ 514svn_boolean_t 515svn_wc__internal_changelist_match(svn_wc__db_t *db, 516 const char *local_abspath, 517 const apr_hash_t *clhash, 518 apr_pool_t *scratch_pool); 519 520/* Library-internal version of svn_wc_walk_status(), which see. */ 521svn_error_t * 522svn_wc__internal_walk_status(svn_wc__db_t *db, 523 const char *local_abspath, 524 svn_depth_t depth, 525 svn_boolean_t get_all, 526 svn_boolean_t no_ignore, 527 svn_boolean_t ignore_text_mods, 528 const apr_array_header_t *ignore_patterns, 529 svn_wc_status_func4_t status_func, 530 void *status_baton, 531 svn_cancel_func_t cancel_func, 532 void *cancel_baton, 533 apr_pool_t *scratch_pool); 534 535/** A callback invoked by the generic node-walker function. */ 536typedef svn_error_t *(*svn_wc__node_found_func_t)(const char *local_abspath, 537 svn_node_kind_t kind, 538 void *walk_baton, 539 apr_pool_t *scratch_pool); 540 541/* Call @a walk_callback with @a walk_baton for @a local_abspath and all 542 nodes underneath it, restricted by @a walk_depth, and possibly 543 @a changelists. 544 545 If @a show_hidden is true, include hidden nodes, else ignore them. 546 If CHANGELISTS is non-NULL and non-empty, filter thereon. */ 547svn_error_t * 548svn_wc__internal_walk_children(svn_wc__db_t *db, 549 const char *local_abspath, 550 svn_boolean_t show_hidden, 551 const apr_array_header_t *changelists, 552 svn_wc__node_found_func_t walk_callback, 553 void *walk_baton, 554 svn_depth_t walk_depth, 555 svn_cancel_func_t cancel_func, 556 void *cancel_baton, 557 apr_pool_t *scratch_pool); 558 559/* Library-internal version of svn_wc_remove_from_revision_control2, 560 which see.*/ 561svn_error_t * 562svn_wc__internal_remove_from_revision_control(svn_wc__db_t *db, 563 const char *local_abspath, 564 svn_boolean_t destroy_wf, 565 svn_cancel_func_t cancel_func, 566 void *cancel_baton, 567 apr_pool_t *scratch_pool); 568 569/* Internal version of svn_wc__node_get_origin() */ 570svn_error_t * 571svn_wc__internal_get_origin(svn_boolean_t *is_copy, 572 svn_revnum_t *revision, 573 const char **repos_relpath, 574 const char **repos_root_url, 575 const char **repos_uuid, 576 svn_depth_t *depth, 577 const char **copy_root_abspath, 578 svn_wc__db_t *db, 579 const char *local_abspath, 580 svn_boolean_t scan_deleted, 581 apr_pool_t *result_pool, 582 apr_pool_t *scratch_pool); 583 584/* Upgrade the wc sqlite database given in SDB for the wc located at 585 WCROOT_ABSPATH. It's current/starting format is given by START_FORMAT. 586 After the upgrade is complete (to as far as the automatic upgrade will 587 perform), the resulting format is RESULT_FORMAT. All allocations are 588 performed in SCRATCH_POOL. */ 589svn_error_t * 590svn_wc__upgrade_sdb(int *result_format, 591 const char *wcroot_abspath, 592 svn_sqlite__db_t *sdb, 593 int start_format, 594 apr_pool_t *scratch_pool); 595 596/* Create a conflict skel from the old separated data */ 597svn_error_t * 598svn_wc__upgrade_conflict_skel_from_raw(svn_skel_t **conflicts, 599 svn_wc__db_t *db, 600 const char *wri_abspath, 601 const char *local_relpath, 602 const char *conflict_old, 603 const char *conflict_wrk, 604 const char *conflict_new, 605 const char *prej_file, 606 const char *tree_conflict_data, 607 apr_size_t tree_conflict_len, 608 apr_pool_t *result_pool, 609 apr_pool_t *scratch_pool); 610 611svn_error_t * 612svn_wc__wipe_postupgrade(const char *dir_abspath, 613 svn_boolean_t whole_admin, 614 svn_cancel_func_t cancel_func, 615 void *cancel_baton, 616 apr_pool_t *scratch_pool); 617 618/* Ensure LOCAL_ABSPATH is still locked in DB. Returns the error 619 * SVN_ERR_WC_NOT_LOCKED if this is not the case. 620 */ 621svn_error_t * 622svn_wc__write_check(svn_wc__db_t *db, 623 const char *local_abspath, 624 apr_pool_t *scratch_pool); 625 626/* Read into CONFLICTS svn_wc_conflict_description2_t* structs 627 * for all conflicts that have LOCAL_ABSPATH as victim. 628 * 629 * Victim must be versioned or be part of a tree conflict. 630 * 631 * If CREATE_TEMPFILES is TRUE, create temporary files for property conflicts. 632 * 633 * Allocate *CONFLICTS in RESULT_POOL and do temporary allocations in 634 * SCRATCH_POOL 635 */ 636svn_error_t * 637svn_wc__read_conflicts(const apr_array_header_t **conflicts, 638 svn_skel_t **conflict_skel, 639 svn_wc__db_t *db, 640 const char *local_abspath, 641 svn_boolean_t create_tempfiles, 642 svn_boolean_t only_tree_conflict, 643 apr_pool_t *result_pool, 644 apr_pool_t *scratch_pool); 645 646 647/* Perform the actual merge of file changes between an original file, 648 identified by ORIGINAL_CHECKSUM (an empty file if NULL) to a new file 649 identified by NEW_CHECKSUM in the working copy identified by WRI_ABSPATH. 650 651 Merge the result into LOCAL_ABSPATH, which is part of the working copy 652 identified by WRI_ABSPATH. Use OLD_REVISION and TARGET_REVISION for naming 653 the intermediate files. 654 655 Set *FOUND_TEXT_CONFLICT to TRUE when the merge encountered a conflict, 656 otherwise to FALSE. 657 658 The rest of the arguments are passed to svn_wc__internal_merge. 659 */ 660svn_error_t * 661svn_wc__perform_file_merge(svn_skel_t **work_items, 662 svn_skel_t **conflict_skel, 663 svn_boolean_t *found_conflict, 664 svn_wc__db_t *db, 665 const char *local_abspath, 666 const char *wri_abspath, 667 const svn_checksum_t *new_checksum, 668 const svn_checksum_t *original_checksum, 669 apr_hash_t *old_actual_props, 670 const apr_array_header_t *ext_patterns, 671 svn_revnum_t old_revision, 672 svn_revnum_t target_revision, 673 const apr_array_header_t *propchanges, 674 const char *diff3_cmd, 675 svn_cancel_func_t cancel_func, 676 void *cancel_baton, 677 apr_pool_t *result_pool, 678 apr_pool_t *scratch_pool); 679 680 681/* Couple of random helpers for the Ev2 shims. 682 ### These will eventually be obsoleted and removed. */ 683struct svn_wc__shim_fetch_baton_t 684{ 685 svn_wc__db_t *db; 686 const char *base_abspath; 687 svn_boolean_t fetch_base; 688}; 689 690/* Using a BATON of struct shim_fetch_baton, return KIND for PATH. */ 691svn_error_t * 692svn_wc__fetch_kind_func(svn_node_kind_t *kind, 693 void *baton, 694 const char *path, 695 svn_revnum_t base_revision, 696 apr_pool_t *scratch_pool); 697 698/* Using a BATON of struct shim_fetch_baton, return PROPS for PATH. */ 699svn_error_t * 700svn_wc__fetch_props_func(apr_hash_t **props, 701 void *baton, 702 const char *path, 703 svn_revnum_t base_revision, 704 apr_pool_t *result_pool, 705 apr_pool_t *scratch_pool); 706 707/* Using a BATON of struct shim_fetch_baton, return a delta base for PATH. */ 708svn_error_t * 709svn_wc__fetch_base_func(const char **filename, 710 void *baton, 711 const char *path, 712 svn_revnum_t base_revision, 713 apr_pool_t *result_pool, 714 apr_pool_t *scratch_pool); 715 716/* Find duplicate targets in *EXTERNALS, a list of svn_wc_external_item2_t* 717 * elements, and store each target string in *DUPLICATE_TARGETS as const 718 * char * elements. *DUPLICATE_TARGETS will be NULL if no duplicates were 719 * found. */ 720svn_error_t * 721svn_wc__externals_find_target_dups(apr_array_header_t **duplicate_targets, 722 apr_array_header_t *externals, 723 apr_pool_t *pool, 724 apr_pool_t *scratch_pool); 725 726svn_error_t * 727svn_wc__node_has_local_mods(svn_boolean_t *modified, 728 svn_boolean_t *all_edits_are_deletes, 729 svn_wc__db_t *db, 730 const char *local_abspath, 731 svn_boolean_t ignore_unversioned, 732 svn_cancel_func_t cancel_func, 733 void *cancel_baton, 734 apr_pool_t *scratch_pool); 735 736#ifdef __cplusplus 737} 738#endif /* __cplusplus */ 739 740#endif /* SVN_LIBSVN_WC_H */ 741