Author: julianfoad
Revision: 991563
Modified property: svn:log
Modified: svn:log at Wed Sep 1 15:52:38 2010
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Wed Sep 1 15:52:38 2010
@@ -12,218 +12,3 @@ as none of this is required in single-DB
* subversion/libsvn_wc/wc_db.h
(svn_wc__db_kind_t): Remove 'svn_wc__db_kind_subdir'.
(svn_wc__db_temp_base_add_subdir): Delete, as it was unused.
-Index: subversion/libsvn_wc/wc_db.c
-===================================================================
---- subversion/libsvn_wc/wc_db.c (revision 991548)
-+++ subversion/libsvn_wc/wc_db.c (working copy)
-@@ -2058,30 +2005,34 @@ svn_wc__db_base_get_info(svn_wc__db_stat
- {
- svn_wc__db_kind_t node_kind = svn_sqlite__column_token(stmt, 3,
- kind_map);
-
- if (kind)
- {
-+#ifndef SVN_WC__SINGLE_DB
- if (node_kind == svn_wc__db_kind_subdir)
- *kind = svn_wc__db_kind_dir;
- else
-+#endif
- *kind = node_kind;
- }
- if (status)
- {
- *status = svn_sqlite__column_token(stmt, 2, presence_map);
-
-+#ifndef SVN_WC__SINGLE_DB
- if (node_kind == svn_wc__db_kind_subdir
- && *status == svn_wc__db_status_normal)
- {
- /* We're looking at the subdir record in the *parent* directory,
- which implies per-dir .svn subdirs. We should be looking
- at the subdir itself; therefore, it is missing or obstructed
- in some way. Inform the caller. */
- *status = svn_wc__db_status_obstructed;
- }
-+#endif
- }
- if (revision)
- {
- *revision = svn_sqlite__column_revnum(stmt, 4);
- }
- if (repos_relpath)
-@@ -2241,30 +2192,34 @@ svn_wc__db_base_get_info_from_parent(svn
- {
- svn_wc__db_kind_t node_kind = svn_sqlite__column_token(stmt, 3,
- kind_map);
-
- if (kind)
- {
-+#ifndef SVN_WC__SINGLE_DB
- if (node_kind == svn_wc__db_kind_subdir)
- *kind = svn_wc__db_kind_dir;
- else
-+#endif
- *kind = node_kind;
- }
- if (status)
- {
- *status = svn_sqlite__column_token(stmt, 2, presence_map);
-
-+#ifndef SVN_WC__SINGLE_DB
- if (node_kind == svn_wc__db_kind_subdir
- && *status == svn_wc__db_status_normal)
- {
- /* We're looking at the subdir record in the *parent* directory,
- which implies per-dir .svn subdirs. We should be looking
- at the subdir itself; therefore, it is missing or obstructed
- in some way. Inform the caller. */
- *status = svn_wc__db_status_obstructed;
- }
-+#endif
- }
- if (revision)
- {
- *revision = svn_sqlite__column_revnum(stmt, 4);
- }
- if (repos_relpath)
-@@ -2981,13 +2936,16 @@ temp_cross_db_copy(svn_wc__db_t *db,
- svn_sqlite__stmt_t *stmt;
- svn_boolean_t have_row;
- svn_depth_t depth;
-
- SVN_ERR_ASSERT(kind == svn_wc__db_kind_file
- || kind == svn_wc__db_kind_dir
-- || kind == svn_wc__db_kind_subdir);
-+#ifndef SVN_WC__SINGLE_DB
-+ || kind == svn_wc__db_kind_subdir
-+#endif
-+ );
-
- SVN_ERR(svn_wc__db_read_info(NULL /* status */,
- NULL /* kind */,
- NULL /* revision */,
- NULL /* repos_relpath */,
- NULL /* repos_root_url */,
-@@ -5122,22 +5080,24 @@ svn_wc__db_read_info(svn_wc__db_status_t
- ### both set to 'incomplete'. */
- SVN_ERR_ASSERT((*status != svn_wc__db_status_absent
- && *status != svn_wc__db_status_excluded
- /* && *status != svn_wc__db_status_incomplete
*/)
- || !*have_work);
-
-+#ifndef SVN_WC__SINGLE_DB
- if (node_kind == svn_wc__db_kind_subdir
- && *status == svn_wc__db_status_normal)
- {
- /* We should have read a row from the subdir wc.db. It
- must be obstructed in some way.
-
- It is also possible that a WORKING node will override
- this value with a proper status. */
- *status = svn_wc__db_status_obstructed;
- }
-+#endif
- }
-
- if (*have_work)
- {
- svn_wc__db_status_t work_status;
-
-@@ -5161,43 +5121,49 @@ svn_wc__db_read_info(svn_wc__db_status_t
- || work_status == svn_wc__db_status_base_deleted)
- {
- /* The caller should scan upwards to detect whether this
- deletion has occurred because this node has been moved
- away, or it is a regular deletion. Also note that the
- deletion could be of the BASE tree, or a child of
-- something that has been copied/moved here.
-+ something that has been copied/moved here. */
-
-- If we're looking at the data in the parent, then
-+#ifndef SVN_WC__SINGLE_DB
-+ /* If we're looking at the data in the parent, then
- something has obstructed the child data. Inform
- the caller. */
- if (node_kind == svn_wc__db_kind_subdir)
- *status = svn_wc__db_status_obstructed_delete;
- else
-+#endif
- *status = svn_wc__db_status_deleted;
- }
- else /* normal */
- {
- /* The caller should scan upwards to detect whether this
- addition has occurred because of a simple addition,
-- a copy, or is the destination of a move.
-+ a copy, or is the destination of a move. */
-
-- If we're looking at the data in the parent, then
-+#ifndef SVN_WC__SINGLE_DB
-+ /* If we're looking at the data in the parent, then
- something has obstructed the child data. Inform
- the caller. */
- if (node_kind == svn_wc__db_kind_subdir)
- *status = svn_wc__db_status_obstructed_add;
- else
-+#endif
- *status = svn_wc__db_status_added;
- }
- }
- }
- if (kind)
- {
-+#ifndef SVN_WC__SINGLE_DB
- if (node_kind == svn_wc__db_kind_subdir)
- *kind = svn_wc__db_kind_dir;
- else
-+#endif
- *kind = node_kind;
- }
- if (revision)
- {
- if (*have_work)
- *revision = SVN_INVALID_REVNUM;
-@@ -5269,13 +5235,16 @@ svn_wc__db_read_info(svn_wc__db_status_t
- else
- *last_mod_time = svn_sqlite__column_int64(stmt_base, 12);
- }
- if (depth)
- {
- if (node_kind != svn_wc__db_kind_dir
-- && node_kind != svn_wc__db_kind_subdir)
-+#ifndef SVN_WC__SINGLE_DB
-+ && node_kind != svn_wc__db_kind_subdir
-+#endif
-+ )
- {
- *depth = svn_depth_unknown;
- }
- else
- {
- const char *depth_str;
-@@ -6616,23 +6585,25 @@ svn_wc__db_scan_addition(svn_wc__db_stat
- return svn_error_createf(SVN_ERR_WC_PATH_UNEXPECTED_STATUS,
- svn_sqlite__reset(stmt),
- _("Expected node '%s' to be added."),
- svn_dirent_local_style(local_abspath,
- scratch_pool));
-
-+#ifndef SVN_WC__SINGLE_DB
- /* ### in per-dir operation, it is possible that we just fetched
- ### the parent stub. examine the KIND field.
- ###
- ### scan_addition is NOT allowed for an obstructed_add status
- ### from read_info. there may be key information in the
- ### subdir record (eg. copyfrom_*). */
- {
- svn_wc__db_kind_t kind = svn_sqlite__column_token(stmt, 1,
- kind_map);
- SVN_ERR_ASSERT(kind != svn_wc__db_kind_subdir);
- }
-+#endif
-
- /* Provide the default status; we'll override as appropriate. */
- if (status)
- *status = svn_wc__db_status_added;
- }
-
