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 20:06:33 UTC
svn commit: r984153 [24/39] - in /subversion/branches/ignore-mergeinfo: ./
build/ build/ac-macros/ build/generator/ build/generator/templates/
build/hudson/ build/hudson/jobs/subversion-1.6.x-solaris/
build/hudson/jobs/subversion-1.6.x-ubuntu/ build/hu...
Modified: subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/status.c?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/status.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/status.c Tue Aug 10 18:06:17 2010
@@ -722,7 +722,7 @@ is_external_path(apr_hash_t *externals,
hi;
hi = apr_hash_next(hi))
{
- const char *external_abspath = svn_apr_hash_index_key(hi);
+ const char *external_abspath = svn__apr_hash_index_key(hi);
if (svn_dirent_is_child(local_abspath, external_abspath, NULL))
return TRUE;
@@ -755,7 +755,7 @@ send_unversioned_item(const struct walk_
const char *local_abspath,
svn_node_kind_t path_kind,
svn_boolean_t path_special,
- apr_array_header_t *patterns,
+ const apr_array_header_t *patterns,
svn_boolean_t no_ignore,
svn_wc_status_func4_t status_func,
void *status_baton,
@@ -1631,8 +1631,8 @@ handle_statii(struct edit_baton *eb,
/* Loop over all the statuses still in our hash, handling each one. */
for (hi = apr_hash_first(pool, statii); hi; hi = apr_hash_next(hi))
{
- const char *path = svn_apr_hash_index_key(hi);
- svn_wc_status2_t *status = svn_apr_hash_index_val(hi);
+ const char *path = svn__apr_hash_index_key(hi);
+ svn_wc_status2_t *status = svn__apr_hash_index_val(hi);
/* Clear the subpool. */
svn_pool_clear(subpool);
@@ -1674,6 +1674,7 @@ handle_statii(struct edit_baton *eb,
/*** The callbacks we'll plug into an svn_delta_editor_t structure. ***/
+/* */
static svn_error_t *
set_target_revision(void *edit_baton,
svn_revnum_t target_revision,
@@ -1685,6 +1686,7 @@ set_target_revision(void *edit_baton,
}
+/* */
static svn_error_t *
open_root(void *edit_baton,
svn_revnum_t base_revision,
@@ -1697,6 +1699,7 @@ open_root(void *edit_baton,
}
+/* */
static svn_error_t *
delete_entry(const char *path,
svn_revnum_t revision,
@@ -1737,6 +1740,7 @@ delete_entry(const char *path,
}
+/* */
static svn_error_t *
add_directory(const char *path,
void *parent_baton,
@@ -1762,6 +1766,7 @@ add_directory(const char *path,
}
+/* */
static svn_error_t *
open_directory(const char *path,
void *parent_baton,
@@ -1774,6 +1779,7 @@ open_directory(const char *path,
}
+/* */
static svn_error_t *
change_dir_prop(void *dir_baton,
const char *name,
@@ -1804,6 +1810,7 @@ change_dir_prop(void *dir_baton,
+/* */
static svn_error_t *
close_directory(void *dir_baton,
apr_pool_t *pool)
@@ -1939,6 +1946,7 @@ close_directory(void *dir_baton,
+/* */
static svn_error_t *
add_file(const char *path,
void *parent_baton,
@@ -1961,6 +1969,7 @@ add_file(const char *path,
}
+/* */
static svn_error_t *
open_file(const char *path,
void *parent_baton,
@@ -1976,6 +1985,7 @@ open_file(const char *path,
}
+/* */
static svn_error_t *
apply_textdelta(void *file_baton,
const char *base_checksum,
@@ -1996,6 +2006,7 @@ apply_textdelta(void *file_baton,
}
+/* */
static svn_error_t *
change_file_prop(void *file_baton,
const char *name,
@@ -2027,6 +2038,7 @@ change_file_prop(void *file_baton,
}
+/* */
static svn_error_t *
close_file(void *file_baton,
const char *text_checksum, /* ignored, as we receive no data */
@@ -2074,6 +2086,7 @@ close_file(void *file_baton,
pool);
}
+/* */
static svn_error_t *
close_edit(void *edit_baton,
apr_pool_t *pool)
@@ -2343,6 +2356,7 @@ svn_wc_get_default_ignores(apr_array_hea
}
+/* */
static svn_error_t *
internal_status(svn_wc_status2_t **status,
svn_wc__db_t *db,
@@ -2368,7 +2382,16 @@ internal_status(svn_wc_status2_t **statu
else if (err)
return svn_error_return(err);
- if (entry && ! svn_path_is_empty(local_abspath))
+ if (entry)
+ {
+ svn_boolean_t hidden;
+ SVN_ERR(svn_wc__entry_is_hidden(&hidden, entry));
+
+ if (hidden)
+ entry = NULL;
+ }
+
+ if (entry && !svn_dirent_is_root(local_abspath, strlen(local_abspath)))
{
const char *parent_abspath = svn_dirent_dirname(local_abspath,
scratch_pool);
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=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/translate.c (original)
+++ subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/translate.c Tue Aug 10 18:06:17 2010
@@ -50,12 +50,14 @@
+/* */
static svn_error_t *
read_handler_unsupported(void *baton, char *buffer, apr_size_t *len)
{
SVN_ERR_MALFUNCTION();
}
+/* */
static svn_error_t *
write_handler_unsupported(void *baton, const char *buffer, apr_size_t *len)
{
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=984153&r1=984152&r2=984153&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 18:06:17 2010
@@ -38,38 +38,6 @@
#include "svn_private_config.h"
-
-/* OVERVIEW
- *
- * This file handles the storage and retrieval of tree conflict descriptions
- * (svn_wc_conflict_description_t) in the WC.
- *
- * Data Format
- *
- * All tree conflicts descriptions for the current tree conflict victims in
- * one parent directory are stored in a single "tree_conflict_data" text
- * field in that parent's THIS_DIR entry.
- *
- * tree_conflict_data: zero or more conflicts (one per victim path),
- * separated by the SVN_WC__TREE_CONFLICT_DESC_SEPARATOR character.
- *
- * a description entry: a fixed sequence of text fields, some of which
- * may be empty, corresponding to the pertinent fields of
- * svn_wc_conflict_description_t, separated by
- * SVN_WC__TREE_CONFLICT_DESC_FIELD_SEPARATOR.
- *
- * a field: a string within which any separator or escape characters are
- * escaped with the escape character SVN_WC__TREE_CONFLICT_ESCAPE_CHAR.
- *
- * Error Handling
- *
- * On reading from the WC entry, errors of malformed data are handled by
- * raising an svn_error_t, as these can occur from WC corruption. On
- * writing, errors in the internal data consistency before it is written are
- * handled more severely because any such errors must be due to a bug.
- */
-
-
/* ### this should move to a more general location... */
/* A map for svn_node_kind_t values. */
static const svn_token_map_t node_kind_map[] =
@@ -115,6 +83,7 @@ const svn_token_map_t svn_wc__conflict_r
};
+/* */
static svn_boolean_t
is_valid_version_info_skel(const svn_skel_t *skel)
{
@@ -127,6 +96,7 @@ is_valid_version_info_skel(const svn_ske
}
+/* */
static svn_boolean_t
is_valid_conflict_skel(const svn_skel_t *skel)
{
@@ -216,11 +186,9 @@ read_node_version_info(const svn_wc_conf
}
/* Parse a newly allocated svn_wc_conflict_description2_t object from the
- * character string pointed to by *START. Return the result in *CONFLICT.
- * Don't read further than END. Set *START to point to the next character
- * after the description that was read.
+ * provided SKEL. Return the result in *CONFLICT, allocated in RESULT_POOL.
* DIR_PATH is the path to the WC directory whose conflicts are being read.
- * Do all allocations in pool.
+ * Use SCRATCH_POOL for temporary allocations.
*/
svn_error_t *
svn_wc__deserialize_conflict(const svn_wc_conflict_description2_t **conflict,
@@ -468,7 +436,7 @@ svn_wc__write_tree_conflicts(const char
{
svn_skel_t *c_skel;
- SVN_ERR(svn_wc__serialize_conflict(&c_skel, svn_apr_hash_index_val(hi),
+ SVN_ERR(svn_wc__serialize_conflict(&c_skel, svn__apr_hash_index_val(hi),
pool, pool));
svn_skel__prepend(c_skel, skel);
}
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=984153&r1=984152&r2=984153&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 18:06:17 2010
@@ -74,19 +74,6 @@ svn_wc__deserialize_conflict(const svn_w
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* Like svn_wc__add_tree_conflict(), but append to the log accumulator
- * LOG_ACCUM a command to rewrite the entry field, and do not flush the log.
- * This function is meant to be used in the working copy library where
- * log accumulators are usually readily available.
- *
- * If *LOG_ACCUM is NULL then set *LOG_ACCUM to a new stringbug allocated in
- * POOL, else append to the existing stringbuf there.
- */
-svn_error_t *
-svn_wc__loggy_add_tree_conflict(svn_stringbuf_t **log_accum,
- const svn_wc_conflict_description2_t *conflict,
- apr_pool_t *pool);
-
/*
* Encode tree conflict descriptions into a single string.
*