Subversion
 All Data Structures Files Functions Variables Typedefs Enumerations Enumerator Macros Groups Pages
svn_wc.h
Go to the documentation of this file.
1 /**
2  * @copyright
3  * ====================================================================
4  * Licensed to the Apache Software Foundation (ASF) under one
5  * or more contributor license agreements. See the NOTICE file
6  * distributed with this work for additional information
7  * regarding copyright ownership. The ASF licenses this file
8  * to you under the Apache License, Version 2.0 (the
9  * "License"); you may not use this file except in compliance
10  * with the License. You may obtain a copy of the License at
11  *
12  * http://www.apache.org/licenses/LICENSE-2.0
13  *
14  * Unless required by applicable law or agreed to in writing,
15  * software distributed under the License is distributed on an
16  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17  * KIND, either express or implied. See the License for the
18  * specific language governing permissions and limitations
19  * under the License.
20  * ====================================================================
21  * @endcopyright
22  *
23  * @file svn_wc.h
24  * @brief Subversion's working copy library
25  *
26  * Requires:
27  * - A working copy
28  *
29  * Provides:
30  * - Ability to manipulate working copy's versioned data.
31  * - Ability to manipulate working copy's administrative files.
32  *
33  * Used By:
34  * - Clients.
35  *
36  * Notes:
37  * The 'path' parameters to most of the older functions can be
38  * absolute or relative (relative to current working
39  * directory). If there are any cases where they are
40  * relative to the path associated with the
41  * 'svn_wc_adm_access_t *adm_access' baton passed along with the
42  * path, those cases should be explicitly documented, and if they
43  * are not, please fix it. All new functions introduced since
44  * Subversion 1.7 require absolute paths, unless explicitly
45  * documented otherwise.
46  *
47  * Starting with Subversion 1.7, several arguments are re-ordered
48  * to be more consistent through the api. The common ordering used
49  * is:
50  *
51  * Firsts:
52  * - Output arguments
53  * Then:
54  * - Working copy context
55  * - Local abspath
56  * Followed by:
57  * - Function specific arguments
58  * - Specific callbacks with their batons
59  * Finally:
60  * - Generic callbacks (with baton) from directly functional to
61  * just observing:
62  * - svn_wc_conflict_resolver_func2_t
63  * - svn_wc_external_update_t
64  * - svn_cancel_func_t
65  * - svn_wc_notify_func2_t
66  * - Result pool
67  * - Scratch pool.
68  */
69 
70 #ifndef SVN_WC_H
71 #define SVN_WC_H
72 
73 #include <apr.h>
74 #include <apr_pools.h>
75 #include <apr_tables.h>
76 #include <apr_hash.h>
77 #include <apr_time.h>
78 #include <apr_file_io.h>
79 
80 #include "svn_types.h"
81 #include "svn_string.h"
82 #include "svn_checksum.h"
83 #include "svn_io.h"
84 #include "svn_delta.h" /* for svn_stream_t */
85 #include "svn_opt.h"
86 #include "svn_ra.h" /* for svn_ra_reporter_t type */
87 
88 #ifdef __cplusplus
89 extern "C" {
90 #endif /* __cplusplus */
91 
92 
93 /**
94  * Get libsvn_wc version information.
95  *
96  * @since New in 1.1.
97  */
98 const svn_version_t *
99 svn_wc_version(void);
100 
101 
102 /**
103  * @defgroup svn_wc Working copy management
104  * @{
105  */
106 
107 
108 /** Flags for use with svn_wc_translated_file2() and svn_wc_translated_stream().
109  *
110  * @defgroup translate_flags Translation flags
111  * @{
112  */
113 
114  /** Translate from Normal Form.
115  *
116  * The working copy text bases and repository files are stored
117  * in normal form. Some files' contents - or ever representation -
118  * differs between the working copy and the normal form. This flag
119  * specifies to take the latter form as input and transform it
120  * to the former.
121  *
122  * Either this flag or #SVN_WC_TRANSLATE_TO_NF should be specified,
123  * but not both.
124  */
125 #define SVN_WC_TRANSLATE_FROM_NF 0x00000000
126 
127  /** Translate to Normal Form.
128  *
129  * Either this flag or #SVN_WC_TRANSLATE_FROM_NF should be specified,
130  * but not both.
131  */
132 #define SVN_WC_TRANSLATE_TO_NF 0x00000001
133 
134  /** Force repair of eol styles, making sure the output file consistently
135  * contains the one eol style as specified by the svn:eol-style
136  * property and the required translation direction.
137  *
138  */
139 #define SVN_WC_TRANSLATE_FORCE_EOL_REPAIR 0x00000002
140 
141  /** Don't register a pool cleanup to delete the output file */
142 #define SVN_WC_TRANSLATE_NO_OUTPUT_CLEANUP 0x00000004
143 
144  /** Guarantee a new file is created on successful return.
145  * The default shortcuts translation by returning the path
146  * of the untranslated file when no translation is required.
147  */
148 #define SVN_WC_TRANSLATE_FORCE_COPY 0x00000008
149 
150  /** Use a non-wc-local tmp directory for creating output files,
151  * instead of in the working copy admin tmp area which is the default.
152  *
153  * @since New in 1.4.
154  */
155 #define SVN_WC_TRANSLATE_USE_GLOBAL_TMP 0x00000010
156 
157 /** @} */
158 
159 
160 /**
161  * @defgroup svn_wc_context Working copy context
162  * @{
163  */
164 
165 /** The context for all working copy interactions.
166  *
167  * This is the client-facing datastructure API consumers are required
168  * to create and use when interacting with a working copy. Multiple
169  * contexts can be created for the same working copy simultaneously, within
170  * the same process or different processes. Context mutexing will be handled
171  * internally by the working copy library.
172  *
173  * @note: #svn_wc_context_t should be passed by non-const pointer in all
174  * APIs, even for read-only operations, as it contains mutable data (caching,
175  * etc.).
176  *
177  * @since New in 1.7.
178  */
180 
181 /** Create a context for the working copy, and return it in @a *wc_ctx. This
182  * context is not associated with a particular working copy, but as operations
183  * are performed, will load the appropriate working copy information.
184  *
185  * @a config should hold the various configuration options that may apply to
186  * this context. It should live at least as long as @a result_pool. It may
187  * be @c NULL.
188  *
189  * The context will be allocated in @a result_pool, and will use @a
190  * result_pool for any internal allocations requiring the same longevity as
191  * the context. The context will be automatically destroyed, and its
192  * resources released, when @a result_pool is cleared, or it may be manually
193  * destroyed by invoking svn_wc_context_destroy().
194  *
195  * Use @a scratch_pool for temporary allocations. It may be cleared
196  * immediately upon returning from this function.
197  *
198  * @since New in 1.7.
199  */
200 svn_error_t *
202  const svn_config_t *config,
203  apr_pool_t *result_pool,
204  apr_pool_t *scratch_pool);
205 
206 
207 /** Destroy the working copy context described by @a wc_ctx, releasing any
208  * acquired resources.
209  *
210  * @since New in 1.7.
211  */
212 svn_error_t *
214 
215 
216 /** @} */
217 
218 
219 /**
220  * Locking/Opening/Closing using adm access batons.
221  *
222  * @defgroup svn_wc_adm_access Adm access batons (deprecated)
223  * @{
224  */
225 
226 /** Baton for access to a working copy administrative area.
227  *
228  * Access batons can be grouped into sets, by passing an existing open
229  * baton when opening a new baton. Given one baton in a set, other batons
230  * may be retrieved. This allows an entire hierarchy to be locked, and
231  * then the set of batons can be passed around by passing a single baton.
232  *
233  * @deprecated Provided for backward compatibility with the 1.6 API.
234  * New code should use a #svn_wc_context_t object to access the working
235  * copy.
236  */
238 
239 
240 /**
241  * Return, in @a *adm_access, a pointer to a new access baton for the working
242  * copy administrative area associated with the directory @a path. If
243  * @a write_lock is TRUE the baton will include a write lock, otherwise the
244  * baton can only be used for read access. If @a path refers to a directory
245  * that is already write locked then the error #SVN_ERR_WC_LOCKED will be
246  * returned. The error #SVN_ERR_WC_NOT_DIRECTORY will be returned if
247  * @a path is not a versioned directory.
248  *
249  * If @a associated is an open access baton then @a adm_access will be added
250  * to the set containing @a associated. @a associated can be @c NULL, in
251  * which case @a adm_access is the start of a new set.
252  *
253  * @a levels_to_lock specifies how far to lock. Zero means just the specified
254  * directory. Any negative value means to lock the entire working copy
255  * directory hierarchy under @a path. A positive value indicates the number of
256  * levels of directories to lock -- 1 means just immediate subdirectories, 2
257  * means immediate subdirectories and their subdirectories, etc. All the
258  * access batons will become part of the set containing @a adm_access. This
259  * is an all-or-nothing option, if it is not possible to lock all the
260  * requested directories then an error will be returned and @a adm_access will
261  * be invalid, with the exception that subdirectories of @a path that are
262  * missing from the physical filesystem will not be locked and will not cause
263  * an error. The error #SVN_ERR_WC_LOCKED will be returned if a
264  * subdirectory of @a path is already write locked.
265  *
266  * If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
267  * if the client has canceled the operation.
268  *
269  * @a pool will be used to allocate memory for the baton and any subsequently
270  * cached items. If @a adm_access has not been closed when the pool is
271  * cleared, it will be closed automatically at that point, and removed from
272  * its set. A baton closed in this way will not remove physical locks from
273  * the working copy if cleanup is required.
274  *
275  * The first baton in a set, with @a associated passed as @c NULL, must have
276  * the longest lifetime of all the batons in the set. This implies it must be
277  * the root of the hierarchy.
278  *
279  * @since New in 1.2.
280  * @deprecated Provided for backward compatibility with the 1.6 API.
281  * Callers should use a #svn_wc_context_t object to access the working
282  * copy.
283  */
285 svn_error_t *
287  svn_wc_adm_access_t *associated,
288  const char *path,
289  svn_boolean_t write_lock,
290  int levels_to_lock,
291  svn_cancel_func_t cancel_func,
292  void *cancel_baton,
293  apr_pool_t *pool);
294 
295 /**
296  * Similar to svn_wc_adm_open3(), but without cancellation support.
297  *
298  * @deprecated Provided for backward compatibility with the 1.1 API.
299  */
301 svn_error_t *
303  svn_wc_adm_access_t *associated,
304  const char *path,
305  svn_boolean_t write_lock,
306  int levels_to_lock,
307  apr_pool_t *pool);
308 
309 /**
310  * Similar to svn_wc_adm_open2(), but with @a tree_lock instead of
311  * @a levels_to_lock. @a levels_to_lock is set to -1 if @a tree_lock
312  * is @c TRUE, else 0.
313  *
314  * @deprecated Provided for backward compatibility with the 1.0 API.
315  */
317 svn_error_t *
319  svn_wc_adm_access_t *associated,
320  const char *path,
321  svn_boolean_t write_lock,
322  svn_boolean_t tree_lock,
323  apr_pool_t *pool);
324 
325 /**
326  * Checks the working copy to determine the node type of @a path. If
327  * @a path is a versioned directory then the behaviour is like that of
328  * svn_wc_adm_open3(), otherwise, if @a path is a file or does not
329  * exist, then the behaviour is like that of svn_wc_adm_open3() with
330  * @a path replaced by the parent directory of @a path. If @a path is
331  * an unversioned directory, the behaviour is also like that of
332  * svn_wc_adm_open3() on the parent, except that if the open fails,
333  * then the returned #SVN_ERR_WC_NOT_DIRECTORY error refers to @a path,
334  * not to @a path's parent.
335  *
336  * @since New in 1.2.
337  * @deprecated Provided for backward compatibility with the 1.6 API.
338  * Callers should use a #svn_wc_context_t object to access the working
339  * copy.
340  */
342 svn_error_t *
344  svn_wc_adm_access_t *associated,
345  const char *path,
346  svn_boolean_t write_lock,
347  int levels_to_lock,
348  svn_cancel_func_t cancel_func,
349  void *cancel_baton,
350  apr_pool_t *pool);
351 
352 /**
353  * Similar to svn_wc_adm_probe_open3() without the cancel
354  * functionality.
355  *
356  * @deprecated Provided for backward compatibility with the 1.1 API.
357  */
359 svn_error_t *
361  svn_wc_adm_access_t *associated,
362  const char *path,
363  svn_boolean_t write_lock,
364  int levels_to_lock,
365  apr_pool_t *pool);
366 
367 /**
368  * Similar to svn_wc_adm_probe_open2(), but with @a tree_lock instead of
369  * @a levels_to_lock. @a levels_to_lock is set to -1 if @a tree_lock
370  * is @c TRUE, else 0.
371  *
372  * @deprecated Provided for backward compatibility with the 1.0 API.
373  */
375 svn_error_t *
377  svn_wc_adm_access_t *associated,
378  const char *path,
379  svn_boolean_t write_lock,
380  svn_boolean_t tree_lock,
381  apr_pool_t *pool);
382 
383 /**
384  * Open access batons for @a path and return in @a *anchor_access and
385  * @a *target the anchor and target required to drive an editor. Return
386  * in @a *target_access the access baton for the target, which may be the
387  * same as @a *anchor_access (in which case @a *target is the empty
388  * string, never NULL). All the access batons will be in the
389  * @a *anchor_access set.
390  *
391  * @a levels_to_lock determines the levels_to_lock used when opening
392  * @a path if @a path is a versioned directory, @a levels_to_lock is
393  * ignored otherwise. If @a write_lock is @c TRUE the access batons
394  * will hold write locks.
395  *
396  * If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
397  * if the client has canceled the operation.
398  *
399  * This function is essentially a combination of svn_wc_adm_open3() and
400  * svn_wc_get_actual_target(), with the emphasis on reducing physical IO.
401  *
402  * @since New in 1.2.
403  * @deprecated Provided for backward compatibility with the 1.6 API.
404  * Callers should use a #svn_wc_context_t object to access the working
405  * copy.
406  */
408 svn_error_t *
410  svn_wc_adm_access_t **target_access,
411  const char **target,
412  const char *path,
413  svn_boolean_t write_lock,
414  int levels_to_lock,
415  svn_cancel_func_t cancel_func,
416  void *cancel_baton,
417  apr_pool_t *pool);
418 
419 /** Return, in @a *adm_access, a pointer to an existing access baton associated
420  * with @a path. @a path must be a directory that is locked as part of the
421  * set containing the @a associated access baton.
422  *
423  * If the requested access baton is marked as missing in, or is simply
424  * absent from, @a associated, return #SVN_ERR_WC_NOT_LOCKED.
425  *
426  * @a pool is used only for local processing, it is not used for the batons.
427  *
428  * @deprecated Provided for backward compatibility with the 1.6 API.
429  */
431 svn_error_t *
433  svn_wc_adm_access_t *associated,
434  const char *path,
435  apr_pool_t *pool);
436 
437 /** Check the working copy to determine the node type of @a path. If
438  * @a path is a versioned directory then the behaviour is like that of
439  * svn_wc_adm_retrieve(), otherwise, if @a path is a file, an unversioned
440  * directory, or does not exist, then the behaviour is like that of
441  * svn_wc_adm_retrieve() with @a path replaced by the parent directory of
442  * @a path.
443  *
444  * @deprecated Provided for backward compatibility with the 1.6 API.
445  */
447 svn_error_t *
449  svn_wc_adm_access_t *associated,
450  const char *path,
451  apr_pool_t *pool);
452 
453 /**
454  * Try various ways to obtain an access baton for @a path.
455  *
456  * First, try to obtain @a *adm_access via svn_wc_adm_probe_retrieve(),
457  * but if this fails because @a associated can't give a baton for
458  * @a path or @a path's parent, then try svn_wc_adm_probe_open3(),
459  * this time passing @a write_lock and @a levels_to_lock. If there is
460  * still no access because @a path is not a versioned directory, then
461  * just set @a *adm_access to NULL and return success. But if it is
462  * because @a path is locked, then return the error #SVN_ERR_WC_LOCKED,
463  * and the effect on @a *adm_access is undefined. (Or if the attempt
464  * fails for any other reason, return the corresponding error, and the
465  * effect on @a *adm_access is also undefined.)
466  *
467  * If svn_wc_adm_probe_open3() succeeds, then add @a *adm_access to
468  * @a associated.
469  *
470  * If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
471  * if the client has canceled the operation.
472  *
473  * Use @a pool only for local processing, not to allocate @a *adm_access.
474  *
475  * @since New in 1.2.
476  * @deprecated Provided for backward compatibility with the 1.6 API.
477  */
479 svn_error_t *
481  svn_wc_adm_access_t *associated,
482  const char *path,
483  svn_boolean_t write_lock,
484  int levels_to_lock,
485  svn_cancel_func_t cancel_func,
486  void *cancel_baton,
487  apr_pool_t *pool);
488 
489 /**
490  * Similar to svn_wc_adm_probe_try3() without the cancel
491  * functionality.
492  *
493  * @deprecated Provided for backward compatibility with the 1.1 API.
494  */
496 svn_error_t *
498  svn_wc_adm_access_t *associated,
499  const char *path,
500  svn_boolean_t write_lock,
501  int levels_to_lock,
502  apr_pool_t *pool);
503 
504 /**
505  * Similar to svn_wc_adm_probe_try2(), but with @a tree_lock instead of
506  * @a levels_to_lock. @a levels_to_lock is set to -1 if @a tree_lock
507  * is @c TRUE, else 0.
508  *
509  * @deprecated Provided for backward compatibility with the 1.0 API.
510  */
512 svn_error_t *
514  svn_wc_adm_access_t *associated,
515  const char *path,
516  svn_boolean_t write_lock,
517  svn_boolean_t tree_lock,
518  apr_pool_t *pool);
519 
520 
521 /** Give up the access baton @a adm_access, and its lock if any. This will
522  * recursively close any batons in the same set that are direct
523  * subdirectories of @a adm_access. Any physical locks will be removed from
524  * the working copy. Lock removal is unconditional, there is no check to
525  * determine if cleanup is required.
526  *
527  * Any temporary allocations are performed using @a scratch_pool.
528  *
529  * @since New in 1.6
530  * @deprecated Provided for backward compatibility with the 1.6 API.
531  */
533 svn_error_t *
535  apr_pool_t *scratch_pool);
536 
537 /**
538  * Similar to svn_wc_adm_close2(), but with the internal pool of @a adm_access
539  * used for temporary allocations.
540  *
541  * @deprecated Provided for backward compatibility with the 1.5 API.
542  */
544 svn_error_t *
546 
547 /** Return the path used to open the access baton @a adm_access.
548  *
549  * @deprecated Provided for backward compatibility with the 1.6 API.
550  */
552 const char *
554 
555 /** Return the pool used by access baton @a adm_access.
556  *
557  * @deprecated Provided for backward compatibility with the 1.6 API.
558  */
560 apr_pool_t *
562 
563 /** Return @c TRUE is the access baton @a adm_access has a write lock,
564  * @c FALSE otherwise. Compared to svn_wc_locked() this is a cheap, fast
565  * function that doesn't access the filesystem.
566  *
567  * @deprecated Provided for backward compatibility with the 1.6 API.
568  * New code should use svn_wc_locked2() instead.
569  */
572 svn_wc_adm_locked(const svn_wc_adm_access_t *adm_access);
573 
574 /** @} */
575 
576 
577 /** Gets up to two booleans indicating whether a path is locked for
578  * writing.
579  *
580  * @a locked_here is set to TRUE when a write lock on @a local_abspath
581  * exists in @a wc_ctx. @a locked is set to TRUE when there is a
582  * write_lock on @a local_abspath
583  *
584  * @a locked_here and/or @a locked can be NULL when you are not
585  * interested in a specific value
586  *
587  * @since New in 1.7.
588  */
589 svn_error_t *
590 svn_wc_locked2(svn_boolean_t *locked_here,
591  svn_boolean_t *locked,
592  svn_wc_context_t *wc_ctx,
593  const char *local_abspath,
594  apr_pool_t *scratch_pool);
595 
596 /** Set @a *locked to non-zero if @a path is locked, else set it to zero.
597  *
598  * New code should use svn_wc_locked2() instead.
599  *
600  * @deprecated Provided for backward compatibility with the 1.6 API.
601  */
603 svn_error_t *
605  const char *path,
606  apr_pool_t *pool);
607 
608 
609 /**
610  * @defgroup svn_wc_adm_dir_name Name of Subversion's admin dir
611  * @{
612  */
613 
614 /** The default name of the administrative subdirectory.
615  *
616  * Ideally, this would be completely private to wc internals (in fact,
617  * it used to be that adm_subdir() in adm_files.c was the only function
618  * who knew the adm subdir's name). However, import wants to protect
619  * against importing administrative subdirs, so now the name is a
620  * matter of public record.
621  *
622  * @deprecated Provided for backward compatibility with the 1.2 API.
623  */
624 #define SVN_WC_ADM_DIR_NAME ".svn"
625 
626 
627 /**
628  * Return @c TRUE if @a name is the name of the WC administrative
629  * directory. Use @a pool for any temporary allocations. Only works
630  * with base directory names, not paths or URIs.
631  *
632  * For compatibility, the default name (.svn) will always be treated
633  * as an admin dir name, even if the working copy is actually using an
634  * alternative name.
635  *
636  * @since New in 1.3.
637  */
639 svn_wc_is_adm_dir(const char *name, apr_pool_t *pool);
640 
641 
642 /**
643  * Return the name of the administrative directory.
644  * Use @a pool for any temporary allocations.
645  *
646  * The returned pointer will refer to either a statically allocated
647  * string, or to a string allocated in @a pool.
648  *
649  * @since New in 1.3.
650  */
651 const char *
652 svn_wc_get_adm_dir(apr_pool_t *pool);
653 
654 
655 /**
656  * Use @a name for the administrative directory in the working copy.
657  * Use @a pool for any temporary allocations.
658  *
659  * The list of valid names is limited. Currently only ".svn" (the
660  * default) and "_svn" are allowed.
661  *
662  * @note This function changes global (per-process) state and must be
663  * called in a single-threaded context during the initialization of a
664  * Subversion client.
665  *
666  * @since New in 1.3.
667  */
668 svn_error_t *
669 svn_wc_set_adm_dir(const char *name,
670  apr_pool_t *pool);
671 
672 /** @} */
673 
674 
675 /**
676  * @defgroup svn_wc_externals Externals
677  * @{
678  */
679 
680 /** Callback for external definitions updates
681  *
682  * @a local_abspath is the path on which the external definition was found.
683  * @a old_val and @a new_val are the before and after values of the
684  * SVN_PROP_EXTERNALS property. @a depth is the ambient depth of the
685  * working copy directory at @a local_abspath.
686  *
687  * @since New in 1.7. */
688 typedef svn_error_t *(*svn_wc_external_update_t)(void *baton,
689  const char *local_abspath,
690  const svn_string_t *old_val,
691  const svn_string_t *new_val,
692  svn_depth_t depth,
693  apr_pool_t *scratch_pool);
694 
695 /** Traversal information is information gathered by a working copy
696  * crawl or update. For example, the before and after values of the
697  * svn:externals property are important after an update, and since
698  * we're traversing the working tree anyway (a complete traversal
699  * during the initial crawl, and a traversal of changed paths during
700  * the checkout/update/switch), it makes sense to gather the
701  * property's values then instead of making a second pass.
702  *
703  * New code should use the svn_wc_external_update_t callback instead.
704  *
705  * @deprecated Provided for backward compatibility with the 1.6 API.
706  */
708 
709 
710 /** Return a new, empty traversal info object, allocated in @a pool.
711  *
712  * New code should use the svn_wc_external_update_t callback instead.
713  *
714  * @deprecated Provided for backward compatibility with the 1.6 API.
715  */
718 svn_wc_init_traversal_info(apr_pool_t *pool);
719 
720 /** Set @a *externals_old and @a *externals_new to hash tables representing
721  * changes to values of the svn:externals property on directories
722  * traversed by @a traversal_info.
723  *
724  * @a traversal_info is obtained from svn_wc_init_traversal_info(), but is
725  * only useful after it has been passed through another function, such
726  * as svn_wc_crawl_revisions(), svn_wc_get_update_editor(),
727  * svn_wc_get_switch_editor(), etc.
728  *
729  * Each hash maps <tt>const char *</tt> directory names onto
730  * <tt>const char *</tt> values of the externals property for that directory.
731  * The dir names are full paths -- that is, anchor plus target, not target
732  * alone. The values are not parsed, they are simply copied raw, and are
733  * never NULL: directories that acquired or lost the property are
734  * simply omitted from the appropriate table. Directories whose value
735  * of the property did not change show the same value in each hash.
736  *
737  * The hashes, keys, and values have the same lifetime as @a traversal_info.
738  *
739  * New code should use the svn_wc_external_update_t callback instead.
740  *
741  * @deprecated Provided for backward compatibility with the 1.6 API.
742  */
744 void
745 svn_wc_edited_externals(apr_hash_t **externals_old,
746  apr_hash_t **externals_new,
747  svn_wc_traversal_info_t *traversal_info);
748 
749 
750 /** Set @a *depths to a hash table mapping <tt>const char *</tt>
751  * directory names (directories traversed by @a traversal_info) to
752  * <tt>const char *</tt> values (the depths of those directories, as
753  * converted by svn_depth_to_word()).
754  *
755  * @a traversal_info is obtained from svn_wc_init_traversal_info(), but is
756  * only useful after it has been passed through another function, such
757  * as svn_wc_crawl_revisions(), svn_wc_get_update_editor(),
758  * svn_wc_get_switch_editor(), etc.
759  *
760  * The dir names are full paths -- that is, anchor plus target, not target
761  * alone. The values are not allocated, they are static constant strings.
762  * Although the values are never NULL, not all directories traversed
763  * are necessarily listed. For example, directories which did not
764  * have an svn:externals property set or modified are not included.
765  *
766  * The hashes and keys have the same lifetime as @a traversal_info.
767  *
768  * New code should use the svn_wc_external_update_t callback instead.
769  *
770  * @since New in 1.5.
771  * @deprecated Provided for backward compatibility with the 1.6 API.
772  */
774 void
775 svn_wc_traversed_depths(apr_hash_t **depths,
776  svn_wc_traversal_info_t *traversal_info);
777 
778 
779 /** One external item. This usually represents one line from an
780  * svn:externals description but with the path and URL
781  * canonicalized.
782  *
783  * In order to avoid backwards compatibility problems clients should use
784  * svn_wc_external_item_create() to allocate and initialize this structure
785  * instead of doing so themselves.
786  *
787  * @since New in 1.5.
788  */
790 {
791  /** The name of the subdirectory into which this external should be
792  checked out. This is relative to the parent directory that
793  holds this external item. (Note that these structs are often
794  stored in hash tables with the target dirs as keys, so this
795  field will often be redundant.) */
796  const char *target_dir;
797 
798  /** Where to check out from. */
799  const char *url;
800 
801  /** What revision to check out. The only valid kinds for this are
802  svn_opt_revision_number, svn_opt_revision_date, and
803  svn_opt_revision_head. */
805 
806  /** The peg revision to use when checking out. The only valid kinds are
807  svn_opt_revision_number, svn_opt_revision_date, and
808  svn_opt_revision_head. */
810 
812 
813 /**
814  * Initialize an external item.
815  * Set @a *item to an external item object, allocated in @a pool.
816  *
817  * In order to avoid backwards compatibility problems, this function
818  * is used to initialize and allocate the #svn_wc_external_item2_t
819  * structure rather than doing so explicitly, as the size of this
820  * structure may change in the future.
821  *
822  * The current implementation never returns error, but callers should
823  * still check for error, for compatibility with future versions.
824  *
825  * @since New in 1.5.
826  */
827 svn_error_t *
829  apr_pool_t *pool);
830 
831 /**
832  * Return a duplicate of @a item, allocated in @a pool. No part of the new
833  * item will be shared with @a item.
834  *
835  * @since New in 1.5.
836  */
839  apr_pool_t *pool);
840 
841 /**
842  * One external item. Similar to svn_wc_external_item2_t, except
843  * @a revision is interpreted as both the operational revision and the
844  * peg revision.
845  *
846  * @deprecated Provided for backward compatibility with the 1.4 API.
847  */
849 {
850  /** Same as #svn_wc_external_item2_t.target_dir */
851  const char *target_dir;
852 
853  /** Same as #svn_wc_external_item2_t.url */
854  const char *url;
855 
856  /** Same as #svn_wc_external_item2_t.revision */
858 
860 
861 /**
862  * Return a duplicate of @a item, allocated in @a pool. No part of the new
863  * item will be shared with @a item.
864  *
865  * @since New in 1.3.
866  *
867  * @deprecated Provided for backward compatibility with the 1.4 API.
868  */
872  apr_pool_t *pool);
873 
874 /**
875  * If @a externals_p is non-NULL, set @a *externals_p to an array of
876  * #svn_wc_external_item2_t * objects based on @a desc.
877  *
878  * If the format of @a desc is invalid, don't touch @a *externals_p and
879  * return #SVN_ERR_CLIENT_INVALID_EXTERNALS_DESCRIPTION. Thus, if
880  * you just want to check the validity of an externals description,
881  * and don't care about the parsed result, pass NULL for @a externals_p.
882  *
883  * The format of @a desc is the same as for values of the directory
884  * property #SVN_PROP_EXTERNALS. Look there for more details.
885  *
886  * If @a canonicalize_url is @c TRUE, canonicalize the @a url member
887  * of those objects. If the @a url member refers to an absolute URL,
888  * it will be canonicalized as URL consistent with the way URLs are
889  * canonicalized throughout the Subversion API. If, however, the
890  * @a url member makes use of the recognized (and proprietary)
891  * relative URL syntax, "canonicalization" is a less easily-defined
892  * concept which may even result in munging the relative URL syntax
893  * beyond recognition. You've been warned.
894  *
895  * Allocate the table, keys, and values in @a pool.
896  *
897  * Use @a parent_directory only in constructing error strings.
898  *
899  * @since New in 1.5.
900  */
901 svn_error_t *
902 svn_wc_parse_externals_description3(apr_array_header_t **externals_p,
903  const char *parent_directory,
904  const char *desc,
905  svn_boolean_t canonicalize_url,
906  apr_pool_t *pool);
907 
908 /**
909  * Similar to svn_wc_parse_externals_description3() with @a
910  * canonicalize_url set to @c TRUE, but returns an array of
911  * #svn_wc_external_item_t * objects instead of
912  * #svn_wc_external_item2_t * objects
913  *
914  * @since New in 1.1.
915  *
916  * @deprecated Provided for backward compatibility with the 1.4 API.
917  */
919 svn_error_t *
920 svn_wc_parse_externals_description2(apr_array_header_t **externals_p,
921  const char *parent_directory,
922  const char *desc,
923  apr_pool_t *pool);
924 
925 /**
926  * Similar to svn_wc_parse_externals_description2(), but returns the
927  * parsed externals in a hash instead of an array. This function
928  * should not be used, as storing the externals in a hash causes their
929  * order of evaluation to be not easily identifiable.
930  *
931  * @deprecated Provided for backward compatibility with the 1.0 API.
932  */
934 svn_error_t *
935 svn_wc_parse_externals_description(apr_hash_t **externals_p,
936  const char *parent_directory,
937  const char *desc,
938  apr_pool_t *pool);
939 
940 /** @} */
941 
942 
943 /**
944  * @defgroup svn_wc_notifications Notification callback handling
945  * @{
946  *
947  * In many cases, the WC library will scan a working copy and make
948  * changes. The caller usually wants to know when each of these changes
949  * has been made, so that it can display some kind of notification to
950  * the user.
951  *
952  * These notifications have a standard callback function type, which
953  * takes the path of the file that was affected, and a caller-
954  * supplied baton.
955  *
956  * @note The callback is a 'void' return -- this is a simple
957  * reporting mechanism, rather than an opportunity for the caller to
958  * alter the operation of the WC library.
959  *
960  * @note Some of the actions are used across several
961  * different Subversion commands. For example, the update actions are
962  * also used for checkouts, switches, and merges.
963  */
964 
965 /** The type of action occurring. */
967 {
968  /** Adding a path to revision control. */
970 
971  /** Copying a versioned path. */
973 
974  /** Deleting a versioned path. */
976 
977  /** Restoring a missing path from the pristine text-base. */
979 
980  /** Reverting a modified path. */
982 
983  /** A revert operation has failed. */
985 
986  /** Resolving a conflict. */
988 
989  /** Skipping a path. */
991 
992  /** Got a delete in an update. */
994 
995  /** Got an add in an update. */
997 
998  /** Got any other action in an update. */
1000 
1001  /** The last notification in an update (including updates of externals). */
1003 
1004  /** Updating an external module. */
1006 
1007  /** The last notification in a status (including status on externals). */
1009 
1010  /** Running status on an external module. */
1012 
1013  /** Committing a modification. */
1015 
1016  /** Committing an addition. */
1018 
1019  /** Committing a deletion. */
1021 
1022  /** Committing a replacement. */
1024 
1025  /** Transmitting post-fix text-delta data for a file. */
1027 
1028  /** Processed a single revision's blame. */
1030 
1031  /** Locking a path. @since New in 1.2. */
1033 
1034  /** Unlocking a path. @since New in 1.2. */
1036 
1037  /** Failed to lock a path. @since New in 1.2. */
1039 
1040  /** Failed to unlock a path. @since New in 1.2. */
1042 
1043  /** Tried adding a path that already exists. @since New in 1.5. */
1045 
1046  /** Changelist name set. @since New in 1.5. */
1048 
1049  /** Changelist name cleared. @since New in 1.5. */
1051 
1052  /** Warn user that a path has moved from one changelist to another.
1053  @since New in 1.5.
1054  @deprecated As of 1.7, separate clear and set notifications are sent. */
1056 
1057  /** A merge operation (to path) has begun. See #svn_wc_notify_t.merge_range.
1058  @since New in 1.5. */
1060 
1061  /** A merge operation (to path) from a foreign repository has begun.
1062  See #svn_wc_notify_t.merge_range. @since New in 1.5. */
1064 
1065  /** Replace notification. @since New in 1.5. */
1067 
1068  /** Property added. @since New in 1.6. */
1070 
1071  /** Property updated. @since New in 1.6. */
1073 
1074  /** Property deleted. @since New in 1.6. */
1076 
1077  /** Nonexistent property deleted. @since New in 1.6. */
1079 
1080  /** Revprop set. @since New in 1.6. */
1082 
1083  /** Revprop deleted. @since New in 1.6. */
1085 
1086  /** The last notification in a merge. @since New in 1.6. */
1088 
1089  /** The path is a tree-conflict victim of the intended action (*not*
1090  * a persistent tree-conflict from an earlier operation, but *this*
1091  * operation caused the tree-conflict). @since New in 1.6. */
1093 
1094  /** The path is a subdirectory referenced in an externals definition
1095  * which is unable to be operated on. @since New in 1.6. */
1097 
1098  /** Starting an update operation. @since New in 1.7. */
1100 
1101  /** An update tried to add a file or directory at a path where
1102  * a separate working copy was found. @since New in 1.7. */
1104 
1105  /** An explicit update tried to update a file or directory that
1106  * doesn't live in the repository and can't be brought in.
1107  * @since New in 1.7. */
1109 
1110  /** An update tried to update a file or directory to which access could
1111  * not be obtained. @since New in 1.7. */
1113 
1114  /** An update operation removed an external working copy.
1115  * @since New in 1.7. */
1117 
1118  /** A node below an existing node was added during update.
1119  * @since New in 1.7. */
1121 
1122  /** A node below an exising node was updated during update.
1123  * @since New in 1.7. */
1125 
1126  /** A node below an existing node was deleted during update.
1127  * @since New in 1.7. */
1129 
1130  /** The mergeinfo on path was updated. @since New in 1.7. */
1132 
1133  /** An working copy directory was upgraded to the latest format
1134  * @since New in 1.7. */
1136 
1137  /** Mergeinfo describing a merge was recorded.
1138  * @since New in 1.7. */
1140 
1141  /** Mergeinfo was removed due to elision.
1142  * @since New in 1.7. */
1144 
1145  /** A file in the working copy was patched.
1146  * @since New in 1.7. */
1148 
1149  /** A hunk from a patch was applied.
1150  * @since New in 1.7. */
1152 
1153  /** A hunk from a patch was rejected.
1154  * @since New in 1.7. */
1156 
1157  /** A hunk from a patch was found to already be applied.
1158  * @since New in 1.7. */
1160 
1161  /** Committing a non-overwriting copy (path is the target of the
1162  * copy, not the source).
1163  * @since New in 1.7. */
1165 
1166  /** Committing an overwriting (replace) copy (path is the target of
1167  * the copy, not the source).
1168  * @since New in 1.7. */
1170 
1171  /** The server has instructed the client to follow a URL
1172  * redirection.
1173  * @since New in 1.7. */
1175 
1176  /** The operation was attempted on a path which doesn't exist.
1177  * @since New in 1.7. */
1179 
1180  /** Removing a path by excluding it.
1181  * @since New in 1.7. */
1183 
1184  /** Operation failed because the node remains in conflict
1185  * @since New in 1.7. */
1187 
1188  /** Operation failed because an added node is missing
1189  * @since New in 1.7. */
1191 
1192  /** Operation failed because a node is out of date
1193  * @since New in 1.7. */
1195 
1196  /** Operation failed because an added parent is not selected
1197  * @since New in 1.7. */
1199 
1200  /** Operation failed because a node is locked by another user and/or
1201  * working copy. @since New in 1.7. */
1203 
1204  /** Operation failed because the operation was forbidden by the server.
1205  * @since New in 1.7. */
1207 
1208  /** The operation skipped the path because it was conflicted.
1209  * @since New in 1.7. */
1211 
1213 
1214 
1215 /** The type of notification that is occurring. */
1217 {
1218  svn_wc_notify_state_inapplicable = 0,
1219 
1220  /** Notifier doesn't know or isn't saying. */
1222 
1223  /** The state did not change. */
1225 
1226  /** The item wasn't present. */
1228 
1229  /** An unversioned item obstructed work. */
1231 
1232  /** Pristine state was modified. */
1234 
1235  /** Modified state had mods merged in. */
1237 
1238  /** Modified state got conflicting mods. */
1240 
1241  /** The source to copy the file from is missing. */
1243 
1245 
1246 /**
1247  * What happened to a lock during an operation.
1248  *
1249  * @since New in 1.2.
1250  */
1252 {
1253  svn_wc_notify_lock_state_inapplicable = 0,
1254 
1255  svn_wc_notify_lock_state_unknown,
1256 
1257  /** The lock wasn't changed. */
1259 
1260  /** The item was locked. */
1262 
1263  /** The item was unlocked. */
1265 
1267 
1268 /**
1269  * Structure used in the #svn_wc_notify_func2_t function.
1270  *
1271  * @c kind, @c content_state, @c prop_state and @c lock_state are from
1272  * after @c action, not before.
1273  *
1274  * @note If @c action is #svn_wc_notify_update (### what?), then @c path has
1275  * already been installed, so it is legitimate for an implementation of
1276  * #svn_wc_notify_func2_t to examine @c path in the working copy.
1277  *
1278  * @note The purpose of the @c kind, @c mime_type, @c content_state, and
1279  * @c prop_state fields is to provide "for free" information that an
1280  * implementation is likely to want, and which it would otherwise be
1281  * forced to deduce via expensive operations such as reading entries
1282  * and properties. However, if the caller does not have this
1283  * information, it will simply pass the corresponding `*_unknown'
1284  * values, and it is up to the implementation how to handle that
1285  * (i.e., whether to attempt deduction, or just to punt and
1286  * give a less informative notification).
1287  *
1288  * @note Callers of notification functions should use svn_wc_create_notify()
1289  * or svn_wc_create_notify_url() to create structures of this type to allow
1290  * for extensibility.
1291  *
1292  * @since New in 1.2.
1293  */
1294 typedef struct svn_wc_notify_t {
1295 
1296  /** Path, either absolute or relative to the current working directory
1297  * (i.e., not relative to an anchor). @c path is "." or another valid path
1298  * value for compatibility reasons when the real target is an url that
1299  * is available in @c url. */
1300  const char *path;
1301 
1302  /** Action that describes what happened to #svn_wc_notify_t.path. */
1304 
1305  /** Node kind of @c path. */
1307 
1308  /** If non-NULL, indicates the mime-type of @c path.
1309  * It is always @c NULL for directories. */
1310  const char *mime_type;
1311 
1312  /** Points to the lock structure received from the repository when
1313  * @c action is #svn_wc_notify_locked. For other actions, it is
1314  * @c NULL. */
1316 
1317  /** Points to an error describing the reason for the failure when @c
1318  * action is one of the following: #svn_wc_notify_failed_lock,
1319  * #svn_wc_notify_failed_unlock, #svn_wc_notify_failed_external.
1320  * Is @c NULL otherwise. */
1322 
1323  /** The type of notification that is occurring about node content. */
1325 
1326  /** The type of notification that is occurring about node properties. */
1328 
1329  /** Reflects the addition or removal of a lock token in the working copy. */
1331 
1332  /** When @c action is #svn_wc_notify_update_completed, target revision
1333  * of the update, or #SVN_INVALID_REVNUM if not available; when @c
1334  * action is #svn_wc_notify_blame_revision, processed revision; Since
1335  * Subversion 1.7 when action is #svn_wc_notify_update_update or
1336  * #svn_wc_notify_update_add, the target revision.
1337  * In all other cases, it is #SVN_INVALID_REVNUM.
1338  */
1340 
1341  /** If @c action pertains to a changelist, this is the changelist name.
1342  * In all other cases, it is @c NULL. @since New in 1.5 */
1343  const char *changelist_name;
1344 
1345  /** When @c action is #svn_wc_notify_merge_begin, and both the
1346  * left and right sides of the merge are from the same URL. In all
1347  * other cases, it is @c NULL. @since New in 1.5 */
1349 
1350  /** Similar to @c path, but if non-NULL the notification is about a url.
1351  * @since New in 1.6 */
1352  const char *url;
1353 
1354  /** If non-NULL, specifies an absolute path prefix that can be subtracted
1355  * from the start of the absolute path in @c path or @c url. Its purpose
1356  * is to allow notification to remove a common prefix from all the paths
1357  * displayed for an operation. @since New in 1.6 */
1358  const char *path_prefix;
1359 
1360  /** If @c action relates to properties, specifies the name of the property.
1361  * @since New in 1.6 */
1362  const char *prop_name;
1363 
1364  /** If @c action is #svn_wc_notify_blame_revision, contains a list of
1365  * revision properties for the specified revision
1366  * @since New in 1.6 */
1367  apr_hash_t *rev_props;
1368 
1369  /** If @c action is #svn_wc_notify_update_update or
1370  * #svn_wc_notify_update_add, contains the revision before the update.
1371  * In all other cases, it is #SVN_INVALID_REVNUM.
1372  * @since New in 1.7 */
1374 
1375  /** These fields are used by svn patch to identify the
1376  * hunk the notification is for. They are line-based
1377  * offsets and lengths parsed from the unidiff hunk header.
1378  * @since New in 1.7. */
1379  /* @{ */
1381  svn_linenum_t hunk_original_length;
1382  svn_linenum_t hunk_modified_start;
1383  svn_linenum_t hunk_modified_length;
1384  /* @} */
1385 
1386  /** The line at which a hunk was matched (and applied).
1387  * @since New in 1.7. */
1389 
1390  /** The fuzz factor the hunk was applied with.
1391  * @since New in 1.7 */
1393 
1394  /* NOTE: Add new fields at the end to preserve binary compatibility.
1395  Also, if you add fields here, you have to update svn_wc_create_notify
1396  and svn_wc_dup_notify. */
1397 } svn_wc_notify_t;
1398 
1399 /**
1400  * Allocate an #svn_wc_notify_t structure in @a pool, initialize and return
1401  * it.
1402  *
1403  * Set the @c path field of the created struct to @a path, and @c action to
1404  * @a action. Set all other fields to their @c _unknown, @c NULL or
1405  * invalid value, respectively. Make only a shallow copy of the pointer
1406  * @a path.
1407  *
1408  * @since New in 1.2.
1409  */
1411 svn_wc_create_notify(const char *path,
1412  svn_wc_notify_action_t action,
1413  apr_pool_t *pool);
1414 
1415 /**
1416  * Allocate an #svn_wc_notify_t structure in @a pool, initialize and return
1417  * it.
1418  *
1419  * Set the @c url field of the created struct to @a url, @c path to "." and @c
1420  * action to @a action. Set all other fields to their @c _unknown, @c NULL or
1421  * invalid value, respectively. Make only a shallow copy of the pointer
1422  * @a url.
1423  *
1424  * @since New in 1.6.
1425  */
1427 svn_wc_create_notify_url(const char *url,
1428  svn_wc_notify_action_t action,
1429  apr_pool_t *pool);
1430 
1431 /**
1432  * Return a deep copy of @a notify, allocated in @a pool.
1433  *
1434  * @since New in 1.2.
1435  */
1437 svn_wc_dup_notify(const svn_wc_notify_t *notify,
1438  apr_pool_t *pool);
1439 
1440 /**
1441  * Notify the world that @a notify->action has happened to @a notify->path.
1442  *
1443  * Recommendation: callers of #svn_wc_notify_func2_t should avoid
1444  * invoking it multiple times on the same path within a given
1445  * operation, and implementations should not bother checking for such
1446  * duplicate calls. For example, in an update, the caller should not
1447  * invoke the notify func on receiving a prop change and then again
1448  * on receiving a text change. Instead, wait until all changes have
1449  * been received, and then invoke the notify func once (from within
1450  * an #svn_delta_editor_t's close_file(), for example), passing
1451  * the appropriate @a notify->content_state and @a notify->prop_state flags.
1452  *
1453  * @since New in 1.2.
1454  */
1455 typedef void (*svn_wc_notify_func2_t)(void *baton,
1456  const svn_wc_notify_t *notify,
1457  apr_pool_t *pool);
1458 
1459 /**
1460  * Similar to #svn_wc_notify_func2_t, but takes the information as arguments
1461  * instead of struct fields.
1462  *
1463  * @deprecated Provided for backward compatibility with the 1.1 API.
1464  */
1465 typedef void (*svn_wc_notify_func_t)(void *baton,
1466  const char *path,
1467  svn_wc_notify_action_t action,
1468  svn_node_kind_t kind,
1469  const char *mime_type,
1470  svn_wc_notify_state_t content_state,
1471  svn_wc_notify_state_t prop_state,
1472  svn_revnum_t revision);
1473 
1474 /** @} */
1475 
1476 
1477 /**
1478  * Interactive conflict handling
1479  *
1480  * @defgroup svn_wc_conflict Conflict callback functionality
1481  * @{
1482  *
1483  * This API gives a Subversion client application the opportunity to
1484  * define a callback that allows the user to resolve conflicts
1485  * interactively during updates and merges.
1486  *
1487  * If a conflict is discovered, libsvn_wc invokes the callback with an
1488  * #svn_wc_conflict_description_t. This structure describes the
1489  * path in conflict, whether it's a text or property conflict, and may
1490  * also present up to three files that can be used to resolve the
1491  * conflict (perhaps by launching an editor or 3rd-party merging
1492  * tool). The structure also provides a possible fourth file (@c
1493  * merged_file) which, if not NULL, represents libsvn_wc's attempt to
1494  * contextually merge the first three files. (Note that libsvn_wc
1495  * will not attempt to merge a file that it believes is binary, and it
1496  * will only attempt to merge property values it believes to be a
1497  * series of multi-line text.)
1498  *
1499  * When the callback is finished interacting with the user, it
1500  * responds by returning a #svn_wc_conflict_result_t. This
1501  * structure indicates whether the user wants to postpone the conflict
1502  * for later (allowing libsvn_wc to mark the path "conflicted" as
1503  * usual), or whether the user wants libsvn_wc to use one of the four
1504  * files as the "final" state for resolving the conflict immediately.
1505  *
1506  * Note that the callback is at liberty (and encouraged) to merge the
1507  * three files itself. If it does so, it signals this to libsvn_wc by
1508  * returning a choice of #svn_wc_conflict_choose_merged. To return
1509  * the 'final' merged file to libsvn_wc, the callback has the option of
1510  * either:
1511  *
1512  * - editing the original @c merged_file in-place
1513  *
1514  * or, if libsvn_wc never supplied a merged_file in the
1515  * description structure (i.e. passed NULL for that field),
1516  *
1517  * - return the merged file in the #svn_wc_conflict_result_t.
1518  *
1519  */
1520 
1521 /** The type of action being attempted on an object.
1522  *
1523  * @since New in 1.5.
1524  */
1526 {
1527  svn_wc_conflict_action_edit, /**< attempting to change text or props */
1528  svn_wc_conflict_action_add, /**< attempting to add object */
1529  svn_wc_conflict_action_delete, /**< attempting to delete object */
1530  svn_wc_conflict_action_replace /**< attempting to replace object,
1531  @since New in 1.7 */
1533 
1534 
1535 /** The pre-existing condition which is causing a state of conflict.
1536  *
1537  * @since New in 1.5.
1538  */
1540 {
1541  /** Local edits are already present */
1543  /** Another object is in the way */
1545  /** Object is already schedule-delete */
1547  /** Object is unknown or missing */
1549  /** Object is unversioned */
1551  /** Object is already added or schedule-add. @since New in 1.6. */
1553  /** Object is already replaced. @since New in 1.7. */
1555 
1557 
1558 
1559 /** The type of conflict being described by an
1560  * #svn_wc_conflict_description2_t (see below).
1561  *
1562  * @since New in 1.5.
1563  */
1565 {
1566  /** textual conflict (on a file) */
1568  /** property conflict (on a file or dir) */
1570  /** tree conflict (on a dir) @since New in 1.6. */
1573 
1574 
1575 /** The user operation that exposed a conflict.
1576  *
1577  * @since New in 1.6.
1578  */
1580 {
1581  svn_wc_operation_none = 0,
1582  svn_wc_operation_update,
1583  svn_wc_operation_switch,
1584  svn_wc_operation_merge
1585 
1587 
1588 
1589 /** Info about one of the conflicting versions of a node. Each field may
1590  * have its respective null/invalid/unknown value if the corresponding
1591  * information is not relevant or not available.
1592  *
1593  * @todo Consider making some or all of the info mandatory, to reduce
1594  * complexity.
1595  *
1596  * @note Fields may be added to the end of this structure in future
1597  * versions. Therefore, to preserve binary compatibility, users
1598  * should not directly allocate structures of this type.
1599  *
1600  * @see svn_wc_conflict_version_create()
1601  * @see svn_wc_conflict_version_dup()
1602  *
1603  * @since New in 1.6.
1604 */
1606 {
1607  /** @name Where to find this node version in a repository */
1608  /**@{*/
1609 
1610  /** URL of repository root */
1611  const char *repos_url;
1612 
1613  /** revision at which to look up path_in_repos */
1615 
1616  /** path within repos; must not start with '/' */
1617  const char *path_in_repos;
1618  /* @todo We may decide to add the repository UUID, to handle conflicts
1619  * properly during a repository move. */
1620  /** @} */
1621 
1622  /** Info about this node */
1623  svn_node_kind_t node_kind; /* note that 'none' is a legitimate value */
1624 
1625  /* @todo Add metadata about a local copy of the node, if and when
1626  * we store one. */
1627 
1628  /* Remember to update svn_wc_conflict_version_create() and
1629  * svn_wc_conflict_version_dup() in case you add fields to this struct. */
1631 
1632 /**
1633  * Allocate an #svn_wc_conflict_version_t structure in @a pool,
1634  * initialize to contain a conflict origin, and return it.
1635  *
1636  * Set the @c repos_url field of the created struct to @a repos_url, the
1637  * @c path_in_repos field to @a path_in_repos, the @c peg_rev field to
1638  * @a peg_rev and the the @c node_kind to @c node_kind. Make only shallow
1639  * copies of the pointer arguments.
1640  *
1641  * @since New in 1.6.
1642  */
1644 svn_wc_conflict_version_create(const char *repos_url,
1645  const char *path_in_repos,
1646  svn_revnum_t peg_rev,
1647  svn_node_kind_t node_kind,
1648  apr_pool_t *pool);
1649 
1650 /** Return a duplicate of @a version, allocated in @a pool.
1651  * No part of the new version will be shared with @a version.
1652  *
1653  * @since New in 1.6.
1654  */
1657  apr_pool_t *pool);
1658 
1659 /** A struct that describes a conflict that has occurred in the
1660  * working copy.
1661  *
1662  * The conflict described by this structure is one of:
1663  * - a conflict on the content of the file node @a local_abspath
1664  * - a conflict on the property @a property_name of @a local_abspath
1665  * - a tree conflict, of which @a local_abspath is the victim
1666  * Be aware that the victim of a tree conflict can be a non-existent node.
1667  * The three kinds of conflict are distinguished by @a kind.
1668  *
1669  * @note Fields may be added to the end of this structure in future
1670  * versions. Therefore, to preserve binary compatibility, users
1671  * should not directly allocate structures of this type but should use
1672  * svn_wc_create_conflict_description_text2() or
1673  * svn_wc_create_conflict_description_prop2() or
1674  * svn_wc_create_conflict_description_tree2() instead.
1675  *
1676  * @since New in 1.7.
1677  */
1679 {
1680  /** The path that is in conflict (for a tree conflict, it is the victim) */
1681  const char *local_abspath;
1682 
1683  /** The node type of the path being operated on (for a tree conflict,
1684  * ### which version?) */
1686 
1687  /** What sort of conflict are we describing? */
1689 
1690  /** The name of the property whose conflict is being described.
1691  * (Only if @a kind is 'property'; else undefined.) */
1692  const char *property_name;
1693 
1694  /** Whether svn thinks ('my' version of) @c path is a 'binary' file.
1695  * (Only if @c kind is 'text', else undefined.) */
1697 
1698  /** The svn:mime-type property of ('my' version of) @c path, if available,
1699  * else NULL.
1700  * (Only if @c kind is 'text', else undefined.) */
1701  const char *mime_type;
1702 
1703  /** The action being attempted on the conflicted node or property.
1704  * (When @c kind is 'text', this action must be 'edit'.) */
1706 
1707  /** The state of the target node or property, relative to its merge-left
1708  * source, that is the reason for the conflict.
1709  * (When @c kind is 'text', this reason must be 'edited'.) */
1711 
1712  /** If this is text-conflict and involves the merging of two files
1713  * descended from a common ancestor, here are the paths of up to
1714  * four fulltext files that can be used to interactively resolve the
1715  * conflict.
1716  *
1717  * @a base_abspath, @a their_abspath and @a my_abspath are absolute
1718  * paths.
1719  *
1720  * ### Is @a merged_file relative to some directory, or absolute?
1721  *
1722  * All four files will be in repository-normal form -- LF
1723  * line endings and contracted keywords. (If any of these files are
1724  * not available, they default to NULL.)
1725  *
1726  * On the other hand, if this is a property-conflict, then these
1727  * paths represent temporary files that contain the three different
1728  * property-values in conflict. The fourth path (@c merged_file)
1729  * may or may not be NULL; if set, it represents libsvn_wc's
1730  * attempt to merge the property values together. (Remember that
1731  * property values are technically binary values, and thus can't
1732  * always be merged.)
1733  */
1734  const char *base_abspath; /* common ancestor of the two files being merged */
1735 
1736  /** their version of the file */
1737  /* ### BH: For properties this field contains the reference to
1738  the property rejection (.prej) file */
1739  const char *their_abspath;
1740 
1741  /** my locally-edited version of the file */
1742  const char *my_abspath;
1743 
1744  /** merged version; may contain conflict markers */
1745  const char *merged_file;
1746 
1747  /** The operation that exposed the conflict.
1748  * Used only for tree conflicts.
1749  */
1751 
1752  /** Info on the "merge-left source" or "older" version of incoming change. */
1754 
1755  /** Info on the "merge-right source" or "their" version of incoming change. */
1757 
1758  /* Remember to adjust svn_wc__conflict_description_dup()
1759  * if you add new fields to this struct. */
1761 
1762 
1763 /** Similar to #svn_wc_conflict_description2_t, but with relative paths and
1764  * adm_access batons. Passed to #svn_wc_conflict_resolver_func_t.
1765  *
1766  * @since New in 1.5.
1767  * @deprecated Provided for backward compatibility with the 1.6 API.
1768  */
1770 {
1771  /** The path that is in conflict (for a tree conflict, it is the victim) */
1772  const char *path;
1773 
1774  /** The node type of the path being operated on (for a tree conflict,
1775  * ### which version?) */
1777 
1778  /** What sort of conflict are we describing? */
1780 
1781  /** The name of the property whose conflict is being described.
1782  * (Only if @a kind is 'property'; else undefined.) */
1783  const char *property_name;
1784 
1785  /** Whether svn thinks ('my' version of) @c path is a 'binary' file.
1786  * (Only if @c kind is 'text', else undefined.) */
1788 
1789  /** The svn:mime-type property of ('my' version of) @c path, if available,
1790  * else NULL.
1791  * (Only if @c kind is 'text', else undefined.) */
1792  const char *mime_type;
1793 
1794  /** If not NULL, an open working copy access baton to either the
1795  * path itself (if @c path is a directory), or to the parent
1796  * directory (if @c path is a file.)
1797  * For a tree conflict, this will always be an access baton
1798  * to the parent directory of the path, even if the path is
1799  * a directory. */
1801 
1802  /** The action being attempted on the conflicted node or property.
1803  * (When @c kind is 'text', this action must be 'edit'.) */
1805 
1806  /** The state of the target node or property, relative to its merge-left
1807  * source, that is the reason for the conflict.
1808  * (When @c kind is 'text', this reason must be 'edited'.) */
1810 
1811  /** If this is text-conflict and involves the merging of two files
1812  * descended from a common ancestor, here are the paths of up to
1813  * four fulltext files that can be used to interactively resolve the
1814  * conflict. All four files will be in repository-normal form -- LF
1815  * line endings and contracted keywords. (If any of these files are
1816  * not available, they default to NULL.)
1817  *
1818  * On the other hand, if this is a property-conflict, then these
1819  * paths represent temporary files that contain the three different
1820  * property-values in conflict. The fourth path (@c merged_file)
1821  * may or may not be NULL; if set, it represents libsvn_wc's
1822  * attempt to merge the property values together. (Remember that
1823  * property values are technically binary values, and thus can't
1824  * always be merged.)
1825  */
1826  const char *base_file; /* common ancestor of the two files being merged */
1827 
1828  /** their version of the file */
1829  const char *their_file;
1830 
1831  /** my locally-edited version of the file */
1832  const char *my_file;
1833 
1834  /** merged version; may contain conflict markers */
1835  const char *merged_file;
1836 
1837  /** The operation that exposed the conflict.
1838  * Used only for tree conflicts.
1839  *
1840  * @since New in 1.6.
1841  */
1843 
1844  /** Info on the "merge-left source" or "older" version of incoming change.
1845  * @since New in 1.6. */
1847 
1848  /** Info on the "merge-right source" or "their" version of incoming change.
1849  * @since New in 1.6. */
1851 
1852  /* Remember to adjust svn_wc__conflict_description_dup()
1853  * if you add new fields to this struct. */
1855 
1856 /**
1857  * Allocate an #svn_wc_conflict_description_t structure in @a result_pool,
1858  * initialize to represent a text conflict, and return it.
1859  *
1860  * Set the @c local_abspath field of the created struct to @a local_abspath
1861  * (which must be an absolute path), the @c kind field to
1862  * #svn_wc_conflict_kind_text, the @c node_kind to #svn_node_file,
1863  * the @c action to #svn_wc_conflict_action_edit, and the @c reason to
1864  * #svn_wc_conflict_reason_edited.
1865  *
1866  * @note It is the caller's responsibility to set the other required fields
1867  * (such as the four file names and @c mime_type and @c is_binary).
1868  *
1869  * @since New in 1.7.
1870  */
1872 svn_wc_conflict_description_create_text2(const char *local_abspath,
1873  apr_pool_t *result_pool);
1874 
1875 
1876 /** Similar to svn_wc_conflict_description_create_text2(), but returns
1877  * a #svn_wc_conflict_description_t *.
1878  *
1879  * @since New in 1.6.
1880  * @deprecated Provided for backward compatibility with the 1.6 API.
1881  */
1885  svn_wc_adm_access_t *adm_access,
1886  apr_pool_t *pool);
1887 
1888 /**
1889  * Allocate an #svn_wc_conflict_description_t structure in @a result_pool,
1890  * initialize to represent a property conflict, and return it.
1891  *
1892  * Set the @c local_abspath field of the created struct to @a local_abspath
1893  * (which must be an absolute path), the @c kind field
1894  * to #svn_wc_conflict_kind_prop, the @c node_kind to @a node_kind, and
1895  * the @c property_name to @a property_name.
1896  *
1897  * @note: It is the caller's responsibility to set the other required fields
1898  * (such as the four file names and @c action and @c reason).
1899  *
1900  * @since New in 1.7.
1901  */
1903 svn_wc_conflict_description_create_prop2(const char *local_abspath,
1904  svn_node_kind_t node_kind,
1905  const char *property_name,
1906  apr_pool_t *result_pool);
1907 
1908 /** Similar to svn_wc_conflict_descriptor_create_prop(), but returns
1909  * a #svn_wc_conflict_description_t *.
1910  *
1911  * @since New in 1.6.
1912  * @deprecated Provided for backward compatibility with the 1.6 API.
1913  */
1917  svn_wc_adm_access_t *adm_access,
1918  svn_node_kind_t node_kind,
1919  const char *property_name,
1920  apr_pool_t *pool);
1921 
1922 /**
1923  * Allocate an #svn_wc_conflict_description_t structure in @a pool,
1924  * initialize to represent a tree conflict, and return it.
1925  *
1926  * Set the @c local_abspath field of the created struct to @a local_abspath
1927  * (which must be an absolute path), the @c kind field to
1928  * #svn_wc_conflict_kind_tree, the @c node_kind to @a node_kind, the @c
1929  * operation to @a operation, the @c src_left_version field to
1930  * @a src_left_version, and the @c src_right_version field to
1931  * @a src_right_version.
1932  *
1933  * @note: It is the caller's responsibility to set the other required fields
1934  * (such as the four file names and @c action and @c reason).
1935  *
1936  * @since New in 1.7.
1937  */
1940  const char *local_abspath,
1941  svn_node_kind_t node_kind,
1942  svn_wc_operation_t operation,
1943  const svn_wc_conflict_version_t *src_left_version,
1944  const svn_wc_conflict_version_t *src_right_version,
1945  apr_pool_t *result_pool);
1946 
1947 
1948 /** Similar to svn_wc_conflict_description_create_tree(), but returns
1949  * a #svn_wc_conflict_description_t *.
1950  *
1951  * @since New in 1.6.
1952  * @deprecated Provided for backward compatibility with the 1.6 API.
1953  */
1957  const char *path,
1958  svn_wc_adm_access_t *adm_access,
1959  svn_node_kind_t node_kind,
1960  svn_wc_operation_t operation,
1961  /* non-const */ svn_wc_conflict_version_t *src_left_version,
1962  /* non-const */ svn_wc_conflict_version_t *src_right_version,
1963  apr_pool_t *pool);
1964 
1965 
1966 /** Return a duplicate of @a conflict, allocated in @a result_pool.
1967  * A deep copy of all members will be made.
1968  *
1969  * @since New in 1.7.
1970  */
1973  const svn_wc_conflict_description2_t *conflict,
1974  apr_pool_t *result_pool);
1975 
1976 
1977 /** The way in which the conflict callback chooses a course of action.
1978  *
1979  * @since New in 1.5.
1980  */
1982 {
1983  /** Don't resolve the conflict now. Let libsvn_wc mark the path
1984  'conflicted', so user can run 'svn resolved' later. */
1986 
1987  /** If there were files to choose from, select one as a way of
1988  resolving the conflict here and now. libsvn_wc will then do the
1989  work of "installing" the chosen file.
1990  */
1991  svn_wc_conflict_choose_base, /**< original version */
1992  svn_wc_conflict_choose_theirs_full, /**< incoming version */
1994  svn_wc_conflict_choose_theirs_conflict, /**< incoming (for conflicted hunks) */
1995  svn_wc_conflict_choose_mine_conflict, /**< own (for conflicted hunks) */
1996  svn_wc_conflict_choose_merged /**< merged version */
1997 
1999 
2000 
2001 /** The final result returned by #svn_wc_conflict_resolver_func_t.
2002  *
2003  * @note Fields may be added to the end of this structure in future
2004  * versions. Therefore, to preserve binary compatibility, users
2005  * should not directly allocate structures of this type. Instead,
2006  * construct this structure using svn_wc_create_conflict_result()
2007  * below.
2008  *
2009  * @since New in 1.5.
2010  */
2012 {
2013  /** A choice to either delay the conflict resolution or select a
2014  particular file to resolve the conflict. */
2016 
2017  /** If not NULL, this is a path to a file which contains the client's
2018  (or more likely, the user's) merging of the three values in
2019  conflict. libsvn_wc accepts this file if (and only if) @c choice
2020  is set to #svn_wc_conflict_choose_merged.*/
2021  const char *merged_file;
2022 
2023  /** If true, save a backup copy of merged_file (or the original
2024  merged_file from the conflict description, if merged_file is
2025  NULL) in the user's working copy. */
2027 
2029 
2030 
2031 /**
2032  * Allocate an #svn_wc_conflict_result_t structure in @a pool,
2033  * initialize and return it.
2034  *
2035  * Set the @c choice field of the structure to @a choice, and @c
2036  * merged_file to @a merged_file. Set all other fields to their @c
2037  * _unknown, @c NULL or invalid value, respectively. Make only a shallow
2038  * copy of the pointer argument @a merged_file.
2039  *
2040  * @since New in 1.5.
2041  */
2044  const char *merged_file,
2045  apr_pool_t *pool);
2046 
2047 
2048 /** A callback used in merge, update and switch for resolving conflicts
2049  * during the application of a tree delta to a working copy.
2050  *
2051  * @a description describes the exact nature of the conflict, and
2052  * provides information to help resolve it. @a baton is a closure
2053  * object; it should be provided by the implementation, and passed by
2054  * the caller. When finished, the callback signals its resolution by
2055  * returning a structure in @a *result, which should be allocated in
2056  * @a result_pool. (See #svn_wc_conflict_result_t.) @a scratch_pool
2057  * should be used for any temporary allocations.
2058  *
2059  * The values #svn_wc_conflict_choose_mine_conflict and
2060  * #svn_wc_conflict_choose_theirs_conflict are not legal for conflicts
2061  * in binary files or properties.
2062  *
2063  * Implementations of this callback are free to present the conflict
2064  * using any user interface. This may include simple contextual
2065  * conflicts in a file's text or properties, or more complex
2066  * 'tree'-based conflicts related to obstructed additions, deletions,
2067  * and edits. The callback implementation is free to decide which
2068  * sorts of conflicts to handle; it's also free to decide which types
2069  * of conflicts are automatically resolvable and which require user
2070  * interaction.
2071  *
2072  * @since New in 1.7.
2073  */
2074 typedef svn_error_t *(*svn_wc_conflict_resolver_func2_t)(
2075  svn_wc_conflict_result_t **result,
2076  const svn_wc_conflict_description2_t *description,
2077  void *baton,
2078  apr_pool_t *result_pool,
2079  apr_pool_t *scratch_pool);
2080 
2081 
2082 /** Similar to #svn_wc_conflict_resolver_func2_t, but using
2083  * #svn_wc_conflict_description_t instead of
2084  * #svn_wc_conflict_description2_t
2085  *
2086  * @since New in 1.5.
2087  * @deprecated Provided for backward compatibility with the 1.6 API.
2088  */
2089 typedef svn_error_t *(*svn_wc_conflict_resolver_func_t)(
2090  svn_wc_conflict_result_t **result,
2091  const svn_wc_conflict_description_t *description,
2092  void *baton,
2093  apr_pool_t *pool);
2094 
2095 /** @} */
2096 
2097 
2098 
2099 /**
2100  * A callback vtable invoked by our diff-editors, as they receive diffs
2101  * from the server. 'svn diff' and 'svn merge' implement their own versions
2102  * of this vtable.
2103  *
2104  * Common parameters:
2105  *
2106  * If @a state is non-NULL, set @a *state to the state of the item
2107  * after the operation has been performed. (In practice, this is only
2108  * useful with merge, not diff; diff callbacks will probably set
2109  * @a *state to #svn_wc_notify_state_unknown, since they do not change
2110  * the state and therefore do not bother to know the state after the
2111  * operation.) By default, @a state refers to the item's content
2112  * state. Functions concerned with property state have separate
2113  * @a contentstate and @a propstate arguments.
2114  *
2115  * If @a tree_conflicted is non-NULL, set @a *tree_conflicted to true if
2116  * this operation caused a tree conflict, else to false. (Like with @a
2117  * state, this is only useful with merge, not diff; diff callbacks
2118  * should set this to false.)
2119  *
2120  * @since New in 1.7.
2121  */
2123 {
2124  /**
2125  * This function is called before @a file_changed to allow callbacks to
2126  * skip the most expensive processing of retrieving the file data.
2127  *
2128  */
2129  svn_error_t *(*file_opened)(svn_boolean_t *tree_conflicted,
2130  svn_boolean_t *skip,
2131  const char *path,
2132  svn_revnum_t rev,
2133  void *diff_baton,
2134  apr_pool_t *scratch_pool);
2135 
2136  /**
2137  * A file @a path has changed. If @a tmpfile2 is non-NULL, the
2138  * contents have changed and those changes can be seen by comparing
2139  * @a tmpfile1 and @a tmpfile2, which represent @a rev1 and @a rev2 of
2140  * the file, respectively.
2141  *
2142  * If known, the @c svn:mime-type value of each file is passed into
2143  * @a mimetype1 and @a mimetype2; either or both of the values can
2144  * be NULL. The implementor can use this information to decide if
2145  * (or how) to generate differences.
2146  *
2147  * @a propchanges is an array of (#svn_prop_t) structures. If it contains
2148  * any elements, the original list of properties is provided in
2149  * @a originalprops, which is a hash of #svn_string_t values, keyed on the
2150  * property name.
2151  *
2152  */
2153  svn_error_t *(*file_changed)(svn_wc_notify_state_t *contentstate,
2154  svn_wc_notify_state_t *propstate,
2155  svn_boolean_t *tree_conflicted,
2156  const char *path,
2157  const char *tmpfile1,
2158  const char *tmpfile2,
2159  svn_revnum_t rev1,
2160  svn_revnum_t rev2,
2161  const char *mimetype1,
2162  const char *mimetype2,
2163  const apr_array_header_t *propchanges,
2164  apr_hash_t *originalprops,
2165  void *diff_baton,
2166  apr_pool_t *scratch_pool);
2167 
2168  /**
2169  * A file @a path was added. The contents can be seen by comparing
2170  * @a tmpfile1 and @a tmpfile2, which represent @a rev1 and @a rev2
2171  * of the file, respectively. (If either file is empty, the rev
2172  * will be 0.)
2173  *
2174  * If known, the @c svn:mime-type value of each file is passed into
2175  * @a mimetype1 and @a mimetype2; either or both of the values can
2176  * be NULL. The implementor can use this information to decide if
2177  * (or how) to generate differences.
2178  *
2179  * @a propchanges is an array of (#svn_prop_t) structures. If it contains
2180  * any elements, the original list of properties is provided in
2181  * @a originalprops, which is a hash of #svn_string_t values, keyed on the
2182  * property name.
2183  * If @a copyfrom_path is non-@c NULL, this add has history (i.e., is a
2184  * copy), and the origin of the copy may be recorded as
2185  * @a copyfrom_path under @a copyfrom_revision.
2186  */
2187  svn_error_t *(*file_added)(svn_wc_notify_state_t *contentstate,
2188  svn_wc_notify_state_t *propstate,
2189  svn_boolean_t *tree_conflicted,
2190  const char *path,
2191  const char *tmpfile1,
2192  const char *tmpfile2,
2193  svn_revnum_t rev1,
2194  svn_revnum_t rev2,
2195  const char *mimetype1,
2196  const char *mimetype2,
2197  const char *copyfrom_path,
2198  svn_revnum_t copyfrom_revision,
2199  const apr_array_header_t *propchanges,
2200  apr_hash_t *originalprops,
2201  void *diff_baton,
2202  apr_pool_t *scratch_pool);
2203 
2204  /**
2205  * A file @a path was deleted. The [loss of] contents can be seen by
2206  * comparing @a tmpfile1 and @a tmpfile2. @a originalprops provides
2207  * the properties of the file.
2208  * ### Some existing callers include WC "entry props" in @a originalprops.
2209  *
2210  * If known, the @c svn:mime-type value of each file is passed into
2211  * @a mimetype1 and @a mimetype2; either or both of the values can
2212  * be NULL. The implementor can use this information to decide if
2213  * (or how) to generate differences.
2214  */
2215  svn_error_t *(*file_deleted)(svn_wc_notify_state_t *state,
2216  svn_boolean_t *tree_conflicted,
2217  const char *path,
2218  const char *tmpfile1,
2219  const char *tmpfile2,
2220  const char *mimetype1,
2221  const char *mimetype2,
2222  apr_hash_t *originalprops,
2223  void *diff_baton,
2224  apr_pool_t *scratch_pool);
2225 
2226  /**
2227  * A directory @a path was deleted.
2228  */
2229  svn_error_t *(*dir_deleted)(svn_wc_notify_state_t *state,
2230  svn_boolean_t *tree_conflicted,
2231  const char *path,
2232  void *diff_baton,
2233  apr_pool_t *scratch_pool);
2234  /**
2235  * A directory @a path has been opened. @a rev is the revision that the
2236  * directory came from.
2237  *
2238  * This function is called for any existing directory @a path before any
2239  * of the callbacks are called for a child of @a path.
2240  *
2241  * If the callback returns @c TRUE in @a *skip_children, children
2242  * of this directory will be skipped.
2243  */
2244  svn_error_t *(*dir_opened)(svn_boolean_t *tree_conflicted,
2245  svn_boolean_t *skip,
2246  svn_boolean_t *skip_children,
2247  const char *path,
2248  svn_revnum_t rev,
2249  void *diff_baton,
2250  apr_pool_t *scratch_pool);
2251 
2252  /**
2253  * A directory @a path was added. @a rev is the revision that the
2254  * directory came from.
2255  *
2256  * This function is called for any new directory @a path before any
2257  * of the callbacks are called for a child of @a path.
2258  *
2259  * If @a copyfrom_path is non-@c NULL, this add has history (i.e., is a
2260  * copy), and the origin of the copy may be recorded as
2261  * @a copyfrom_path under @a copyfrom_revision.
2262  */
2263  svn_error_t *(*dir_added)(svn_wc_notify_state_t *state,
2264  svn_boolean_t *tree_conflicted,
2265  svn_boolean_t *skip,
2266  svn_boolean_t *skip_children,
2267  const char *path,
2268  svn_revnum_t rev,
2269  const char *copyfrom_path,
2270  svn_revnum_t copyfrom_revision,
2271  void *diff_baton,
2272  apr_pool_t *scratch_pool);
2273 
2274  /**
2275  * A list of property changes (@a propchanges) was applied to the
2276  * directory @a path.
2277  *
2278  * The array is a list of (#svn_prop_t) structures.
2279  *
2280  * @a dir_was_added is set to #TRUE if the directory was added, and
2281  * to #FALSE if the directory pre-existed.
2282  */
2283  svn_error_t *(*dir_props_changed)(svn_wc_notify_state_t *propstate,
2284  svn_boolean_t *tree_conflicted,
2285  const char *path,
2286  svn_boolean_t dir_was_added,
2287  const apr_array_header_t *propchanges,
2288  apr_hash_t *original_props,
2289  void *diff_baton,
2290  apr_pool_t *scratch_pool);
2291 
2292  /**
2293  * A directory @a path which has been opened with @a dir_opened or @a
2294  * dir_added has been closed.
2295  *
2296  * @a dir_was_added is set to #TRUE if the directory was added, and
2297  * to #FALSE if the directory pre-existed.
2298  */
2299  svn_error_t *(*dir_closed)(svn_wc_notify_state_t *contentstate,
2300  svn_wc_notify_state_t *propstate,
2301  svn_boolean_t *tree_conflicted,
2302  const char *path,
2303  svn_boolean_t dir_was_added,
2304  void *diff_baton,
2305  apr_pool_t *scratch_pool);
2306 
2308 
2309 
2310 /**
2311  * Similar to #svn_wc_diff_callbacks4_t, but without @a copyfrom_path and
2312  * @a copyfrom_revision arguments to @c file_added and @c dir_added functions.
2313  *
2314  * @since New in 1.6.
2315  * @deprecated Provided for backward compatibility with the 1.6 API.
2316  */
2318 {
2319  /** The same as #svn_wc_diff_callbacks4_t.file_changed. */
2320  svn_error_t *(*file_changed)(svn_wc_adm_access_t *adm_access,
2321  svn_wc_notify_state_t *contentstate,
2322  svn_wc_notify_state_t *propstate,
2323  svn_boolean_t *tree_conflicted,
2324  const char *path,
2325  const char *tmpfile1,
2326  const char *tmpfile2,
2327  svn_revnum_t rev1,
2328  svn_revnum_t rev2,
2329  const char *mimetype1,
2330  const char *mimetype2,
2331  const apr_array_header_t *propchanges,
2332  apr_hash_t *originalprops,
2333  void *diff_baton);
2334 
2335  /** Similar to #svn_wc_diff_callbacks4_t.file_added but without
2336  * @a copyfrom_path and @a copyfrom_revision arguments. */
2337  svn_error_t *(*file_added)(svn_wc_adm_access_t *adm_access,
2338  svn_wc_notify_state_t *contentstate,
2339  svn_wc_notify_state_t *propstate,
2340  svn_boolean_t *tree_conflicted,
2341  const char *path,
2342  const char *tmpfile1,
2343  const char *tmpfile2,
2344  svn_revnum_t rev1,
2345  svn_revnum_t rev2,
2346  const char *mimetype1,
2347  const char *mimetype2,
2348  const apr_array_header_t *propchanges,
2349  apr_hash_t *originalprops,
2350  void *diff_baton);
2351 
2352  /** The same as #svn_wc_diff_callbacks4_t.file_deleted. */
2353  svn_error_t *(*file_deleted)(svn_wc_adm_access_t *adm_access,
2354  svn_wc_notify_state_t *state,
2355  svn_boolean_t *tree_conflicted,
2356  const char *path,
2357  const char *tmpfile1,
2358  const char *tmpfile2,
2359  const char *mimetype1,
2360  const char *mimetype2,
2361  apr_hash_t *originalprops,
2362  void *diff_baton);
2363 
2364  /** Similar to #svn_wc_diff_callbacks4_t.dir_added but without
2365  * @a copyfrom_path and @a copyfrom_revision arguments. */
2366  svn_error_t *(*dir_added)(svn_wc_adm_access_t *adm_access,
2367  svn_wc_notify_state_t *state,
2368  svn_boolean_t *tree_conflicted,
2369  const char *path,
2370  svn_revnum_t rev,
2371  void *diff_baton);
2372 
2373  /** The same as #svn_wc_diff_callbacks4_t.dir_deleted. */
2374  svn_error_t *(*dir_deleted)(svn_wc_adm_access_t *adm_access,
2375  svn_wc_notify_state_t *state,
2376  svn_boolean_t *tree_conflicted,
2377  const char *path,
2378  void *diff_baton);
2379 
2380  /** The same as #svn_wc_diff_callbacks4_t.dir_props_changed. */
2381  svn_error_t *(*dir_props_changed)(svn_wc_adm_access_t *adm_access,
2382  svn_wc_notify_state_t *propstate,
2383  svn_boolean_t *tree_conflicted,
2384  const char *path,
2385  const apr_array_header_t *propchanges,
2386  apr_hash_t *original_props,
2387  void *diff_baton);
2388 
2389  /** The same as #svn_wc_diff_callbacks4_t.dir_opened. */
2390  svn_error_t *(*dir_opened)(svn_wc_adm_access_t *adm_access,
2391  svn_boolean_t *tree_conflicted,
2392  const char *path,
2393  svn_revnum_t rev,
2394  void *diff_baton);
2395 
2396  /** The same as #svn_wc_diff_callbacks4_t.dir_closed. */
2397  svn_error_t *(*dir_closed)(svn_wc_adm_access_t *adm_access,
2398  svn_wc_notify_state_t *contentstate,
2399  svn_wc_notify_state_t *propstate,
2400  svn_boolean_t *tree_conflicted,
2401  const char *path,
2402  void *diff_baton);
2403 
2405 
2406 /**
2407  * Similar to #svn_wc_diff_callbacks3_t, but without the @c dir_opened
2408  * and @c dir_closed functions, and without the @a tree_conflicted argument
2409  * to the functions.
2410  *
2411  * @deprecated Provided for backward compatibility with the 1.2 API.
2412  */
2414 {
2415  /** The same as @c file_changed in #svn_wc_diff_callbacks3_t. */
2416  svn_error_t *(*file_changed)(svn_wc_adm_access_t *adm_access,
2417  svn_wc_notify_state_t *contentstate,
2418  svn_wc_notify_state_t *propstate,
2419  const char *path,
2420  const char *tmpfile1,
2421  const char *tmpfile2,
2422  svn_revnum_t rev1,
2423  svn_revnum_t rev2,
2424  const char *mimetype1,
2425  const char *mimetype2,
2426  const apr_array_header_t *propchanges,
2427  apr_hash_t *originalprops,
2428  void *diff_baton);
2429 
2430  /** The same as @c file_added in #svn_wc_diff_callbacks3_t. */
2431  svn_error_t *(*file_added)(svn_wc_adm_access_t *adm_access,
2432  svn_wc_notify_state_t *contentstate,
2433  svn_wc_notify_state_t *propstate,
2434  const char *path,
2435  const char *tmpfile1,
2436  const char *tmpfile2,
2437  svn_revnum_t rev1,
2438  svn_revnum_t rev2,
2439  const char *mimetype1,
2440  const char *mimetype2,
2441  const apr_array_header_t *propchanges,
2442  apr_hash_t *originalprops,
2443  void *diff_baton);
2444 
2445  /** The same as @c file_deleted in #svn_wc_diff_callbacks3_t. */
2446  svn_error_t *(*file_deleted)(svn_wc_adm_access_t *adm_access,
2447  svn_wc_notify_state_t *state,
2448  const char *path,
2449  const char *tmpfile1,
2450  const char *tmpfile2,
2451  const char *mimetype1,
2452  const char *mimetype2,
2453  apr_hash_t *originalprops,
2454  void *diff_baton);
2455 
2456  /** The same as @c dir_added in #svn_wc_diff_callbacks3_t. */
2457  svn_error_t *(*dir_added)(svn_wc_adm_access_t *adm_access,
2458  svn_wc_notify_state_t *state,
2459  const char *path,
2460  svn_revnum_t rev,
2461  void *diff_baton);
2462 
2463  /** The same as @c dir_deleted in #svn_wc_diff_callbacks3_t. */
2464  svn_error_t *(*dir_deleted)(svn_wc_adm_access_t *adm_access,
2465  svn_wc_notify_state_t *state,
2466  const char *path,
2467  void *diff_baton);
2468 
2469  /** The same as @c dir_props_changed in #svn_wc_diff_callbacks3_t. */
2470  svn_error_t *(*dir_props_changed)(svn_wc_adm_access_t *adm_access,
2471  svn_wc_notify_state_t *state,
2472  const char *path,
2473  const apr_array_header_t *propchanges,
2474  apr_hash_t *original_props,
2475  void *diff_baton);
2476 
2478 
2479 /**
2480  * Similar to #svn_wc_diff_callbacks2_t, but with file additions/content
2481  * changes and property changes split into different functions.
2482  *
2483  * @deprecated Provided for backward compatibility with the 1.1 API.
2484  */
2486 {
2487  /** Similar to @c file_changed in #svn_wc_diff_callbacks2_t, but without
2488  * property change information. @a tmpfile2 is never NULL. @a state applies
2489  * to the file contents. */
2490  svn_error_t *(*file_changed)(svn_wc_adm_access_t *adm_access,
2491  svn_wc_notify_state_t *state,
2492  const char *path,
2493  const char *tmpfile1,
2494  const char *tmpfile2,
2495  svn_revnum_t rev1,
2496  svn_revnum_t rev2,
2497  const char *mimetype1,
2498  const char *mimetype2,
2499  void *diff_baton);
2500 
2501  /** Similar to @c file_added in #svn_wc_diff_callbacks2_t, but without
2502  * property change information. @a *state applies to the file contents. */
2503  svn_error_t *(*file_added)(svn_wc_adm_access_t *adm_access,
2504  svn_wc_notify_state_t *state,
2505  const char *path,
2506  const char *tmpfile1,
2507  const char *tmpfile2,
2508  svn_revnum_t rev1,
2509  svn_revnum_t rev2,
2510  const char *mimetype1,
2511  const char *mimetype2,
2512  void *diff_baton);
2513 
2514  /** Similar to @c file_deleted in #svn_wc_diff_callbacks2_t, but without
2515  * the properties. */
2516  svn_error_t *(*file_deleted)(svn_wc_adm_access_t *adm_access,
2517  svn_wc_notify_state_t *state,
2518  const char *path,
2519  const char *tmpfile1,
2520  const char *tmpfile2,
2521  const char *mimetype1,
2522  const char *mimetype2,
2523  void *diff_baton);
2524 
2525  /** The same as @c dir_added in #svn_wc_diff_callbacks2_t. */
2526  svn_error_t *(*dir_added)(svn_wc_adm_access_t *adm_access,
2527  svn_wc_notify_state_t *state,
2528  const char *path,
2529  svn_revnum_t rev,
2530  void *diff_baton);
2531 
2532  /** The same as @c dir_deleted in #svn_wc_diff_callbacks2_t. */
2533  svn_error_t *(*dir_deleted)(svn_wc_adm_access_t *adm_access,
2534  svn_wc_notify_state_t *state,
2535  const char *path,
2536  void *diff_baton);
2537 
2538  /** Similar to @c dir_props_changed in #svn_wc_diff_callbacks2_t, but this
2539  * function is called for files as well as directories. */
2540  svn_error_t *(*props_changed)(svn_wc_adm_access_t *adm_access,
2541  svn_wc_notify_state_t *state,
2542  const char *path,
2543  const apr_array_header_t *propchanges,
2544  apr_hash_t *original_props,
2545  void *diff_baton);
2546 
2548 
2549 
2550 /* Asking questions about a working copy. */
2551 
2552 /** Set @a *wc_format to @a local_abspath's working copy format version
2553  * number if @a local_abspath is a valid working copy directory, else set it
2554  * to 0.
2555  *
2556  * Return error @c APR_ENOENT if @a local_abspath does not exist at all.
2557  *
2558  * @since New in 1.7.
2559  */
2560 svn_error_t *
2561 svn_wc_check_wc2(int *wc_format,
2562  svn_wc_context_t *wc_ctx,
2563  const char *local_abspath,
2564  apr_pool_t *scratch_pool);
2565 
2566 /**
2567  * Similar to svn_wc_check_wc2(), but with a relative path and no supplied
2568  * working copy context.
2569  *
2570  * @deprecated Provided for backward compatibility with the 1.6 API.
2571  */
2573 svn_error_t *
2574 svn_wc_check_wc(const char *path,
2575  int *wc_format,
2576  apr_pool_t *pool);
2577 
2578 
2579 /** Set @a *has_binary_prop to @c TRUE iff @a path has been marked
2580  * with a property indicating that it is non-text (in other words, binary).
2581  * @a adm_access is an access baton set that contains @a path.
2582  *
2583  * @deprecated Provided for backward compatibility with the 1.6 API. As a
2584  * replacement for this functionality, @see svn_mime_type_is_binary and
2585  * #SVN_PROP_MIME_TYPE.
2586  */
2588 svn_error_t *
2589 svn_wc_has_binary_prop(svn_boolean_t *has_binary_prop,
2590  const char *path,
2591  svn_wc_adm_access_t *adm_access,
2592  apr_pool_t *pool);
2593 
2594 
2595 /* Detecting modification. */
2596 
2597 /** Set @a *modified_p to non-zero if @a local_abspath's text is modified
2598  * with regard to the base revision, else set @a *modified_p to zero.
2599  * @a local_abspath is the absolute path to the file.
2600  *
2601  * If @a force_comparison is @c TRUE, this function will not allow
2602  * early return mechanisms that avoid actual content comparison.
2603  * Instead, if there is a text base, a full byte-by-byte comparison
2604  * will be done, and the entry checksum verified as well. (This means
2605  * that if the text base is much longer than the working file, every
2606  * byte of the text base will still be examined.)
2607  *
2608  * If @a local_abspath does not exist, consider it unmodified. If it exists
2609  * but is not under revision control (not even scheduled for
2610  * addition), return the error #SVN_ERR_ENTRY_NOT_FOUND.
2611  *
2612  * @since New in 1.7.
2613  */
2614 svn_error_t *
2616  svn_wc_context_t *wc_ctx,
2617  const char *local_abspath,
2618  svn_boolean_t force_comparison,
2619  apr_pool_t *scratch_pool);
2620 
2621 /** Similar to svn_wc_text_modified_p2(), but with a relative path and
2622  * adm_access baton?
2623  *
2624  * @deprecated Provided for backward compatibility with the 1.6 API.
2625  */
2627 svn_error_t *
2629  const char *filename,
2630  svn_boolean_t force_comparison,
2631  svn_wc_adm_access_t *adm_access,
2632  apr_pool_t *pool);
2633 
2634 /** Set @a *modified_p to non-zero if @a path's properties are modified
2635  * with regard to the base revision, else set @a modified_p to zero.
2636  * @a adm_access must be an access baton for @a path.
2637  *
2638  * @since New in 1.7.
2639  */
2640 svn_error_t *
2642  svn_wc_context_t *wc_ctx,
2643  const char *local_abspath,
2644  apr_pool_t *scratch_pool);
2645 
2646 /** Similar to svn_wc_props_modified_p2(), but with a relative path and
2647  * adm_access baton.
2648  *
2649  * @deprecated Provided for backward compatibility with the 1.6 API.
2650  */
2652 svn_error_t *
2654  const char *path,
2655  svn_wc_adm_access_t *adm_access,
2656  apr_pool_t *pool);
2657 
2658 
2659 /**
2660  * @defgroup svn_wc_entries Entries and status (deprecated)
2661  * @{
2662  */
2663 
2664 /** The schedule states an entry can be in.
2665  * @deprecated Provided for backward compatibility with the 1.6 API. */
2666 typedef enum svn_wc_schedule_t
2667 {
2668  /** Nothing special here */
2670 
2671  /** Slated for addition */
2673 
2674  /** Slated for deletion */
2676 
2677  /** Slated for replacement (delete + add) */
2679 
2681 
2682 
2683 /**
2684  * Values for the working_size field in svn_wc_entry_t
2685  * when it isn't set to the actual size value of the unchanged
2686  * working file.
2687  *
2688  * The value of the working size is unknown (hasn't been
2689  * calculated and stored in the past for whatever reason).
2690  *
2691  * @since New in 1.5
2692  * @deprecated Provided for backward compatibility with the 1.6 API.
2693  */
2694 #define SVN_WC_ENTRY_WORKING_SIZE_UNKNOWN (-1)
2695 
2696 /** A working copy entry -- that is, revision control information about
2697  * one versioned entity.
2698  *
2699  * @deprecated Provided for backward compatibility with the 1.6 API.
2700  */
2701 /* SVN_DEPRECATED */
2702 typedef struct svn_wc_entry_t
2703 {
2704  /* IMPORTANT: If you extend this structure, add new fields to the end. */
2705 
2706  /* General Attributes */
2707 
2708  /** entry's name */
2709  const char *name;
2710 
2711  /** base revision */
2713 
2714  /** url in repository */
2715  const char *url;
2716 
2717  /** canonical repository URL or NULL if not known */
2718  const char *repos;
2719 
2720  /** repository uuid */
2721  const char *uuid;
2722 
2723  /** node kind (file, dir, ...) */
2725 
2726  /* State information */
2727 
2728  /** scheduling (add, delete, replace ...) */
2730 
2731  /** in a copied state (possibly because the entry is a child of a
2732  * path that is #svn_wc_schedule_add or #svn_wc_schedule_replace,
2733  * when the entry itself is #svn_wc_schedule_normal).
2734  * COPIED is true for nodes under a directory that was copied, but
2735  * COPYFROM_URL is null there. They are both set for the root
2736  * destination of the copy.
2737  */
2739 
2740  /** The directory containing this entry had a versioned child of this
2741  * name, but this entry represents a different revision or a switched
2742  * path at which no item exists in the repository. This typically
2743  * arises from committing or updating to a deletion of this entry
2744  * without committing or updating the parent directory.
2745  *
2746  * The schedule can be 'normal' or 'add'. */
2748 
2749  /** absent -- we know an entry of this name exists, but that's all
2750  (usually this happens because of authz restrictions) */
2752 
2753  /** for THIS_DIR entry, implies whole entries file is incomplete */
2755 
2756  /** copyfrom location */
2757  const char *copyfrom_url;
2758 
2759  /** copyfrom revision */
2761 
2762  /** old version of conflicted file. A file basename, relative to the
2763  * user's directory that the THIS_DIR entry refers to. */
2764  const char *conflict_old;
2765 
2766  /** new version of conflicted file. A file basename, relative to the
2767  * user's directory that the THIS_DIR entry refers to. */
2768  const char *conflict_new;
2769 
2770  /** working version of conflicted file. A file basename, relative to the
2771  * user's directory that the THIS_DIR entry refers to. */
2772  const char *conflict_wrk;
2773 
2774  /** property reject file. A file basename, relative to the user's
2775  * directory that the THIS_DIR entry refers to. */
2776  const char *prejfile;
2777 
2778  /** last up-to-date time for text contents (0 means no information available)
2779  */
2780  apr_time_t text_time;
2781 
2782  /** last up-to-date time for properties (0 means no information available)
2783  *
2784  * @deprecated This value will always be 0 in version 1.4 and later.
2785  */
2786  apr_time_t prop_time;
2787 
2788  /** Hex MD5 checksum for the untranslated text base file,
2789  * can be @c NULL for backwards compatibility.
2790  */
2791  const char *checksum;
2792 
2793  /* "Entry props" */
2794 
2795  /** last revision this was changed */
2797 
2798  /** last date this was changed */
2799  apr_time_t cmt_date;
2800 
2801  /** last commit author of this item */
2802  const char *cmt_author;
2803 
2804  /** lock token or NULL if path not locked in this WC
2805  * @since New in 1.2.
2806  */
2807  const char *lock_token;
2808 
2809  /** lock owner, or NULL if not locked in this WC
2810  * @since New in 1.2.
2811  */
2812  const char *lock_owner;
2813 
2814  /** lock comment or NULL if not locked in this WC or no comment
2815  * @since New in 1.2.
2816  */
2817  const char *lock_comment;
2818 
2819  /** Lock creation date or 0 if not locked in this WC
2820  * @since New in 1.2.
2821  */
2823 
2824  /** Whether this entry has any working properties.
2825  * False if this information is not stored in the entry.
2826  *
2827  * @since New in 1.4. */
2829 
2830  /** Whether this entry has property modifications.
2831  *
2832  * @note For working copies in older formats, this flag is not valid.
2833  *
2834  * @see svn_wc_props_modified_p().
2835  *
2836  * @since New in 1.4. */
2838 
2839  /** A space-separated list of all properties whose presence/absence is cached
2840  * in this entry.
2841  *
2842  * @see @c present_props.
2843  *
2844  * @since New in 1.4.
2845  * @deprecated This value will always be "" in version 1.7 and later. */
2846  const char *cachable_props;
2847 
2848  /** Cached property existence for this entry.
2849  * This is a space-separated list of property names. If a name exists in
2850  * @c cachable_props but not in this list, this entry does not have that
2851  * property. If a name exists in both lists, the property is present on this
2852  * entry.
2853  *
2854  * @since New in 1.4.
2855  * @deprecated This value will always be "" in version 1.7 and later. */
2856  const char *present_props;
2857 
2858  /** which changelist this item is part of, or NULL if not part of any.
2859  * @since New in 1.5.
2860  */
2861  const char *changelist;
2862 
2863  /** Size of the file after being translated into local
2864  * representation, or #SVN_WC_ENTRY_WORKING_SIZE_UNKNOWN if
2865  * unknown.
2866  *
2867  * @since New in 1.5.
2868  */
2869  apr_off_t working_size;
2870 
2871  /** Whether a local copy of this entry should be kept in the working copy
2872  * after a deletion has been committed, Only valid for the this-dir entry
2873  * when it is scheduled for deletion.
2874  *
2875  * @since New in 1.5. */
2877 
2878  /** The depth of this entry.
2879  *
2880  * ### It's a bit annoying that we only use this on this_dir
2881  * ### entries, yet it will exist (with value svn_depth_infinity) on
2882  * ### all entries. Maybe some future extensibility would make this
2883  * ### field meaningful on entries besides this_dir.
2884  *
2885  * @since New in 1.5. */
2887 
2888  /** Serialized data for all of the tree conflicts detected in this_dir.
2889  *
2890  * @since New in 1.6. */
2891  const char *tree_conflict_data;
2892 
2893  /** The entry is a intra-repository file external and this is the
2894  * repository root relative path to the file specified in the
2895  * externals definition, otherwise NULL if the entry is not a file
2896  * external.
2897  *
2898  * @since New in 1.6. */
2899  const char *file_external_path;
2900 
2901  /** The entry is a intra-repository file external and this is the
2902  * peg revision number specified in the externals definition. This
2903  * field is only valid when the file_external_path field is
2904  * non-NULL. The only permissible values are
2905  * svn_opt_revision_unspecified if the entry is not an external,
2906  * svn_opt_revision_head if the external revision is unspecified or
2907  * specified with -r HEAD or svn_opt_revision_number for a specific
2908  * revision number.
2909  *
2910  * @since New in 1.6. */
2912 
2913  /** The entry is an intra-repository file external and this is the
2914  * operative revision number specified in the externals definition.
2915  * This field is only valid when the file_external_path field is
2916  * non-NULL. The only permissible values are
2917  * svn_opt_revision_unspecified if the entry is not an external,
2918  * svn_opt_revision_head if the external revision is unspecified or
2919  * specified with -r HEAD or svn_opt_revision_number for a specific
2920  * revision number.
2921  *
2922  * @since New in 1.6. */
2924 
2925  /* IMPORTANT: If you extend this structure, check the following functions in
2926  * subversion/libsvn_wc/entries.c, to see if you need to extend them as well.
2927  *
2928  * svn_wc__atts_to_entry()
2929  * svn_wc_entry_dup()
2930  * alloc_entry()
2931  * read_entry()
2932  * write_entry()
2933  * fold_entry()
2934  */
2935 } svn_wc_entry_t;
2936 
2937 
2938 /** How an entries file's owner dir is named in the entries file.
2939  * @deprecated Provided for backward compatibility with the 1.6 API. */
2940 #define SVN_WC_ENTRY_THIS_DIR ""
2941 
2942 
2943 /** Set @a *entry to an entry for @a path, allocated in the access baton pool.
2944  * If @a show_hidden is TRUE, return the entry even if it's in 'excluded',
2945  * 'deleted' or 'absent' state. Excluded entries are those with their depth
2946  * set to #svn_depth_exclude. If @a path is not under revision control, or
2947  * if entry is hidden, not scheduled for re-addition, and @a show_hidden is @c
2948  * FALSE, then set @a *entry to @c NULL.
2949  *
2950  * @a *entry should not be modified, since doing so modifies the entries
2951  * cache in @a adm_access without changing the entries file on disk.
2952  *
2953  * If @a path is not a directory then @a adm_access must be an access baton
2954  * for the parent directory of @a path. To avoid needing to know whether
2955  * @a path is a directory or not, if @a path is a directory @a adm_access
2956  * can still be an access baton for the parent of @a path so long as the
2957  * access baton for @a path itself is in the same access baton set.
2958  *
2959  * @a path can be relative or absolute but must share the same base used
2960  * to open @a adm_access.
2961  *
2962  * Note that it is possible for @a path to be absent from disk but still
2963  * under revision control; and conversely, it is possible for @a path to
2964  * be present, but not under revision control.
2965  *
2966  * Use @a pool only for local processing.
2967  *
2968  * @deprecated Provided for backward compatibility with the 1.6 API.
2969  */
2971 svn_error_t *
2972 svn_wc_entry(const svn_wc_entry_t **entry,
2973  const char *path,
2974  svn_wc_adm_access_t *adm_access,
2975  svn_boolean_t show_hidden,
2976  apr_pool_t *pool);
2977 
2978 
2979 /** Parse the `entries' file for @a adm_access and return a hash @a entries,
2980  * whose keys are (<tt>const char *</tt>) entry names and values are
2981  * (<tt>svn_wc_entry_t *</tt>). The hash @a entries, and its keys and
2982  * values, are allocated from the pool used to open the @a adm_access
2983  * baton (that's how the entries caching works). @a pool is used for
2984  * transient allocations.
2985  *
2986  * Entries that are in a 'excluded', 'deleted' or 'absent' state (and not
2987  * scheduled for re-addition) are not returned in the hash, unless
2988  * @a show_hidden is TRUE. Excluded entries are those with their depth set to
2989  * #svn_depth_exclude.
2990  *
2991  * @par Important:
2992  * The @a entries hash is the entries cache in @a adm_access
2993  * and so usually the hash itself, the keys and the values should be treated
2994  * as read-only. If any of these are modified then it is the caller's
2995  * responsibility to ensure that the entries file on disk is updated. Treat
2996  * the hash values as type (<tt>const svn_wc_entry_t *</tt>) if you wish to
2997  * avoid accidental modification. Modifying the schedule member is a
2998  * particularly bad idea, as the entries writing process relies on having
2999  * access to the original schedule. Use a duplicate entry to modify the
3000  * schedule.
3001  *
3002  * @par Important:
3003  * Only the entry structures representing files and
3004  * #SVN_WC_ENTRY_THIS_DIR contain complete information. The entry
3005  * structures representing subdirs have only the `kind' and `state'
3006  * fields filled in. If you want info on a subdir, you must use this
3007  * routine to open its @a path and read the #SVN_WC_ENTRY_THIS_DIR
3008  * structure, or call svn_wc_entry() on its @a path.
3009  *
3010  * @deprecated Provided for backward compatibility with the 1.6 API.
3011  */
3013 svn_error_t *
3014 svn_wc_entries_read(apr_hash_t **entries,
3015  svn_wc_adm_access_t *adm_access,
3016  svn_boolean_t show_hidden,
3017  apr_pool_t *pool);
3018 
3019 
3020 /** Return a duplicate of @a entry, allocated in @a pool. No part of the new
3021  * entry will be shared with @a entry.
3022  *
3023  * @deprecated Provided for backward compatibility with the 1.6 API.
3024  */
3027 svn_wc_entry_dup(const svn_wc_entry_t *entry,
3028  apr_pool_t *pool);
3029 
3030 /** @} */
3031 
3032 
3033 /**
3034  * This struct contains information about a working copy node.
3035  *
3036  * @note Fields may be added to the end of this structure in future
3037  * versions. Therefore, users shouldn't allocate structures of this
3038  * type, to preserve binary compatibility.
3039  *
3040  * @since New in 1.7.
3041  */
3042 typedef struct svn_wc_info_t
3043 {
3044  /* ### Do we still need schedule? */
3045  svn_wc_schedule_t schedule;
3046  const char *copyfrom_url;
3047  svn_revnum_t copyfrom_rev;
3048  const svn_checksum_t *checksum;
3049  const char *changelist;
3050  svn_depth_t depth;
3051 
3052  /**
3053  * The size of the file after being translated into its local
3054  * representation, or #SVN_INVALID_FILESIZE if unknown.
3055  * Not applicable for directories.
3056  */
3058 
3059  /**
3060  * The time at which the file had the recorded size recorded_size and was
3061  * considered unmodified. */
3062  apr_time_t recorded_time;
3063 
3064  /** Array of const svn_wc_conflict_description2_t * which contains info
3065  * on any conflict of which this node is a victim. Otherwise NULL. */
3066  const apr_array_header_t *conflicts;
3067 
3068  /** The local absolute path of the working copy root. */
3069  const char *wcroot_abspath;
3070 
3071 } svn_wc_info_t;
3072 
3073 /**
3074  * Return a duplicate of @a info, allocated in @a pool. No part of the new
3075  * structure will be shared with @a info.
3076  *
3077  * @since New in 1.7.
3078  */
3079 svn_wc_info_t *
3080 svn_wc_info_dup(const svn_wc_info_t *info,
3081  apr_pool_t *pool);
3082 
3083 
3084 /** Given @a local_abspath in a dir under version control, decide if it is
3085  * in a state of conflict; return the answers in @a *text_conflicted_p, @a
3086  * *prop_conflicted_p, and @a *tree_conflicted_p. If one or two of the
3087  * answers are uninteresting, simply pass @c NULL pointers for those.
3088  *
3089  * If @a local_abspath is unversioned or does not exist, return
3090  * #SVN_ERR_WC_PATH_NOT_FOUND.
3091  *
3092  * If the @a local_abspath has corresponding text conflict files (with suffix
3093  * .mine, .theirs, etc.) that cannot be found, assume that the text conflict
3094  * has been resolved by the user and return @c FALSE in @a
3095  * *text_conflicted_p.
3096  *
3097  * Similarly, if a property conflicts file (.prej suffix) is said to exist,
3098  * but it cannot be found, assume that the property conflicts have been
3099  * resolved by the user and return @c FALSE in @a *prop_conflicted_p.
3100  *
3101  * @a *tree_conflicted_p can't be auto-resolved in this fashion. An
3102  * explicit `resolved' is needed.
3103  *
3104  * @since New in 1.7.
3105  */
3106 svn_error_t *
3107 svn_wc_conflicted_p3(svn_boolean_t *text_conflicted_p,
3108  svn_boolean_t *prop_conflicted_p,
3109  svn_boolean_t *tree_conflicted_p,
3110  svn_wc_context_t *wc_ctx,
3111  const char *local_abspath,
3112  apr_pool_t *scratch_pool);
3113 
3114 /** Similar to svn_wc_conflicted_p3(), but with a path/adm_access parameter
3115  * pair in place of a wc_ctx/local_abspath pair.
3116  *
3117  * @since New in 1.6.
3118  * @deprecated Provided for backward compatibility with the 1.6 API.
3119  */
3121 svn_error_t *
3122 svn_wc_conflicted_p2(svn_boolean_t *text_conflicted_p,
3123  svn_boolean_t *prop_conflicted_p,
3124  svn_boolean_t *tree_conflicted_p,
3125  const char *path,
3126  svn_wc_adm_access_t *adm_access,
3127  apr_pool_t *pool);
3128 
3129 /** Given a @a dir_path under version control, decide if one of its entries
3130  * (@a entry) is in a state of conflict; return the answers in @a
3131  * text_conflicted_p and @a prop_conflicted_p. These pointers must not be
3132  * null.
3133  *
3134  * If the @a entry mentions that text conflict files (with suffix .mine,
3135  * .theirs, etc.) exist, but they cannot be found, assume the text conflict
3136  * has been resolved by the user and return FALSE in @a *text_conflicted_p.
3137  *
3138  * Similarly, if the @a entry mentions that a property conflicts file (.prej
3139  * suffix) exists, but it cannot be found, assume the property conflicts
3140  * have been resolved by the user and return FALSE in @a *prop_conflicted_p.
3141  *
3142  * The @a entry is not updated.
3143  *
3144  * @deprecated Provided for backward compatibility with the 1.5 API.
3145  */
3147 svn_error_t *
3148 svn_wc_conflicted_p(svn_boolean_t *text_conflicted_p,
3149  svn_boolean_t *prop_conflicted_p,
3150  const char *dir_path,
3151  const svn_wc_entry_t *entry,
3152  apr_pool_t *pool);
3153 
3154 
3155 /** Set @a *url and @a *rev to the ancestor URL and revision for @a path,
3156  * allocating in @a pool. @a adm_access must be an access baton for @a path.
3157  *
3158  * If @a url or @a rev is NULL, then ignore it (just don't return the
3159  * corresponding information).
3160  *
3161  * @deprecated Provided for backward compatibility with the 1.6 API.
3162  */
3164 svn_error_t *
3165 svn_wc_get_ancestry(char **url,
3166  svn_revnum_t *rev,
3167  const char *path,
3168  svn_wc_adm_access_t *adm_access,
3169  apr_pool_t *pool);
3170 
3171 
3172 /** A callback vtable invoked by the generic entry-walker function.
3173  * @since New in 1.5.
3174  */
3176 {
3177  /** An @a entry was found at @a path. */
3178  svn_error_t *(*found_entry)(const char *path,
3179  const svn_wc_entry_t *entry,
3180  void *walk_baton,
3181  apr_pool_t *pool);
3182 
3183  /** Handle the error @a err encountered while processing @a path.
3184  * Wrap or squelch @a err as desired, and return an #svn_error_t
3185  * *, or #SVN_NO_ERROR.
3186  */
3187  svn_error_t *(*handle_error)(const char *path,
3188  svn_error_t *err,
3189  void *walk_baton,
3190  apr_pool_t *pool);
3191 
3193 
3194 /** @deprecated Provided for backward compatibility with the 1.4 API. */
3196 {
3197  /** An @a entry was found at @a path. */
3198  svn_error_t *(*found_entry)(const char *path,
3199  const svn_wc_entry_t *entry,
3200  void *walk_baton,
3201  apr_pool_t *pool);
3202 
3204 
3205 /**
3206  * A generic entry-walker.
3207  *
3208  * Do a potentially recursive depth-first entry-walk beginning on
3209  * @a path, which can be a file or dir. Call callbacks in
3210  * @a walk_callbacks, passing @a walk_baton to each. Use @a pool for
3211  * looping, recursion, and to allocate all entries returned.
3212  * @a adm_access must be an access baton for @a path. The pool
3213  * passed to @a walk_callbacks is a temporary subpool of @a pool.
3214  *
3215  * If @a depth is #svn_depth_empty, invoke the callbacks on @a path
3216  * and return without recursing further. If #svn_depth_files, do
3217  * the same and invoke the callbacks on file children (if any) of
3218  * @a path, then return. If #svn_depth_immediates, do the preceding
3219  * but also invoke callbacks on immediate subdirectories, then return.
3220  * If #svn_depth_infinity, recurse fully starting from @a path.
3221  *
3222  * If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
3223  * if the client has canceled the operation.
3224  *
3225  * Like our other entries interfaces, entries that are in a 'excluded',
3226  * 'deleted' or 'absent' state (and not scheduled for re-addition) are not
3227  * discovered, unless @a show_hidden is TRUE. Excluded entries are those with
3228  * their depth set to #svn_depth_exclude.
3229  *
3230  * When a new directory is entered, #SVN_WC_ENTRY_THIS_DIR will always
3231  * be returned first.
3232  *
3233  * @note Callers should be aware that each directory will be
3234  * returned *twice*: first as an entry within its parent, and
3235  * subsequently as the '.' entry within itself. The two calls can be
3236  * distinguished by looking for #SVN_WC_ENTRY_THIS_DIR in the 'name'
3237  * field of the entry.
3238  *
3239  * @since New in 1.5.
3240  * @deprecated Provided for backward compatibility with the 1.6 API.
3241  */
3243 svn_error_t *
3244 svn_wc_walk_entries3(const char *path,
3245  svn_wc_adm_access_t *adm_access,
3246  const svn_wc_entry_callbacks2_t *walk_callbacks,
3247  void *walk_baton,
3248  svn_depth_t depth,
3249  svn_boolean_t show_hidden,
3250  svn_cancel_func_t cancel_func,
3251  void *cancel_baton,
3252  apr_pool_t *pool);
3253 
3254 /**
3255  * Similar to svn_wc_walk_entries3(), but without cancellation support
3256  * or error handling from @a walk_callbacks, and with @a depth always
3257  * set to #svn_depth_infinity.
3258  *
3259  * @since New in 1.2.
3260  * @deprecated Provided for backward compatibility with the 1.4 API.
3261  */
3263 svn_error_t *
3264 svn_wc_walk_entries2(const char *path,
3265  svn_wc_adm_access_t *adm_access,
3266  const svn_wc_entry_callbacks_t *walk_callbacks,
3267  void *walk_baton,
3268  svn_boolean_t show_hidden,
3269  svn_cancel_func_t cancel_func,
3270  void *cancel_baton,
3271  apr_pool_t *pool);
3272 
3273 /**
3274  * Similar to svn_wc_walk_entries2(), but without cancellation support.
3275  *
3276  * @deprecated Provided for backward compatibility with the 1.1 API.
3277  */
3279 svn_error_t *
3280 svn_wc_walk_entries(const char *path,
3281  svn_wc_adm_access_t *adm_access,
3282  const svn_wc_entry_callbacks_t *walk_callbacks,
3283  void *walk_baton,
3284  svn_boolean_t show_hidden,
3285  apr_pool_t *pool);
3286 
3287 
3288 /** Mark missing @a path as 'deleted' in its @a parent's list of
3289  * entries. @a path should be a directory that is both deleted (via
3290  * svn_wc_delete4) and removed (via a system call). This function
3291  * should only be called during post-commit processing following a
3292  * successful commit editor drive.
3293  *
3294  * Return #SVN_ERR_WC_PATH_FOUND if @a path isn't actually missing.
3295  *
3296  * @deprecated Provided for backward compatibility with the 1.6 API.
3297  */
3299 svn_error_t *
3300 svn_wc_mark_missing_deleted(const char *path,
3301  svn_wc_adm_access_t *parent,
3302  apr_pool_t *pool);
3303 
3304 
3305 /** Ensure that an administrative area exists for @a local_abspath, so
3306  * that @a local_abspath is a working copy subdir based on @a url at @a
3307  * revision, with depth @a depth, and with repository UUID @a repos_uuid
3308  * and repository root URL @a repos_root_url.
3309  *
3310  * @a depth must be a definite depth, it cannot be #svn_depth_unknown.
3311  * @a repos_uuid and @a repos_root_url MUST NOT be @c NULL, and
3312  * @a repos_root_url must be a prefix of @a url.
3313  *
3314  * If the administrative area does not exist, then create it and
3315  * initialize it to an unlocked state.
3316  *
3317  * If the administrative area already exists then the given @a url
3318  * must match the URL in the administrative area and the given
3319  * @a revision must match the BASE of the working copy dir unless
3320  * the admin directory is scheduled for deletion or the
3321  * #SVN_ERR_WC_OBSTRUCTED_UPDATE error will be returned.
3322  *
3323  * Do not ensure existence of @a local_abspath itself; if @a local_abspath
3324  * does not exist, return error.
3325  *
3326  * Use @a scratch_pool for temporary allocations.
3327  *
3328  * @since New in 1.7.
3329  */
3330 svn_error_t *
3332  const char *local_abspath,
3333  const char *url,
3334  const char *repos_root_url,
3335  const char *repos_uuid,
3336  svn_revnum_t revision,
3337  svn_depth_t depth,
3338  apr_pool_t *scratch_pool);
3339 
3340 /**
3341  * Similar to svn_wc_ensure_adm4(), but without the wc context parameter.
3342  *
3343  * @note the @a uuid and @a repos parameters were documented as allowing
3344  * @c NULL to be passed. Beginning with 1.7, this will return an error,
3345  * contrary to prior documented behavior: see 'notes/api-errata/1.7/wc005.txt'.
3346  *
3347  * @since New in 1.5.
3348  * @deprecated Provided for backwards compatibility with the 1.6 API.
3349  */
3351 svn_error_t *
3352 svn_wc_ensure_adm3(const char *path,
3353  const char *uuid,
3354  const char *url,
3355  const char *repos,
3356  svn_revnum_t revision,
3357  svn_depth_t depth,
3358  apr_pool_t *pool);
3359 
3360 
3361 /**
3362  * Similar to svn_wc_ensure_adm3(), but with @a depth set to
3363  * #svn_depth_infinity.
3364  *
3365  * See the note on svn_wc_ensure_adm3() regarding the @a repos and @a uuid
3366  * parameters.
3367  *
3368  * @since New in 1.3.
3369  * @deprecated Provided for backwards compatibility with the 1.4 API.
3370  */
3372 svn_error_t *
3373 svn_wc_ensure_adm2(const char *path,
3374  const char *uuid,
3375  const char *url,
3376  const char *repos,
3377  svn_revnum_t revision,
3378  apr_pool_t *pool);
3379 
3380 
3381 /**
3382  * Similar to svn_wc_ensure_adm2(), but with @a repos set to @c NULL.
3383  *
3384  * @note as of 1.7, this function always returns #SVN_ERR_BAD_URL since
3385  * the @a repos parameter may not be @c NULL.
3386  *
3387  * @deprecated Provided for backwards compatibility with the 1.2 API.
3388  */
3390 svn_error_t *
3391 svn_wc_ensure_adm(const char *path,
3392  const char *uuid,
3393  const char *url,
3394  svn_revnum_t revision,
3395  apr_pool_t *pool);
3396 
3397 
3398 /** Set the repository root URL of @a path to @a repos, if possible.
3399  *
3400  * Before Subversion 1.7 there could be working copy directories that
3401  * didn't have a stored repository root in some specific circumstances.
3402  * This function allowed setting this root later.
3403  *
3404  * Since Subversion 1.7 this function just returns #SVN_NO_ERROR.
3405  *
3406  * @since New in 1.3.
3407  * @deprecated Provided for backwards compatibility with the 1.6 API.
3408  */
3410 svn_error_t *
3412  const char *path,
3413  const char *repos,
3414  apr_pool_t *pool);
3415 
3416 
3417 /**
3418  * @defgroup svn_wc_status Working copy status.
3419  * @{
3420  *
3421  * We have three functions for getting working copy status: one function
3422  * for getting the status of exactly one thing, another for
3423  * getting the statuses of (potentially) multiple things and a third for
3424  * getting the working copy out-of-dateness with respect to the repository.
3425  *
3426  * Why do we have two different functions for getting working copy status?
3427  * The concept of depth, as explained in the documentation for
3428  * svn_depth_t, may be useful in understanding this. Suppose we're
3429  * getting the status of directory D:
3430  *
3431  * To offer all three levels, we could have one unified function,
3432  * taking a `depth' parameter. Unfortunately, because this function
3433  * would have to handle multiple return values as well as the single
3434  * return value case, getting the status of just one entity would
3435  * become cumbersome: you'd have to roll through a hash to find one
3436  * lone status.
3437  *
3438  * So we have svn_wc_status3() for depth-empty (just D itself), and
3439  * svn_wc_walk_status() for depth-immediates and depth-infinity,
3440  * since the latter two involve multiple return values. And for
3441  * out-of-dateness information we have svn_wc_get_status_editor5().
3442  */
3443 
3444 /** The type of status for the working copy. */
3446 {
3447  /** does not exist */
3449 
3450  /** is not a versioned thing in this wc */
3452 
3453  /** exists, but uninteresting */
3455 
3456  /** is scheduled for addition */
3458 
3459  /** under v.c., but is missing */
3461 
3462  /** scheduled for deletion */
3464 
3465  /** was deleted and then re-added */
3467 
3468  /** text or props have been modified */
3470 
3471  /** local mods received repos mods (### unused) */
3473 
3474  /** local mods received conflicting repos mods */
3476 
3477  /** is unversioned but configured to be ignored */
3479 
3480  /** an unversioned resource is in the way of the versioned resource */
3482 
3483  /** an unversioned directory path populated by an svn:externals
3484  property; this status is not used for file externals */
3486 
3487  /** a directory doesn't contain a complete entries list */
3489 };
3490 
3491 /**
3492  * Structure for holding the "status" of a working copy item.
3493  *
3494  * @note Fields may be added to the end of this structure in future
3495  * versions. Therefore, to preserve binary compatibility, users
3496  * should not directly allocate structures of this type.
3497  *
3498  * @since New in 1.7.
3499  */
3500 typedef struct svn_wc_status3_t
3501 {
3502  /** The kind of node as recorded in the working copy */
3504 
3505  /** The depth of the node as recorded in the working copy
3506  * (#svn_depth_unknown for files or when no depth is set) */
3508 
3509  /** The actual size of the working file on disk, or SVN_INVALID_FILESIZE
3510  * if unknown (or if the item isn't a file at all). */
3512 
3513  /** If the path is under version control, versioned is TRUE, otherwise
3514  * FALSE. */
3516 
3517  /** Set to TRUE if the item is the victim of a conflict. */
3519 
3520  /** The status of the node itself. In order of precedence: Obstructions,
3521  * structural changes, text changes. */
3523 
3524  /** The status of the entry's text. */
3526 
3527  /** The status of the entry's properties. */
3529 
3530  /** a file or directory can be 'copied' if it's scheduled for
3531  * addition-with-history (or part of a subtree that is scheduled as such.).
3532  */
3534 
3535  /** Base revision. */
3537 
3538  /** Last revision this was changed */
3540 
3541  /** Date of last commit. */
3542  apr_time_t changed_date;
3543 
3544  /** Last commit author of this item */
3545  const char *changed_author;
3546 
3547  /** The URL of the repository */
3548  const char *repos_root_url;
3549 
3550  /** The UUID of the repository */
3551  const char *repos_uuid;
3552 
3553  /** The in-repository path relative to the repository root. */
3554  const char *repos_relpath;
3555 
3556  /** a file or directory can be 'switched' if the switch command has been
3557  * used. If this is TRUE, then file_external will be FALSE.
3558  */
3560 
3561  /** This directory has a working copy lock */
3563 
3564  /** The repository file lock. (Values of path, token, owner, comment
3565  * and are available if a lock is present) */
3567 
3568  /** Which changelist this item is part of, or NULL if not part of any. */
3569  const char *changelist;
3570 
3571  /**
3572  * @defgroup svn_wc_status_ood WC out-of-date info from the repository
3573  * @{
3574  *
3575  * When the working copy item is out-of-date compared to the
3576  * repository, the following fields represent the state of the
3577  * youngest revision of the item in the repository. If the working
3578  * copy is not out of date, the fields are initialized as described
3579  * below.
3580  */
3581 
3582  /** Set to the node kind of the youngest commit, or #svn_node_none
3583  * if not out of date. */
3585 
3586  /** The status of the node, based on the text status if the node has no
3587  * restructuring changes */
3589 
3590  /** The entry's text status in the repository. */
3592 
3593  /** The entry's property status in the repository. */
3595 
3596  /** The entry's lock in the repository, if any. */
3598 
3599  /** Set to the youngest committed revision, or #SVN_INVALID_REVNUM
3600  * if not out of date. */
3602 
3603  /** Set to the most recent commit date, or @c 0 if not out of date. */
3604  apr_time_t ood_changed_date;
3605 
3606  /** Set to the user name of the youngest commit, or @c NULL if not
3607  * out of date or non-existent. Because a non-existent @c
3608  * svn:author property has the same behavior as an out-of-date
3609  * working copy, examine @c ood_last_cmt_rev to determine whether
3610  * the working copy is out of date. */
3611  const char *ood_changed_author;
3612 
3613  /** @} */
3614 
3615  /* NOTE! Please update svn_wc_dup_status3() when adding new fields here. */
3617 
3618 /**
3619  * ### All diffs are not yet known.
3620  * Same as svn_wc_status3_t, but without the #svn_boolean_t 'versioned'
3621  * field. Instead an item that is not versioned has the 'entry' field set to
3622  * @c NULL.
3623  *
3624  * @since New in 1.2.
3625  * @deprecated Provided for backward compatibility with the 1.6 API.
3626  */
3627 typedef struct svn_wc_status2_t
3628 {
3629  /** Can be @c NULL if not under version control. */
3631 
3632  /** The status of the entry itself, including its text if it is a file. */
3634 
3635  /** The status of the entry's properties. */
3637 
3638  /** a directory can be 'locked' if a working copy update was interrupted. */
3640 
3641  /** a file or directory can be 'copied' if it's scheduled for
3642  * addition-with-history (or part of a subtree that is scheduled as such.).
3643  */
3645 
3646  /** a file or directory can be 'switched' if the switch command has been
3647  * used. If this is TRUE, then file_external will be FALSE.
3648  */
3650 
3651  /** The entry's text status in the repository. */
3653 
3654  /** The entry's property status in the repository. */
3656 
3657  /** The entry's lock in the repository, if any. */
3659 
3660  /** Set to the URI (actual or expected) of the item.
3661  * @since New in 1.3
3662  */
3663  const char *url;
3664 
3665  /**
3666  * @defgroup svn_wc_status_ood WC out-of-date info from the repository
3667  * @{
3668  *
3669  * When the working copy item is out-of-date compared to the
3670  * repository, the following fields represent the state of the
3671  * youngest revision of the item in the repository. If the working
3672  * copy is not out of date, the fields are initialized as described
3673  * below.
3674  */
3675 
3676  /** Set to the youngest committed revision, or #SVN_INVALID_REVNUM
3677  * if not out of date.
3678  * @since New in 1.3
3679  */
3681 
3682  /** Set to the most recent commit date, or @c 0 if not out of date.
3683  * @since New in 1.3
3684  */
3685  apr_time_t ood_last_cmt_date;
3686 
3687  /** Set to the node kind of the youngest commit, or #svn_node_none
3688  * if not out of date.
3689  * @since New in 1.3
3690  */
3692 
3693  /** Set to the user name of the youngest commit, or @c NULL if not
3694  * out of date or non-existent. Because a non-existent @c
3695  * svn:author property has the same behavior as an out-of-date
3696  * working copy, examine @c ood_last_cmt_rev to determine whether
3697  * the working copy is out of date.
3698  * @since New in 1.3
3699  */
3700  const char *ood_last_cmt_author;
3701 
3702  /** @} */
3703 
3704  /** Non-NULL if the entry is the victim of a tree conflict.
3705  * @since New in 1.6
3706  */
3708 
3709  /** If the item is a file that was added to the working copy with an
3710  * svn:externals; if file_external is TRUE, then switched is always
3711  * FALSE.
3712  * @since New in 1.6
3713  */
3715 
3716  /** The actual status of the text compared to the pristine base of the
3717  * file. This value isn't masked by other working copy statuses.
3718  * @c pristine_text_status is #svn_wc_status_none if this value was
3719  * not calculated during the status walk.
3720  * @since New in 1.6
3721  */
3723 
3724  /** The actual status of the properties compared to the pristine base of
3725  * the node. This value isn't masked by other working copy statuses.
3726  * @c pristine_prop_status is #svn_wc_status_none if this value was
3727  * not calculated during the status walk.
3728  * @since New in 1.6
3729  */
3731 
3733 
3734 
3735 
3736 /**
3737  * Same as #svn_wc_status2_t, but without the #svn_lock_t 'repos_lock' field.
3738  *
3739  * @deprecated Provided for backward compatibility with the 1.1 API.
3740  */
3741 typedef struct svn_wc_status_t
3742 {
3743  /** Can be @c NULL if not under version control. */
3745 
3746  /** The status of the entries text. */
3748 
3749  /** The status of the entries properties. */
3751 
3752  /** a directory can be 'locked' if a working copy update was interrupted. */
3754 
3755  /** a file or directory can be 'copied' if it's scheduled for
3756  * addition-with-history (or part of a subtree that is scheduled as such.).
3757  */
3759 
3760  /** a file or directory can be 'switched' if the switch command has been
3761  * used.
3762  */
3764 
3765  /** The entry's text status in the repository. */
3767 
3768  /** The entry's property status in the repository. */
3770 
3771 } svn_wc_status_t;
3772 
3773 
3774 /**
3775  * Return a deep copy of the @a orig_stat status structure, allocated
3776  * in @a pool.
3777  *
3778  * @since New in 1.7.
3779  */
3781 svn_wc_dup_status3(const svn_wc_status3_t *orig_stat,
3782  apr_pool_t *pool);
3783 
3784 /**
3785  * Same as svn_wc_dup_status3(), but for older svn_wc_status_t structures.
3786  *
3787  * @since New in 1.2
3788  * @deprecated Provided for backward compatibility with the 1.6 API.
3789  */
3792 svn_wc_dup_status2(const svn_wc_status2_t *orig_stat,
3793  apr_pool_t *pool);
3794 
3795 
3796 /**
3797  * Same as svn_wc_dup_status2(), but for older svn_wc_status_t structures.
3798  *
3799  * @deprecated Provided for backward compatibility with the 1.1 API.
3800  */
3803 svn_wc_dup_status(const svn_wc_status_t *orig_stat,
3804  apr_pool_t *pool);
3805 
3806 
3807 /**
3808  * Fill @a *status for @a local_abspath, allocating in @a result_pool.
3809  * Use @a scratch_pool for temporary allocations.
3810  *
3811  * Here are some things to note about the returned structure. A quick
3812  * examination of the @c status->text_status after a successful return of
3813  * this function can reveal the following things:
3814  *
3815  * - #svn_wc_status_none : @a local_abspath is not versioned, and is
3816  * not present on disk
3817  *
3818  * - #svn_wc_status_missing : @a local_abspath is versioned, but is
3819  * missing from the working copy.
3820  *
3821  * - #svn_wc_status_unversioned : @a local_abspath is not versioned,
3822  * but is present on disk and not being
3823  * ignored (see above).
3824  *
3825  * The other available results for the @c text_status field are more
3826  * straightforward in their meanings. See the comments on the
3827  * #svn_wc_status_kind structure for some hints.
3828  *
3829  * @since New in 1.7.
3830  */
3831 svn_error_t *
3833  svn_wc_context_t *wc_ctx,
3834  const char *local_abspath,
3835  apr_pool_t *result_pool,
3836  apr_pool_t *scratch_pool);
3837 
3838 /** Similar to svn_wc_status3(), but with a adm_access baton and absolute
3839  * path.
3840  *
3841  * @since New in 1.2.
3842  * @deprecated Provided for backward compatibility with the 1.6 API.
3843  */
3845 svn_error_t *
3847  const char *path,
3848  svn_wc_adm_access_t *adm_access,
3849  apr_pool_t *pool);
3850 
3851 
3852 /**
3853  * Same as svn_wc_status2(), but for older svn_wc_status_t structures.
3854  *
3855  * @deprecated Provided for backward compatibility with the 1.1 API.
3856  */
3858 svn_error_t *
3860  const char *path,
3861  svn_wc_adm_access_t *adm_access,
3862  apr_pool_t *pool);
3863 
3864 
3865 
3866 
3867 /**
3868  * A callback for reporting a @a status about @a local_abspath.
3869  *
3870  * @a baton is a closure object; it should be provided by the
3871  * implementation, and passed by the caller.
3872  *
3873  * @a scratch_pool will be cleared between invocations to the callback.
3874  *
3875  * ### we might be revamping the status infrastructure, and this callback
3876  * ### could totally disappear by the end of 1.7 development. however, we
3877  * ### need to mark the STATUS parameter as "const" so that it is easier
3878  * ### to reason about who/what can modify those structures.
3879  *
3880  * @since New in 1.7.
3881  */
3882 typedef svn_error_t *(*svn_wc_status_func4_t)(void *baton,
3883  const char *local_abspath,
3884  const svn_wc_status3_t *status,
3885  apr_pool_t *scratch_pool);
3886 
3887 /**
3888  * Same as svn_wc_status_func4_t, but with a non-const status and a relative
3889  * path.
3890  *
3891  * @since New in 1.6.
3892  * @deprecated Provided for backward compatibility with the 1.6 API.
3893  */
3894 typedef svn_error_t *(*svn_wc_status_func3_t)(void *baton,
3895  const char *path,
3896  svn_wc_status2_t *status,
3897  apr_pool_t *pool);
3898 
3899 /**
3900  * Same as svn_wc_status_func3_t, but without a provided pool or
3901  * the ability to propagate errors.
3902  *
3903  * @since New in 1.2.
3904  * @deprecated Provided for backward compatibility with the 1.5 API.
3905  */
3906 typedef void (*svn_wc_status_func2_t)(void *baton,
3907  const char *path,
3908  svn_wc_status2_t *status);
3909 
3910 /**
3911  * Same as svn_wc_status_func2_t, but for older svn_wc_status_t structures.
3912  *
3913  * @deprecated Provided for backward compatibility with the 1.1 API.
3914  */
3915 typedef void (*svn_wc_status_func_t)(void *baton,
3916  const char *path,
3917  svn_wc_status_t *status);
3918 
3919 /**
3920  * Walk the working copy status of @a local_abspath using @a wc_ctx, by
3921  * creating #svn_wc_status3_t structures and sending these through
3922  * @a status_func / @a status_baton.
3923  *
3924  * * Assuming the target is a directory, then:
3925  *
3926  * - If @a get_all is FALSE, then only locally-modified entries will be
3927  * returned. If TRUE, then all entries will be returned.
3928  *
3929  * - If @a ignore_text_mods is TRUE, then the walk will not check for
3930  * modified files. Any #svn_wc_status3_t structures returned for files
3931  * will always have a text_status field set to svn_wc_status_normal.
3932  * If @a ignore_text_mods is FALSE, the walk checks for text changes
3933  * and returns #svn_wc_status3_t structures describing any changes.
3934  *
3935  * - If @a depth is #svn_depth_empty, a status structure will
3936  * be returned for the target only; if #svn_depth_files, for the
3937  * target and its immediate file children; if
3938  * #svn_depth_immediates, for the target and its immediate
3939  * children; if #svn_depth_infinity, for the target and
3940  * everything underneath it, fully recursively.
3941  *
3942  * If @a depth is #svn_depth_unknown, take depths from the
3943  * working copy and behave as above in each directory's case.
3944  *
3945  * If the given @a depth is incompatible with the depth found in a
3946  * working copy directory, the found depth always governs.
3947  *
3948  * If @a no_ignore is set, statuses that would typically be ignored
3949  * will instead be reported.
3950  *
3951  * @a ignore_patterns is an array of file patterns matching
3952  * unversioned files to ignore for the purposes of status reporting,
3953  * or @c NULL if the default set of ignorable file patterns should be used.
3954  *
3955  * If @a cancel_func is non-NULL, call it with @a cancel_baton while walking
3956  * to determine if the client has canceled the operation.
3957  *
3958  * This function uses @a scratch_pool for temporary allocations.
3959  *
3960  * @since New in 1.7.
3961  */
3962 svn_error_t *
3964  const char *local_abspath,
3965  svn_depth_t depth,
3966  svn_boolean_t get_all,
3967  svn_boolean_t no_ignore,
3968  svn_boolean_t ignore_text_mods,
3969  const apr_array_header_t *ignore_patterns,
3970  svn_wc_status_func4_t status_func,
3971  void *status_baton,
3972  svn_cancel_func_t cancel_func,
3973  void *cancel_baton,
3974  apr_pool_t *scratch_pool);
3975 
3976 /**
3977  * Set @a *editor and @a *edit_baton to an editor that generates
3978  * #svn_wc_status3_t structures and sends them through @a status_func /
3979  * @a status_baton. @a anchor_abspath is a working copy directory
3980  * directory which will be used as the root of our editor. If @a
3981  * target_basename is not "", it represents a node in the @a anchor_abspath
3982  * which is the subject of the editor drive (otherwise, the @a
3983  * anchor_abspath is the subject).
3984  *
3985  * If @a set_locks_baton is non-@c NULL, it will be set to a baton that can
3986  * be used in a call to the svn_wc_status_set_repos_locks() function.
3987  *
3988  * Callers drive this editor to describe working copy out-of-dateness
3989  * with respect to the repository. If this information is not
3990  * available or not desired, callers should simply call the
3991  * close_edit() function of the @a editor vtable.
3992  *
3993  * If the editor driver calls @a editor's set_target_revision() vtable
3994  * function, then when the edit drive is completed, @a *edit_revision
3995  * will contain the revision delivered via that interface.
3996  *
3997  * Assuming the target is a directory, then:
3998  *
3999  * - If @a get_all is FALSE, then only locally-modified entries will be
4000  * returned. If TRUE, then all entries will be returned.
4001  *
4002  * - If @a depth is #svn_depth_empty, a status structure will
4003  * be returned for the target only; if #svn_depth_files, for the
4004  * target and its immediate file children; if
4005  * #svn_depth_immediates, for the target and its immediate
4006  * children; if #svn_depth_infinity, for the target and
4007  * everything underneath it, fully recursively.
4008  *
4009  * If @a depth is #svn_depth_unknown, take depths from the
4010  * working copy and behave as above in each directory's case.
4011  *
4012  * If the given @a depth is incompatible with the depth found in a
4013  * working copy directory, the found depth always governs.
4014  *
4015  * If @a no_ignore is set, statuses that would typically be ignored
4016  * will instead be reported.
4017  *
4018  * @a ignore_patterns is an array of file patterns matching
4019  * unversioned files to ignore for the purposes of status reporting,
4020  * or @c NULL if the default set of ignorable file patterns should be used.
4021  *
4022  * If @a cancel_func is non-NULL, call it with @a cancel_baton while building
4023  * the @a statushash to determine if the client has canceled the operation.
4024  *
4025  * If @a depth_as_sticky is set handle @a depth like when depth_is_sticky is
4026  * passed for updating. This will show excluded nodes show up as added in the
4027  * repository.
4028  *
4029  * If @a server_performs_filtering is TRUE, assume that the server handles
4030  * the ambient depth filtering, so this doesn't have to be handled in the
4031  * editor.
4032  *
4033  * Allocate the editor itself in @a result_pool, and use @a scratch_pool
4034  * for temporary allocations. The editor will do its temporary allocations
4035  * in a subpool of @a result_pool.
4036  *
4037  * @since New in 1.7.
4038  */
4039 svn_error_t *
4041  void **edit_baton,
4042  void **set_locks_baton,
4043  svn_revnum_t *edit_revision,
4044  svn_wc_context_t *wc_ctx,
4045  const char *anchor_abspath,
4046  const char *target_basename,
4047  svn_depth_t depth,
4048  svn_boolean_t get_all,
4049  svn_boolean_t no_ignore,
4050  svn_boolean_t depth_as_sticky,
4051  svn_boolean_t server_performs_filtering,
4052  const apr_array_header_t *ignore_patterns,
4053  svn_wc_status_func4_t status_func,
4054  void *status_baton,
4055  svn_cancel_func_t cancel_func,
4056  void *cancel_baton,
4057  apr_pool_t *result_pool,
4058  apr_pool_t *scratch_pool);
4059 
4060 /**
4061  * Same as svn_wc_get_status_editor5, but using #svn_wc_status_func3_t
4062  * instead of #svn_wc_status_func4_t. And @a server_performs_filtering
4063  * always set to #TRUE.
4064  *
4065  * This also uses a single pool parameter, stating that all temporary
4066  * allocations are performed in manually constructed/destroyed subpool.
4067  *
4068  * @since New in 1.6.
4069  * @deprecated Provided for backward compatibility with the 1.6 API.
4070  */
4072 svn_error_t *
4074  void **edit_baton,
4075  void **set_locks_baton,
4076  svn_revnum_t *edit_revision,
4077  svn_wc_adm_access_t *anchor,
4078  const char *target,
4079  svn_depth_t depth,
4080  svn_boolean_t get_all,
4081  svn_boolean_t no_ignore,
4082  const apr_array_header_t *ignore_patterns,
4083  svn_wc_status_func3_t status_func,
4084  void *status_baton,
4085  svn_cancel_func_t cancel_func,
4086  void *cancel_baton,
4087  svn_wc_traversal_info_t *traversal_info,
4088  apr_pool_t *pool);
4089 
4090 /**
4091  * Same as svn_wc_get_status_editor4(), but using #svn_wc_status_func2_t
4092  * instead of #svn_wc_status_func3_t.
4093  *
4094  * @since New in 1.5.
4095  * @deprecated Provided for backward compatibility with the 1.5 API.
4096  */
4098 svn_error_t *
4100  void **edit_baton,
4101  void **set_locks_baton,
4102  svn_revnum_t *edit_revision,
4103  svn_wc_adm_access_t *anchor,
4104  const char *target,
4105  svn_depth_t depth,
4106  svn_boolean_t get_all,
4107  svn_boolean_t no_ignore,
4108  const apr_array_header_t *ignore_patterns,
4109  svn_wc_status_func2_t status_func,
4110  void *status_baton,
4111  svn_cancel_func_t cancel_func,
4112  void *cancel_baton,
4113  svn_wc_traversal_info_t *traversal_info,
4114  apr_pool_t *pool);
4115 
4116 /**
4117  * Like svn_wc_get_status_editor3(), but with @a ignore_patterns
4118  * provided from the corresponding value in @a config, and @a recurse
4119  * instead of @a depth. If @a recurse is TRUE, behave as if for
4120  * #svn_depth_infinity; else if @a recurse is FALSE, behave as if for
4121  * #svn_depth_immediates.
4122  *
4123  * @since New in 1.2.
4124  * @deprecated Provided for backward compatibility with the 1.4 API.
4125  */
4127 svn_error_t *
4129  void **edit_baton,
4130  void **set_locks_baton,
4131  svn_revnum_t *edit_revision,
4132  svn_wc_adm_access_t *anchor,
4133  const char *target,
4134  apr_hash_t *config,
4135  svn_boolean_t recurse,
4136  svn_boolean_t get_all,
4137  svn_boolean_t no_ignore,
4138  svn_wc_status_func2_t status_func,
4139  void *status_baton,
4140  svn_cancel_func_t cancel_func,
4141  void *cancel_baton,
4142  svn_wc_traversal_info_t *traversal_info,
4143  apr_pool_t *pool);
4144 
4145 /**
4146  * Same as svn_wc_get_status_editor2(), but with @a set_locks_baton set
4147  * to @c NULL, and taking a deprecated svn_wc_status_func_t argument.
4148  *
4149  * @deprecated Provided for backward compatibility with the 1.1 API.
4150  */
4152 svn_error_t *
4154  void **edit_baton,
4155  svn_revnum_t *edit_revision,
4156  svn_wc_adm_access_t *anchor,
4157  const char *target,
4158  apr_hash_t *config,
4159  svn_boolean_t recurse,
4160  svn_boolean_t get_all,
4161  svn_boolean_t no_ignore,
4162  svn_wc_status_func_t status_func,
4163  void *status_baton,
4164  svn_cancel_func_t cancel_func,
4165  void *cancel_baton,
4166  svn_wc_traversal_info_t *traversal_info,
4167  apr_pool_t *pool);
4168 
4169 
4170 /**
4171  * Associate @a locks, a hash table mapping <tt>const char*</tt>
4172  * absolute repository paths to <tt>svn_lock_t</tt> objects, with a
4173  * @a set_locks_baton returned by an earlier call to
4174  * svn_wc_get_status_editor3(). @a repos_root is the repository root URL.
4175  * Perform all allocations in @a pool.
4176  *
4177  * @note @a locks will not be copied, so it must be valid throughout the
4178  * edit. @a pool must also not be destroyed or cleared before the edit is
4179  * finished.
4180  *
4181  * @since New in 1.2.
4182  */
4183 svn_error_t *
4184 svn_wc_status_set_repos_locks(void *set_locks_baton,
4185  apr_hash_t *locks,
4186  const char *repos_root,
4187  apr_pool_t *pool);
4188 
4189 /** @} */
4190 
4191 
4192 /**
4193  * Copy @a src_abspath to @a dst_abspath, and schedule @a dst_abspath
4194  * for addition to the repository, remembering the copy history. @a wc_ctx
4195  * is used for accessing the working copy and must contain a write lock for
4196  * the parent directory of @a dst_abspath,
4197  *
4198  * If @a metadata_only is TRUE then this is a database-only operation and
4199  * the working directories and files are not copied.
4200  *
4201  * @a src_abspath must be a file or directory under version control;
4202  * the parent of @a dst_abspath must be a directory under version control
4203  * in the same working copy; @a dst_abspath will be the name of the copied
4204  * item, and it must not exist already if @a metadata_only is FALSE. Note that
4205  * when @a src points to a versioned file, the working file doesn't
4206  * necessarily exist in which case its text-base is used instead.
4207  *
4208  * If @a cancel_func is non-NULL, call it with @a cancel_baton at
4209  * various points during the operation. If it returns an error
4210  * (typically #SVN_ERR_CANCELLED), return that error immediately.
4211  *
4212  * If @a notify_func is non-NULL, call it with @a notify_baton and the path
4213  * of the root node (only) of the destination.
4214  *
4215  * Use @a scratch_pool for temporary allocations.
4216  *
4217  * @since New in 1.7.
4218  */
4219 svn_error_t *
4221  const char *src_abspath,
4222  const char *dst_abspath,
4223  svn_boolean_t metadata_only,
4224  svn_cancel_func_t cancel_func,
4225  void *cancel_baton,
4226  svn_wc_notify_func2_t notify_func,
4227  void *notify_baton,
4228  apr_pool_t *scratch_pool);
4229 
4230 /** Similar to svn_wc_copy3(), but takes access batons and a relative path
4231  * and a basename instead of absolute paths and a working copy context.
4232  *
4233  * @since New in 1.2.
4234  * @deprecated Provided for backward compatibility with the 1.6 API.
4235  */
4237 svn_error_t *
4238 svn_wc_copy2(const char *src,
4239  svn_wc_adm_access_t *dst_parent,
4240  const char *dst_basename,
4241  svn_cancel_func_t cancel_func,
4242  void *cancel_baton,
4243  svn_wc_notify_func2_t notify_func,
4244  void *notify_baton,
4245  apr_pool_t *pool);
4246 
4247 /**
4248  * Similar to svn_wc_copy2(), but takes an #svn_wc_notify_func_t instead.
4249  *
4250  * @deprecated Provided for backward compatibility with the 1.1 API.
4251  */
4253 svn_error_t *
4254 svn_wc_copy(const char *src,
4255  svn_wc_adm_access_t *dst_parent,
4256  const char *dst_basename,
4257  svn_cancel_func_t cancel_func,
4258  void *cancel_baton,
4259  svn_wc_notify_func_t notify_func,
4260  void *notify_baton,
4261  apr_pool_t *pool);
4262 
4263 /**
4264  * Move @a src_abspath to @a dst_abspath, by scheduling @a dst_abspath
4265  * for addition to the repository, remembering the history. Mark @a src_abspath
4266  * as deleted after moving.@a wc_ctx is used for accessing the working copy and
4267  * must contain a write lock for the parent directory of @a src_abspath and
4268  * @a dst_abspath.
4269  *
4270  * If @a metadata_only is TRUE then this is a database-only operation and
4271  * the working directories and files are not changed.
4272  *
4273  * @a src_abspath must be a file or directory under version control;
4274  * the parent of @a dst_abspath must be a directory under version control
4275  * in the same working copy; @a dst_abspath will be the name of the copied
4276  * item, and it must not exist already if @a metadata_only is FALSE. Note that
4277  * when @a src points to a versioned file, the working file doesn't
4278  * necessarily exist in which case its text-base is used instead.
4279  *
4280  * If @a cancel_func is non-NULL, call it with @a cancel_baton at
4281  * various points during the operation. If it returns an error
4282  * (typically #SVN_ERR_CANCELLED), return that error immediately.
4283  *
4284  * If @a notify_func is non-NULL, call it with @a notify_baton and the path
4285  * of the root node (only) of the destination.
4286  *
4287  * Use @a scratch_pool for temporary allocations.
4288  *
4289  * @since New in 1.7.
4290  */
4291 svn_error_t *
4293  const char *src_abspath,
4294  const char *dst_abspath,
4295  svn_boolean_t metadata_only,
4296  svn_cancel_func_t cancel_func,
4297  void *cancel_baton,
4298  svn_wc_notify_func2_t notify_func,
4299  void *notify_baton,
4300  apr_pool_t *scratch_pool);
4301 
4302 /**
4303  * Schedule @a local_abspath for deletion. It will be deleted from the
4304  * repository on the next commit. If @a local_abspath refers to a
4305  * directory, then a recursive deletion will occur. @a wc_ctx must hold
4306  * a write lock for the parent of @a local_abspath, @a local_abspath itself
4307  * and everything below @a local_abspath.
4308  *
4309  * If @a keep_local is FALSE, this function immediately deletes all files,
4310  * modified and unmodified, versioned and of @a delete_unversioned is TRUE,
4311  * unversioned from the working copy.
4312  * It also immediately deletes unversioned directories and directories that
4313  * are scheduled to be added below @a local_abspath. Only versioned may
4314  * remain in the working copy, these get deleted by the update following
4315  * the commit.
4316  *
4317  * If @a keep_local is TRUE, all files and directories will be kept in the
4318  * working copy (and will become unversioned on the next commit).
4319  *
4320  * If @a delete_unversioned_target is TRUE and @a local_abspath is not
4321  * versioned, @a local_abspath will be handled as an added files without
4322  * history. So it will be deleted if @a keep_local is FALSE. If @a
4323  * delete_unversioned is FALSE and @a local_abspath is not versioned a
4324  * #SVN_ERR_WC_PATH_NOT_FOUND error will be returned.
4325  *
4326  * If @a cancel_func is non-NULL, call it with @a cancel_baton at
4327  * various points during the operation. If it returns an error
4328  * (typically #SVN_ERR_CANCELLED), return that error immediately.
4329  *
4330  * For each path marked for deletion, @a notify_func will be called with
4331  * the @a notify_baton and that path. The @a notify_func callback may be
4332  * @c NULL if notification is not needed.
4333  *
4334  * Use @a scratch_pool for temporary allocations. It may be cleared
4335  * immediately upon returning from this function.
4336  *
4337  * @since New in 1.7.
4338  */
4339  /* ### BH: Maybe add a delete_switched flag that allows deny switched
4340  nodes like file externals? */
4341 svn_error_t *
4343  const char *local_abspath,
4344  svn_boolean_t keep_local,
4345  svn_boolean_t delete_unversioned_target,
4346  svn_cancel_func_t cancel_func,
4347  void *cancel_baton,
4348  svn_wc_notify_func2_t notify_func,
4349  void *notify_baton,
4350  apr_pool_t *scratch_pool);
4351 
4352 /**
4353  * Similar to svn_wc_delete4, but uses an access baton and relative path
4354  * instead of a working copy context and absolute path. @a adm_access
4355  * must hold a write lock for the parent of @a path.
4356  *
4357  * @c delete_unversioned_target will always be set to TRUE.
4358  *
4359  * @since New in 1.5.
4360  * @deprecated Provided for backward compatibility with the 1.6 API.
4361  */
4363 svn_error_t *
4364 svn_wc_delete3(const char *path,
4365  svn_wc_adm_access_t *adm_access,
4366  svn_cancel_func_t cancel_func,
4367  void *cancel_baton,
4368  svn_wc_notify_func2_t notify_func,
4369  void *notify_baton,
4370  svn_boolean_t keep_local,
4371  apr_pool_t *pool);
4372 
4373 /**
4374  * Similar to svn_wc_delete3(), but with @a keep_local always set to FALSE.
4375  *
4376  * @deprecated Provided for backward compatibility with the 1.4 API.
4377  */
4379 svn_error_t *
4380 svn_wc_delete2(const char *path,
4381  svn_wc_adm_access_t *adm_access,
4382  svn_cancel_func_t cancel_func,
4383  void *cancel_baton,
4384  svn_wc_notify_func2_t notify_func,
4385  void *notify_baton,
4386  apr_pool_t *pool);
4387 
4388 /**
4389  * Similar to svn_wc_delete2(), but takes an #svn_wc_notify_func_t instead.
4390  *
4391  * @deprecated Provided for backward compatibility with the 1.1 API.
4392  */
4394 svn_error_t *
4395 svn_wc_delete(const char *path,
4396  svn_wc_adm_access_t *adm_access,
4397  svn_cancel_func_t cancel_func,
4398  void *cancel_baton,
4399  svn_wc_notify_func_t notify_func,
4400  void *notify_baton,
4401  apr_pool_t *pool);
4402 
4403 
4404 /**
4405  * Schedule the single node that exists on disk at @a local_abspath for
4406  * addition to the working copy. The added node will have no properties.
4407  *
4408  * The versioned state of the parent path must be a modifiable directory,
4409  * and the versioned state of @a local_abspath must be either nonexistent or
4410  * deleted; if deleted, the new node will be a replacement.
4411  *
4412  * If @a local_abspath does not exist as file, directory or symlink, return
4413  * #SVN_ERR_WC_PATH_NOT_FOUND.
4414  *
4415  * This is a replacement for svn_wc_add4() case 2a.
4416  *
4417  * ### TODO: Allow the caller to provide the node's properties?
4418  *
4419  * ### TODO: Split into add_dir, add_file, add_symlink?
4420  *
4421  * @since New in 1.7.
4422  */
4423 svn_error_t *
4425  const char *local_abspath,
4426  svn_wc_notify_func2_t notify_func,
4427  void *notify_baton,
4428  apr_pool_t *scratch_pool);
4429 
4430 
4431 /**
4432  * Put @a local_abspath under version control by registering it as addition
4433  * or copy in the database containing its parent. The new node is scheduled
4434  * for addition to the repository below its parent node.
4435  *
4436  * 1) If the node is already versioned, it MUST BE the root of a separate
4437  * working copy from the same repository as the parent WC. The new node
4438  * and anything below it will be scheduled for addition inside the parent
4439  * working copy as a copy of the original location. The separate working
4440  * copy will be integrated by this step. In this case, which is only used
4441  * by code like that of "svn cp URL@rev path" @a copyfrom_url and
4442  * @a copyfrom_rev MUST BE the the url and revision of @a local_abspath
4443  * in the separate working copy.
4444  *
4445  * 2a) If the node was not versioned before it will be scheduled as a local
4446  * addition or 2b) if @a copyfrom_url and @a copyfrom_rev are set as a copy
4447  * of that location. In this last case the function doesn't set the pristine
4448  * version (of a file) and/or pristine properties, which callers should
4449  * handle via different APIs. Usually it is easier to call
4450  * svn_wc_add_repos_file4() (### or a possible svn_wc_add_repos_dir()) than
4451  * using this variant.
4452  *
4453  * If @a local_abspath does not exist as file, directory or symlink, return
4454  * #SVN_ERR_WC_PATH_NOT_FOUND.
4455  *
4456  * If @a local_abspath is an unversioned directory, record @a depth on it;
4457  * otherwise, ignore @a depth. (Use #svn_depth_infinity unless you exactly
4458  * know what you are doing, or you may create an unexpected sparse working
4459  * copy)
4460  *
4461  * If @a cancel_func is non-NULL, call it with @a cancel_baton at
4462  * various points during the operation. If it returns an error
4463  * (typically #SVN_ERR_CANCELLED), return that error immediately.
4464  *
4465  * When the @a local_abspath has been added, then @a notify_func will be
4466  * called (if it is not @c NULL) with the @a notify_baton and the path.
4467  *
4468  * @note Case 1 is deprecated. Consider doing a WC-to-WC copy instead.
4469  * @note For case 2a, prefer svn_wc_add_from_disk().
4470  *
4471  * @since New in 1.7.
4472  */
4473 svn_error_t *
4475  const char *local_abspath,
4476  svn_depth_t depth,
4477  const char *copyfrom_url,
4478  svn_revnum_t copyfrom_rev,
4479  svn_cancel_func_t cancel_func,
4480  void *cancel_baton,
4481  svn_wc_notify_func2_t notify_func,
4482  void *notify_baton,
4483  apr_pool_t *scratch_pool);
4484 
4485 /**
4486  * Similar to svn_wc_add4(), but with an access baton
4487  * and relative path instead of a context and absolute path.
4488  * @since New in 1.6.
4489  * @deprecated Provided for backward compatibility with the 1.6 API.
4490  */
4492 svn_error_t *
4493 svn_wc_add3(const char *path,
4494  svn_wc_adm_access_t *parent_access,
4495  svn_depth_t depth,
4496  const char *copyfrom_url,
4497  svn_revnum_t copyfrom_rev,
4498  svn_cancel_func_t cancel_func,
4499  void *cancel_baton,
4500  svn_wc_notify_func2_t notify_func,
4501  void *notify_baton,
4502  apr_pool_t *pool);
4503 
4504 /**
4505  * Similar to svn_wc_add3(), but with the @a depth parameter always
4506  * #svn_depth_infinity.
4507  *
4508  * @since New in 1.2.
4509  * @deprecated Provided for backward compatibility with the 1.5 API.
4510  */
4512 svn_error_t *
4513 svn_wc_add2(const char *path,
4514  svn_wc_adm_access_t *parent_access,
4515  const char *copyfrom_url,
4516  svn_revnum_t copyfrom_rev,
4517  svn_cancel_func_t cancel_func,
4518  void *cancel_baton,
4519  svn_wc_notify_func2_t notify_func,
4520  void *notify_baton,
4521  apr_pool_t *pool);
4522 
4523 /**
4524  * Similar to svn_wc_add2(), but takes an #svn_wc_notify_func_t instead.
4525  *
4526  * @deprecated Provided for backward compatibility with the 1.1 API.
4527  */
4529 svn_error_t *
4530 svn_wc_add(const char *path,
4531  svn_wc_adm_access_t *parent_access,
4532  const char *copyfrom_url,
4533  svn_revnum_t copyfrom_rev,
4534  svn_cancel_func_t cancel_func,
4535  void *cancel_baton,
4536  svn_wc_notify_func_t notify_func,
4537  void *notify_baton,
4538  apr_pool_t *pool);
4539 
4540 /** Add a file to a working copy at @a local_abspath, obtaining the
4541  * text-base's contents from @a new_base_contents, the wc file's
4542  * content from @a new_contents, its unmodified properties from @a
4543  * new_base_props and its actual properties from @a new_props. Use
4544  * @a wc_ctx for accessing the working copy.
4545  *
4546  * The unmodified text and props normally come from the repository
4547  * file represented by the copyfrom args, see below. The new file
4548  * will be marked as copy.
4549  *
4550  * @a new_contents and @a new_props may be NULL, in which case
4551  * the working copy text and props are taken from the base files with
4552  * appropriate translation of the file's content.
4553  *
4554  * @a new_contents must be provided in Normal Form. This is required
4555  * in order to pass both special and non-special files through a stream.
4556  *
4557  * @a wc_ctx must contain a write lock for the parent of @a local_abspath.
4558  *
4559  * If @a copyfrom_url is non-NULL, then @a copyfrom_rev must be a
4560  * valid revision number, and together they are the copyfrom history
4561  * for the new file.
4562  *
4563  * The @a cancel_func and @a cancel_baton are a standard cancellation
4564  * callback, or NULL if no callback is needed. @a notify_func and
4565  * @a notify_baton are a notification callback, and (if not NULL)
4566  * will be notified of the addition of this file.
4567  *
4568  * Use @a scratch_pool for temporary allocations.
4569  *
4570  * ### This function is very redundant with svn_wc_add(). Ideally,
4571  * we'd merge them, so that svn_wc_add() would just take optional
4572  * new_props and optional copyfrom information. That way it could be
4573  * used for both 'svn add somefilesittingonmydisk' and for adding
4574  * files from repositories, with or without copyfrom history.
4575  *
4576  * The problem with this Ideal Plan is that svn_wc_add() also takes
4577  * care of recursive URL-rewriting. There's a whole comment in its
4578  * doc string about how that's really weird, outside its core mission,
4579  * etc, etc. So another part of the Ideal Plan is that that
4580  * functionality of svn_wc_add() would move into a separate function.
4581  *
4582  * @since New in 1.7.
4583  */
4584 svn_error_t *
4586  const char *local_abspath,
4587  svn_stream_t *new_base_contents,
4588  svn_stream_t *new_contents,
4589  apr_hash_t *new_base_props,
4590  apr_hash_t *new_props,
4591  const char *copyfrom_url,
4592  svn_revnum_t copyfrom_rev,
4593  svn_cancel_func_t cancel_func,
4594  void *cancel_baton,
4595  apr_pool_t *scratch_pool);
4596 
4597 /** Similar to svn_wc_add_repos_file4, but uses access batons and a
4598  * relative path instead of a working copy context and absolute path.
4599  *
4600  * ### NOTE: the notification callback/baton is not yet used.
4601  *
4602  * @since New in 1.6.
4603  * @deprecated Provided for compatibility with the 1.6 API.
4604  */
4606 svn_error_t *
4607 svn_wc_add_repos_file3(const char *dst_path,
4608  svn_wc_adm_access_t *adm_access,
4609  svn_stream_t *new_base_contents,
4610  svn_stream_t *new_contents,
4611  apr_hash_t *new_base_props,
4612  apr_hash_t *new_props,
4613  const char *copyfrom_url,
4614  svn_revnum_t copyfrom_rev,
4615  svn_cancel_func_t cancel_func,
4616  void *cancel_baton,
4617  svn_wc_notify_func2_t notify_func,
4618  void *notify_baton,
4619  apr_pool_t *scratch_pool);
4620 
4621 
4622 /** Same as svn_wc_add_repos_file3(), except that it has pathnames rather
4623  * than streams for the text base, and actual text, and has no cancellation.
4624  *
4625  * @since New in 1.4.
4626  * @deprecated Provided for compatibility with the 1.5 API
4627  */
4629 svn_error_t *
4630 svn_wc_add_repos_file2(const char *dst_path,
4631  svn_wc_adm_access_t *adm_access,
4632  const char *new_text_base_path,
4633  const char *new_text_path,
4634  apr_hash_t *new_base_props,
4635  apr_hash_t *new_props,
4636  const char *copyfrom_url,
4637  svn_revnum_t copyfrom_rev,
4638  apr_pool_t *pool);
4639 
4640 /** Same as svn_wc_add_repos_file3(), except that it doesn't have the
4641  * BASE arguments or cancellation.
4642  *
4643  * @deprecated Provided for compatibility with the 1.3 API
4644  */
4646 svn_error_t *
4647 svn_wc_add_repos_file(const char *dst_path,
4648  svn_wc_adm_access_t *adm_access,
4649  const char *new_text_path,
4650  apr_hash_t *new_props,
4651  const char *copyfrom_url,
4652  svn_revnum_t copyfrom_rev,
4653  apr_pool_t *pool);
4654 
4655 
4656 /** Remove @a local_abspath from revision control. @a wc_ctx must
4657  * hold a write lock.
4658  *
4659  * If @a local_abspath is a file, all its info will be removed from the
4660  * administrative area. If @a local_abspath is a directory, then the
4661  * administrative area will be deleted, along with *all* the administrative
4662  * areas anywhere in the tree below @a adm_access.
4663  *
4664  * Normally, only administrative data is removed. However, if
4665  * @a destroy_wf is TRUE, then all working file(s) and dirs are deleted
4666  * from disk as well. When called with @a destroy_wf, any locally
4667  * modified files will *not* be deleted, and the special error
4668  * #SVN_ERR_WC_LEFT_LOCAL_MOD might be returned. (Callers only need to
4669  * check for this special return value if @a destroy_wf is TRUE.)
4670  *
4671  * If @a instant_error is TRUE, then return
4672  * #SVN_ERR_WC_LEFT_LOCAL_MOD the instant a locally modified file is
4673  * encountered. Otherwise, leave locally modified files in place and
4674  * return the error only after all the recursion is complete.
4675  *
4676  * If @a cancel_func is non-NULL, call it with @a cancel_baton at
4677  * various points during the removal. If it returns an error
4678  * (typically #SVN_ERR_CANCELLED), return that error immediately.
4679  *
4680  * WARNING: This routine is exported for careful, measured use by
4681  * libsvn_client. Do *not* call this routine unless you really
4682  * understand what the heck you're doing.
4683  *
4684  * @since New in 1.7.
4685  */
4686 svn_error_t *
4688  const char *local_abspath,
4689  svn_boolean_t destroy_wf,
4690  svn_boolean_t instant_error,
4691  svn_cancel_func_t cancel_func,
4692  void *cancel_baton,
4693  apr_pool_t *pool);
4694 
4695 /**
4696  * Similar to svn_wc_remove_from_revision_control2() but with a name
4697  * and access baton.
4698  *
4699  * WARNING: This routine was exported for careful, measured use by
4700  * libsvn_client. Do *not* call this routine unless you really
4701  * understand what the heck you're doing.
4702  *
4703  * @deprecated Provided for compatibility with the 1.6 API
4704  */
4706 svn_error_t *
4708  const char *name,
4709  svn_boolean_t destroy_wf,
4710  svn_boolean_t instant_error,
4711  svn_cancel_func_t cancel_func,
4712  void *cancel_baton,
4713  apr_pool_t *pool);
4714 
4715 
4716 /**
4717  * Assuming @a local_abspath is under version control or a tree conflict
4718  * victim and in a state of conflict, then take @a local_abspath *out*
4719  * of this state. If @a resolve_text is TRUE then any text conflict is
4720  * resolved, if @a resolve_tree is TRUE then any tree conflicts are
4721  * resolved. If @a resolve_prop is set to "" all property conflicts are
4722  * resolved, if it is set to any other string value, conflicts on that
4723  * specific property are resolved and when resolve_prop is NULL, no
4724  * property conflicts are resolved.
4725  *
4726  * If @a depth is #svn_depth_empty, act only on @a local_abspath; if
4727  * #svn_depth_files, resolve @a local_abspath and its conflicted file
4728  * children (if any); if #svn_depth_immediates, resolve @a local_abspath
4729  * and all its immediate conflicted children (both files and directories,
4730  * if any); if #svn_depth_infinity, resolve @a local_abspath and every
4731  * conflicted file or directory anywhere beneath it.
4732  *
4733  * If @a conflict_choice is #svn_wc_conflict_choose_base, resolve the
4734  * conflict with the old file contents; if
4735  * #svn_wc_conflict_choose_mine_full, use the original working contents;
4736  * if #svn_wc_conflict_choose_theirs_full, the new contents; and if
4737  * #svn_wc_conflict_choose_merged, don't change the contents at all,
4738  * just remove the conflict status, which is the pre-1.5 behavior.
4739  *
4740  * #svn_wc_conflict_choose_theirs_conflict and
4741  * #svn_wc_conflict_choose_mine_conflict are not legal for binary
4742  * files or properties.
4743  *
4744  * @a wc_ctx is a working copy context, with a write lock, for @a
4745  * local_abspath.
4746  *
4747  * Needless to say, this function doesn't touch conflict markers or
4748  * anything of that sort -- only a human can semantically resolve a
4749  * conflict. Instead, this function simply marks a file as "having
4750  * been resolved", clearing the way for a commit.
4751  *
4752  * The implementation details are opaque, as our "conflicted" criteria
4753  * might change over time. (At the moment, this routine removes the
4754  * three fulltext 'backup' files and any .prej file created in a conflict,
4755  * and modifies @a local_abspath's entry.)
4756  *
4757  * If @a local_abspath is not under version control and not a tree
4758  * conflict, return #SVN_ERR_ENTRY_NOT_FOUND. If @a path isn't in a
4759  * state of conflict to begin with, do nothing, and return #SVN_NO_ERROR.
4760  *
4761  * If @c local_abspath was successfully taken out of a state of conflict,
4762  * report this information to @c notify_func (if non-@c NULL.) If only
4763  * text, only property, or only tree conflict resolution was requested,
4764  * and it was successful, then success gets reported.
4765  *
4766  * Temporary allocations will be performed in @a scratch_pool.
4767  *
4768  * @since New in 1.7.
4769  */
4770 svn_error_t *
4772  const char *local_abspath,
4773  svn_depth_t depth,
4774  svn_boolean_t resolve_text,
4775  const char *resolve_prop,
4776  svn_boolean_t resolve_tree,
4777  svn_wc_conflict_choice_t conflict_choice,
4778  svn_cancel_func_t cancel_func,
4779  void *cancel_baton,
4780  svn_wc_notify_func2_t notify_func,
4781  void *notify_baton,
4782  apr_pool_t *scratch_pool);
4783 
4784 /** Similar to svn_wc_resolved_conflict5, but takes an absolute path
4785  * and an access baton. This version doesn't support resolving a specific
4786  * property.conflict.
4787  *
4788  * @since New in 1.6.
4789  * @deprecated Provided for backward compatibility with the 1.6 API.
4790  */
4792 svn_error_t *
4793 svn_wc_resolved_conflict4(const char *path,
4794  svn_wc_adm_access_t *adm_access,
4795  svn_boolean_t resolve_text,
4796  svn_boolean_t resolve_props,
4797  svn_boolean_t resolve_tree,
4798  svn_depth_t depth,
4799  svn_wc_conflict_choice_t conflict_choice,
4800  svn_wc_notify_func2_t notify_func,
4801  void *notify_baton,
4802  svn_cancel_func_t cancel_func,
4803  void *cancel_baton,
4804  apr_pool_t *pool);
4805 
4806 
4807 /**
4808  * Similar to svn_wc_resolved_conflict4(), but without tree-conflict
4809  * resolution support.
4810  *
4811  * @since New in 1.5.
4812  * @deprecated Provided for backward compatibility with the 1.5 API.
4813  */
4815 svn_error_t *
4816 svn_wc_resolved_conflict3(const char *path,
4817  svn_wc_adm_access_t *adm_access,
4818  svn_boolean_t resolve_text,
4819  svn_boolean_t resolve_props,
4820  svn_depth_t depth,
4821  svn_wc_conflict_choice_t conflict_choice,
4822  svn_wc_notify_func2_t notify_func,
4823  void *notify_baton,
4824  svn_cancel_func_t cancel_func,
4825  void *cancel_baton,
4826  apr_pool_t *pool);
4827 
4828 
4829 /**
4830  * Similar to svn_wc_resolved_conflict3(), but without automatic conflict
4831  * resolution support, and with @a depth set according to @a recurse:
4832  * if @a recurse is TRUE, @a depth is #svn_depth_infinity, else it is
4833  * #svn_depth_files.
4834  *
4835  * @since New in 1.2.
4836  * @deprecated Provided for backward compatibility with the 1.4 API.
4837  */
4839 svn_error_t *
4840 svn_wc_resolved_conflict2(const char *path,
4841  svn_wc_adm_access_t *adm_access,
4842  svn_boolean_t resolve_text,
4843  svn_boolean_t resolve_props,
4844  svn_boolean_t recurse,
4845  svn_wc_notify_func2_t notify_func,
4846  void *notify_baton,
4847  svn_cancel_func_t cancel_func,
4848  void *cancel_baton,
4849  apr_pool_t *pool);
4850 
4851 /**
4852  * Similar to svn_wc_resolved_conflict2(), but takes an
4853  * svn_wc_notify_func_t and doesn't have cancellation support.
4854  *
4855  * @deprecated Provided for backward compatibility with the 1.1 API.
4856  */
4858 svn_error_t *
4859 svn_wc_resolved_conflict(const char *path,
4860  svn_wc_adm_access_t *adm_access,
4861  svn_boolean_t resolve_text,
4862  svn_boolean_t resolve_props,
4863  svn_boolean_t recurse,
4864  svn_wc_notify_func_t notify_func,
4865  void *notify_baton,
4866  apr_pool_t *pool);
4867 
4868 
4869 /* Commits. */
4870 
4871 
4872 /**
4873  * Storage type for queued post-commit data.
4874  *
4875  * @since New in 1.5.
4876  */
4878 
4879 
4880 /**
4881  * Create a queue for use with svn_wc_queue_committed() and
4882  * svn_wc_process_committed_queue().
4883  *
4884  * The returned queue and all further allocations required for queuing
4885  * new items will also be done from @a pool.
4886  *
4887  * @since New in 1.5.
4888  */
4890 svn_wc_committed_queue_create(apr_pool_t *pool);
4891 
4892 
4893 /**
4894  * Queue committed items to be processed later by
4895  * svn_wc_process_committed_queue2().
4896  *
4897  * Record in @a queue that @a local_abspath will need to be bumped
4898  * after a commit succeeds.
4899  *
4900  * If non-NULL, @a wcprop_changes is an array of <tt>svn_prop_t *</tt>
4901  * changes to wc properties; if an #svn_prop_t->value is NULL, then
4902  * that property is deleted.
4903  * ### [JAF] No, a prop whose value is NULL is ignored, not deleted. This
4904  * ### seems to be not a set of changes but rather the new complete set of
4905  * ### props. And it's renamed to 'new_dav_cache' inside; why?
4906  *
4907  * If @a remove_lock is @c TRUE, any entryprops related to a repository
4908  * lock will be removed.
4909  *
4910  * If @a remove_changelist is @c TRUE, any association with a
4911  * changelist will be removed.
4912  *
4913  *
4914  * If @a sha1_checksum is non-NULL, use it to identify the node's pristine
4915  * text.
4916  *
4917  * If @a recurse is TRUE and @a local_abspath is a directory, then bump every
4918  * versioned object at or under @a local_abspath. This is usually done for
4919  * copied trees.
4920  *
4921  * ### In the present implementation, if a recursive directory item is in
4922  * the queue, then any children (at any depth) of that directory that
4923  * are also in the queue as separate items will get:
4924  * 'wcprop_changes' = NULL;
4925  * 'remove_lock' = FALSE;
4926  * 'remove_changelist' from the recursive parent item;
4927  * and any children (at any depth) of that directory that are NOT in
4928  * the queue as separate items will get:
4929  * 'wcprop_changes' = NULL;
4930  * 'remove_lock' = FALSE;
4931  * 'remove_changelist' from the recursive parent item;
4932  *
4933  * @note the @a recurse parameter should be used with extreme care since
4934  * it will bump ALL nodes under the directory, regardless of their
4935  * actual inclusion in the new revision.
4936  *
4937  * All pointer data passed to this function (@a local_abspath,
4938  * @a wcprop_changes and the checksums) should remain valid until the
4939  * queue has been processed by svn_wc_process_committed_queue2().
4940  *
4941  * Temporary allocations will be performed in @a scratch_pool, and persistent
4942  * allocations will use the same pool as @a queue used when it was created.
4943  *
4944  * @since New in 1.7.
4945  */
4946 svn_error_t *
4948  svn_wc_context_t *wc_ctx,
4949  const char *local_abspath,
4950  svn_boolean_t recurse,
4951  const apr_array_header_t *wcprop_changes,
4952  svn_boolean_t remove_lock,
4953  svn_boolean_t remove_changelist,
4954  const svn_checksum_t *sha1_checksum,
4955  apr_pool_t *scratch_pool);
4956 
4957 /** Same as svn_wc_queue_committed3() except @a path doesn't have to be an
4958  * abspath and @a adm_access is unused and a SHA-1 checksum cannot be
4959  * specified.
4960  *
4961  * @since New in 1.6.
4962  *
4963  * @deprecated Provided for backwards compatibility with the 1.6 API.
4964  */
4966 svn_error_t *
4968  const char *path,
4969  svn_wc_adm_access_t *adm_access,
4970  svn_boolean_t recurse,
4971  const apr_array_header_t *wcprop_changes,
4972  svn_boolean_t remove_lock,
4973  svn_boolean_t remove_changelist,
4974  const svn_checksum_t *md5_checksum,
4975  apr_pool_t *scratch_pool);
4976 
4977 
4978 /** Same as svn_wc_queue_committed2() but the @a queue parameter has an
4979  * extra indirection and @a digest is supplied instead of a checksum type.
4980  *
4981  * @note despite the extra indirection, this function does NOT allocate
4982  * the queue for you. svn_wc_committed_queue_create() must be called.
4983  *
4984  * @since New in 1.5
4985  *
4986  * @deprecated Provided for backwards compatibility with 1.5
4987  */
4989 svn_error_t *
4991  const char *path,
4992  svn_wc_adm_access_t *adm_access,
4993  svn_boolean_t recurse,
4994  const apr_array_header_t *wcprop_changes,
4995  svn_boolean_t remove_lock,
4996  svn_boolean_t remove_changelist,
4997  const unsigned char *digest,
4998  apr_pool_t *pool);
4999 
5000 
5001 /**
5002  * Bump all items in @a queue to @a new_revnum after a commit succeeds.
5003  * @a rev_date and @a rev_author are the (server-side) date and author
5004  * of the new revision; one or both may be @c NULL.
5005  *
5006  * If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
5007  * if the client wants to cancel the operation.
5008  *
5009  * @since New in 1.7.
5010  */
5011 svn_error_t *
5013  svn_wc_context_t *wc_ctx,
5014  svn_revnum_t new_revnum,
5015  const char *rev_date,
5016  const char *rev_author,
5017  svn_cancel_func_t cancel_func,
5018  void *cancel_baton,
5019  apr_pool_t *scratch_pool);
5020 
5021 /** @see svn_wc_process_committed_queue2()
5022  *
5023  * @since New in 1.5.
5024  * @deprecated Provided for backwards compatibility with the 1.6 API.
5025  */
5027 svn_error_t *
5029  svn_wc_adm_access_t *adm_access,
5030  svn_revnum_t new_revnum,
5031  const char *rev_date,
5032  const char *rev_author,
5033  apr_pool_t *pool);
5034 
5035 
5036 /**
5037  * @note this function has improper expectations around the operation and
5038  * execution of other parts of the Subversion WC library. The resulting
5039  * coupling makes this interface near-impossible to support. Documentation
5040  * has been removed, as a result.
5041  *
5042  * @deprecated Use the svn_wc_committed_queue_* functions instead. Provided
5043  * for backwards compatibility with the 1.5 API.
5044  */
5046 svn_error_t *
5047 svn_wc_process_committed4(const char *path,
5048  svn_wc_adm_access_t *adm_access,
5049  svn_boolean_t recurse,
5050  svn_revnum_t new_revnum,
5051  const char *rev_date,
5052  const char *rev_author,
5053  const apr_array_header_t *wcprop_changes,
5054  svn_boolean_t remove_lock,
5055  svn_boolean_t remove_changelist,
5056  const unsigned char *digest,
5057  apr_pool_t *pool);
5058 
5059 /** @see svn_wc_process_committed4()
5060  *
5061  * @deprecated Use the svn_wc_committed_queue_* functions instead. Provided
5062  * for backwards compatibility with the 1.4 API.
5063  */
5065 svn_error_t *
5066 svn_wc_process_committed3(const char *path,
5067  svn_wc_adm_access_t *adm_access,
5068  svn_boolean_t recurse,
5069  svn_revnum_t new_revnum,
5070  const char *rev_date,
5071  const char *rev_author,
5072  const apr_array_header_t *wcprop_changes,
5073  svn_boolean_t remove_lock,
5074  const unsigned char *digest,
5075  apr_pool_t *pool);
5076 
5077 /** @see svn_wc_process_committed4()
5078  *
5079  * @deprecated Use the svn_wc_committed_queue_* functions instead. Provided
5080  * for backwards compatibility with the 1.3 API.
5081  */
5083 svn_error_t *
5084 svn_wc_process_committed2(const char *path,
5085  svn_wc_adm_access_t *adm_access,
5086  svn_boolean_t recurse,
5087  svn_revnum_t new_revnum,
5088  const char *rev_date,
5089  const char *rev_author,
5090  const apr_array_header_t *wcprop_changes,
5091  svn_boolean_t remove_lock,
5092  apr_pool_t *pool);
5093 
5094 /** @see svn_wc_process_committed4()
5095  *
5096  * @deprecated Use the svn_wc_committed_queue_* functions instead. Provided
5097  * for backward compatibility with the 1.1 API.
5098  */
5100 svn_error_t *
5101 svn_wc_process_committed(const char *path,
5102  svn_wc_adm_access_t *adm_access,
5103  svn_boolean_t recurse,
5104  svn_revnum_t new_revnum,
5105  const char *rev_date,
5106  const char *rev_author,
5107  const apr_array_header_t *wcprop_changes,
5108  apr_pool_t *pool);
5109 
5110 
5111 
5112 
5113 
5114 /**
5115  * Do a depth-first crawl in a working copy, beginning at @a local_abspath,
5116  * using @a wc_ctx for accessing the working copy.
5117  *
5118  * Communicate the `state' of the working copy's revisions and depths
5119  * to @a reporter/@a report_baton. Obviously, if @a local_abspath is a
5120  * file instead of a directory, this depth-first crawl will be a short one.
5121  *
5122  * No locks or logs are created, nor are any animals harmed in the
5123  * process unless @a restore_files is TRUE. No cleanup is necessary.
5124  *
5125  * After all revisions are reported, @a reporter->finish_report() is
5126  * called, which immediately causes the RA layer to update the working
5127  * copy. Thus the return value may very well reflect the result of
5128  * the update!
5129  *
5130  * If @a depth is #svn_depth_empty, then report state only for
5131  * @a path itself. If #svn_depth_files, do the same and include
5132  * immediate file children of @a path. If #svn_depth_immediates,
5133  * then behave as if for #svn_depth_files but also report the
5134  * property states of immediate subdirectories. If @a depth is
5135  * #svn_depth_infinity, then report state fully recursively. All
5136  * descents are only as deep as @a path's own depth permits, of
5137  * course. If @a depth is #svn_depth_unknown, then just use
5138  * #svn_depth_infinity, which in practice means depth of @a path.
5139  *
5140  * Iff @a honor_depth_exclude is TRUE, the crawler will report paths
5141  * whose ambient depth is #svn_depth_exclude as being excluded, and
5142  * thus prevent the server from pushing update data for those paths;
5143  * therefore, don't set this flag if you wish to pull in excluded paths.
5144  * Note that #svn_depth_exclude on the target @a path is never
5145  * honored, even if @a honor_depth_exclude is TRUE, because we need to
5146  * be able to explicitly pull in a target. For example, if this is
5147  * the working copy...
5148  *
5149  * svn co greek_tree_repos wc_dir
5150  * svn up --set-depth exclude wc_dir/A/B/E # now A/B/E is excluded
5151  *
5152  * ...then 'svn up wc_dir/A/B' would report E as excluded (assuming
5153  * @a honor_depth_exclude is TRUE), but 'svn up wc_dir/A/B/E' would
5154  * not, because the latter is trying to explicitly pull in E. In
5155  * general, we never report the update target as excluded.
5156  *
5157  * Iff @a depth_compatibility_trick is TRUE, then set the @c start_empty
5158  * flag on @a reporter->set_path() and @a reporter->link_path() calls
5159  * as necessary to trick a pre-1.5 (i.e., depth-unaware) server into
5160  * sending back all the items the client might need to upgrade a
5161  * working copy from a shallower depth to a deeper one.
5162  *
5163  * If @a restore_files is TRUE, then unexpectedly missing working files
5164  * will be restored from the administrative directory's cache. For each
5165  * file restored, the @a notify_func function will be called with the
5166  * @a notify_baton and the path of the restored file. @a notify_func may
5167  * be @c NULL if this notification is not required. If @a
5168  * use_commit_times is TRUE, then set restored files' timestamps to
5169  * their last-commit-times.
5170  *
5171  * @since New in 1.7.
5172  */
5173 svn_error_t *
5175  const char *local_abspath,
5176  const svn_ra_reporter3_t *reporter,
5177  void *report_baton,
5178  svn_boolean_t restore_files,
5179  svn_depth_t depth,
5180  svn_boolean_t honor_depth_exclude,
5181  svn_boolean_t depth_compatibility_trick,
5182  svn_boolean_t use_commit_times,
5183  svn_cancel_func_t cancel_func,
5184  void *cancel_baton,
5185  svn_wc_notify_func2_t notify_func,
5186  void *notify_baton,
5187  apr_pool_t *scratch_pool);
5188 
5189 /**
5190  * Similar to svn_wc_crawl_revisions5, but with a relative path and
5191  * access baton instead of an absolute path and wc_ctx.
5192  *
5193  * Passes NULL for @a cancel_func and @a cancel_baton.
5194  *
5195  * @since New in 1.6.
5196  * @deprecated Provided for compatibility with the 1.6 API.
5197  */
5199 svn_error_t *
5200 svn_wc_crawl_revisions4(const char *path,
5201  svn_wc_adm_access_t *adm_access,
5202  const svn_ra_reporter3_t *reporter,
5203  void *report_baton,
5204  svn_boolean_t restore_files,
5205  svn_depth_t depth,
5206  svn_boolean_t honor_depth_exclude,
5207  svn_boolean_t depth_compatibility_trick,
5208  svn_boolean_t use_commit_times,
5209  svn_wc_notify_func2_t notify_func,
5210  void *notify_baton,
5211  svn_wc_traversal_info_t *traversal_info,
5212  apr_pool_t *pool);
5213 
5214 
5215 /**
5216  * Similar to svn_wc_crawl_revisions4, but with @a honor_depth_exclude always
5217  * set to false.
5218  *
5219  * @deprecated Provided for compatibility with the 1.5 API.
5220  */
5222 svn_error_t *
5223 svn_wc_crawl_revisions3(const char *path,
5224  svn_wc_adm_access_t *adm_access,
5225  const svn_ra_reporter3_t *reporter,
5226  void *report_baton,
5227  svn_boolean_t restore_files,
5228  svn_depth_t depth,
5229  svn_boolean_t depth_compatibility_trick,
5230  svn_boolean_t use_commit_times,
5231  svn_wc_notify_func2_t notify_func,
5232  void *notify_baton,
5233  svn_wc_traversal_info_t *traversal_info,
5234  apr_pool_t *pool);
5235 
5236 /**
5237  * Similar to svn_wc_crawl_revisions3, but taking svn_ra_reporter2_t
5238  * instead of svn_ra_reporter3_t, and therefore only able to report
5239  * #svn_depth_infinity for depths; and taking @a recurse instead of @a
5240  * depth; and with @a depth_compatibility_trick always false.
5241  *
5242  * @deprecated Provided for compatibility with the 1.4 API.
5243  */
5245 svn_error_t *
5246 svn_wc_crawl_revisions2(const char *path,
5247  svn_wc_adm_access_t *adm_access,
5248  const svn_ra_reporter2_t *reporter,
5249  void *report_baton,
5250  svn_boolean_t restore_files,
5251  svn_boolean_t recurse,
5252  svn_boolean_t use_commit_times,
5253  svn_wc_notify_func2_t notify_func,
5254  void *notify_baton,
5255  svn_wc_traversal_info_t *traversal_info,
5256  apr_pool_t *pool);
5257 
5258 /**
5259  * Similar to svn_wc_crawl_revisions2(), but takes an #svn_wc_notify_func_t
5260  * and a #svn_ra_reporter_t instead.
5261  *
5262  * @deprecated Provided for backward compatibility with the 1.1 API.
5263  */
5265 svn_error_t *
5266 svn_wc_crawl_revisions(const char *path,
5267  svn_wc_adm_access_t *adm_access,
5268  const svn_ra_reporter_t *reporter,
5269  void *report_baton,
5270  svn_boolean_t restore_files,
5271  svn_boolean_t recurse,
5272  svn_boolean_t use_commit_times,
5273  svn_wc_notify_func_t notify_func,
5274  void *notify_baton,
5275  svn_wc_traversal_info_t *traversal_info,
5276  apr_pool_t *pool);
5277 
5278 
5279 /**
5280  * @defgroup svn_wc_roots Working copy roots
5281  * @{
5282  */
5283 
5284 /** Set @a *wc_root to @c TRUE if @a local_abspath represents a "working copy
5285  * root", @c FALSE otherwise. Here, @a local_abspath is a "working copy root"
5286  * if its parent directory is not a WC or if its parent directory's repository
5287  * URL is not the parent of its own repository URL. Thus, a switched subtree is
5288  * considered to be a working copy root. Also, a deleted tree-conflict
5289  * victim is considered a "working copy root" because it has no URL.
5290  *
5291  * If @a local_abspath is not found, return the error #SVN_ERR_ENTRY_NOT_FOUND.
5292  *
5293  * Use @a scratch_pool for any temporary allocations.
5294  *
5295  * @since New in 1.7.
5296  */
5297 svn_error_t *
5299  svn_wc_context_t *wc_ctx,
5300  const char *local_abspath,
5301  apr_pool_t *scratch_pool);
5302 
5303 /**
5304  * Similar to svn_wc_is_wc_root2(), but with an access baton and relative
5305  * path.
5306  *
5307  * @note If @a path is '', this function will always return @c TRUE.
5308  *
5309  * @deprecated Provided for backward compatibility with the 1.6 API.
5310  */
5312 svn_error_t *
5314  const char *path,
5315  svn_wc_adm_access_t *adm_access,
5316  apr_pool_t *pool);
5317 
5318 /** @} */
5319 
5320 
5321 /* Updates. */
5322 
5323 /** Conditionally split @a path into an @a anchor and @a target for the
5324  * purpose of updating and committing.
5325  *
5326  * @a anchor is the directory at which the update or commit editor
5327  * should be rooted.
5328  *
5329  * @a target is the actual subject (relative to the @a anchor) of the
5330  * update/commit, or "" if the @a anchor itself is the subject.
5331  *
5332  * Allocate @a anchor and @a target in @a result_pool; @a scratch_pool
5333  * is used for temporary allocations.
5334  *
5335  * @note Even though this API uses a #svn_wc_context_t, it accepts a
5336  * (possibly) relative path and returns a (possibly) relative path in
5337  * @a *anchor. The reason being that the outputs are generally used to
5338  * open access batons, and such opening currently requires relative paths.
5339  * In the long-run, I expect this API to be removed from 1.7, due to the
5340  * remove of access batons, but for the time being, the #svn_wc_context_t
5341  * parameter allows us to avoid opening a duplicate database, just for this
5342  * function.
5343  *
5344  * @since New in 1.7.
5345  */
5346 svn_error_t *
5347 svn_wc_get_actual_target2(const char **anchor,
5348  const char **target,
5349  svn_wc_context_t *wc_ctx,
5350  const char *path,
5351  apr_pool_t *result_pool,
5352  apr_pool_t *scratch_pool);
5353 
5354 
5355 /** Similar to svn_wc_get_actual_target2(), but without the wc context, and
5356  * with a absolute path.
5357  *
5358  * @deprecated Provided for backward compatibility with the 1.6 API.
5359  */
5361 svn_error_t *
5362 svn_wc_get_actual_target(const char *path,
5363  const char **anchor,
5364  const char **target,
5365  apr_pool_t *pool);
5366 
5367 
5368 /**
5369  * @defgroup svn_wc_update_switch Update and switch (update-like functionality)
5370  * @{
5371  */
5372 
5373 /**
5374  * A simple callback type to wrap svn_ra_get_file(); see that
5375  * docstring for more information.
5376  *
5377  * This technique allows libsvn_client to 'wrap' svn_ra_get_file() and
5378  * pass it down into libsvn_wc functions, thus allowing the WC layer
5379  * to legally call the RA function via (blind) callback.
5380  *
5381  * @since New in 1.5
5382  * @deprecated Provided for backward compatibility with the 1.6 API.
5383  */
5384 typedef svn_error_t *(*svn_wc_get_file_t)(void *baton,
5385  const char *path,
5386  svn_revnum_t revision,
5387  svn_stream_t *stream,
5388  svn_revnum_t *fetched_rev,
5389  apr_hash_t **props,
5390  apr_pool_t *pool);
5391 
5392 /**
5393  * A simple callback type to wrap svn_ra_get_dir2() for avoiding issue #3569,
5394  * where a directory is updated to a revision without some of its children
5395  * recorded in the working copy. A future update won't bring these files in
5396  * because the repository assumes they are already there.
5397  *
5398  * We really only need the names of the dirents for a not-present marking,
5399  * but we also store the node-kind if we receive one.
5400  *
5401  * @a *dirents should be set to a hash mapping <tt>const char *</tt> child
5402  * names, to <tt>const svn_dirent_t *</tt> instances.
5403  *
5404  * @since New in 1.7.
5405  */
5406 typedef svn_error_t *(*svn_wc_dirents_func_t)(void *baton,
5407  apr_hash_t **dirents,
5408  const char *repos_root_url,
5409  const char *repos_relpath,
5410  apr_pool_t *result_pool,
5411  apr_pool_t *scratch_pool);
5412 
5413 
5414 /**
5415  * Set @a *editor and @a *edit_baton to an editor and baton for updating a
5416  * working copy.
5417  *
5418  * @a anchor_abspath is a local working copy directory, with a fully recursive
5419  * write lock in @a wc_ctx, which will be used as the root of our editor.
5420  *
5421  * @a target_basename is the entry in @a anchor_abspath that will actually be
5422  * updated, or the empty string if all of @a anchor_abspath should be updated.
5423  *
5424  * The editor invokes @a notify_func with @a notify_baton as the update
5425  * progresses, if @a notify_func is non-NULL.
5426  *
5427  * If @a cancel_func is non-NULL, the editor will invoke @a cancel_func with
5428  * @a cancel_baton as the update progresses to see if it should continue.
5429  *
5430  * If @a conflict_func is non-NULL, then invoke it with @a
5431  * conflict_baton whenever a conflict is encountered, giving the
5432  * callback a chance to resolve the conflict before the editor takes
5433  * more drastic measures (such as marking a file conflicted, or
5434  * bailing out of the update).
5435  *
5436  * If @a external_func is non-NULL, then invoke it with @a external_baton
5437  * whenever external changes are encountered, giving the callback a chance
5438  * to store the external information for processing.
5439  *
5440  * If @a diff3_cmd is non-NULL, then use it as the diff3 command for
5441  * any merging; otherwise, use the built-in merge code.
5442  *
5443  * @a preserved_exts is an array of filename patterns which, when
5444  * matched against the extensions of versioned files, determine for
5445  * which such files any related generated conflict files will preserve
5446  * the original file's extension as their own. If a file's extension
5447  * does not match any of the patterns in @a preserved_exts (which is
5448  * certainly the case if @a preserved_exts is @c NULL or empty),
5449  * generated conflict files will carry Subversion's custom extensions.
5450  *
5451  * @a target_revision is a pointer to a revision location which, after
5452  * successful completion of the drive of this editor, will be
5453  * populated with the revision to which the working copy was updated.
5454  *
5455  * If @a use_commit_times is TRUE, then all edited/added files will
5456  * have their working timestamp set to the last-committed-time. If
5457  * FALSE, the working files will be touched with the 'now' time.
5458  *
5459  * If @a allow_unver_obstructions is TRUE, then allow unversioned
5460  * obstructions when adding a path.
5461  *
5462  * If @a adds_as_modification is TRUE, a local addition at the same path
5463  * as an incoming addition of the same node kind results in a normal node
5464  * with a possible local modification, instead of a tree conflict.
5465  *
5466  * If @a depth is #svn_depth_infinity, update fully recursively.
5467  * Else if it is #svn_depth_immediates, update the uppermost
5468  * directory, its file entries, and the presence or absence of
5469  * subdirectories (but do not descend into the subdirectories).
5470  * Else if it is #svn_depth_files, update the uppermost directory
5471  * and its immediate file entries, but not subdirectories.
5472  * Else if it is #svn_depth_empty, update exactly the uppermost
5473  * target, and don't touch its entries.
5474  *
5475  * If @a depth_is_sticky is set and @a depth is not
5476  * #svn_depth_unknown, then in addition to updating PATHS, also set
5477  * their sticky ambient depth value to @a depth.
5478  *
5479  * If @a server_performs_filtering is TRUE, assume that the server handles
5480  * the ambient depth filtering, so this doesn't have to be handled in the
5481  * editor.
5482  *
5483  * If @a fetch_dirents_func is not NULL, the update editor may call this
5484  * callback, when asked to perform a depth restricted update. It will do this
5485  * before returning the editor to allow using the primary ra session for this.
5486  *
5487  * @since New in 1.7.
5488  */
5489 svn_error_t *
5491  void **edit_baton,
5492  svn_revnum_t *target_revision,
5493  svn_wc_context_t *wc_ctx,
5494  const char *anchor_abspath,
5495  const char *target_basename,
5496  svn_boolean_t use_commit_times,
5497  svn_depth_t depth,
5498  svn_boolean_t depth_is_sticky,
5499  svn_boolean_t allow_unver_obstructions,
5500  svn_boolean_t adds_as_modification,
5501  svn_boolean_t server_performs_filtering,
5502  svn_boolean_t clean_checkout,
5503  const char *diff3_cmd,
5504  const apr_array_header_t *preserved_exts,
5505  svn_wc_dirents_func_t fetch_dirents_func,
5506  void *fetch_dirents_baton,
5507  svn_wc_conflict_resolver_func2_t conflict_func,
5508  void *conflict_baton,
5509  svn_wc_external_update_t external_func,
5510  void *external_baton,
5511  svn_cancel_func_t cancel_func,
5512  void *cancel_baton,
5513  svn_wc_notify_func2_t notify_func,
5514  void *notify_baton,
5515  apr_pool_t *result_pool,
5516  apr_pool_t *scratch_pool);
5517 
5518 /** Similar to svn_wc_get_update_editor4, but uses access batons and relative
5519  * path instead of a working copy context-abspath pair and
5520  * svn_wc_traversal_info_t instead of an externals callback. Also,
5521  * @a fetch_func and @a fetch_baton are ignored.
5522  *
5523  * If @a ti is non-NULL, record traversal info in @a ti, for use by
5524  * post-traversal accessors such as svn_wc_edited_externals().
5525  *
5526  * All locks, both those in @a anchor and newly acquired ones, will be
5527  * released when the editor driver calls @c close_edit.
5528  *
5529  * Always sets @a adds_as_modification to TRUE, @a server_performs_filtering
5530  * and @a clean_checkout to FALSE.
5531  *
5532  * Uses a svn_wc_conflict_resolver_func_t conflict resolver instead of a
5533  * svn_wc_conflict_resolver_func2_t.
5534  *
5535  * This function assumes that @a diff3_cmd is path encoded. Later versions
5536  * assume utf-8.
5537  *
5538  * Always passes a null dirent function.
5539  *
5540  * @since New in 1.5.
5541  * @deprecated Provided for backward compatibility with the 1.6 API.
5542  */
5544 svn_error_t *
5545 svn_wc_get_update_editor3(svn_revnum_t *target_revision,
5546  svn_wc_adm_access_t *anchor,
5547  const char *target,
5548  svn_boolean_t use_commit_times,
5549  svn_depth_t depth,
5550  svn_boolean_t depth_is_sticky,
5551  svn_boolean_t allow_unver_obstructions,
5552  svn_wc_notify_func2_t notify_func,
5553  void *notify_baton,
5554  svn_cancel_func_t cancel_func,
5555  void *cancel_baton,
5556  svn_wc_conflict_resolver_func_t conflict_func,
5557  void *conflict_baton,
5558  svn_wc_get_file_t fetch_func,
5559  void *fetch_baton,
5560  const char *diff3_cmd,
5561  const apr_array_header_t *preserved_exts,
5562  const svn_delta_editor_t **editor,
5563  void **edit_baton,
5565  apr_pool_t *pool);
5566 
5567 
5568 /**
5569  * Similar to svn_wc_get_update_editor3() but with the @a
5570  * allow_unver_obstructions parameter always set to FALSE, @a
5571  * conflict_func and baton set to NULL, @a fetch_func and baton set to
5572  * NULL, @a preserved_exts set to NULL, @a depth_is_sticky set to
5573  * FALSE, and @a depth set according to @a recurse: if @a recurse is
5574  * TRUE, pass #svn_depth_infinity, if FALSE, pass #svn_depth_files.
5575  *
5576  * @deprecated Provided for backward compatibility with the 1.4 API.
5577  */
5579 svn_error_t *
5580 svn_wc_get_update_editor2(svn_revnum_t *target_revision,
5581  svn_wc_adm_access_t *anchor,
5582  const char *target,
5583  svn_boolean_t use_commit_times,
5584  svn_boolean_t recurse,
5585  svn_wc_notify_func2_t notify_func,
5586  void *notify_baton,
5587  svn_cancel_func_t cancel_func,
5588  void *cancel_baton,
5589  const char *diff3_cmd,
5590  const svn_delta_editor_t **editor,
5591  void **edit_baton,
5593  apr_pool_t *pool);
5594 
5595 /**
5596  * Similar to svn_wc_get_update_editor2(), but takes an svn_wc_notify_func_t
5597  * instead.
5598  *
5599  * @deprecated Provided for backward compatibility with the 1.1 API.
5600  */
5602 svn_error_t *
5603 svn_wc_get_update_editor(svn_revnum_t *target_revision,
5604  svn_wc_adm_access_t *anchor,
5605  const char *target,
5606  svn_boolean_t use_commit_times,
5607  svn_boolean_t recurse,
5608  svn_wc_notify_func_t notify_func,
5609  void *notify_baton,
5610  svn_cancel_func_t cancel_func,
5611  void *cancel_baton,
5612  const char *diff3_cmd,
5613  const svn_delta_editor_t **editor,
5614  void **edit_baton,
5616  apr_pool_t *pool);
5617 
5618 /**
5619  * A variant of svn_wc_get_update_editor4().
5620  *
5621  * Set @a *editor and @a *edit_baton to an editor and baton for "switching"
5622  * a working copy to a new @a switch_url. (Right now, this URL must be
5623  * within the same repository that the working copy already comes
5624  * from.) @a switch_url must not be @c NULL.
5625  *
5626  * All other parameters behave as for svn_wc_get_update_editor4().
5627  *
5628  * @since New in 1.7.
5629  */
5630 svn_error_t *
5632  void **edit_baton,
5633  svn_revnum_t *target_revision,
5634  svn_wc_context_t *wc_ctx,
5635  const char *anchor_abspath,
5636  const char *target_basename,
5637  const char *switch_url,
5638  svn_boolean_t use_commit_times,
5639  svn_depth_t depth,
5640  svn_boolean_t depth_is_sticky,
5641  svn_boolean_t allow_unver_obstructions,
5642  svn_boolean_t server_performs_filtering,
5643  const char *diff3_cmd,
5644  const apr_array_header_t *preserved_exts,
5645  svn_wc_dirents_func_t fetch_dirents_func,
5646  void *fetch_dirents_baton,
5647  svn_wc_conflict_resolver_func2_t conflict_func,
5648  void *conflict_baton,
5649  svn_wc_external_update_t external_func,
5650  void *external_baton,
5651  svn_cancel_func_t cancel_func,
5652  void *cancel_baton,
5653  svn_wc_notify_func2_t notify_func,
5654  void *notify_baton,
5655  apr_pool_t *result_pool,
5656  apr_pool_t *scratch_pool);
5657 
5658 /** Similar to svn_wc_get_switch_editor4, but uses access batons and relative
5659  * path instead of a working copy context and svn_wc_traversal_info_t instead
5660  * of an externals callback.
5661  *
5662  * If @a ti is non-NULL, record traversal info in @a ti, for use by
5663  * post-traversal accessors such as svn_wc_edited_externals().
5664  *
5665  * All locks, both those in @a anchor and newly acquired ones, will be
5666  * released when the editor driver calls @c close_edit.
5667  *
5668  * Always sets @a server_performs_filtering to FALSE.
5669  *
5670  * Uses a svn_wc_conflict_resolver_func_t conflict resolver instead of a
5671  * svn_wc_conflict_resolver_func2_t.
5672  *
5673  * This function assumes that @a diff3_cmd is path encoded. Later versions
5674  * assume utf-8.
5675  *
5676  * @since New in 1.5.
5677  * @deprecated Provided for backward compatibility with the 1.6 API.
5678  */
5680 svn_error_t *
5681 svn_wc_get_switch_editor3(svn_revnum_t *target_revision,
5682  svn_wc_adm_access_t *anchor,
5683  const char *target,
5684  const char *switch_url,
5685  svn_boolean_t use_commit_times,
5686  svn_depth_t depth,
5687  svn_boolean_t depth_is_sticky,
5688  svn_boolean_t allow_unver_obstructions,
5689  svn_wc_notify_func2_t notify_func,
5690  void *notify_baton,
5691  svn_cancel_func_t cancel_func,
5692  void *cancel_baton,
5693  svn_wc_conflict_resolver_func_t conflict_func,
5694  void *conflict_baton,
5695  const char *diff3_cmd,
5696  const apr_array_header_t *preserved_exts,
5697  const svn_delta_editor_t **editor,
5698  void **edit_baton,
5700  apr_pool_t *pool);
5701 
5702 /**
5703  * Similar to svn_wc_get_switch_editor3() but with the
5704  * @a allow_unver_obstructions parameter always set to FALSE,
5705  * @a preserved_exts set to NULL, @a conflict_func and baton set to NULL,
5706  * @a depth_is_sticky set to FALSE, and @a depth set according to @a
5707  * recurse: if @a recurse is TRUE, pass #svn_depth_infinity, if
5708  * FALSE, pass #svn_depth_files.
5709  *
5710  * @deprecated Provided for backward compatibility with the 1.4 API.
5711  */
5713 svn_error_t *
5714 svn_wc_get_switch_editor2(svn_revnum_t *target_revision,
5715  svn_wc_adm_access_t *anchor,
5716  const char *target,
5717  const char *switch_url,
5718  svn_boolean_t use_commit_times,
5719  svn_boolean_t recurse,
5720  svn_wc_notify_func2_t notify_func,
5721  void *notify_baton,
5722  svn_cancel_func_t cancel_func,
5723  void *cancel_baton,
5724  const char *diff3_cmd,
5725  const svn_delta_editor_t **editor,
5726  void **edit_baton,
5728  apr_pool_t *pool);
5729 
5730 /**
5731  * Similar to svn_wc_get_switch_editor2(), but takes an
5732  * #svn_wc_notify_func_t instead.
5733  *
5734  * @deprecated Provided for backward compatibility with the 1.1 API.
5735  */
5737 svn_error_t *
5738 svn_wc_get_switch_editor(svn_revnum_t *target_revision,
5739  svn_wc_adm_access_t *anchor,
5740  const char *target,
5741  const char *switch_url,
5742  svn_boolean_t use_commit_times,
5743  svn_boolean_t recurse,
5744  svn_wc_notify_func_t notify_func,
5745  void *notify_baton,
5746  svn_cancel_func_t cancel_func,
5747  void *cancel_baton,
5748  const char *diff3_cmd,
5749  const svn_delta_editor_t **editor,
5750  void **edit_baton,
5752  apr_pool_t *pool);
5753 
5754 /** @} */
5755 
5756 
5757 /**
5758  * @defgroup svn_wc_properties Properties
5759  * @{
5760  */
5761 
5762 /* A word about the implementation of working copy property storage:
5763  *
5764  * Since properties are key/val pairs, you'd think we store them in
5765  * some sort of Berkeley DB-ish format, and even store pending changes
5766  * to them that way too.
5767  *
5768  * However, we already have libsvn_subr/hashdump.c working, and it
5769  * uses a human-readable format. That will be very handy when we're
5770  * debugging, and presumably we will not be dealing with any huge
5771  * properties or property lists initially. Therefore, we will
5772  * continue to use hashdump as the internal mechanism for storing and
5773  * reading from property lists, but note that the interface here is
5774  * _not_ dependent on that. We can swap in a DB-based implementation
5775  * at any time and users of this library will never know the
5776  * difference.
5777  */
5778 
5779 /** Set @a *props to a hash table mapping <tt>char *</tt> names onto
5780  * <tt>svn_string_t *</tt> values for all the regular properties of
5781  * @a local_abspath. Allocate the table, names, and values in
5782  * @a result_pool. If the node has no properties, then an empty hash
5783  * is returned. Use @a wc_ctx to access the working copy, and @a
5784  * scratch_pool for temporary allocations.
5785  *
5786  * If the node does not exist, #SVN_ERR_WC_PATH_NOT_FOUND is returned.
5787  *
5788  * @since New in 1.7.
5789  */
5790 svn_error_t *
5791 svn_wc_prop_list2(apr_hash_t **props,
5792  svn_wc_context_t *wc_ctx,
5793  const char *local_abspath,
5794  apr_pool_t *result_pool,
5795  apr_pool_t *scratch_pool);
5796 
5797 /** Similar to svn_wc_prop_list2() but with a #svn_wc_adm_access_t /
5798  * relative path parameter pair.
5799  *
5800  * @deprecated Provided for backwards compatibility with the 1.6 API.
5801  */
5803 svn_error_t *
5804 svn_wc_prop_list(apr_hash_t **props,
5805  const char *path,
5806  svn_wc_adm_access_t *adm_access,
5807  apr_pool_t *pool);
5808 
5809 
5810 /** Return the set of "pristine" properties for @a local_abspath.
5811  *
5812  * There are node states where properties do not make sense. For these
5813  * cases, NULL will be returned in @a *props. Otherwise, a hash table
5814  * will always be returned (but may be empty, indicating no properties).
5815  *
5816  * If the node is locally-added, then @a *props will be set to NULL since
5817  * pristine properties are undefined. Note: if this addition is replacing a
5818  * previously-deleted node, then the replaced node's properties are not
5819  * available until the addition is reverted.
5820  *
5821  * If the node has been copied (from another node in the repository), then
5822  * the pristine properties will correspond to those original properties.
5823  *
5824  * If the node is locally-deleted, these properties will correspond to
5825  * the BASE node's properties, as checked-out from the repository. Note: if
5826  * this deletion is a child of a copy, then the pristine properties will
5827  * correspond to that copy's properties, not any potential BASE node. The
5828  * BASE node's properties will not be accessible until the copy is reverted.
5829  *
5830  * Nodes that are incomplete, excluded, absent, or not present at the
5831  * node's revision will return NULL in @a props.
5832  *
5833  * If the node is not versioned, SVN_ERR_WC_PATH_NOT_FOUND will be returned.
5834  *
5835  * @a props will be allocated in @a result_pool, and all temporary
5836  * allocations will be performed in @a scratch_pool.
5837  *
5838  * @since New in 1.7.
5839  */
5840 svn_error_t *
5841 svn_wc_get_pristine_props(apr_hash_t **props,
5842  svn_wc_context_t *wc_ctx,
5843  const char *local_abspath,
5844  apr_pool_t *result_pool,
5845  apr_pool_t *scratch_pool);
5846 
5847 
5848 /** Set @a *value to the value of property @a name for @a local_abspath,
5849  * allocating @a *value in @a result_pool. If no such prop, set @a *value
5850  * to @c NULL. @a name may be a regular or wc property; if it is an
5851  * entry property, return the error #SVN_ERR_BAD_PROP_KIND. @a wc_ctx
5852  * is used to access the working copy.
5853  *
5854  * If @a local_abspath is not a versioned path, return
5855  * #SVN_ERR_WC_PATH_NOT_FOUND
5856  *
5857  * @since New in 1.7.
5858  */
5859 svn_error_t *
5860 svn_wc_prop_get2(const svn_string_t **value,
5861  svn_wc_context_t *wc_ctx,
5862  const char *local_abspath,
5863  const char *name,
5864  apr_pool_t *result_pool,
5865  apr_pool_t *scratch_pool);
5866 
5867 /** Similar to svn_wc_prop_get2(), but with a #svn_wc_adm_access_t /
5868  * relative path parameter pair.
5869  *
5870  * When @a path is not versioned, set @a *value to NULL.
5871  *
5872  * @deprecated Provided for backwards compatibility with the 1.6 API.
5873  */
5875 svn_error_t *
5876 svn_wc_prop_get(const svn_string_t **value,
5877  const char *name,
5878  const char *path,
5879  svn_wc_adm_access_t *adm_access,
5880  apr_pool_t *pool);
5881 
5882 /**
5883  * Set property @a name to @a value for @a local_abspath, or if @a value is
5884  * NULL, remove property @a name from @a local_abspath. Use @a wc_ctx to
5885  * access @a local_abspath.
5886  *
5887  * If @a skip_checks is TRUE, do no validity checking. But if @a
5888  * skip_checks is FALSE, and @a name is not a valid property for @a
5889  * path, return an error, either #SVN_ERR_ILLEGAL_TARGET (if the
5890  * property is not appropriate for @a path), or
5891  * #SVN_ERR_BAD_MIME_TYPE (if @a name is "svn:mime-type", but @a value
5892  * is not a valid mime-type).
5893  *
5894  * @a depth follows the usual semeatic for depth. If the property is a
5895  * wc property, @a depth must be #svn_depth_empty.
5896  *
5897  * @a name may be a wc property or a regular property; but if it is an
5898  * entry property, return the error #SVN_ERR_BAD_PROP_KIND, even if
5899  * @a skip_checks is TRUE.
5900  *
5901  * @a changelist_filter is an array of <tt>const char *</tt> changelist
5902  * names, used as a restrictive filter on items whose properties are
5903  * set; that is, don't set properties on any item unless it's a member
5904  * of one of those changelists. If @a changelist_filter is empty (or
5905  * altogether @c NULL), no changelist filtering occurs.
5906  *
5907  * If @a cancel_func is non-NULL, then it will be invoked (with the
5908  * @a cancel_baton value passed) during the processing of the property
5909  * set (i.e. when @a depth indicates some amount of recursion).
5910  *
5911  * For each file or directory operated on, @a notify_func will be called
5912  * with its path and the @a notify_baton. @a notify_func may be @c NULL
5913  * if you are not interested in this information.
5914  *
5915  * Use @a scratch_pool for temporary allocation.
5916  *
5917  * @since New in 1.7.
5918  */
5919 svn_error_t *
5921  const char *local_abspath,
5922  const char *name,
5923  const svn_string_t *value,
5924  svn_depth_t depth,
5925  svn_boolean_t skip_checks,
5926  const apr_array_header_t *changelist_filter,
5927  svn_cancel_func_t cancel_func,
5928  void *cancel_baton,
5929  svn_wc_notify_func2_t notify_func,
5930  void *notify_baton,
5931  apr_pool_t *scratch_pool);
5932 
5933 /** Similar to svn_wc_prop_set4(), but with a #svn_wc_adm_access_t /
5934  * relative path parameter pair, no @a depth parameter, no changelist
5935  * filtering (for the depth-based property setting), and no cancelation.
5936  *
5937  * @since New in 1.6.
5938  * @deprecated Provided for backwards compatibility with the 1.6 API.
5939  */
5941 svn_error_t *
5942 svn_wc_prop_set3(const char *name,
5943  const svn_string_t *value,
5944  const char *path,
5945  svn_wc_adm_access_t *adm_access,
5946  svn_boolean_t skip_checks,
5947  svn_wc_notify_func2_t notify_func,
5948  void *notify_baton,
5949  apr_pool_t *pool);
5950 
5951 
5952 /**
5953  * Like svn_wc_prop_set3(), but without the notification callbacks.
5954  *
5955  * @since New in 1.2.
5956  * @deprecated Provided for backwards compatibility with the 1.5 API.
5957  */
5959 svn_error_t *
5960 svn_wc_prop_set2(const char *name,
5961  const svn_string_t *value,
5962  const char *path,
5963  svn_wc_adm_access_t *adm_access,
5964  svn_boolean_t skip_checks,
5965  apr_pool_t *pool);
5966 
5967 
5968 /**
5969  * Like svn_wc_prop_set2(), but with @a skip_checks always FALSE.
5970  *
5971  * @deprecated Provided for backward compatibility with the 1.1 API.
5972  */
5974 svn_error_t *
5975 svn_wc_prop_set(const char *name,
5976  const svn_string_t *value,
5977  const char *path,
5978  svn_wc_adm_access_t *adm_access,
5979  apr_pool_t *pool);
5980 
5981 
5982 /** Return TRUE iff @a name is a 'normal' property name. 'Normal' is
5983  * defined as a user-visible and user-tweakable property that shows up
5984  * when you fetch a proplist.
5985  *
5986  * The function currently parses the namespace like so:
5987  *
5988  * - 'svn:wc:' ==> a wcprop, stored/accessed separately via different API.
5989  *
5990  * - 'svn:entry:' ==> an "entry" prop, shunted into the 'entries' file.
5991  *
5992  * If these patterns aren't found, then the property is assumed to be
5993  * Normal.
5994  */
5996 svn_wc_is_normal_prop(const char *name);
5997 
5998 
5999 
6000 /** Return TRUE iff @a name is a 'wc' property name. */
6002 svn_wc_is_wc_prop(const char *name);
6003 
6004 /** Return TRUE iff @a name is a 'entry' property name. */
6006 svn_wc_is_entry_prop(const char *name);
6007 
6008 /** Callback type used by #svn_wc_canonicalize_svn_prop.
6009  *
6010  * If @a mime_type is non-null, it sets @a *mime_type to the value of
6011  * #SVN_PROP_MIME_TYPE for the path passed to
6012  * #svn_wc_canonicalize_svn_prop (allocated from @a pool). If @a
6013  * stream is non-null, it writes the contents of the file to @a
6014  * stream.
6015  *
6016  * (Currently, this is used if you are attempting to set the
6017  * #SVN_PROP_EOL_STYLE property, to make sure that the value matches
6018  * the mime type and contents.)
6019  */
6020 typedef svn_error_t *(*svn_wc_canonicalize_svn_prop_get_file_t)(
6021  const svn_string_t **mime_type,
6022  svn_stream_t *stream,
6023  void *baton,
6024  apr_pool_t *pool);
6025 
6026 
6027 /** Canonicalize the value of an svn:* property @a propname with
6028  * value @a propval.
6029  *
6030  * If the property is not appropriate for a node of kind @a kind, or
6031  * is otherwise invalid, throw an error. Otherwise, set @a *propval_p
6032  * to a canonicalized version of the property value. If @a
6033  * skip_some_checks is TRUE, only some validity checks are taken.
6034  *
6035  * Some validity checks require access to the contents and MIME type
6036  * of the target if it is a file; they will call @a prop_getter with @a
6037  * getter_baton, which then needs to set the MIME type and print the
6038  * contents of the file to the given stream.
6039  *
6040  * @a path should be the path of the file in question; it is only used
6041  * for error messages.
6042  *
6043  * ### This is not actually related to the WC, but it does need to call
6044  * ### svn_wc_parse_externals_description2.
6045  */
6046 svn_error_t *
6047 svn_wc_canonicalize_svn_prop(const svn_string_t **propval_p,
6048  const char *propname,
6049  const svn_string_t *propval,
6050  const char *path,
6051  svn_node_kind_t kind,
6052  svn_boolean_t skip_some_checks,
6054  void *getter_baton,
6055  apr_pool_t *pool);
6056 
6057 /** @} */
6058 
6059 
6060 /**
6061  * @defgroup svn_wc_diffs Diffs
6062  * @{
6063  */
6064 
6065 /**
6066  * Return an @a editor/@a edit_baton for diffing a working copy against the
6067  * repository. The editor is allocated in @a result_pool; temporary
6068  * calculations are performed in @a scratch_pool.
6069  *
6070  * This editor supports diffing either the actual files and properties in the
6071  * working copy (when @a use_text_base is #FALSE), or the current pristine
6072  * information (when @a use_text_base is #TRUE) against the editor driver.
6073  *
6074  * @a anchor_abspath/@a target represent the base of the hierarchy to be
6075  * compared. The diff callback paths will be relative to this path.
6076  *
6077  * Diffs will be reported as valid relpaths, with @a anchor_abspath being
6078  * the root ("").
6079  *
6080  * @a callbacks/@a callback_baton is the callback table to use.
6081  *
6082  * If @a depth is #svn_depth_empty, just diff exactly @a target or
6083  * @a anchor_path if @a target is empty. If #svn_depth_files then do the same
6084  * and for top-level file entries as well (if any). If
6085  * #svn_depth_immediates, do the same as #svn_depth_files but also diff
6086  * top-level subdirectories at #svn_depth_empty. If #svn_depth_infinity,
6087  * then diff fully recursively.
6088  *
6089  * @a ignore_ancestry determines whether paths that have discontinuous node
6090  * ancestry are treated as delete/add or as simple modifications. If
6091  * @a ignore_ancestry is @c FALSE, then any discontinuous node ancestry will
6092  * result in the diff given as a full delete followed by an add.
6093  *
6094  * @a show_copies_as_adds determines whether paths added with history will
6095  * appear as a diff against their copy source, or whether such paths will
6096  * appear as if they were newly added in their entirety.
6097  *
6098  * If @a use_git_diff_format is TRUE, copied paths will be treated as added
6099  * if they weren't modified after being copied. This allows the callbacks
6100  * to generate appropriate --git diff headers for such files.
6101  *
6102  * Normally, the difference from repository->working_copy is shown.
6103  * If @a reverse_order is TRUE, then show working_copy->repository diffs.
6104  *
6105  * If @a cancel_func is non-NULL, it will be used along with @a cancel_baton
6106  * to periodically check if the client has canceled the operation.
6107  *
6108  * @a changelist_filter is an array of <tt>const char *</tt> changelist
6109  * names, used as a restrictive filter on items whose differences are
6110  * reported; that is, don't generate diffs about any item unless
6111  * it's a member of one of those changelists. If @a changelist_filter is
6112  * empty (or altogether @c NULL), no changelist filtering occurs.
6113  *
6114  * If @a server_performs_filtering is TRUE, assume that the server handles
6115  * the ambient depth filtering, so this doesn't have to be handled in the
6116  * editor.
6117  *
6118  * @since New in 1.7.
6119  */
6120 svn_error_t *
6122  void **edit_baton,
6123  svn_wc_context_t *wc_ctx,
6124  const char *anchor_abspath,
6125  const char *target,
6126  svn_depth_t depth,
6127  svn_boolean_t ignore_ancestry,
6128  svn_boolean_t show_copies_as_adds,
6129  svn_boolean_t use_git_diff_format,
6130  svn_boolean_t use_text_base,
6131  svn_boolean_t reverse_order,
6132  svn_boolean_t server_performs_filtering,
6133  const apr_array_header_t *changelist_filter,
6134  const svn_wc_diff_callbacks4_t *callbacks,
6135  void *callback_baton,
6136  svn_cancel_func_t cancel_func,
6137  void *cancel_baton,
6138  apr_pool_t *result_pool,
6139  apr_pool_t *scratch_pool);
6140 
6141 /**
6142  * Similar to svn_wc_get_diff_editor6(), but with an access baton and relative
6143  * path. @a server_performs_filtering always true and with a
6144  * #svn_wc_diff_callbacks3_t instead of #svn_wc_diff_callbacks4_t,
6145  * @a show_copies_as_adds, and @a use_git_diff_format set to @c FALSE.
6146  *
6147  * Diffs will be reported as below the relative path stored in @a anchor.
6148  *
6149  * @since New in 1.6.
6150  *
6151  * @deprecated Provided for backward compatibility with the 1.6 API.
6152  */
6154 svn_error_t *
6156  const char *target,
6157  const svn_wc_diff_callbacks3_t *callbacks,
6158  void *callback_baton,
6159  svn_depth_t depth,
6160  svn_boolean_t ignore_ancestry,
6161  svn_boolean_t use_text_base,
6162  svn_boolean_t reverse_order,
6163  svn_cancel_func_t cancel_func,
6164  void *cancel_baton,
6165  const apr_array_header_t *changelist_filter,
6166  const svn_delta_editor_t **editor,
6167  void **edit_baton,
6168  apr_pool_t *pool);
6169 
6170 /**
6171  * Similar to svn_wc_get_diff_editor5(), but with an
6172  * #svn_wc_diff_callbacks2_t instead of #svn_wc_diff_callbacks3_t.
6173  *
6174  * @deprecated Provided for backward compatibility with the 1.5 API.
6175  */
6177 svn_error_t *
6179  const char *target,
6180  const svn_wc_diff_callbacks2_t *callbacks,
6181  void *callback_baton,
6182  svn_depth_t depth,
6183  svn_boolean_t ignore_ancestry,
6184  svn_boolean_t use_text_base,
6185  svn_boolean_t reverse_order,
6186  svn_cancel_func_t cancel_func,
6187  void *cancel_baton,
6188  const apr_array_header_t *changelist_filter,
6189  const svn_delta_editor_t **editor,
6190  void **edit_baton,
6191  apr_pool_t *pool);
6192 
6193 /**
6194  * Similar to svn_wc_get_diff_editor4(), but with @a changelist_filter
6195  * passed as @c NULL, and @a depth set to #svn_depth_infinity if @a
6196  * recurse is TRUE, or #svn_depth_files if @a recurse is FALSE.
6197  *
6198  * @deprecated Provided for backward compatibility with the 1.4 API.
6199 
6200  * @since New in 1.2.
6201  */
6203 svn_error_t *
6205  const char *target,
6206  const svn_wc_diff_callbacks2_t *callbacks,
6207  void *callback_baton,
6208  svn_boolean_t recurse,
6209  svn_boolean_t ignore_ancestry,
6210  svn_boolean_t use_text_base,
6211  svn_boolean_t reverse_order,
6212  svn_cancel_func_t cancel_func,
6213  void *cancel_baton,
6214  const svn_delta_editor_t **editor,
6215  void **edit_baton,
6216  apr_pool_t *pool);
6217 
6218 
6219 /**
6220  * Similar to svn_wc_get_diff_editor3(), but with an
6221  * #svn_wc_diff_callbacks_t instead of #svn_wc_diff_callbacks2_t.
6222  *
6223  * @deprecated Provided for backward compatibility with the 1.1 API.
6224  */
6226 svn_error_t *
6228  const char *target,
6229  const svn_wc_diff_callbacks_t *callbacks,
6230  void *callback_baton,
6231  svn_boolean_t recurse,
6232  svn_boolean_t ignore_ancestry,
6233  svn_boolean_t use_text_base,
6234  svn_boolean_t reverse_order,
6235  svn_cancel_func_t cancel_func,
6236  void *cancel_baton,
6237  const svn_delta_editor_t **editor,
6238  void **edit_baton,
6239  apr_pool_t *pool);
6240 
6241 
6242 /**
6243  * Similar to svn_wc_get_diff_editor2(), but with @a ignore_ancestry
6244  * always set to @c FALSE.
6245  *
6246  * @deprecated Provided for backward compatibility with the 1.0 API.
6247  */
6249 svn_error_t *
6251  const char *target,
6252  const svn_wc_diff_callbacks_t *callbacks,
6253  void *callback_baton,
6254  svn_boolean_t recurse,
6255  svn_boolean_t use_text_base,
6256  svn_boolean_t reverse_order,
6257  svn_cancel_func_t cancel_func,
6258  void *cancel_baton,
6259  const svn_delta_editor_t **editor,
6260  void **edit_baton,
6261  apr_pool_t *pool);
6262 
6263 
6264 /**
6265  * Compare working copy against the text-base.
6266  *
6267  * @a target_abspath represents the base of the hierarchy to be compared.
6268  *
6269  * @a callbacks/@a callback_baton is the callback table to use when two
6270  * files are to be compared.
6271  *
6272  * If @a depth is #svn_depth_empty, just diff exactly @a target_path.
6273  * If #svn_depth_files then do the same
6274  * and for top-level file entries as well (if any). If
6275  * #svn_depth_immediates, do the same as #svn_depth_files but also diff
6276  * top-level subdirectories at #svn_depth_empty. If #svn_depth_infinity,
6277  * then diff fully recursively.
6278  *
6279  * @a ignore_ancestry determines whether paths that have discontinuous node
6280  * ancestry are treated as delete/add or as simple modifications. If
6281  * @a ignore_ancestry is @c FALSE, then any discontinuous node ancestry will
6282  * result in the diff given as a full delete followed by an add.
6283  *
6284  * @a show_copies_as_adds determines whether paths added with history will
6285  * appear as a diff against their copy source, or whether such paths will
6286  * appear as if they were newly added in their entirety.
6287  *
6288  * If @a use_git_diff_format is TRUE, copied paths will be treated as added
6289  * if they weren't modified after being copied. This allows the callbacks
6290  * to generate appropriate --git diff headers for such files.
6291  *
6292  * @a changelist_filter is an array of <tt>const char *</tt> changelist
6293  * names, used as a restrictive filter on items whose differences are
6294  * reported; that is, don't generate diffs about any item unless
6295  * it's a member of one of those changelists. If @a changelist_filter is
6296  * empty (or altogether @c NULL), no changelist filtering occurs.
6297  *
6298  * If @a cancel_func is non-NULL, invoke it with @a cancel_baton at various
6299  * points during the operation. If it returns an error (typically
6300  * #SVN_ERR_CANCELLED), return that error immediately.
6301  *
6302  * @since New in 1.7.
6303  */
6304 svn_error_t *
6306  const char *target_abspath,
6307  const svn_wc_diff_callbacks4_t *callbacks,
6308  void *callback_baton,
6309  svn_depth_t depth,
6310  svn_boolean_t ignore_ancestry,
6311  svn_boolean_t show_copies_as_adds,
6312  svn_boolean_t use_git_diff_format,
6313  const apr_array_header_t *changelist_filter,
6314  svn_cancel_func_t cancel_func,
6315  void *cancel_baton,
6316  apr_pool_t *scratch_pool);
6317 
6318 /**
6319  * Similar to svn_wc_diff6(), but with a #svn_wc_diff_callbacks3_t argument
6320  * instead of #svn_wc_diff_callbacks4_t, @a show_copies_as_adds,
6321  * and @a use_git_diff_format set to * @c FALSE.
6322  * It also doesn't allow specifying a cancel function.
6323  *
6324  * @since New in 1.6.
6325  * @deprecated Provided for backward compatibility with the 1.6 API.
6326  */
6328 svn_error_t *
6330  const char *target,
6331  const svn_wc_diff_callbacks3_t *callbacks,
6332  void *callback_baton,
6333  svn_depth_t depth,
6334  svn_boolean_t ignore_ancestry,
6335  const apr_array_header_t *changelist_filter,
6336  apr_pool_t *pool);
6337 
6338 /**
6339  * Similar to svn_wc_diff5(), but with a #svn_wc_diff_callbacks2_t argument
6340  * instead of #svn_wc_diff_callbacks3_t.
6341  *
6342  * @since New in 1.5.
6343  * @deprecated Provided for backward compatibility with the 1.5 API.
6344  */
6346 svn_error_t *
6348  const char *target,
6349  const svn_wc_diff_callbacks2_t *callbacks,
6350  void *callback_baton,
6351  svn_depth_t depth,
6352  svn_boolean_t ignore_ancestry,
6353  const apr_array_header_t *changelist_filter,
6354  apr_pool_t *pool);
6355 
6356 /**
6357  * Similar to svn_wc_diff4(), but with @a changelist_filter passed @c NULL,
6358  * and @a depth set to #svn_depth_infinity if @a recurse is TRUE, or
6359  * #svn_depth_files if @a recurse is FALSE.
6360  *
6361  * @since New in 1.2.
6362  * @deprecated Provided for backward compatibility with the 1.4 API.
6363  */
6365 svn_error_t *
6367  const char *target,
6368  const svn_wc_diff_callbacks2_t *callbacks,
6369  void *callback_baton,
6370  svn_boolean_t recurse,
6371  svn_boolean_t ignore_ancestry,
6372  apr_pool_t *pool);
6373 
6374 /**
6375  * Similar to svn_wc_diff3(), but with a #svn_wc_diff_callbacks_t argument
6376  * instead of #svn_wc_diff_callbacks2_t.
6377  *
6378  * @since New in 1.1.
6379  * @deprecated Provided for backward compatibility with the 1.1 API.
6380  */
6382 svn_error_t *
6384  const char *target,
6385  const svn_wc_diff_callbacks_t *callbacks,
6386  void *callback_baton,
6387  svn_boolean_t recurse,
6388  svn_boolean_t ignore_ancestry,
6389  apr_pool_t *pool);
6390 
6391 /**
6392  * Similar to svn_wc_diff2(), but with @a ignore_ancestry always set
6393  * to @c FALSE.
6394  *
6395  * @deprecated Provided for backward compatibility with the 1.0 API.
6396  */
6398 svn_error_t *
6400  const char *target,
6401  const svn_wc_diff_callbacks_t *callbacks,
6402  void *callback_baton,
6403  svn_boolean_t recurse,
6404  apr_pool_t *pool);
6405 
6406 
6407 /** Given a @a local_abspath to a file or directory under version control,
6408  * discover any local changes made to properties and/or the set of 'pristine'
6409  * properties. @a wc_ctx will be used to access the working copy.
6410  *
6411  * If @a propchanges is non-@c NULL, return these changes as an array of
6412  * #svn_prop_t structures stored in @a *propchanges. The structures and
6413  * array will be allocated in @a result_pool. If there are no local property
6414  * modifications on @a local_abspath, then set @a *propchanges will be empty.
6415  *
6416  * If @a original_props is non-@c NULL, then set @a *original_props to
6417  * hashtable (<tt>const char *name</tt> -> <tt>const svn_string_t *value</tt>)
6418  * that represents the 'pristine' property list of @a path. This hashtable is
6419  * allocated in @a result_pool.
6420  *
6421  * Use @a scratch_pool for temporary allocations.
6422  */
6423 svn_error_t *
6424 svn_wc_get_prop_diffs2(apr_array_header_t **propchanges,
6425  apr_hash_t **original_props,
6426  svn_wc_context_t *wc_ctx,
6427  const char *local_abspath,
6428  apr_pool_t *result_pool,
6429  apr_pool_t *scratch_pool);
6430 
6431 /** Similar to svn_wc_get_prop_diffs2(), but with a #svn_wc_adm_access_t /
6432  * relative path parameter pair.
6433  *
6434  * @deprecated Provided for backwards compatibility with the 1.6 API.
6435  */
6437 svn_error_t *
6438 svn_wc_get_prop_diffs(apr_array_header_t **propchanges,
6439  apr_hash_t **original_props,
6440  const char *path,
6441  svn_wc_adm_access_t *adm_access,
6442  apr_pool_t *pool);
6443 
6444 /** @} */
6445 
6446 
6447 /**
6448  * @defgroup svn_wc_merging Merging
6449  * @{
6450  */
6451 
6452 /** The outcome of a merge carried out (or tried as a dry-run) by
6453  * svn_wc_merge()
6454  */
6456 {
6457  /** The working copy is (or would be) unchanged. The changes to be
6458  * merged were already present in the working copy
6459  */
6461 
6462  /** The working copy has been (or would be) changed. */
6464 
6465  /** The working copy has been (or would be) changed, but there was (or
6466  * would be) a conflict
6467  */
6469 
6470  /** No merge was performed, probably because the target file was
6471  * either absent or not under version control.
6472  */
6474 
6476 
6477 /** Given absolute paths to three fulltexts, merge the differences between
6478  * @a left_abspath and @a right_abspath into @a target_abspath.
6479  * It may help to know that @a left_abspath, @a right_abspath and @a
6480  * target_abspath correspond to "OLDER", "YOURS", and "MINE",
6481  * respectively, in the diff3 documentation.
6482  *
6483  * @a wc_ctx should contain a write lock for the directory containing @a
6484  * target_abspath.
6485  *
6486  * This function assumes that @a left_abspath and @a right_abspath are
6487  * in repository-normal form (linefeeds, with keywords contracted); if
6488  * necessary, @a target_abspath is temporarily converted to this form to
6489  * receive the changes, then translated back again.
6490  *
6491  * If @a target_abspath is absent, or present but not under version
6492  * control, then set @a *merge_outcome to #svn_wc_merge_no_merge and
6493  * return success without merging anything. (The reasoning is that if
6494  * the file is not versioned, then it is probably unrelated to the
6495  * changes being considered, so they should not be merged into it.)
6496  *
6497  * @a dry_run determines whether the working copy is modified. When it
6498  * is @c FALSE the merge will cause @a target_abspath to be modified, when
6499  * it is @c TRUE the merge will be carried out to determine the result but
6500  * @a target_abspath will not be modified.
6501  *
6502  * If @a diff3_cmd is non-NULL, then use it as the diff3 command for
6503  * any merging; otherwise, use the built-in merge code. If @a
6504  * merge_options is non-NULL, either pass its elements to @a diff3_cmd or
6505  * parse it and use as options to the internal merge code (see
6506  * svn_diff_file_options_parse()). @a merge_options must contain
6507  * <tt>const char *</tt> elements.
6508  *
6509  * The outcome of the merge is returned in @a *merge_outcome. If there
6510  * is a conflict and @a dry_run is @c FALSE, then attempt to call @a
6511  * conflict_func with @a conflict_baton (if non-NULL). If the
6512  * conflict callback cannot resolve the conflict, then:
6513  *
6514  * * Put conflict markers around the conflicting regions in
6515  * @a target_abspath, labeled with @a left_label, @a right_label, and
6516  * @a target_label. (If any of these labels are @c NULL, default
6517  * values will be used.)
6518  *
6519  * * Copy @a left_abspath, @a right_abspath, and the original @a
6520  * target_abspath to unique names in the same directory as @a
6521  * target_abspath, ending with the suffixes ".LEFT_LABEL", ".RIGHT_LABEL",
6522  * and ".TARGET_LABEL" respectively.
6523  *
6524  * * Mark @a target_abspath as "text-conflicted", and track the above
6525  * mentioned backup files as well.
6526  *
6527  * * If @a left_version and/or @a right_version are not NULL, provide
6528  * these values to the conflict handler and track these while the conflict
6529  * exists.
6530  *
6531  * Binary case:
6532  *
6533  * If @a target_abspath is a binary file, then no merging is attempted,
6534  * the merge is deemed to be a conflict. If @a dry_run is @c FALSE the
6535  * working @a target_abspath is untouched, and copies of @a left_abspath and
6536  * @a right_abspath are created next to it using @a left_label and
6537  * @a right_label. @a target_abspath is marked as "text-conflicted", and
6538  * begins tracking the two backup files and the version information.
6539  *
6540  * If @a dry_run is @c TRUE no files are changed. The outcome of the merge
6541  * is returned in @a *merge_outcome.
6542  *
6543  * Use @a scratch_pool for any temporary allocation.
6544  *
6545  * @since New in 1.7.
6546  */
6547 svn_error_t *
6548 svn_wc_merge4(enum svn_wc_merge_outcome_t *merge_outcome,
6549  svn_wc_context_t *wc_ctx,
6550  const char *left_abspath,
6551  const char *right_abspath,
6552  const char *target_abspath,
6553  const char *left_label,
6554  const char *right_label,
6555  const char *target_label,
6556  const svn_wc_conflict_version_t *left_version,
6557  const svn_wc_conflict_version_t *right_version,
6558  svn_boolean_t dry_run,
6559  const char *diff3_cmd,
6560  const apr_array_header_t *merge_options,
6561  const apr_array_header_t *prop_diff,
6562  svn_wc_conflict_resolver_func2_t conflict_func,
6563  void *conflict_baton,
6564  svn_cancel_func_t cancel_func,
6565  void *cancel_baton,
6566  apr_pool_t *scratch_pool);
6567 
6568 /** Similar to svn_wc_merge4() but takes relative paths and an access
6569  * baton. It doesn't support a cancel function or tracking origin version
6570  * information.
6571  *
6572  * Uses a svn_wc_conflict_resolver_func_t conflict resolver instead of a
6573  * svn_wc_conflict_resolver_func2_t.
6574  *
6575  * This function assumes that @a diff3_cmd is path encoded. Later versions
6576  * assume utf-8.
6577  *
6578  * @since New in 1.5.
6579  * @deprecated Provided for backwards compatibility with the 1.6 API.
6580  */
6582 svn_error_t *
6583 svn_wc_merge3(enum svn_wc_merge_outcome_t *merge_outcome,
6584  const char *left,
6585  const char *right,
6586  const char *merge_target,
6587  svn_wc_adm_access_t *adm_access,
6588  const char *left_label,
6589  const char *right_label,
6590  const char *target_label,
6591  svn_boolean_t dry_run,
6592  const char *diff3_cmd,
6593  const apr_array_header_t *merge_options,
6594  const apr_array_header_t *prop_diff,
6595  svn_wc_conflict_resolver_func_t conflict_func,
6596  void *conflict_baton,
6597  apr_pool_t *pool);
6598 
6599 
6600 /** Similar to svn_wc_merge3(), but with @a prop_diff, @a
6601  * conflict_func, @a conflict_baton set to NULL.
6602  *
6603  * @deprecated Provided for backwards compatibility with the 1.4 API.
6604  */
6606 svn_error_t *
6607 svn_wc_merge2(enum svn_wc_merge_outcome_t *merge_outcome,
6608  const char *left,
6609  const char *right,
6610  const char *merge_target,
6611  svn_wc_adm_access_t *adm_access,
6612  const char *left_label,
6613  const char *right_label,
6614  const char *target_label,
6615  svn_boolean_t dry_run,
6616  const char *diff3_cmd,
6617  const apr_array_header_t *merge_options,
6618  apr_pool_t *pool);
6619 
6620 
6621 /** Similar to svn_wc_merge2(), but with @a merge_options set to NULL.
6622  *
6623  * @deprecated Provided for backwards compatibility with the 1.3 API.
6624  */
6626 svn_error_t *
6627 svn_wc_merge(const char *left,
6628  const char *right,
6629  const char *merge_target,
6630  svn_wc_adm_access_t *adm_access,
6631  const char *left_label,
6632  const char *right_label,
6633  const char *target_label,
6634  svn_boolean_t dry_run,
6635  enum svn_wc_merge_outcome_t *merge_outcome,
6636  const char *diff3_cmd,
6637  apr_pool_t *pool);
6638 
6639 
6640 /** Given a @a local_abspath under version control, merge an array of @a
6641  * propchanges into the path's existing properties. @a propchanges is
6642  * an array of #svn_prop_t objects, and @a baseprops is a hash
6643  * representing the original set of properties that @a propchanges is
6644  * working against. @a wc_ctx contains a lock for @a local_abspath.
6645  *
6646  * Only the working properties will be changed.
6647  *
6648  * If @a state is non-NULL, set @a *state to the state of the properties
6649  * after the merge.
6650  *
6651  * If conflicts are found when merging working properties, they are
6652  * described in a temporary .prej file (or appended to an already-existing
6653  * .prej file), and the entry is marked "conflicted".
6654  *
6655  * If @a cancel_func is non-NULL, invoke it with @a cancel_baton at various
6656  * points during the operation. If it returns an error (typically
6657  * #SVN_ERR_CANCELLED), return that error immediately.
6658  *
6659  * If @a local_abspath is not under version control, return the error
6660  * #SVN_ERR_WC_PATH_NOT_FOUND and don't touch anyone's properties.
6661  *
6662  * If @a local_abspath has a status in which it doesn't have properties
6663  * (E.g. deleted) return the error SVN_ERR_WC_PATH_UNEXPECTED_STATUS.
6664  *
6665  * @since New in 1.7.
6666  */
6667 svn_error_t *
6669  svn_wc_context_t *wc_ctx,
6670  const char *local_abspath,
6671  const svn_wc_conflict_version_t *left_version,
6672  const svn_wc_conflict_version_t *right_version,
6673  apr_hash_t *baseprops,
6674  const apr_array_header_t *propchanges,
6675  svn_boolean_t dry_run,
6676  svn_wc_conflict_resolver_func2_t conflict_func,
6677  void *conflict_baton,
6678  svn_cancel_func_t cancel_func,
6679  void *cancel_baton,
6680  apr_pool_t *scratch_pool);
6681 
6682 
6683 /** Similar to svn_wc_merge_props3, but takes an access baton and relative
6684  * path, no cancel_function, and no left and right version.
6685  *
6686  * This function has the @a base_merge parameter which (when TRUE) will
6687  * apply @a propchanges to this node's pristine set of properties. This
6688  * functionality is not supported on newer APIs -- pristine information
6689  * should only be changed through an update editor drive.
6690  *
6691  * Uses a svn_wc_conflict_resolver_func_t conflict resolver instead of a
6692  * svn_wc_conflict_resolver_func2_t.
6693  *
6694  * For compatibility reasons this function returns
6695  * #SVN_ERR_UNVERSIONED_RESOURCE, when svn_wc_merge_props3 would return either
6696  * #SVN_ERR_WC_PATH_NOT_FOUND or #SVN_ERR_WC_PATH_UNEXPECTED_STATUS.
6697  *
6698  * @since New in 1.5.
6699  * @deprecated Provided for backward compatibility with the 1.6 API.
6700  */
6702 svn_error_t *
6704  const char *path,
6705  svn_wc_adm_access_t *adm_access,
6706  apr_hash_t *baseprops,
6707  const apr_array_header_t *propchanges,
6708  svn_boolean_t base_merge,
6709  svn_boolean_t dry_run,
6710  svn_wc_conflict_resolver_func_t conflict_func,
6711  void *conflict_baton,
6712  apr_pool_t *pool);
6713 
6714 
6715 /**
6716  * Same as svn_wc_merge_props2(), but with a @a conflict_func (and
6717  * baton) of NULL.
6718  *
6719  * @deprecated Provided for backward compatibility with the 1.4 API.
6720  */
6722 svn_error_t *
6724  const char *path,
6725  svn_wc_adm_access_t *adm_access,
6726  apr_hash_t *baseprops,
6727  const apr_array_header_t *propchanges,
6728  svn_boolean_t base_merge,
6729  svn_boolean_t dry_run,
6730  apr_pool_t *pool);
6731 
6732 
6733 /**
6734  * Similar to svn_wc_merge_props(), but no baseprops are given.
6735  * Instead, it's assumed that the incoming propchanges are based
6736  * against the working copy's own baseprops. While this assumption is
6737  * correct for 'svn update', it's incorrect for 'svn merge', and can
6738  * cause flawed behavior. (See issue #2035.)
6739  *
6740  * @deprecated Provided for backward compatibility with the 1.2 API.
6741  */
6743 svn_error_t *
6745  const char *path,
6746  svn_wc_adm_access_t *adm_access,
6747  const apr_array_header_t *propchanges,
6748  svn_boolean_t base_merge,
6749  svn_boolean_t dry_run,
6750  apr_pool_t *pool);
6751 
6752 /** @} */
6753 
6754 
6755 /** Given a @a path to a wc file, return in @a *contents a readonly stream to
6756  * the pristine contents of the file that would serve as base content for the
6757  * next commit. That means:
6758  *
6759  * When there is no change in node history scheduled, i.e. when there are only
6760  * local text-mods, prop-mods or a delete, return the last checked-out or
6761  * updated-/switched-to contents of the file.
6762  *
6763  * If the file is simply added or replaced (no copy-/move-here involved),
6764  * set @a *contents to @c NULL.
6765  *
6766  * When the file has been locally copied-/moved-here, return the contents of
6767  * the copy/move source (even if the copy-/move-here replaces a locally
6768  * deleted file).
6769  *
6770  * If @a local_abspath refers to an unversioned or non-existing path, return
6771  * @c SVN_ERR_WC_PATH_NOT_FOUND. Use @a wc_ctx to access the working copy.
6772  * @a contents may not be @c NULL (unlike @a *contents).
6773  *
6774  * @since New in 1.7. */
6775 svn_error_t *
6777  svn_wc_context_t *wc_ctx,
6778  const char *local_abspath,
6779  apr_pool_t *result_pool,
6780  apr_pool_t *scratch_pool);
6781 
6782 /** Similar to svn_wc_get_pristine_contents2, but takes no working copy
6783  * context and a path that can be relative
6784  *
6785  * @since New in 1.6.
6786  * @deprecated Provided for backward compatibility with the 1.6 API.
6787  */
6789 svn_error_t *
6791  const char *path,
6792  apr_pool_t *result_pool,
6793  apr_pool_t *scratch_pool);
6794 
6795 
6796 /** Set @a *pristine_path to the path of the "normal" pristine text file for
6797  * the versioned file @a path.
6798  *
6799  * If @a path does not have a pristine text, set @a *pristine_path to a path where
6800  * nothing exists on disk (in a directory that does exist).
6801  *
6802  * @note: Before version 1.7, the behaviour in that case was to provide the
6803  * path where the pristine text *would be* if it were present. The new
6804  * behaviour is intended to provide backward compatibility for callers that
6805  * open or test the provided path immediately, and not for callers that
6806  * store the path for later use.
6807  *
6808  * @deprecated Provided for backwards compatibility with the 1.5 API.
6809  * Callers should use svn_wc_get_pristine_contents() instead.
6810  */
6812 svn_error_t *
6813 svn_wc_get_pristine_copy_path(const char *path,
6814  const char **pristine_path,
6815  apr_pool_t *pool);
6816 
6817 
6818 /**
6819  * Recurse from @a local_abspath, cleaning up unfinished log business. Perform
6820  * any temporary allocations in @a scratch_pool. Any working copy locks under
6821  * @a local_abspath will be taken over and then cleared by this function.
6822  *
6823  * WARNING: there is no mechanism that will protect locks that are still being
6824  * used.
6825  *
6826  * If @a cancel_func is non-NULL, invoke it with @a cancel_baton at various
6827  * points during the operation. If it returns an error (typically
6828  * #SVN_ERR_CANCELLED), return that error immediately.
6829  *
6830  * @since New in 1.7.
6831  */
6832 svn_error_t *
6834  const char *local_abspath,
6835  svn_cancel_func_t cancel_func,
6836  void *cancel_baton,
6837  apr_pool_t *scratch_pool);
6838 
6839 /**
6840  * Similar to svn_wc_cleanup3() but uses relative paths and creates its own
6841  * swn_wc_context_t.
6842  *
6843  * @since New in 1.2.
6844  * @deprecated Provided for backward compatibility with the 1.6 API.
6845  */
6847 svn_error_t *
6848 svn_wc_cleanup2(const char *path,
6849  const char *diff3_cmd,
6850  svn_cancel_func_t cancel_func,
6851  void *cancel_baton,
6852  apr_pool_t *pool);
6853 
6854 /**
6855  * Similar to svn_wc_cleanup2(). @a optional_adm_access is an historic
6856  * relic and not used, it may be NULL.
6857  *
6858  * @deprecated Provided for backward compatibility with the 1.1 API.
6859  */
6861 svn_error_t *
6862 svn_wc_cleanup(const char *path,
6863  svn_wc_adm_access_t *optional_adm_access,
6864  const char *diff3_cmd,
6865  svn_cancel_func_t cancel_func,
6866  void *cancel_baton,
6867  apr_pool_t *pool);
6868 
6869 /** Callback for retrieving a repository root for a url from upgrade.
6870  *
6871  * Called by svn_wc_upgrade() when no repository root and/or repository
6872  * uuid are recorded in the working copy. For normal Subversion 1.5 and
6873  * later working copies, this callback will not be used.
6874  *
6875  * @since New in 1.7.
6876  */
6877 typedef svn_error_t * (*svn_wc_upgrade_get_repos_info_t)(
6878  const char **repos_root,
6879  const char **repos_uuid,
6880  void *baton,
6881  const char *url,
6882  apr_pool_t *result_pool,
6883  apr_pool_t *scratch_pool);
6884 
6885 
6886 /**
6887  * Upgrade the working copy at @a local_abspath to the latest metadata
6888  * storage format. @a local_abspath should be an absolute path to the
6889  * root of the working copy.
6890  *
6891  * If @a cancel_func is non-NULL, invoke it with @a cancel_baton at
6892  * various points during the operation. If it returns an error
6893  * (typically #SVN_ERR_CANCELLED), return that error immediately.
6894  *
6895  * For each directory converted, @a notify_func will be called with
6896  * in @a notify_baton action #svn_wc_notify_upgrade_path and as path
6897  * the path of the upgraded directory. @a notify_func may be @c NULL
6898  * if this notification is not needed.
6899  *
6900  * If the old working copy doesn't contain a repository root and/or
6901  * repository uuid, @a repos_info_func (if non-NULL) will be called
6902  * with @a repos_info_baton to provide the missing information.
6903  *
6904  * @since New in 1.7.
6905  */
6906 svn_error_t *
6908  const char *local_abspath,
6909  svn_wc_upgrade_get_repos_info_t repos_info_func,
6910  void *repos_info_baton,
6911  svn_cancel_func_t cancel_func,
6912  void *cancel_baton,
6913  svn_wc_notify_func2_t notify_func,
6914  void *notify_baton,
6915  apr_pool_t *scratch_pool);
6916 
6917 
6918 /** Relocation validation callback typedef.
6919  *
6920  * Called for each relocated file/directory. @a uuid, if non-NULL, contains
6921  * the expected repository UUID, @a url contains the tentative URL.
6922  *
6923  * @a baton is a closure object; it should be provided by the
6924  * implementation, and passed by the caller.
6925  *
6926  * If @a root_url is passed, then the implementation should make sure that
6927  * @a url is the repository root.
6928  * @a pool may be used for temporary allocations.
6929  *
6930  * @since New in 1.5.
6931  */
6932 typedef svn_error_t *(*svn_wc_relocation_validator3_t)(void *baton,
6933  const char *uuid,
6934  const char *url,
6935  const char *root_url,
6936  apr_pool_t *pool);
6937 
6938 /** Similar to #svn_wc_relocation_validator3_t, but with
6939  * the @a root argument.
6940  *
6941  * If @a root is TRUE, then the implementation should make sure that @a url
6942  * is the repository root. Else, it can be an URL inside the repository.
6943  *
6944  * @deprecated Provided for backwards compatibility with the 1.4 API.
6945  */
6946 typedef svn_error_t *(*svn_wc_relocation_validator2_t)(void *baton,
6947  const char *uuid,
6948  const char *url,
6949  svn_boolean_t root,
6950  apr_pool_t *pool);
6951 
6952 /** Similar to #svn_wc_relocation_validator2_t, but without
6953  * the @a root and @a pool arguments. @a uuid will not be NULL in this version
6954  * of the function.
6955  *
6956  * @deprecated Provided for backwards compatibility with the 1.3 API.
6957  */
6958 typedef svn_error_t *(*svn_wc_relocation_validator_t)(void *baton,
6959  const char *uuid,
6960  const char *url);
6961 
6962 /** Recursively change repository references at @a wcroot_abspath
6963  * (which is the root directory of a working copy). The pre-change
6964  * URL should begin with @a from, and the post-change URL will begin
6965  * with @a to. @a validator (and its baton, @a validator_baton), will
6966  * be called for the newly generated base URL and calculated repo
6967  * root.
6968  *
6969  * @a wc_ctx is an working copy context.
6970  *
6971  * @a scratch_pool will be used for temporary allocations.
6972  *
6973  * @since New in 1.7.
6974  */
6975 svn_error_t *
6977  const char *wcroot_abspath,
6978  const char *from,
6979  const char *to,
6981  void *validator_baton,
6982  apr_pool_t *scratch_pool);
6983 
6984 /** Similar to svn_wc_relocate4(), but with a #svn_wc_adm_access_t /
6985  * relative path parameter pair.
6986  *
6987  * @note As of the 1.7 API, @a path is required to be a working copy
6988  * root directory, and @a recurse is required to be TRUE.
6989  *
6990  * @since New in 1.5.
6991  * @deprecated Provided for limited backwards compatibility with the
6992  * 1.6 API.
6993  */
6995 svn_error_t *
6996 svn_wc_relocate3(const char *path,
6997  svn_wc_adm_access_t *adm_access,
6998  const char *from,
6999  const char *to,
7000  svn_boolean_t recurse,
7002  void *validator_baton,
7003  apr_pool_t *pool);
7004 
7005 /** Similar to svn_wc_relocate3(), but uses #svn_wc_relocation_validator2_t.
7006  *
7007  * @since New in 1.4.
7008  * @deprecated Provided for backwards compatibility with the 1.4 API. */
7010 svn_error_t *
7011 svn_wc_relocate2(const char *path,
7012  svn_wc_adm_access_t *adm_access,
7013  const char *from,
7014  const char *to,
7015  svn_boolean_t recurse,
7017  void *validator_baton,
7018  apr_pool_t *pool);
7019 
7020 /** Similar to svn_wc_relocate2(), but uses #svn_wc_relocation_validator_t.
7021  *
7022  * @deprecated Provided for backwards compatibility with the 1.3 API. */
7024 svn_error_t *
7025 svn_wc_relocate(const char *path,
7026  svn_wc_adm_access_t *adm_access,
7027  const char *from,
7028  const char *to,
7029  svn_boolean_t recurse,
7031  void *validator_baton,
7032  apr_pool_t *pool);
7033 
7034 
7035 /**
7036  * Revert changes to @a local_abspath. Perform necessary allocations in
7037  * @a scratch_pool.
7038  *
7039  * @a wc_ctx contains the necessary locks required for performing the
7040  * operation.
7041  *
7042  * If @a depth is #svn_depth_empty, revert just @a path (if a
7043  * directory, then revert just the properties on that directory).
7044  * Else if #svn_depth_files, revert @a path and any files
7045  * directly under @a path if it is directory. Else if
7046  * #svn_depth_immediates, revert all of the preceding plus
7047  * properties on immediate subdirectories; else if #svn_depth_infinity,
7048  * revert path and everything under it fully recursively.
7049  *
7050  * @a changelist_filter is an array of <tt>const char *</tt> changelist
7051  * names, used as a restrictive filter on items reverted; that is,
7052  * don't revert any item unless it's a member of one of those
7053  * changelists. If @a changelist_filter is empty (or altogether @c NULL),
7054  * no changelist filtering occurs.
7055  *
7056  * If @a cancel_func is non-NULL, call it with @a cancel_baton at
7057  * various points during the reversion process. If it returns an
7058  * error (typically #SVN_ERR_CANCELLED), return that error
7059  * immediately.
7060  *
7061  * If @a use_commit_times is TRUE, then all reverted working-files
7062  * will have their timestamp set to the last-committed-time. If
7063  * FALSE, the reverted working-files will be touched with the 'now' time.
7064  *
7065  * For each item reverted, @a notify_func will be called with @a notify_baton
7066  * and the path of the reverted item. @a notify_func may be @c NULL if this
7067  * notification is not needed.
7068  *
7069  * If @a path is not under version control, return the error
7070  * #SVN_ERR_UNVERSIONED_RESOURCE.
7071  *
7072  * @since New in 1.7.
7073  */
7074 svn_error_t *
7076  const char *local_abspath,
7077  svn_depth_t depth,
7078  svn_boolean_t use_commit_times,
7079  const apr_array_header_t *changelist_filter,
7080  svn_cancel_func_t cancel_func,
7081  void *cancel_baton,
7082  svn_wc_notify_func2_t notify_func,
7083  void *notify_baton,
7084  apr_pool_t *scratch_pool);
7085 
7086 /** Similar to svn_wc_revert4() but takes a relative path and access baton.
7087  *
7088  * @since New in 1.5.
7089  * @deprecated Provided for backward compatibility with the 1.6 API.
7090  */
7092 svn_error_t *
7093 svn_wc_revert3(const char *path,
7094  svn_wc_adm_access_t *parent_access,
7095  svn_depth_t depth,
7096  svn_boolean_t use_commit_times,
7097  const apr_array_header_t *changelist_filter,
7098  svn_cancel_func_t cancel_func,
7099  void *cancel_baton,
7100  svn_wc_notify_func2_t notify_func,
7101  void *notify_baton,
7102  apr_pool_t *pool);
7103 
7104 /**
7105  * Similar to svn_wc_revert3(), but with @a changelist_filter passed as @c
7106  * NULL, and @a depth set according to @a recursive: if @a recursive
7107  * is TRUE, @a depth is #svn_depth_infinity; if FALSE, @a depth is
7108  * #svn_depth_empty.
7109  *
7110  * @note Most APIs map @a recurse==FALSE to @a depth==svn_depth_files;
7111  * revert is deliberately different.
7112  *
7113  * @since New in 1.2.
7114  * @deprecated Provided for backward compatibility with the 1.4 API.
7115  */
7117 svn_error_t *
7118 svn_wc_revert2(const char *path,
7119  svn_wc_adm_access_t *parent_access,
7120  svn_boolean_t recursive,
7121  svn_boolean_t use_commit_times,
7122  svn_cancel_func_t cancel_func,
7123  void *cancel_baton,
7124  svn_wc_notify_func2_t notify_func,
7125  void *notify_baton,
7126  apr_pool_t *pool);
7127 
7128 /**
7129  * Similar to svn_wc_revert2(), but takes an #svn_wc_notify_func_t instead.
7130  *
7131  * @deprecated Provided for backward compatibility with the 1.1 API.
7132  */
7134 svn_error_t *
7135 svn_wc_revert(const char *path,
7136  svn_wc_adm_access_t *parent_access,
7137  svn_boolean_t recursive,
7138  svn_boolean_t use_commit_times,
7139  svn_cancel_func_t cancel_func,
7140  void *cancel_baton,
7141  svn_wc_notify_func_t notify_func,
7142  void *notify_baton,
7143  apr_pool_t *pool);
7144 
7145 /**
7146  * Restores a missing node, @a local_abspath using the @a wc_ctx. Records
7147  * the new last modified time of the file for status processing.
7148  *
7149  * If @a use_commit_times is TRUE, then set restored files' timestamps
7150  * to their last-commit-times.
7151  *
7152  * Returns SVN_ERROR_WC_PATH_NOT_FOUND if LOCAL_ABSPATH is not versioned and
7153  * SVN_ERROR_WC_PATH_UNEXPECTED_STATUS if LOCAL_ABSPATH is in a status where
7154  * it can't be restored.
7155  *
7156  * @since New in 1.7.
7157  */
7158 svn_error_t *
7160  const char *local_abspath,
7161  svn_boolean_t use_commit_times,
7162  apr_pool_t *scratch_pool);
7163 
7164 
7165 /* Tmp files */
7166 
7167 /** Create a unique temporary file in administrative tmp/ area of
7168  * directory @a path. Return a handle in @a *fp and the path
7169  * in @a *new_name. Either @a fp or @a new_name can be NULL.
7170  *
7171  * The flags will be <tt>APR_WRITE | APR_CREATE | APR_EXCL</tt> and
7172  * optionally @c APR_DELONCLOSE (if the @a delete_when argument is
7173  * set to #svn_io_file_del_on_close).
7174  *
7175  * This means that as soon as @a fp is closed, the tmp file will vanish.
7176  *
7177  * @since New in 1.4
7178  * @deprecated For compatibility with 1.6 API
7179  */
7181 svn_error_t *
7182 svn_wc_create_tmp_file2(apr_file_t **fp,
7183  const char **new_name,
7184  const char *path,
7185  svn_io_file_del_t delete_when,
7186  apr_pool_t *pool);
7187 
7188 
7189 /** Same as svn_wc_create_tmp_file2(), but with @a new_name set to @c NULL,
7190  * and without the ability to delete the file on pool cleanup.
7191  *
7192  * @deprecated For compatibility with 1.3 API
7193  */
7195 svn_error_t *
7196 svn_wc_create_tmp_file(apr_file_t **fp,
7197  const char *path,
7198  svn_boolean_t delete_on_close,
7199  apr_pool_t *pool);
7200 
7201 
7202 /**
7203  * @defgroup svn_wc_translate EOL conversion and keyword expansion
7204  * @{
7205  */
7206 
7207 
7208 /** Set @a xlated_path to a translated copy of @a src
7209  * or to @a src itself if no translation is necessary.
7210  * That is, if @a versioned_file's properties indicate newline conversion or
7211  * keyword expansion, point @a *xlated_path to a copy of @a src
7212  * whose newlines and keywords are converted using the translation
7213  * as requested by @a flags.
7214  *
7215  * If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
7216  * if the client has canceled the operation.
7217  *
7218  * When translating to the normal form, inconsistent eol styles will be
7219  * repaired when appropriate for the given setting. When translating
7220  * from normal form, no EOL repair is performed (consistency is assumed).
7221  * This behaviour can be overridden by specifying
7222  * #SVN_WC_TRANSLATE_FORCE_EOL_REPAIR.
7223  *
7224  * The caller can explicitly request a new file to be returned by setting the
7225  * #SVN_WC_TRANSLATE_FORCE_COPY flag in @a flags.
7226  *
7227  * This function is generally used to get a file that can be compared
7228  * meaningfully against @a versioned_file's text base, if
7229  * @c SVN_WC_TRANSLATE_TO_NF is specified, against @a versioned_file itself
7230  * if @c SVN_WC_TRANSLATE_FROM_NF is specified.
7231  *
7232  * If a new output file is created, it is created in the temp file area
7233  * belonging to @a versioned_file. By default it will be deleted at pool
7234  * cleanup. If @c SVN_WC_TRANSLATE_NO_OUTPUT_CLEANUP is specified, the
7235  * default pool cleanup handler to remove @a *xlated_path is not registered.
7236  * If the input file is returned as the output, its lifetime is not
7237  * specified.
7238  *
7239  * If an error is returned, the effect on @a *xlated_path is undefined.
7240  *
7241  * @since New in 1.4
7242  * @deprecated Provided for compatibility with the 1.6 API
7243  */
7245 svn_error_t *
7246 svn_wc_translated_file2(const char **xlated_path,
7247  const char *src,
7248  const char *versioned_file,
7249  svn_wc_adm_access_t *adm_access,
7250  apr_uint32_t flags,
7251  apr_pool_t *pool);
7252 
7253 
7254 /** Same as svn_wc_translated_file2, but will never clean up
7255  * temporary files.
7256  *
7257  * @deprecated Provided for compatibility with the 1.3 API
7258  */
7260 svn_error_t *
7261 svn_wc_translated_file(const char **xlated_p,
7262  const char *vfile,
7263  svn_wc_adm_access_t *adm_access,
7264  svn_boolean_t force_repair,
7265  apr_pool_t *pool);
7266 
7267 
7268 /** Returns a @a stream allocated in @a pool with access to the given
7269  * @a path taking the file properties from @a versioned_file using
7270  * @a adm_access.
7271  *
7272  * If @a flags includes #SVN_WC_TRANSLATE_FROM_NF, the stream will
7273  * translate from Normal Form to working copy form while writing to
7274  * @a path; stream read operations are not supported.
7275  * Conversely, if @a flags includes #SVN_WC_TRANSLATE_TO_NF, the stream will
7276  * translate from working copy form to Normal Form while reading from
7277  * @a path; stream write operations are not supported.
7278  *
7279  * The @a flags are the same constants as those used for
7280  * svn_wc_translated_file2().
7281  *
7282  * @since New in 1.5.
7283  * @deprecated Provided for compatibility with the 1.6 API.
7284  */
7286 svn_error_t *
7288  const char *path,
7289  const char *versioned_file,
7290  svn_wc_adm_access_t *adm_access,
7291  apr_uint32_t flags,
7292  apr_pool_t *pool);
7293 
7294  /** @} */
7295 
7296 
7297 /**
7298  * @defgroup svn_wc_deltas Text/Prop Deltas Using an Editor
7299  * @{
7300  */
7301 
7302 /** Send the local modifications for versioned file @a local_abspath (with
7303  * matching @a file_baton) through @a editor, then close @a file_baton
7304  * afterwards. Use @a scratch_pool for any temporary allocation.
7305  *
7306  * If @a new_text_base_md5_checksum is non-NULL, set
7307  * @a *new_text_base_md5_checksum to the MD5 checksum of (@a local_abspath
7308  * translated to repository-normal form), allocated in @a result_pool.
7309  *
7310  * If @a new_text_base_sha1_checksum in non-NULL, store a copy of (@a
7311  * local_abspath translated to repository-normal form) in the pristine text
7312  * store, and set @a *new_text_base_sha1_checksum to its SHA-1 checksum.
7313  *
7314  * If @a fulltext, send the untranslated copy of @a local_abspath through
7315  * @a editor as full-text; else send it as svndiff against the current text
7316  * base.
7317  *
7318  * If sending a diff, and the recorded checksum for @a local_abspath's
7319  * text-base does not match the current actual checksum, then remove the tmp
7320  * copy (and set @a *tempfile to NULL if appropriate), and return the
7321  * error #SVN_ERR_WC_CORRUPT_TEXT_BASE.
7322  *
7323  * @note This is intended for use with both infix and postfix
7324  * text-delta styled editor drivers.
7325  *
7326  * @since New in 1.7.
7327  */
7328 svn_error_t *
7329 svn_wc_transmit_text_deltas3(const svn_checksum_t **new_text_base_md5_checksum,
7330  const svn_checksum_t **new_text_base_sha1_checksum,
7331  svn_wc_context_t *wc_ctx,
7332  const char *local_abspath,
7333  svn_boolean_t fulltext,
7334  const svn_delta_editor_t *editor,
7335  void *file_baton,
7336  apr_pool_t *result_pool,
7337  apr_pool_t *scratch_pool);
7338 
7339 /** Similar to svn_wc_transmit_text_deltas3(), but with a relative path
7340  * and adm_access baton, and the checksum output is an MD5 digest instead of
7341  * two svn_checksum_t objects.
7342  *
7343  * If @a tempfile is non-NULL, make a copy of @a path with keywords
7344  * and eol translated to repository-normal form, and set @a *tempfile to the
7345  * absolute path to this copy, allocated in @a result_pool. The copy will
7346  * be in the temporary-text-base directory. Do not clean up the copy;
7347  * caller can do that. (The purpose of handing back the tmp copy is that it
7348  * is usually about to become the new text base anyway, but the installation
7349  * of the new text base is outside the scope of this function.)
7350  *
7351  * @since New in 1.4.
7352  * @deprecated Provided for backwards compatibility with the 1.6 API.
7353  */
7355 svn_error_t *
7356 svn_wc_transmit_text_deltas2(const char **tempfile,
7357  unsigned char digest[],
7358  const char *path,
7359  svn_wc_adm_access_t *adm_access,
7360  svn_boolean_t fulltext,
7361  const svn_delta_editor_t *editor,
7362  void *file_baton,
7363  apr_pool_t *pool);
7364 
7365 /** Similar to svn_wc_transmit_text_deltas2(), but with @a digest set to NULL.
7366  *
7367  * @deprecated Provided for backwards compatibility with the 1.3 API.
7368  */
7370 svn_error_t *
7371 svn_wc_transmit_text_deltas(const char *path,
7372  svn_wc_adm_access_t *adm_access,
7373  svn_boolean_t fulltext,
7374  const svn_delta_editor_t *editor,
7375  void *file_baton,
7376  const char **tempfile,
7377  apr_pool_t *pool);
7378 
7379 
7380 /** Given a @a local_abspath, transmit all local property
7381  * modifications using the appropriate @a editor method (in conjunction
7382  * with @a baton). Use @a scratch_pool for any temporary allocation.
7383  *
7384  * @since New in 1.7.
7385  */
7386 svn_error_t *
7388  const char *local_abspath,
7389  const svn_delta_editor_t *editor,
7390  void *baton,
7391  apr_pool_t *scratch_pool);
7392 
7393 
7394 /** Similar to svn_wc_transmit_prop_deltas2(), but with a relative path,
7395  * adm_access baton and tempfile.
7396  *
7397  * If a temporary file remains after this function is finished, the
7398  * path to that file is returned in @a *tempfile (so the caller can
7399  * clean this up if it wishes to do so).
7400  *
7401  * @note Starting version 1.5, no tempfile will ever be returned
7402  * anymore. If @a *tempfile is passed, its value is set to @c NULL.
7403  *
7404  * @deprecated Provided for backwards compatibility with the 1.6 API.
7405  */
7407 svn_error_t *
7408 svn_wc_transmit_prop_deltas(const char *path,
7409  svn_wc_adm_access_t *adm_access,
7410  const svn_wc_entry_t *entry,
7411  const svn_delta_editor_t *editor,
7412  void *baton,
7413  const char **tempfile,
7414  apr_pool_t *pool);
7415 
7416 /** @} */
7417 
7418 
7419 /**
7420  * @defgroup svn_wc_ignore Ignoring unversioned files and directories
7421  * @{
7422  */
7423 
7424 /** Get the run-time configured list of ignore patterns from the
7425  * #svn_config_t's in the @a config hash, and store them in @a *patterns.
7426  * Allocate @a *patterns and its contents in @a pool.
7427  */
7428 svn_error_t *
7429 svn_wc_get_default_ignores(apr_array_header_t **patterns,
7430  apr_hash_t *config,
7431  apr_pool_t *pool);
7432 
7433 /** Get the list of ignore patterns from the #svn_config_t's in the
7434  * @a config hash and the local ignore patterns from the directory
7435  * at @a local_abspath, using @a wc_ctx, and store them in @a *patterns.
7436  * Allocate @a *patterns and its contents in @a result_pool, use @a
7437  * scratch_pool for temporary allocations.
7438  *
7439  * @since New in 1.7.
7440  */
7441 svn_error_t *
7442 svn_wc_get_ignores2(apr_array_header_t **patterns,
7443  svn_wc_context_t *wc_ctx,
7444  const char *local_abspath,
7445  apr_hash_t *config,
7446  apr_pool_t *result_pool,
7447  apr_pool_t *scratch_pool);
7448 
7449 /** Similar to svn_wc_get_ignores2(), but with a #svn_wc_adm_access_t
7450  * parameter in place of #svn_wc_context_t and @c local_abspath parameters.
7451  *
7452  * @since New in 1.3.
7453  * @deprecated Provided for backwards compatibility with the 1.6 API.
7454  */
7456 svn_error_t *
7457 svn_wc_get_ignores(apr_array_header_t **patterns,
7458  apr_hash_t *config,
7459  svn_wc_adm_access_t *adm_access,
7460  apr_pool_t *pool);
7461 
7462 /** Return TRUE iff @a str matches any of the elements of @a list, a
7463  * list of zero or more ignore patterns.
7464  *
7465  * @since New in 1.5.
7466  */
7468 svn_wc_match_ignore_list(const char *str,
7469  const apr_array_header_t *list,
7470  apr_pool_t *pool);
7471 
7472 /** @} */
7473 
7474 
7475 /**
7476  * @defgroup svn_wc_repos_locks Repository locks
7477  * @{
7478  */
7479 
7480 /** Add @a lock to the working copy for @a local_abspath. If @a
7481  * local_abspath is read-only, due to locking properties, make it writable.
7482  * Perform temporary allocations in @a scratch_pool.
7483  *
7484  * @since New in 1.7.
7485  */
7486 svn_error_t *
7488  const char *abspath,
7489  const svn_lock_t *lock,
7490  apr_pool_t *scratch_pool);
7491 
7492 /**
7493  * Similar to svn_wc_add_lock2(), but with a #svn_wc_adm_access_t /
7494  * relative path parameter pair.
7495  *
7496  * @deprecated Provided for backward compatibility with the 1.6 API.
7497  * @since New in 1.2.
7498  */
7500 svn_error_t *
7501 svn_wc_add_lock(const char *path,
7502  const svn_lock_t *lock,
7503  svn_wc_adm_access_t *adm_access,
7504  apr_pool_t *pool);
7505 
7506 /** Remove any lock from @a local_abspath. If @a local_abspath has a
7507  * lock and the locking so specifies, make the file read-only. Don't
7508  * return an error if @a local_abspath didn't have a lock. Perform temporary
7509  * allocations in @a scratch_pool.
7510  *
7511  * @since New in 1.7.
7512  */
7513 svn_error_t *
7515  const char *local_abspath,
7516  apr_pool_t *scratch_pool);
7517 
7518 /**
7519  * Similar to svn_wc_remove_lock2(), but with a #svn_wc_adm_access_t /
7520  * relative path parameter pair.
7521  *
7522  * @deprecated Provided for backward compatibility with the 1.6 API.
7523  * @since New in 1.2.
7524  */
7526 svn_error_t *
7527 svn_wc_remove_lock(const char *path,
7528  svn_wc_adm_access_t *adm_access,
7529  apr_pool_t *pool);
7530 
7531 /** @} */
7532 
7533 
7534 /** A structure to report a summary of a working copy, including the
7535  * mix of revisions found within it, whether any parts are switched or
7536  * locally modified, and whether it is a sparse checkout.
7537  *
7538  * @note Fields may be added to the end of this structure in future
7539  * versions. Therefore, to preserve binary compatibility, users
7540  * should not directly allocate structures of this type.
7541  *
7542  * @since New in 1.4
7543  */
7545 {
7546  svn_revnum_t min_rev; /**< Lowest revision found */
7547  svn_revnum_t max_rev; /**< Highest revision found */
7548 
7549  svn_boolean_t switched; /**< Is anything switched? */
7550  svn_boolean_t modified; /**< Is anything modified? */
7551 
7552  /** Whether any WC paths are at a depth other than #svn_depth_infinity.
7553  * @since New in 1.5.
7554  */
7557 
7558 /** Set @a *result_p to point to a new #svn_wc_revision_status_t structure
7559  * containing a summary of the revision range and status of the working copy
7560  * at @a local_abspath (not including "externals"). @a local_abspath must
7561  * be absolute. Return SVN_ERR_WC_PATH_NOT_FOUND if @a local_abspath is not
7562  * a working copy path.
7563  *
7564  * Set @a (*result_p)->min_rev and @a (*result_p)->max_rev respectively to the
7565  * lowest and highest revision numbers in the working copy. If @a committed
7566  * is TRUE, summarize the last-changed revisions, else the base revisions.
7567  *
7568  * Set @a (*result_p)->switched to indicate whether any item in the WC is
7569  * switched relative to its parent. If @a trail_url is non-NULL, use it to
7570  * determine if @a local_abspath itself is switched. It should be any trailing
7571  * portion of @a local_abspath's expected URL, long enough to include any parts
7572  * that the caller considers might be changed by a switch. If it does not
7573  * match the end of @a local_abspath's actual URL, then report a "switched"
7574  * status.
7575  *
7576  * Set @a (*result_p)->modified to indicate whether any item is locally
7577  * modified.
7578  *
7579  * If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
7580  * if the client has canceled the operation.
7581  *
7582  * Allocate *result_p in @a result_pool, use @a scratch_pool for temporary
7583  * allocations.
7584  *
7585  * @a wc_ctx should be a valid working copy context.
7586  *
7587  * @since New in 1.7
7588  */
7589 svn_error_t *
7591  svn_wc_context_t *wc_ctx,
7592  const char *local_abspath,
7593  const char *trail_url,
7594  svn_boolean_t committed,
7595  svn_cancel_func_t cancel_func,
7596  void *cancel_baton,
7597  apr_pool_t *result_pool,
7598  apr_pool_t *scratch_pool);
7599 
7600 
7601 /** Similar to svn_wc_revision_status2(), but with a (possibly) local
7602  * path and no wc_ctx parameter.
7603  *
7604  * @since New in 1.4.
7605  * @deprecated Provided for backward compatibility with the 1.6 API.
7606  */
7608 svn_error_t *
7610  const char *wc_path,
7611  const char *trail_url,
7612  svn_boolean_t committed,
7613  svn_cancel_func_t cancel_func,
7614  void *cancel_baton,
7615  apr_pool_t *pool);
7616 
7617 
7618 /**
7619  * Set @a local_abspath's 'changelist' attribute to @a changelist iff
7620  * @a changelist is not @c NULL; otherwise, remove any current
7621  * changelist assignment from @a local_abspath. @a changelist may not
7622  * be the empty string. Recurse to @a depth.
7623  *
7624  * @a changelist_filter is an array of <tt>const char *</tt> changelist
7625  * names, used as a restrictive filter on items whose changelist
7626  * assignments are adjusted; that is, don't tweak the changeset of any
7627  * item unless it's currently a member of one of those changelists.
7628  * If @a changelist_filter is empty (or altogether @c NULL), no changelist
7629  * filtering occurs.
7630  *
7631  * If @a cancel_func is not @c NULL, call it with @a cancel_baton to
7632  * determine if the client has canceled the operation.
7633  *
7634  * If @a notify_func is not @c NULL, call it with @a notify_baton to
7635  * report the change (using notification types
7636  * #svn_wc_notify_changelist_set and #svn_wc_notify_changelist_clear).
7637  *
7638  * Use @a scratch_pool for temporary allocations.
7639  *
7640  * @note For now, directories are NOT allowed to be associated with
7641  * changelists; there is confusion about whether they should behave
7642  * as depth-0 or depth-infinity objects. If @a local_abspath is a directory,
7643  * return an error.
7644  *
7645  * @note This metadata is purely a client-side "bookkeeping"
7646  * convenience, and is entirely managed by the working copy.
7647  *
7648  * @since New in 1.7.
7649  */
7650 svn_error_t *
7652  const char *local_abspath,
7653  const char *changelist,
7654  svn_depth_t depth,
7655  const apr_array_header_t *changelist_filter,
7656  svn_cancel_func_t cancel_func,
7657  void *cancel_baton,
7658  svn_wc_notify_func2_t notify_func,
7659  void *notify_baton,
7660  apr_pool_t *scratch_pool);
7661 
7662 /** Similar to svn_wc_set_changelist2(), but with an access baton and
7663  * relative path.
7664  *
7665  * @since New in 1.5.
7666  * @deprecated Provided for backward compatibility with the 1.6 API.
7667  */
7669 svn_error_t *
7670 svn_wc_set_changelist(const char *path,
7671  const char *changelist,
7672  svn_wc_adm_access_t *adm_access,
7673  svn_cancel_func_t cancel_func,
7674  void *cancel_baton,
7675  svn_wc_notify_func2_t notify_func,
7676  void *notify_baton,
7677  apr_pool_t *pool);
7678 
7679 
7680 
7681 /**
7682  * The callback type used by svn_client_get_changelists().
7683  *
7684  * On each invocation, @a path is a newly discovered member of the
7685  * changelist, and @a baton is a private function closure.
7686  *
7687  * @since New in 1.5.
7688  */
7689 typedef svn_error_t *(*svn_changelist_receiver_t) (void *baton,
7690  const char *path,
7691  const char *changelist,
7692  apr_pool_t *pool);
7693 
7694 
7695 /* @since New in 1.7.
7696  */
7697 svn_error_t *
7698 svn_wc_get_changelists(svn_wc_context_t *wc_ctx,
7699  const char *local_abspath,
7700  svn_depth_t depth,
7701  const apr_array_header_t *changelist_filter,
7702  svn_changelist_receiver_t callback_func,
7703  void *callback_baton,
7704  svn_cancel_func_t cancel_func,
7705  void *cancel_baton,
7706  apr_pool_t *scratch_pool);
7707 
7708 
7709 /** Crop @a local_abspath according to @a depth.
7710  *
7711  * Remove any item that exceeds the boundary of @a depth (relative to
7712  * @a local_abspath) from revision control. Leave modified items behind
7713  * (unversioned), while removing unmodified ones completely.
7714  *
7715  * @a depth can be svn_depth_empty, svn_depth_files or svn_depth_immediates.
7716  * Excluding nodes is handled by svn_wc_exclude().
7717  *
7718  * If @a local_abspath starts out with a shallower depth than @a depth,
7719  * do not upgrade it to @a depth (that would not be cropping); however, do
7720  * check children and crop them appropriately according to @a depth.
7721  *
7722  * Returns immediately with an #SVN_ERR_UNSUPPORTED_FEATURE error if @a
7723  * local_abspath is not a directory, or if @a depth is not restrictive
7724  * (e.g., #svn_depth_infinity).
7725  *
7726  * @a wc_ctx contains a tree lock, for the local path to the working copy
7727  * which will be used as the root of this operation.
7728  *
7729  * If @a cancel_func is not @c NULL, call it with @a cancel_baton at
7730  * various points to determine if the client has canceled the operation.
7731  *
7732  * If @a notify_func is not @c NULL, call it with @a notify_baton to
7733  * report changes as they are made.
7734  *
7735  * @since New in 1.7
7736  */
7737 svn_error_t *
7739  const char *local_abspath,
7740  svn_depth_t depth,
7741  svn_cancel_func_t cancel_func,
7742  void *cancel_baton,
7743  svn_wc_notify_func2_t notify_func,
7744  void *notify_baton,
7745  apr_pool_t *scratch_pool);
7746 
7747 /** Similar to svn_wc_crop_tree2(), but uses an access baton and target.
7748  *
7749  * svn_wc_crop_tree() also allows #svn_depth_exclude, which is now
7750  * handled via svn_wc_exclude()
7751  *
7752  * @a target is a basename in @a anchor or "" for @a anchor itself.
7753  *
7754  * @since New in 1.6
7755  * @deprecated Provided for backward compatibility with the 1.6 API.
7756  */
7758 svn_error_t *
7760  const char *target,
7761  svn_depth_t depth,
7762  svn_wc_notify_func2_t notify_func,
7763  void *notify_baton,
7764  svn_cancel_func_t cancel_func,
7765  void *cancel_baton,
7766  apr_pool_t *pool);
7767 
7768 /** Remove the local node for @a local_abspath from the working copy and
7769  * add an excluded node placeholder in its place.
7770  *
7771  * This feature is only supported for unmodified nodes. An
7772  * #SVN_ERR_UNSUPPORTED_FEATURE error is returned if the node can't be
7773  * excluded in its current state.
7774  *
7775  * @a wc_ctx contains a tree lock, for the local path to the working copy
7776  * which will be used as the root of this operation
7777  *
7778  * If @a notify_func is not @c NULL, call it with @a notify_baton to
7779  * report changes as they are made.
7780  *
7781  * If @a cancel_func is not @c NULL, call it with @a cancel_baton at
7782  * various points to determine if the client has canceled the operation.
7783  *
7784  *
7785  * @since New in 1.7
7786  */
7787 svn_error_t *
7789  const char *local_abspath,
7790  svn_cancel_func_t cancel_func,
7791  void *cancel_baton,
7792  svn_wc_notify_func2_t notify_func,
7793  void *notify_baton,
7794  apr_pool_t *scratch_pool);
7795 
7796 
7797 /** @} */
7798 
7799 /**
7800  * Set @a kind to the #svn_node_kind_t of @a abspath. Use @a wc_ctx
7801  * to access the working copy, and @a scratch_pool for all temporary
7802  * allocations.
7803  *
7804  * If @a abspath is not under version control, set @a kind to #svn_node_none.
7805  * If it is versioned but hidden and @a show_hidden is @c FALSE, also return
7806  * #svn_node_none.
7807  *
7808  * ### What does hidden really mean?
7809  * ### What happens when show_hidden is TRUE?
7810  *
7811  * If the node's info is incomplete, it may or may not have a known node kind
7812  * set. If the kind is not known (yet), set @a kind to #svn_node_unknown.
7813  * Otherwise return the node kind even though the node is marked incomplete.
7814  *
7815  * @since New in 1.7.
7816  */
7817 svn_error_t *
7819  svn_wc_context_t *wc_ctx,
7820  const char *abspath,
7821  svn_boolean_t show_hidden,
7822  apr_pool_t *scratch_pool);
7823 
7824 
7825 /** @} */
7826 
7827 #ifdef __cplusplus
7828 }
7829 #endif /* __cplusplus */
7830 
7831 #endif /* SVN_WC_H */
A file in the working copy was patched.
Definition: svn_wc.h:1147
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.
Definition: svn_wc.h:1380
Failed to lock a path.
Definition: svn_wc.h:1038
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.
Definition: svn_wc.h:1233
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&#39;s working copy format version number if local_abspath is a valid work...
Revprop deleted.
Definition: svn_wc.h:1084
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.
Definition: svn_wc.h:796
enum svn_wc_status_kind prop_status
The status of the entry&#39;s properties.
Definition: svn_wc.h:3636
const char * merged_file
If not NULL, this is a path to a file which contains the client&#39;s (or more likely, the user&#39;s) merging of the three values in conflict.
Definition: svn_wc.h:2021
svn_opt_revision_t file_external_rev
The entry is an intra-repository file external and this is the operative revision number specified in...
Definition: svn_wc.h:2923
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
Definition: svn_wc.h:2796
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&#39;t have the BASE arguments or cancellation...
Reverting a modified path.
Definition: svn_wc.h:981
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
Definition: svn_wc.h:2812
apr_time_t ood_last_cmt_date
Set to the most recent commit date, or 0 if not out of date.
Definition: svn_wc.h:3685
Modified state had mods merged in.
Definition: svn_wc.h:1236
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.
Definition: svn_wc.h:1151
does not exist
Definition: svn_wc.h:3448
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 (&#39;my&#39; version of) path is a &#39;binary&#39; file.
Definition: svn_wc.h:1787
Delta-parsing.
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)
Definition: svn_wc.h:3472
const char * their_file
their version of the file
Definition: svn_wc.h:1829
svn_revnum_t changed_rev
Last revision this was changed.
Definition: svn_wc.h:3539
A working copy entry – that is, revision control information about one versioned entity.
Definition: svn_wc.h:2702
svn_wc_conflict_choice_t
The way in which the conflict callback chooses a course of action.
Definition: svn_wc.h:1981
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?
Definition: svn_wc.h:7550
under v.c., but is missing
Definition: svn_wc.h:3460
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.
Definition: svn_wc.h:1315
svn_depth_t
The concept of depth for directories.
Definition: svn_types.h:387
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.
Definition: svn_wc.h:1005
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...
Definition: svn_wc.h:3906
A revert operation has failed.
Definition: svn_wc.h:984
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.
Definition: svn_wc.h:2413
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...
Definition: svn_wc.h:1465
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...
Changelist name cleared.
Definition: svn_wc.h:1050
const char * path_in_repos
path within repos; must not start with &#39;/&#39;
Definition: svn_wc.h:1617
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.
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 force_comparison, apr_pool_t *scratch_pool)
Set *modified_p to non-zero if local_abspath&#39;s text is modified with regard to the base revision...
const char * repos_root_url
The URL of the repository.
Definition: svn_wc.h:3548
enum svn_wc_status_kind prop_status
The status of the entries properties.
Definition: svn_wc.h:3750
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 &quot;working copy root&quot;, FALSE otherwise. Here, local_abspath is a &quot;working copy root&quot; if its parent directory is not a WC or if its parent directory&#39;s repository URL is not the parent of its own repository URL.
svn_wc_conflict_choice_t choice
A choice to either delay the conflict resolution or select a particular file to resolve the conflict...
Definition: svn_wc.h:2015
Resolving a conflict.
Definition: svn_wc.h:987
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...
const char * repos_relpath
The in-repository path relative to the repository root.
Definition: svn_wc.h:3554
enum svn_wc_status_kind pristine_prop_status
The actual status of the properties compared to the pristine base of the node.
Definition: svn_wc.h:3730
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.
Definition: svn_wc.h:3042
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.
Definition: svn_wc.h:3894
Transmitting post-fix text-delta data for a file.
Definition: svn_wc.h:1026
Structure used in the svn_wc_notify_func2_t function.
Definition: svn_wc.h:1294
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&#39; file for adm_access and return a hash entries, whose keys are (const char *) entr...
Starting an update operation.
Definition: svn_wc.h:1099
Object is unversioned.
Definition: svn_wc.h:1550
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_client_get_changelists().
Definition: svn_wc.h:7689
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...
Definition: svn_wc.h:1710
struct svn_wc_conflict_version_t svn_wc_conflict_version_t
Info about one of the conflicting versions of a node.
svn_boolean_t is_binary
Whether svn thinks (&#39;my&#39; version of) path is a &#39;binary&#39; file.
Definition: svn_wc.h:1696
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 (&#39;my&#39; version of) path, if available, else NULL.
Definition: svn_wc.h:1701
const char * ood_changed_author
Set to the user name of the youngest commit, or NULL if not out of date or non-existent.
Definition: svn_wc.h:3611
enum svn_wc_status_kind repos_prop_status
The entry&#39;s property status in the repository.
Definition: svn_wc.h:3769
svn_linenum_t hunk_fuzz
The fuzz factor the hunk was applied with.
Definition: svn_wc.h:1392
Slated for addition.
Definition: svn_wc.h:2672
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...
Similar to svn_ra_reporter2_t, but without support for lock tokens.
Definition: svn_ra.h:411
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...
scheduled for deletion
Definition: svn_wc.h:3463
General file I/O for Subversion.
svn_boolean_t locked
This directory has a working copy lock.
Definition: svn_wc.h:3562
svn_boolean_t deleted
The directory containing this entry had a versioned child of this name, but this entry represents a d...
Definition: svn_wc.h:2747
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
Definition: svn_wc.h:3457
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.
Definition: svn_wc.h:688
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...
Definition: svn_wc.h:3485
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...
Definition: svn_wc.h:2876
svn_revnum_t min_rev
Lowest revision found.
Definition: svn_wc.h:7546
struct svn_wc_context_t svn_wc_context_t
The context for all working copy interactions.
Definition: svn_wc.h:179
All diffs are not yet known.
Definition: svn_wc.h:3627
svn_wc_traversal_info_t * svn_wc_init_traversal_info(apr_pool_t *pool)
Return a new, empty traversal info object, allocated in pool.
struct svn_wc_external_item_t svn_wc_external_item_t
One external item.
enum svn_wc_status_kind repos_prop_status
The entry&#39;s property status in the repository.
Definition: svn_wc.h:3655
Committing a replacement.
Definition: svn_wc.h:1023
const svn_lock_t * lock
The repository file lock.
Definition: svn_wc.h:3566
A hunk from a patch was rejected.
Definition: svn_wc.h:1155
Info about one of the conflicting versions of a node.
Definition: svn_wc.h:1605
const char * property_name
The name of the property whose conflict is being described.
Definition: svn_wc.h:1692
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...
Definition: svn_wc.h:3714
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...
Nothing special here.
Definition: svn_wc.h:2669
svn_io_file_del_t
Used as an argument when creating temporary files to indicate when a file should be removed...
Definition: svn_io.h:58
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.
Definition: svn_wc.h:1242
const char * prop_name
If action relates to properties, specifies the name of the property.
Definition: svn_wc.h:1362
const char * path_prefix
If non-NULL, specifies an absolute path prefix that can be subtracted from the start of the absolute ...
Definition: svn_wc.h:1358
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.
Definition: svn_wc.h:1548
const char * conflict_new
new version of conflicted file.
Definition: svn_wc.h:2768
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...
Definition: svn_wc.h:2026
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)
Return an editor/edit_baton for diffing a working copy against the repository.
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
Definition: svn_wc.h:1527
svn_boolean_t has_prop_mods
Whether this entry has property modifications.
Definition: svn_wc.h:2837
const char * cachable_props
A space-separated list of all properties whose presence/absence is cached in this entry...
Definition: svn_wc.h:2846
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.
Skipping a path.
Definition: svn_wc.h:990
enum svn_wc_status_kind text_status
The status of the entry itself, including its text if it is a file.
Definition: svn_wc.h:3633
const char * mime_type
If non-NULL, indicates the mime-type of path.
Definition: svn_wc.h:1310
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...
Definition: svn_delta.h:795
Committing a non-overwriting copy (path is the target of the copy, not the source).
Definition: svn_wc.h:1164
Property added.
Definition: svn_wc.h:1069
A node below an existing node was added during update.
Definition: svn_wc.h:1120
svn_wc_conflict_action_t
The type of action being attempted on an object.
Definition: svn_wc.h:1525
svn_wc_notify_action_t
The type of action occurring.
Definition: svn_wc.h:966
textual conflict (on a file)
Definition: svn_wc.h:1567
Operation failed because an added node is missing.
Definition: svn_wc.h:1190
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.
Definition: svn_wc.h:1011
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.
Got an add in an update.
Definition: svn_wc.h:996
Another object is in the way.
Definition: svn_wc.h:1544
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&#39;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&#39;s lock in the repository, if any.
Definition: svn_wc.h:3658
The operation skipped the path because it was conflicted.
Definition: svn_wc.h:1210
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)
Definition: svn_wc.h:1994
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, and both the left and right sides of the merge are from the...
Definition: svn_wc.h:1348
enum svn_wc_status_kind node_status
The status of the node itself.
Definition: svn_wc.h:3522
apr_time_t changed_date
Date of last commit.
Definition: svn_wc.h:3542
svn_revnum_t peg_rev
revision at which to look up path_in_repos
Definition: svn_wc.h:1614
Committing an addition.
Definition: svn_wc.h:1017
Mergeinfo representing a merge of a range of revisions.
Definition: svn_types.h:1108
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&#39;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.
Definition: svn_wc.h:857
const svn_wc_entry_t * entry
Can be NULL if not under version control.
Definition: svn_wc.h:3630
The state did not change.
Definition: svn_wc.h:1224
svn_error_t * err
Points to an error describing the reason for the failure when action is one of the following: svn_wc_...
Definition: svn_wc.h:1321
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,
Definition: svn_wc.h:1530
const apr_array_header_t * conflicts
Array of const svn_wc_conflict_description2_t * which contains info on any conflict of which this nod...
Definition: svn_wc.h:3066
svn_wc_schedule_t schedule
scheduling (add, delete, replace ...)
Definition: svn_wc.h:2729
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.
Definition: svn_wc.h:3700
Tried adding a path that already exists.
Definition: svn_wc.h:1044
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 &quot;status&quot; of a working copy item.
Definition: svn_wc.h:3500
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)
Set kind to the svn_node_kind_t of abspath.
A lock object, for client &amp; server to share.
Definition: svn_types.h:1063
const char * repos
canonical repository URL or NULL if not known
Definition: svn_wc.h:2718
Object is already replaced.
Definition: svn_wc.h:1554
A merge operation (to path) from a foreign repository has begun.
Definition: svn_wc.h:1063
struct svn_wc_status3_t svn_wc_status3_t
Structure for holding the &quot;status&quot; 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 &quot;normal&quot; pristine text file for the versioned file path...
A simple counted string.
Definition: svn_string.h:96
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.
Definition: svn_wc.h:854
svn_wc_notify_lock_state_t
What happened to a lock during an operation.
Definition: svn_wc.h:1251
const char * base_abspath
If this is text-conflict and involves the merging of two files descended from a common ancestor...
Definition: svn_wc.h:1734
Removing a path by excluding it.
Definition: svn_wc.h:1182
The last notification in a status (including status on externals).
Definition: svn_wc.h:1008
The path is a tree-conflict victim of the intended action (not a persistent tree-conflict from an ear...
Definition: svn_wc.h:1092
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.
Definition: svn_types.h:192
const char * changelist
Which changelist this item is part of, or NULL if not part of any.
Definition: svn_wc.h:3569
is not a versioned thing in this wc
Definition: svn_wc.h:3451
An update tried to add a file or directory at a path where a separate working copy was found...
Definition: svn_wc.h:1103
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.
Definition: svn_wc.h:6877
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&#39;t live in the repository and can&#39;t ...
Definition: svn_wc.h:1108
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.
Definition: svn_wc.h:4877
const char * url
url in repository
Definition: svn_wc.h:2715
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).
Definition: svn_wc.h:1388
No merge was performed, probably because the target file was either absent or not under version contr...
Definition: svn_wc.h:6473
svn_node_kind_t node_kind
Info about this node.
Definition: svn_wc.h:1623
A revision, specified in one of svn_opt_revision_kind ways.
Definition: svn_opt.h:396
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.
Definition: svn_wc.h:2891
const char * url
Set to the URI (actual or expected) of the item.
Definition: svn_wc.h:3663
const char * target_dir
Same as svn_wc_external_item2_t.target_dir.
Definition: svn_wc.h:851
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...
Definition: svn_wc.h:3588
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 &#39;copied&#39; if it&#39;s scheduled for addition-with-history (or part of a subtree...
Definition: svn_wc.h:3644
svn_wc_conflict_description_t * tree_conflict
Non-NULL if the entry is the victim of a tree conflict.
Definition: svn_wc.h:3707
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)
Definition: svn_wc.h:1995
const char * changelist_name
If action pertains to a changelist, this is the changelist name.
Definition: svn_wc.h:1343
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.
Definition: svn_wc.h:6020
const svn_lock_t * repos_lock
The entry&#39;s lock in the repository, if any.
Definition: svn_wc.h:3597
Repository Access.
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 &quot;pristine&quot; 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...
Definition: svn_wc.h:2869
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
Definition: svn_wc.h:3454
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...
Subversion error object.
Definition: svn_types.h:90
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.
Definition: svn_wc.h:1216
svn_node_kind_t kind
Node kind of path.
Definition: svn_wc.h:1306
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 &#39;normal&#39; property name.
const char * name
entry&#39;s name
Definition: svn_wc.h:2709
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.
Definition: svn_wc.h:1143
was deleted and then re-added
Definition: svn_wc.h:3466
svn_boolean_t copied
a file or directory can be &#39;copied&#39; if it&#39;s scheduled for addition-with-history (or part of a subtree...
Definition: svn_wc.h:3758
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 &#39;deleted&#39; in its parent&#39;s list of entries.
svn_boolean_t switched
Is anything switched?
Definition: svn_wc.h:7549
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...
Definition: svn_wc.h:3057
apr_time_t ood_changed_date
Set to the most recent commit date, or 0 if not out of date.
Definition: svn_wc.h:3604
The final result returned by svn_wc_conflict_resolver_func_t.
Definition: svn_wc.h:2011
text or props have been modified
Definition: svn_wc.h:3469
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.
Definition: svn_types.h:343
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.
Definition: svn_wc.h:1330
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.
Definition: svn_wc.h:1678
svn_wc_schedule_t
The schedule states an entry can be in.
Definition: svn_wc.h:2666
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...
Definition: svn_wc.h:2089
Operation failed because the node remains in conflict.
Definition: svn_wc.h:1186
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)
Allocate an svn_wc_conflict_version_t structure in pool, initialize to contain a conflict origin...
const char * changelist
which changelist this item is part of, or NULL if not part of any.
Definition: svn_wc.h:2861
const svn_wc_entry_t * entry
Can be NULL if not under version control.
Definition: svn_wc.h:3744
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.
Definition: svn_config.h:53
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.
Definition: svn_wc.h:993
svn_wc_conflict_action_t action
The action being attempted on the conflicted node or property.
Definition: svn_wc.h:1705
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.
Definition: svn_wc.h:3722
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...
Definition: svn_wc.h:1769
Operation failed because a node is locked by another user and/or working copy.
Definition: svn_wc.h:1202
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...
One external item.
Definition: svn_wc.h:789
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-&gt;action has happened to notify-&gt;path.
Definition: svn_wc.h:1455
const char * merged_file
merged version; may contain conflict markers
Definition: svn_wc.h:1745
Notifier doesn&#39;t know or isn&#39;t saying.
Definition: svn_wc.h:1221
svn_node_kind_t kind
node kind (file, dir, ...)
Definition: svn_wc.h:2724
A hunk from a patch was found to already be applied.
Definition: svn_wc.h:1159
struct svn_wc_adm_access_t svn_wc_adm_access_t
Baton for access to a working copy administrative area.
Definition: svn_wc.h:237
const svn_wc_conflict_version_t * src_left_version
Info on the &quot;merge-left source&quot; or &quot;older&quot; version of incoming change.
Definition: svn_wc.h:1753
const char * property_name
The name of the property whose conflict is being described.
Definition: svn_wc.h:1783
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
Definition: svn_wc.h:2807
const char * changed_author
Last commit author of this item.
Definition: svn_wc.h:3545
Operation failed because a node is out of date.
Definition: svn_wc.h:1194
Property deleted.
Definition: svn_wc.h:1075
const char * prejfile
property reject file.
Definition: svn_wc.h:2776
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)
A variant of svn_wc_get_update_editor4().
tree conflict (on a dir)
Definition: svn_wc.h:1571
const char * conflict_old
old version of conflicted file.
Definition: svn_wc.h:2764
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&#39;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
Definition: svn_wc.h:1739
attempting to add object
Definition: svn_wc.h:1528
svn_wc_conflict_kind_t kind
What sort of conflict are we describing?
Definition: svn_wc.h:1779
A node below an existing node was deleted during update.
Definition: svn_wc.h:1128
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).
Definition: svn_wc.h:1564
The last notification in an update (including updates of externals).
Definition: svn_wc.h:1002
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&#39;s properties.
Definition: svn_wc.h:3528
svn_error_t * svn_wc_external_item_create(const svn_wc_external_item2_t **item, apr_pool_t *pool)
Initialize an external item.
svn_wc_operation_t
The user operation that exposed a conflict.
Definition: svn_wc.h:1579
Slated for replacement (delete + add)
Definition: svn_wc.h:2678
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.
An working copy directory was upgraded to the latest format.
Definition: svn_wc.h:1135
apr_hash_t * rev_props
If action is svn_wc_notify_blame_revision, contains a list of revision properties for the specified r...
Definition: svn_wc.h:1367
Replace notification.
Definition: svn_wc.h:1066
const char * repos_url
URL of repository root.
Definition: svn_wc.h:1611
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.
Definition: svn_wc.h:1014
unsigned long svn_linenum_t
A line number, such as in a file or a stream.
Definition: svn_types.h:1196
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)
Set *editor and *edit_baton to an editor and baton for updating a working copy.
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.
Version information.
Definition: svn_version.h:150
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.
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.
Definition: svn_wc.h:1542
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...
Definition: svn_wc.h:2738
struct svn_stream_t svn_stream_t
An abstract stream of bytes–either incoming or outgoing or both.
Definition: svn_io.h:743
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.
Definition: svn_wc.h:3518
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
Definition: svn_wc.h:2721
Deleting a versioned path.
Definition: svn_wc.h:975
Changelist name set.
Definition: svn_wc.h:1047
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&#39;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.
Definition: svn_wc.h:5384
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 swn_wc_context_t.
const char * lock_comment
lock comment or NULL if not locked in this WC or no comment
Definition: svn_wc.h:2817
Slated for deletion.
Definition: svn_wc.h:2675
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&#39;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.
Definition: svn_wc.h:3915
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. ...
Definition: svn_wc.h:3601
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.
Definition: svn_wc.h:2886
svn_wc_conflict_version_t * src_right_version
Info on the &quot;merge-right source&quot; or &quot;their&quot; version of incoming change.
Definition: svn_wc.h:1850
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.
Definition: svn_wc.h:1198
Same as svn_wc_status2_t, but without the svn_lock_t &#39;repos_lock&#39; field.
Definition: svn_wc.h:3741
apr_time_t lock_creation_date
Lock creation date or 0 if not locked in this WC.
Definition: svn_wc.h:2822
A generic checksum representation.
Definition: svn_checksum.h:59
A merge operation (to path) has begun.
Definition: svn_wc.h:1059
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...
Definition: svn_wc.h:1339
const char * url
Where to check out from.
Definition: svn_wc.h:799
svn_node_kind_t node_kind
The node type of the path being operated on (for a tree conflict, which version?)
Definition: svn_wc.h:1685
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 &#39;switched&#39; if the switch command has been used.
Definition: svn_wc.h:3559
struct svn_wc_traversal_info_t svn_wc_traversal_info_t
Traversal information is information gathered by a working copy crawl or update.
Definition: svn_wc.h:707
Warn user that a path has moved from one changelist to another.
Definition: svn_wc.h:1055
If there were files to choose from, select one as a way of resolving the conflict here and now...
Definition: svn_wc.h:1991
const char * wcroot_abspath
The local absolute path of the working copy root.
Definition: svn_wc.h:3069
The mergeinfo on path was updated.
Definition: svn_wc.h:1131
svn_wc_notify_state_t prop_state
The type of notification that is occurring about node properties.
Definition: svn_wc.h:1327
svn_boolean_t switched
a file or directory can be &#39;switched&#39; if the switch command has been used.
Definition: svn_wc.h:3649
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.
Definition: svn_wc.h:969
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)
Definition: svn_wc.h:1772
#define SVN_DEPRECATED
Macro used to mark deprecated functions.
Definition: svn_types.h:58
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.
Definition: svn_wc.h:1139
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...
Definition: svn_wc.h:5406
Unlocking a path.
Definition: svn_wc.h:1035
apr_time_t prop_time
last up-to-date time for properties (0 means no information available)
Definition: svn_wc.h:2786
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.
Definition: svn_wc.h:6958
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 ...
Definition: svn_wc.h:2074
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&#39;s &#39;changelist&#39; 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.
Definition: svn_wc.h:6463
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...
Definition: svn_wc.h:2911
apr_time_t recorded_time
The time at which the file had the recorded size recorded_size and was considered unmodified...
Definition: svn_wc.h:3062
const char * base_file
If this is text-conflict and involves the merging of two files descended from a common ancestor...
Definition: svn_wc.h:1826
property conflict (on a file or dir)
Definition: svn_wc.h:1569
svn_opt_revision_t peg_revision
The peg revision to use when checking out.
Definition: svn_wc.h:809
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
Definition: svn_wc.h:2799
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.
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.
Definition: svn_wc.h:3882
An update tried to update a file or directory to which access could not be obtained.
Definition: svn_wc.h:1112
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.
Definition: svn_wc.h:3551
One external item.
Definition: svn_wc.h:848
enum svn_wc_status_kind text_status
The status of the entries text.
Definition: svn_wc.h:3747
Object is already added or schedule-add.
Definition: svn_wc.h:1552
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&#39;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&#39;s text.
Definition: svn_wc.h:3525
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&#39;t changed.
Definition: svn_wc.h:1258
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. ...
Definition: svn_wc.h:3680
svn_boolean_t svn_wc_is_wc_prop(const char *name)
Return TRUE iff name is a &#39;wc&#39; property name.
Copying a versioned path.
Definition: svn_wc.h:972
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...
Definition: svn_wc.h:2317
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...
Definition: svn_types.h:1040
svn_revnum_t old_revision
If action is svn_wc_notify_update_update or svn_wc_notify_update_add, contains the revision before th...
Definition: svn_wc.h:1373
svn_revnum_t copyfrom_rev
copyfrom revision
Definition: svn_wc.h:2760
long int svn_revnum_t
About Special Files in Subversion.
Definition: svn_types.h:297
const char * merged_file
merged version; may contain conflict markers
Definition: svn_wc.h:1835
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.
Definition: svn_wc.h:1206
const char * file_external_path
The entry is a intra-repository file external and this is the repository root relative path to the fi...
Definition: svn_wc.h:2899
The path is a subdirectory referenced in an externals definition which is unable to be operated on...
Definition: svn_wc.h:1096
svn_boolean_t incomplete
for THIS_DIR entry, implies whole entries file is incomplete
Definition: svn_wc.h:2754
The last notification in a merge.
Definition: svn_wc.h:1087
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&#39;t contain a complete entries list
Definition: svn_wc.h:3488
svn_opt_revision_t revision
What revision to check out.
Definition: svn_wc.h:804
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_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&#39;t present.
Definition: svn_wc.h:1227
The update Reporter.
Definition: svn_ra.h:281
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&#39;t...
Definition: svn_wc.h:3511
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&#39;s contents from new_base_conte...
attempting to delete object
Definition: svn_wc.h:1529
const char * path
Path, either absolute or relative to the current working directory (i.e., not relative to an anchor)...
Definition: svn_wc.h:1300
an unversioned resource is in the way of the versioned resource
Definition: svn_wc.h:3481
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)...
Definition: svn_wc.h:1800
Committing a deletion.
Definition: svn_wc.h:1020
enum svn_wc_status_kind repos_text_status
The entry&#39;s text status in the repository.
Definition: svn_wc.h:3591
A callback vtable invoked by the generic entry-walker function.
Definition: svn_wc.h:3175
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.
Definition: svn_wc.h:6946
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)
Schedule the single node that exists on disk at local_abspath for addition to the working copy...
const char * conflict_wrk
working version of conflicted file.
Definition: svn_wc.h:2772
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.
Definition: svn_wc.h:6460
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 &quot;merge-right source&quot; or &quot;their&quot; version of incoming change.
Definition: svn_wc.h:1756
svn_boolean_t switched
a file or directory can be &#39;switched&#39; if the switch command has been used.
Definition: svn_wc.h:3763
The operation was attempted on a path which doesn&#39;t exist.
Definition: svn_wc.h:1178
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...
Locking a path.
Definition: svn_wc.h:1032
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&#39;t have to be an abspath and adm_access is unused ...
The server has instructed the client to follow a URL redirection.
Definition: svn_wc.h:1174
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.
Definition: svn_wc.h:3515
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.
Definition: svn_wc.h:1842
A callback vtable invoked by our diff-editors, as they receive diffs from the server.
Definition: svn_wc.h:2122
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 &#39;locked&#39; if a working copy update was interrupted.
Definition: svn_wc.h:3639
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...
Definition: svn_wc.h:1809
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...
The item was locked.
Definition: svn_wc.h:1261
svn_node_kind_t ood_kind
Set to the node kind of the youngest commit, or svn_node_none if not out of date. ...
Definition: svn_wc.h:3691
const char * my_file
my locally-edited version of the file
Definition: svn_wc.h:1832
Similar to svn_wc_diff_callbacks2_t, but with file additions/content changes and property changes spl...
Definition: svn_wc.h:2485
Got any other action in an update.
Definition: svn_wc.h:999
Nonexistent property deleted.
Definition: svn_wc.h:1078
local mods received conflicting repos mods
Definition: svn_wc.h:3475
svn_wc_operation_t operation
The operation that exposed the conflict.
Definition: svn_wc.h:1750
const char * copyfrom_url
copyfrom location
Definition: svn_wc.h:2757
svn_boolean_t copied
a file or directory can be &#39;copied&#39; if it&#39;s scheduled for addition-with-history (or part of a subtree...
Definition: svn_wc.h:3533
svn_boolean_t absent
absent – we know an entry of this name exists, but that&#39;s all (usually this happens because of authz ...
Definition: svn_wc.h:2751
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.
svn_wc_conflict_kind_t kind
What sort of conflict are we describing?
Definition: svn_wc.h:1688
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)
Definition: svn_wc.h:1681
svn_revnum_t revision
Base revision.
Definition: svn_wc.h:3536
An update operation removed an external working copy.
Definition: svn_wc.h:1116
const char * checksum
Hex MD5 checksum for the untranslated text base file, can be NULL for backwards compatibility.
Definition: svn_wc.h:2791
Failed to unlock a path.
Definition: svn_wc.h:1041
svn_wc_merge_outcome_t
The outcome of a merge carried out (or tried as a dry-run) by svn_wc_merge()
Definition: svn_wc.h:6455
const char * mime_type
The svn:mime-type property of (&#39;my&#39; version of) path, if available, else NULL.
Definition: svn_wc.h:1792
svn_wc_notify_state_t content_state
The type of notification that is occurring about node content.
Definition: svn_wc.h:1324
int svn_boolean_t
YABT: Yet Another Boolean Type.
Definition: svn_types.h:360
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.
A structure to report a summary of a working copy, including the mix of revisions found within it...
Definition: svn_wc.h:7544
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.
Definition: svn_wc.h:7555
Modified state got conflicting mods.
Definition: svn_wc.h:1239
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 exising node was updated during update.
Definition: svn_wc.h:1124
const char * my_abspath
my locally-edited version of the file
Definition: svn_wc.h:1742
is unversioned but configured to be ignored
Definition: svn_wc.h:3478
apr_time_t text_time
last up-to-date time for text contents (0 means no information available)
Definition: svn_wc.h:2780
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)...
Definition: svn_wc.h:1169
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&#39;s blame.
Definition: svn_wc.h:1029
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.
Definition: svn_wc.h:2856
const char * cmt_author
last commit author of this item
Definition: svn_wc.h:2802
svn_node_kind_t node_kind
The node type of the path being operated on (for a tree conflict, which version?)
Definition: svn_wc.h:1776
struct svn_wc_status_t svn_wc_status_t
Same as svn_wc_status2_t, but without the svn_lock_t &#39;repos_lock&#39; field.
The item was unlocked.
Definition: svn_wc.h:1264
svn_wc_status_kind
The type of status for the working copy.
Definition: svn_wc.h:3445
svn_boolean_t svn_wc_is_entry_prop(const char *name)
Return TRUE iff name is a &#39;entry&#39; property name.
Definition: svn_wc.h:3195
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
Definition: svn_wc.h:2712
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.
Definition: svn_wc.h:6468
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)
Given absolute paths to three fulltexts, merge the differences between left_abspath and right_abspath...
svn_node_kind_t kind
The kind of node as recorded in the working copy.
Definition: svn_wc.h:3503
Restoring a missing path from the pristine text-base.
Definition: svn_wc.h:978
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)
Set *editor and *edit_baton to an editor that generates svn_wc_status3_t structures and sends them th...
svn_node_kind_t ood_kind
Set to the node kind of the youngest commit, or svn_node_none if not out of date. ...
Definition: svn_wc.h:3584
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.
Definition: svn_wc.h:1539
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.
Definition: svn_wc.h:6932
Object is already schedule-delete.
Definition: svn_wc.h:1546
svn_revnum_t max_rev
Highest revision found.
Definition: svn_wc.h:7547
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.
Definition: svn_wc.h:1804
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.
Definition: svn_wc.h:1303
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_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&#39;s property status in the repository.
Definition: svn_wc.h:3594
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&#39;s text status in the repository.
Definition: svn_wc.h:3766
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.
Definition: svn_wc.h:2828
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.
Definition: svn_wc.h:1352
Property updated.
Definition: svn_wc.h:1072
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...
Definition: svn_wc.h:3507
svn_wc_conflict_version_t * src_left_version
Info on the &quot;merge-left source&quot; or &quot;older&quot; version of incoming change.
Definition: svn_wc.h:1846
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 &#39;locked&#39; if a working copy update was interrupted.
Definition: svn_wc.h:3753
enum svn_wc_status_kind repos_text_status
The entry&#39;s text status in the repository.
Definition: svn_wc.h:3652
An unversioned item obstructed work.
Definition: svn_wc.h:1230
Don&#39;t resolve the conflict now.
Definition: svn_wc.h:1985
Similar to svn_ra_reporter3_t, but without support for depths.
Definition: svn_ra.h:370