You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/08/10 22:56:05 UTC
svn commit: r984206 [22/35] - in /subversion/branches/ignore-mergeinfo: ./
build/ build/generator/ build/generator/templates/ build/hudson/
build/hudson/jobs/subversion-1.6.x-solaris/
build/hudson/jobs/subversion-1.6.x-ubuntu/ build/hudson/jobs/subvers...
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/translate.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/translate.c?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/translate.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/translate.c Tue Aug 10 20:55:56 2010
@@ -176,6 +176,8 @@ svn_wc__internal_translated_file(const c
svn_wc__db_t *db,
const char *versioned_abspath,
apr_uint32_t flags,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -242,11 +244,12 @@ svn_wc__internal_translated_file(const c
return svn_error_create(SVN_ERR_IO_UNKNOWN_EOL, NULL, NULL);
}
- SVN_ERR(svn_subst_copy_and_translate3(src, tmp_vfile,
+ SVN_ERR(svn_subst_copy_and_translate4(src, tmp_vfile,
eol, repair_forced,
keywords,
expand,
special,
+ cancel_func, cancel_baton,
result_pool));
xlated_path = tmp_vfile;
@@ -262,12 +265,15 @@ svn_wc_translated_file3(const char **xla
svn_wc_context_t *wc_ctx,
const char *versioned_abspath,
apr_uint32_t flags,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
return svn_wc__internal_translated_file(xlated_abspath, src, wc_ctx->db,
versioned_abspath, flags,
- result_pool,scratch_pool);
+ cancel_func, cancel_baton,
+ result_pool, scratch_pool);
}
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/translate.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/translate.h?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/translate.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/translate.h Tue Aug 10 20:55:56 2010
@@ -142,6 +142,8 @@ svn_wc__internal_translated_file(const c
svn_wc__db_t *db,
const char *versioned_abspath,
apr_uint32_t flags,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/tree_conflicts.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/tree_conflicts.c?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/tree_conflicts.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/tree_conflicts.c Tue Aug 10 20:55:56 2010
@@ -497,3 +497,18 @@ svn_wc__get_tree_conflict(const svn_wc_c
svn_wc__db_op_read_tree_conflict(tree_conflict, wc_ctx->db, victim_abspath,
scratch_pool, scratch_pool));
}
+
+svn_error_t *
+svn_wc__get_all_tree_conflicts(apr_hash_t **tree_conflicts,
+ svn_wc_context_t *wc_ctx,
+ const char *local_abspath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
+{
+ SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
+
+ SVN_ERR(svn_wc__db_op_read_all_tree_conflicts(tree_conflicts, wc_ctx->db,
+ local_abspath,
+ result_pool, scratch_pool));
+ return SVN_NO_ERROR;
+}
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/tree_conflicts.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/tree_conflicts.h?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/tree_conflicts.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/tree_conflicts.h Tue Aug 10 20:55:56 2010
@@ -92,6 +92,19 @@ svn_wc__write_tree_conflicts(const char
apr_hash_t *conflicts,
apr_pool_t *pool);
+/*
+ * Read tree conflict descriptions from @a conflict_data. Set @a *conflicts
+ * to a hash of pointers to svn_wc_conflict_description2_t objects indexed by
+ * svn_wc_conflict_description2_t.local_abspath, all newly allocated in @a
+ * pool. @a dir_path is the path to the working copy directory whose conflicts
+ * are being read. The conflicts read are the tree conflicts on the immediate
+ * child nodes of @a dir_path. Do all allocations in @a pool.
+ */
+svn_error_t *
+svn_wc__read_tree_conflicts(apr_hash_t **conflicts,
+ const char *conflict_data,
+ const char *dir_path,
+ apr_pool_t *pool);
/* Token mapping tables. */
extern const svn_token_map_t svn_wc__operation_map[];