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/10/20 19:57:43 UTC
svn commit: r1025655 [6/6] - in /subversion/branches/object-model: ./
build/win32/ notes/http-and-webdav/ notes/wc-ng/
subversion/bindings/ctypes-python/csvn/ subversion/include/
subversion/libsvn_client/ subversion/libsvn_diff/ subversion/libsvn_fs_fs...
Modified: subversion/branches/object-model/subversion/tests/libsvn_diff/parse-diff-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/tests/libsvn_diff/parse-diff-test.c?rev=1025655&r1=1025654&r2=1025655&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/tests/libsvn_diff/parse-diff-test.c (original)
+++ subversion/branches/object-model/subversion/tests/libsvn_diff/parse-diff-test.c Wed Oct 20 17:57:41 2010
@@ -301,10 +301,7 @@ check_content(svn_diff_hunk_t *hunk, svn
SVN_TEST_ASSERT(exp_eof == hunk_eof);
if (exp_eof)
break;
- if (strcmp(exp_buf->data, hunk_buf->data))
- return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
- "Expected '%s' but was '%s'", exp_buf->data,
- hunk_buf->data);
+ SVN_TEST_STRING_ASSERT(exp_buf->data, hunk_buf->data);
}
SVN_TEST_ASSERT(hunk_buf->len == 0);
@@ -345,8 +342,8 @@ test_parse_unidiff(apr_pool_t *pool)
ignore_whitespace, iterpool,
iterpool));
SVN_TEST_ASSERT(patch);
- SVN_TEST_ASSERT(! strcmp(patch->old_filename, "A/C/gamma"));
- SVN_TEST_ASSERT(! strcmp(patch->new_filename, "A/C/gamma"));
+ SVN_TEST_STRING_ASSERT(patch->old_filename, "A/C/gamma");
+ SVN_TEST_STRING_ASSERT(patch->new_filename, "A/C/gamma");
SVN_TEST_ASSERT(patch->hunks->nelts == 1);
hunk = APR_ARRAY_IDX(patch->hunks, 0, svn_diff_hunk_t *);
@@ -365,13 +362,13 @@ test_parse_unidiff(apr_pool_t *pool)
SVN_TEST_ASSERT(patch);
if (reverse)
{
- SVN_TEST_ASSERT(! strcmp(patch->new_filename, "A/D/gamma.orig"));
- SVN_TEST_ASSERT(! strcmp(patch->old_filename, "A/D/gamma"));
+ SVN_TEST_STRING_ASSERT(patch->new_filename, "A/D/gamma.orig");
+ SVN_TEST_STRING_ASSERT(patch->old_filename, "A/D/gamma");
}
else
{
- SVN_TEST_ASSERT(! strcmp(patch->old_filename, "A/D/gamma.orig"));
- SVN_TEST_ASSERT(! strcmp(patch->new_filename, "A/D/gamma"));
+ SVN_TEST_STRING_ASSERT(patch->old_filename, "A/D/gamma.orig");
+ SVN_TEST_STRING_ASSERT(patch->new_filename, "A/D/gamma");
}
SVN_TEST_ASSERT(patch->hunks->nelts == 1);
@@ -409,8 +406,8 @@ test_parse_git_diff(apr_pool_t *pool)
FALSE, /* ignore_whitespace */
pool, pool));
SVN_TEST_ASSERT(patch);
- SVN_TEST_ASSERT(! strcmp(patch->old_filename, "A/mu"));
- SVN_TEST_ASSERT(! strcmp(patch->new_filename, "A/mu"));
+ SVN_TEST_STRING_ASSERT(patch->old_filename, "A/mu");
+ SVN_TEST_STRING_ASSERT(patch->new_filename, "A/mu");
SVN_TEST_ASSERT(patch->operation == svn_diff_op_deleted);
SVN_TEST_ASSERT(patch->hunks->nelts == 0);
@@ -420,8 +417,8 @@ test_parse_git_diff(apr_pool_t *pool)
FALSE, /* ignore_whitespace */
pool, pool));
SVN_TEST_ASSERT(patch);
- SVN_TEST_ASSERT(! strcmp(patch->old_filename, "A/C/gamma"));
- SVN_TEST_ASSERT(! strcmp(patch->new_filename, "A/C/gamma"));
+ SVN_TEST_STRING_ASSERT(patch->old_filename, "A/C/gamma");
+ SVN_TEST_STRING_ASSERT(patch->new_filename, "A/C/gamma");
SVN_TEST_ASSERT(patch->operation == svn_diff_op_modified);
SVN_TEST_ASSERT(patch->hunks->nelts == 1);
@@ -443,8 +440,8 @@ test_parse_git_diff(apr_pool_t *pool)
pool, pool));
SVN_TEST_ASSERT(patch);
- SVN_TEST_ASSERT(! strcmp(patch->old_filename, "iota"));
- SVN_TEST_ASSERT(! strcmp(patch->new_filename, "iota.copied"));
+ SVN_TEST_STRING_ASSERT(patch->old_filename, "iota");
+ SVN_TEST_STRING_ASSERT(patch->new_filename, "iota.copied");
SVN_TEST_ASSERT(patch->operation == svn_diff_op_copied);
SVN_TEST_ASSERT(patch->hunks->nelts == 0);
@@ -455,8 +452,8 @@ test_parse_git_diff(apr_pool_t *pool)
pool, pool));
SVN_TEST_ASSERT(patch);
- SVN_TEST_ASSERT(! strcmp(patch->old_filename, "new"));
- SVN_TEST_ASSERT(! strcmp(patch->new_filename, "new"));
+ SVN_TEST_STRING_ASSERT(patch->old_filename, "new");
+ SVN_TEST_STRING_ASSERT(patch->new_filename, "new");
SVN_TEST_ASSERT(patch->operation == svn_diff_op_added);
SVN_TEST_ASSERT(patch->hunks->nelts == 0);
@@ -482,8 +479,8 @@ test_parse_git_tree_and_text_diff(apr_po
FALSE, /* ignore_whitespace */
pool, pool));
SVN_TEST_ASSERT(patch);
- SVN_TEST_ASSERT(! strcmp(patch->old_filename, "iota"));
- SVN_TEST_ASSERT(! strcmp(patch->new_filename, "iota.copied"));
+ SVN_TEST_STRING_ASSERT(patch->old_filename, "iota");
+ SVN_TEST_STRING_ASSERT(patch->new_filename, "iota.copied");
SVN_TEST_ASSERT(patch->operation == svn_diff_op_copied);
SVN_TEST_ASSERT(patch->hunks->nelts == 1);
@@ -504,8 +501,8 @@ test_parse_git_tree_and_text_diff(apr_po
FALSE, /* ignore_whitespace */
pool, pool));
SVN_TEST_ASSERT(patch);
- SVN_TEST_ASSERT(! strcmp(patch->old_filename, "A/mu"));
- SVN_TEST_ASSERT(! strcmp(patch->new_filename, "A/mu.moved"));
+ SVN_TEST_STRING_ASSERT(patch->old_filename, "A/mu");
+ SVN_TEST_STRING_ASSERT(patch->new_filename, "A/mu.moved");
SVN_TEST_ASSERT(patch->operation == svn_diff_op_moved);
SVN_TEST_ASSERT(patch->hunks->nelts == 1);
@@ -525,8 +522,8 @@ test_parse_git_tree_and_text_diff(apr_po
FALSE, /* ignore_whitespace */
pool, pool));
SVN_TEST_ASSERT(patch);
- SVN_TEST_ASSERT(! strcmp(patch->old_filename, "/dev/null"));
- SVN_TEST_ASSERT(! strcmp(patch->new_filename, "new"));
+ SVN_TEST_STRING_ASSERT(patch->old_filename, "/dev/null");
+ SVN_TEST_STRING_ASSERT(patch->new_filename, "new");
SVN_TEST_ASSERT(patch->operation == svn_diff_op_added);
SVN_TEST_ASSERT(patch->hunks->nelts == 1);
@@ -545,8 +542,8 @@ test_parse_git_tree_and_text_diff(apr_po
FALSE, /* ignore_whitespace */
pool, pool));
SVN_TEST_ASSERT(patch);
- SVN_TEST_ASSERT(! strcmp(patch->old_filename, "A/B/lambda"));
- SVN_TEST_ASSERT(! strcmp(patch->new_filename, "/dev/null"));
+ SVN_TEST_STRING_ASSERT(patch->old_filename, "A/B/lambda");
+ SVN_TEST_STRING_ASSERT(patch->new_filename, "/dev/null");
SVN_TEST_ASSERT(patch->operation == svn_diff_op_deleted);
SVN_TEST_ASSERT(patch->hunks->nelts == 1);
@@ -579,8 +576,8 @@ test_bad_git_diff_headers(apr_pool_t *po
FALSE, /* ignore_whitespace */
pool, pool));
SVN_TEST_ASSERT(patch);
- SVN_TEST_ASSERT(! strcmp(patch->old_filename, "iota"));
- SVN_TEST_ASSERT(! strcmp(patch->new_filename, "iota.copied"));
+ SVN_TEST_STRING_ASSERT(patch->old_filename, "iota");
+ SVN_TEST_STRING_ASSERT(patch->new_filename, "iota.copied");
SVN_TEST_ASSERT(patch->operation == svn_diff_op_copied);
SVN_TEST_ASSERT(patch->hunks->nelts == 1);
@@ -617,8 +614,8 @@ test_parse_property_diff(apr_pool_t *poo
FALSE, /* ignore_whitespace */
pool, pool));
SVN_TEST_ASSERT(patch);
- SVN_TEST_ASSERT(! strcmp(patch->old_filename, "iota"));
- SVN_TEST_ASSERT(! strcmp(patch->new_filename, "iota"));
+ SVN_TEST_STRING_ASSERT(patch->old_filename, "iota");
+ SVN_TEST_STRING_ASSERT(patch->new_filename, "iota");
SVN_TEST_ASSERT(patch->hunks->nelts == 0);
SVN_TEST_ASSERT(apr_hash_count(patch->prop_patches) == 3);
@@ -720,8 +717,8 @@ test_parse_property_and_text_diff(apr_po
FALSE, /* ignore_whitespace */
pool, pool));
SVN_TEST_ASSERT(patch);
- SVN_TEST_ASSERT(! strcmp(patch->old_filename, "iota"));
- SVN_TEST_ASSERT(! strcmp(patch->new_filename, "iota"));
+ SVN_TEST_STRING_ASSERT(patch->old_filename, "iota");
+ SVN_TEST_STRING_ASSERT(patch->new_filename, "iota");
SVN_TEST_ASSERT(patch->hunks->nelts == 1);
SVN_TEST_ASSERT(apr_hash_count(patch->prop_patches) == 1);
@@ -775,8 +772,8 @@ test_parse_diff_symbols_in_prop_unidiff(
FALSE, /* ignore_whitespace */
pool, pool));
SVN_TEST_ASSERT(patch);
- SVN_TEST_ASSERT(! strcmp(patch->old_filename, "iota"));
- SVN_TEST_ASSERT(! strcmp(patch->new_filename, "iota"));
+ SVN_TEST_STRING_ASSERT(patch->old_filename, "iota");
+ SVN_TEST_STRING_ASSERT(patch->new_filename, "iota");
SVN_TEST_ASSERT(patch->hunks->nelts == 0);
SVN_TEST_ASSERT(apr_hash_count(patch->prop_patches) == 3);
@@ -873,8 +870,8 @@ test_git_diffs_with_spaces_diff(apr_pool
FALSE, /* ignore_whitespace */
pool, pool));
SVN_TEST_ASSERT(patch);
- SVN_TEST_ASSERT(! strcmp(patch->old_filename, "path 1"));
- SVN_TEST_ASSERT(! strcmp(patch->new_filename, "path 1"));
+ SVN_TEST_STRING_ASSERT(patch->old_filename, "path 1");
+ SVN_TEST_STRING_ASSERT(patch->new_filename, "path 1");
SVN_TEST_ASSERT(patch->operation == svn_diff_op_added);
SVN_TEST_ASSERT(patch->hunks->nelts == 0);
@@ -883,8 +880,8 @@ test_git_diffs_with_spaces_diff(apr_pool
FALSE, /* ignore_whitespace */
pool, pool));
SVN_TEST_ASSERT(patch);
- SVN_TEST_ASSERT(! strcmp(patch->old_filename, "path one 1"));
- SVN_TEST_ASSERT(! strcmp(patch->new_filename, "path one 1"));
+ SVN_TEST_STRING_ASSERT(patch->old_filename, "path one 1");
+ SVN_TEST_STRING_ASSERT(patch->new_filename, "path one 1");
SVN_TEST_ASSERT(patch->operation == svn_diff_op_added);
SVN_TEST_ASSERT(patch->hunks->nelts == 0);
@@ -893,8 +890,8 @@ test_git_diffs_with_spaces_diff(apr_pool
FALSE, /* ignore_whitespace */
pool, pool));
SVN_TEST_ASSERT(patch);
- SVN_TEST_ASSERT(! strcmp(patch->old_filename, "dir/ b/path"));
- SVN_TEST_ASSERT(! strcmp(patch->new_filename, "dir/ b/path"));
+ SVN_TEST_STRING_ASSERT(patch->old_filename, "dir/ b/path");
+ SVN_TEST_STRING_ASSERT(patch->new_filename, "dir/ b/path");
SVN_TEST_ASSERT(patch->operation == svn_diff_op_added);
SVN_TEST_ASSERT(patch->hunks->nelts == 0);
@@ -903,8 +900,8 @@ test_git_diffs_with_spaces_diff(apr_pool
FALSE, /* ignore_whitespace */
pool, pool));
SVN_TEST_ASSERT(patch);
- SVN_TEST_ASSERT(! strcmp(patch->old_filename, " b/path 1"));
- SVN_TEST_ASSERT(! strcmp(patch->new_filename, " b/path 1"));
+ SVN_TEST_STRING_ASSERT(patch->old_filename, " b/path 1");
+ SVN_TEST_STRING_ASSERT(patch->new_filename, " b/path 1");
SVN_TEST_ASSERT(patch->operation == svn_diff_op_added);
SVN_TEST_ASSERT(patch->hunks->nelts == 0);
Modified: subversion/branches/object-model/subversion/tests/libsvn_wc/db-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/tests/libsvn_wc/db-test.c?rev=1025655&r1=1025654&r2=1025655&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/tests/libsvn_wc/db-test.c (original)
+++ subversion/branches/object-model/subversion/tests/libsvn_wc/db-test.c Wed Oct 20 17:57:41 2010
@@ -580,38 +580,41 @@ validate_node(svn_wc__db_t *db,
}
value = apr_hash_get(props, "p1", APR_HASH_KEY_STRING);
- SVN_TEST_ASSERT(value != NULL && strcmp(value->data, "v1") == 0);
+ SVN_TEST_STRING_ASSERT(value->data, "v1");
SVN_ERR(svn_wc__db_base_get_prop(&value, db, path, "p1",
scratch_pool, scratch_pool));
- SVN_TEST_ASSERT(value != NULL && strcmp(value->data, "v1") == 0);
+ SVN_TEST_STRING_ASSERT(value->data, "v1");
value = apr_hash_get(props, "for-file", APR_HASH_KEY_STRING);
- SVN_TEST_ASSERT(value != NULL && strcmp(value->data, relpath) == 0);
+ SVN_TEST_STRING_ASSERT(value->data, relpath);
SVN_ERR(svn_wc__db_base_get_prop(&value, db, path, "for-file",
scratch_pool, scratch_pool));
- SVN_TEST_ASSERT(value != NULL && strcmp(value->data, relpath) == 0);
+ SVN_TEST_STRING_ASSERT(value->data, relpath);
SVN_ERR(svn_wc__db_read_props(&props, db, path,
scratch_pool, scratch_pool));
SVN_TEST_ASSERT(props != NULL);
value = apr_hash_get(props, "p1", APR_HASH_KEY_STRING);
- SVN_TEST_ASSERT(value != NULL && strcmp(value->data, "v1") == 0);
+ SVN_TEST_STRING_ASSERT(value->data, "v1");
SVN_ERR(svn_wc__db_read_pristine_props(&props, db, path,
scratch_pool, scratch_pool));
SVN_TEST_ASSERT(props != NULL);
value = apr_hash_get(props, "p1", APR_HASH_KEY_STRING);
- SVN_TEST_ASSERT(value != NULL && strcmp(value->data, "v1") == 0);
+ SVN_TEST_STRING_ASSERT(value->data, "v1");
/* Now add a property value and read it back (all on actual) */
- apr_hash_set(props, "p999", APR_HASH_KEY_STRING, value);
-
- SVN_ERR(svn_wc__db_op_set_props(db, path, props, NULL, NULL, scratch_pool));
- SVN_ERR(svn_wc__db_read_props(&props, db, path,
- scratch_pool, scratch_pool));
- SVN_TEST_ASSERT(props != NULL);
- value = apr_hash_get(props, "p999", APR_HASH_KEY_STRING);
- SVN_TEST_ASSERT(value != NULL && strcmp(value->data, "v1") == 0);
+ {
+ apr_hash_t *actual_props = apr_hash_copy(scratch_pool, props);
+ apr_hash_set(actual_props, "p999", APR_HASH_KEY_STRING, value);
+ SVN_ERR(svn_wc__db_op_set_props(db, path, actual_props,
+ NULL, NULL, scratch_pool));
+ SVN_ERR(svn_wc__db_read_props(&props, db, path,
+ scratch_pool, scratch_pool));
+ SVN_TEST_ASSERT(props != NULL);
+ value = apr_hash_get(props, "p999", APR_HASH_KEY_STRING);
+ SVN_TEST_STRING_ASSERT(value->data, "v1");
+ }
return SVN_NO_ERROR;
}
Modified: subversion/branches/object-model/subversion/tests/libsvn_wc/entries-compat.c
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/tests/libsvn_wc/entries-compat.c?rev=1025655&r1=1025654&r2=1025655&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/tests/libsvn_wc/entries-compat.c (original)
+++ subversion/branches/object-model/subversion/tests/libsvn_wc/entries-compat.c Wed Oct 20 17:57:41 2010
@@ -531,7 +531,7 @@ test_access_baton_like_locking(apr_pool_
SVN_INVALID_REVNUM, NULL, NULL, NULL, NULL, pool));
SVN_ERR(svn_wc_locked(&locked, D3, pool));
SVN_TEST_ASSERT(locked);
- SVN_ERR(svn_wc_revert3(D, adm_access, -1, FALSE,
+ SVN_ERR(svn_wc_revert3(D, adm_access, svn_depth_infinity, FALSE,
NULL, NULL, NULL, NULL, NULL, pool));
SVN_ERR(svn_wc_locked(&locked, D3, pool));
SVN_TEST_ASSERT(!locked);
Modified: subversion/branches/object-model/subversion/tests/libsvn_wc/pristine-store-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/tests/libsvn_wc/pristine-store-test.c?rev=1025655&r1=1025654&r2=1025655&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/tests/libsvn_wc/pristine-store-test.c (original)
+++ subversion/branches/object-model/subversion/tests/libsvn_wc/pristine-store-test.c Wed Oct 20 17:57:41 2010
@@ -48,18 +48,10 @@
#include "private/svn_wc_private.h"
#include "../svn_test.h"
-#include "../svn_test_fs.h"
+#include "../svn_test_utils.h"
-#define REPOSITORIES_WORK_DIR "svn-test-work/repositories"
-#define WCS_WORK_DIR "svn-test-work/working-copies"
-
-/* Create an empty repository and WC for the test TEST_NAME, and open a WC
- * DB context. Set *REPOS_URL to the URL of the new repository, *WC_ABSPATH
- * to the root path of the new WC, and *DB to a new DB context.
- *
- * Create the repository and WC in subdirectories called repos/TEST_NAME and
- * wcs/TEST_NAME respectively, within the current working directory. */
+/* Create repos and WC, and also set *DB to a new DB context. */
static svn_error_t *
create_repos_and_wc(const char **repos_url,
const char **wc_abspath,
@@ -68,41 +60,8 @@ create_repos_and_wc(const char **repos_u
const svn_test_opts_t *opts,
apr_pool_t *pool)
{
- const char *repos_path = svn_relpath_join(REPOSITORIES_WORK_DIR, test_name,
- pool);
- const char *wc_path = svn_relpath_join(WCS_WORK_DIR, test_name, pool);
-
- /* Remove the repo and WC dirs if they already exist, to ensure the test
- * will run even if a previous failed attempt was not cleaned up. */
- SVN_ERR(svn_io_remove_dir2(repos_path, TRUE, NULL, NULL, pool));
- SVN_ERR(svn_io_remove_dir2(wc_path, TRUE, NULL, NULL, pool));
-
- /* Create the parent dirs of the repo and WC if necessary. */
- SVN_ERR(svn_io_make_dir_recursively(REPOSITORIES_WORK_DIR, pool));
- SVN_ERR(svn_io_make_dir_recursively(WCS_WORK_DIR, pool));
-
- /* Create a repos and set *REPOS_URL to its path. */
- {
- svn_repos_t *repos;
-
- SVN_ERR(svn_test__create_repos(&repos, repos_path, opts, pool));
- SVN_ERR(svn_uri_get_file_url_from_dirent(repos_url, repos_path, pool));
- }
-
- /* Create a WC */
- {
- svn_client_ctx_t *ctx;
- svn_opt_revision_t head_rev = { svn_opt_revision_head, {0} };
-
- SVN_ERR(svn_client_create_context(&ctx, pool));
- /* SVN_ERR(svn_config_get_config(&ctx->config, config_dir, pool)); */
- SVN_ERR(svn_dirent_get_absolute(wc_abspath, wc_path, pool));
- SVN_ERR(svn_client_checkout3(NULL, *repos_url, *wc_abspath,
- &head_rev, &head_rev, svn_depth_infinity,
- FALSE /* ignore_externals */,
- FALSE /* allow_unver_obstructions */,
- ctx, pool));
- }
+ SVN_ERR(svn_test__create_repos_and_wc(repos_url, wc_abspath, test_name,
+ opts, pool));
/* Open a DB context */
SVN_ERR(svn_wc__db_open(db, svn_wc__db_openmode_readonly, NULL,
@@ -256,9 +215,8 @@ pristine_get_translated(const svn_test_o
SVN_ERR(svn_wc__db_wclock_obtain(wc_ctx->db, dirname, 0, FALSE, pool));
- SVN_ERR(svn_wc_add4(wc_ctx, versioned_abspath, svn_depth_empty,
- NULL, SVN_INVALID_REVNUM, NULL, NULL, NULL, NULL,
- pool));
+ SVN_ERR(svn_wc_add_from_disk(wc_ctx, versioned_abspath,
+ NULL, NULL, NULL, NULL, pool));
SVN_ERR(svn_wc_prop_set4(wc_ctx, versioned_abspath,
"svn:keywords", svn_string_create("Rev", pool),
FALSE, NULL, NULL, pool));
Modified: subversion/branches/object-model/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/tools/dev/unix-build/Makefile.svn?rev=1025655&r1=1025654&r2=1025655&view=diff
==============================================================================
--- subversion/branches/object-model/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/branches/object-model/tools/dev/unix-build/Makefile.svn Wed Oct 20 17:57:41 2010
@@ -917,7 +917,7 @@ httpd-conf:
echo 'RedirectMatch ^/svn-test-work/repositories/REDIRECT-TEMP-(.*)$$ /svn-test-work/repositories/$$1' >> $(HTTPD_CHECK_CONF)
# We need this to make sure some targets below pick up the right libraries
-LD_LIBRARY_PATH=$(PREFIX)/apr/lib:$(PREFIX)/iconv/lib:$(PREFIX)/bdb/lib:$(PREFIX)/neon/lib:$(PREFIX)/serf/lib:$(PREFIX)/sqlite/lib:$(PREFIX)/svn-$(WC)/lib
+LD_LIBRARY_PATH=$(PREFIX)/apr/lib:$(PREFIX)/iconv/lib:$(PREFIX)/bdb/lib:$(PREFIX)/neon/lib:$(PREFIX)/serf/lib:$(PREFIX)/sqlite/lib:$(PREFIX)/cyrus-sasl/lib:$(PREFIX)/iconv/lib:$(PREFIX)/svn-$(WC)/lib
.PHONY: start-svnserve stop-svnserve start-httpd stop-httpd
Modified: subversion/branches/object-model/tools/dev/wc-format.py
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/tools/dev/wc-format.py?rev=1025655&r1=1025654&r2=1025655&view=diff
==============================================================================
--- subversion/branches/object-model/tools/dev/wc-format.py (original)
+++ subversion/branches/object-model/tools/dev/wc-format.py Wed Oct 20 17:57:41 2010
@@ -4,8 +4,9 @@ import os
import sqlite3
import sys
+MIN_SINGLE_DB_FORMAT = 19
-def print_format(wc_path):
+def get_format(wc_path):
entries = os.path.join(wc_path, '.svn', 'entries')
wc_db = os.path.join(wc_path, '.svn', 'wc.db')
@@ -17,14 +18,26 @@ def print_format(wc_path):
curs.execute('pragma user_version;')
formatno = curs.fetchone()[0]
else:
- formatno = 'not under version control'
+ parent_path = os.path.dirname(os.path.abspath(wc_path))
+ if wc_path != parent_path:
+ formatno = get_format(parent_path)
+ if formatno >= MIN_SINGLE_DB_FORMAT:
+ return formatno
+ else:
+ return 'not under version control'
+ else:
+ return 'not under version control'
+
+ return formatno
+def print_format(wc_path):
# see subversion/libsvn_wc/wc.h for format values and information
# 1.0.x -> 1.3.x: format 4
# 1.4.x: format 8
# 1.5.x: format 9
# 1.6.x: format 10
# 1.7.x: format XXX
+ formatno = get_format(wc_path)
print '%s: %s' % (wc_path, formatno)
Modified: subversion/branches/object-model/tools/diff/diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/tools/diff/diff.c?rev=1025655&r1=1025654&r2=1025655&view=diff
==============================================================================
--- subversion/branches/object-model/tools/diff/diff.c (original)
+++ subversion/branches/object-model/tools/diff/diff.c Wed Oct 20 17:57:41 2010
@@ -1,4 +1,4 @@
-/* diff-test.c -- test driver for text diffs
+/* diff.c -- test driver for text diffs
*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
svn_err = svn_stream_for_stdout(&ostream, pool);
if (svn_err)
{
- svn_handle_error2(svn_err, stdout, FALSE, "diff-test: ");
+ svn_handle_error2(svn_err, stdout, FALSE, "diff: ");
rc = 2;
}
else if (argc == 3)
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
}
else
{
- svn_handle_error2(svn_err, stdout, FALSE, "diff-test: ");
+ svn_handle_error2(svn_err, stdout, FALSE, "diff: ");
rc = 2;
}
}
Modified: subversion/branches/object-model/tools/diff/diff3.c
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/tools/diff/diff3.c?rev=1025655&r1=1025654&r2=1025655&view=diff
==============================================================================
--- subversion/branches/object-model/tools/diff/diff3.c (original)
+++ subversion/branches/object-model/tools/diff/diff3.c Wed Oct 20 17:57:41 2010
@@ -1,4 +1,4 @@
-/* diff3-test.c -- test driver for 3-way text merges
+/* diff3.c -- test driver for 3-way text merges
*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
svn_err = svn_stream_for_stdout(&ostream, pool);
if (svn_err)
{
- svn_handle_error2(svn_err, stdout, FALSE, "diff3-test: ");
+ svn_handle_error2(svn_err, stdout, FALSE, "diff3: ");
rc = 2;
}
else if (argc == 4)
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
}
else
{
- svn_handle_error2(svn_err, stdout, FALSE, "diff3-test: ");
+ svn_handle_error2(svn_err, stdout, FALSE, "diff3: ");
rc = 2;
}
}
Modified: subversion/branches/object-model/tools/diff/diff4.c
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/tools/diff/diff4.c?rev=1025655&r1=1025654&r2=1025655&view=diff
==============================================================================
--- subversion/branches/object-model/tools/diff/diff4.c (original)
+++ subversion/branches/object-model/tools/diff/diff4.c Wed Oct 20 17:57:41 2010
@@ -1,4 +1,4 @@
-/* diff4-test.c -- test driver for 3-way text merges
+/* diff4.c -- test driver for 4-way text merges
*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
svn_err = svn_stream_for_stdout(&ostream, pool);
if (svn_err)
{
- svn_handle_error2(svn_err, stdout, FALSE, "diff4-test: ");
+ svn_handle_error2(svn_err, stdout, FALSE, "diff4: ");
rc = 2;
}
else if (argc == 5)
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
pool);
if (svn_err != NULL)
{
- svn_handle_error2(svn_err, stdout, FALSE, "diff4-test: ");
+ svn_handle_error2(svn_err, stdout, FALSE, "diff4: ");
rc = 2;
}
}