You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gb...@apache.org on 2013/11/17 11:02:41 UTC
svn commit: r1542685 [5/5] - in
/subversion/branches/invoke-diff-cmd-feature: ./ build/ build/ac-macros/
build/generator/ build/generator/templates/ build/win32/
contrib/server-side/svncutter/ notes/ subversion/bindings/javahl/native/
subversion/bindin...
Modified: subversion/branches/invoke-diff-cmd-feature/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/tests/cmdline/svnadmin_tests.py?rev=1542685&r1=1542684&r2=1542685&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/tests/cmdline/svnadmin_tests.py Sun Nov 17 10:02:39 2013
@@ -1931,10 +1931,8 @@ def verify_invalid_path_changes(sbox):
sbox.build(create_wc = False)
repo_url = sbox.repo_url
- B_url = sbox.repo_url + '/B'
- C_url = sbox.repo_url + '/C'
- # Create A/B/E/bravo in r2.
+ # Create a number of revisions each adding a single path
for r in range(2,20):
svntest.actions.run_and_verify_svn(None, None, [],
'mkdir', '-m', 'log_msg',
@@ -1953,11 +1951,13 @@ def verify_invalid_path_changes(sbox):
# del non-existent node
set_changed_path_list(fsfs_file(sbox.repo_dir, 'revs', '6'),
- "_0.0.t5-2 del-dir false false /C\n\n")
+ "_0.0.t5-2 delete-dir false false /C\n\n")
# del existent node of the wrong kind
+ # THIS WILL NOT BE DETECTED
+ # since dump mechanism and file don't care about the types of deleted nodes
set_changed_path_list(fsfs_file(sbox.repo_dir, 'revs', '8'),
- "_0.0.t7-2 dev-file false false /B3\n\n")
+ "_0.0.t7-2 delete-file false false /B3\n\n")
# copy from non-existent node
set_changed_path_list(fsfs_file(sbox.repo_dir, 'revs', '10'),
@@ -1995,7 +1995,7 @@ def verify_invalid_path_changes(sbox):
".*Verified revision 5.",
".*Error verifying revision 6.",
".*Verified revision 7.",
- ".*Error verifying revision 8.",
+ ".*Verified revision 8.",
".*Verified revision 9.",
".*Error verifying revision 10.",
".*Verified revision 11.",
Modified: subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_repos/repos-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_repos/repos-test.c?rev=1542685&r1=1542684&r2=1542685&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_repos/repos-test.c Sun Nov 17 10:02:39 2013
@@ -3335,7 +3335,8 @@ test_config_pool(const svn_test_opts_t *
/* read all config info through a single config pool and we want to be
able to control its lifetime. The latter requires a separate pool. */
config_pool_pool = svn_pool_create(pool);
- SVN_ERR(svn_repos__config_pool_create(&config_pool, config_pool_pool));
+ SVN_ERR(svn_repos__config_pool_create(&config_pool, TRUE,
+ config_pool_pool));
/* have two different configurations */
SVN_ERR(svn_stringbuf_from_file2(
@@ -3375,7 +3376,7 @@ test_config_pool(const svn_test_opts_t *
for (i = 0; i < 4; ++i)
{
SVN_ERR(svn_repos__config_pool_get(
- &cfg, config_pool,
+ &cfg, NULL, config_pool,
svn_dirent_join(wrk_dir,
"config-pool-test1.cfg",
pool),
@@ -3394,7 +3395,7 @@ test_config_pool(const svn_test_opts_t *
for (i = 0; i < 4; ++i)
{
SVN_ERR(svn_repos__config_pool_get(
- &cfg, config_pool,
+ &cfg, NULL, config_pool,
svn_dirent_join(wrk_dir,
"config-pool-test2.cfg",
pool),
@@ -3410,7 +3411,7 @@ test_config_pool(const svn_test_opts_t *
for (i = 0; i < 2; ++i)
{
SVN_ERR(svn_repos__config_pool_get(
- &cfg, config_pool,
+ &cfg, NULL, config_pool,
svn_dirent_join(wrk_dir,
"config-pool-test3.cfg",
pool),
@@ -3440,7 +3441,7 @@ test_config_pool(const svn_test_opts_t *
SVN_ERR(svn_fs_commit_txn2(NULL, &rev, txn, TRUE, pool));
/* reading the config from the repo should still give cfg1 */
- SVN_ERR(svn_repos__config_pool_get(&cfg, config_pool,
+ SVN_ERR(svn_repos__config_pool_get(&cfg, NULL, config_pool,
svn_path_url_add_component2(
repo_root_url,
"dir/config", pool),
@@ -3458,7 +3459,7 @@ test_config_pool(const svn_test_opts_t *
SVN_ERR(svn_fs_commit_txn2(NULL, &rev, txn, TRUE, pool));
/* reading the config from the repo should give cfg2 now */
- SVN_ERR(svn_repos__config_pool_get(&cfg, config_pool,
+ SVN_ERR(svn_repos__config_pool_get(&cfg, NULL, config_pool,
svn_path_url_add_component2(
repo_root_url,
"dir/config", pool),
@@ -3467,7 +3468,7 @@ test_config_pool(const svn_test_opts_t *
svn_pool_clear(subpool);
/* reading the copied config should still give cfg1 */
- SVN_ERR(svn_repos__config_pool_get(&cfg, config_pool,
+ SVN_ERR(svn_repos__config_pool_get(&cfg, NULL, config_pool,
svn_path_url_add_component2(
repo_root_url,
"another-dir/config",
@@ -3477,13 +3478,13 @@ test_config_pool(const svn_test_opts_t *
svn_pool_clear(subpool);
/* once again: repeated reads. This triggers a different code path. */
- SVN_ERR(svn_repos__config_pool_get(&cfg, config_pool,
+ SVN_ERR(svn_repos__config_pool_get(&cfg, NULL, config_pool,
svn_path_url_add_component2(
repo_root_url,
"dir/config", pool),
TRUE, TRUE, NULL, subpool));
SVN_TEST_ASSERT(cfg->sections == sections2);
- SVN_ERR(svn_repos__config_pool_get(&cfg, config_pool,
+ SVN_ERR(svn_repos__config_pool_get(&cfg, NULL, config_pool,
svn_path_url_add_component2(
repo_root_url,
"another-dir/config",
@@ -3493,20 +3494,20 @@ test_config_pool(const svn_test_opts_t *
svn_pool_clear(subpool);
/* access paths that don't exist */
- SVN_TEST_ASSERT_ERROR(svn_repos__config_pool_get(&cfg, config_pool,
+ SVN_TEST_ASSERT_ERROR(svn_repos__config_pool_get(&cfg, NULL, config_pool,
svn_path_url_add_component2(repo_root_url, "X",
pool),
TRUE, TRUE, NULL, subpool),
SVN_ERR_ILLEGAL_TARGET);
- err = svn_repos__config_pool_get(&cfg, config_pool, "X.cfg", TRUE, TRUE,
- NULL, subpool);
+ err = svn_repos__config_pool_get(&cfg, NULL, config_pool, "X.cfg",
+ TRUE, TRUE, NULL, subpool);
SVN_TEST_ASSERT(err && APR_STATUS_IS_ENOENT(err->apr_err));
svn_error_clear(err);
svn_pool_clear(subpool);
/* as long as we keep a reference to a config, clearing the config pool
should not invalidate that reference */
- SVN_ERR(svn_repos__config_pool_get(&cfg, config_pool,
+ SVN_ERR(svn_repos__config_pool_get(&cfg, NULL, config_pool,
svn_dirent_join(wrk_dir,
"config-pool-test1.cfg",
pool),
Propchange: subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_subr/sqlite-test.c
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_wc/op-depth-test.c?rev=1542685&r1=1542684&r2=1542685&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_wc/op-depth-test.c Sun Nov 17 10:02:39 2013
@@ -29,6 +29,7 @@
#include "svn_private_config.h"
#include "svn_types.h"
+#include "svn_hash.h"
#include "svn_io.h"
#include "svn_dirent_uri.h"
#include "svn_pools.h"
@@ -104,6 +105,14 @@ typedef struct nodes_row_t {
const char *props; /* comma-separated list of prop names */
} nodes_row_t;
+/* What conflicts are on a path. */
+typedef struct conflict_info_t {
+ const char *local_relpath;
+ svn_boolean_t text_conflicted;
+ svn_boolean_t prop_conflicted;
+ svn_boolean_t tree_conflicted;
+} conflict_info_t;
+
/* Macro for filling in the REPO_* fields of a non-base NODES_ROW_T
* that has no copy-from info. */
#define NO_COPY_FROM SVN_INVALID_REVNUM, NULL, FALSE
@@ -332,6 +341,146 @@ check_db_rows(svn_test__sandbox_t *b,
}
+static const char *
+print_conflict(const conflict_info_t *row,
+ apr_pool_t *result_pool)
+{
+ return apr_psprintf(result_pool, "\"%s\", %s, %s, %s",
+ row->local_relpath,
+ row->text_conflicted ? "TRUE" : "FALSE",
+ row->prop_conflicted ? "TRUE" : "FALSE",
+ row->tree_conflicted ? "TRUE" : "FALSE");
+}
+
+static svn_error_t *
+compare_conflict_info(const void *key, apr_ssize_t klen,
+ enum svn_hash_diff_key_status status,
+ void *baton)
+{
+ comparison_baton_t *b = baton;
+ conflict_info_t *expected = apr_hash_get(b->expected_hash, key, klen);
+ conflict_info_t *found = apr_hash_get(b->found_hash, key, klen);
+
+ if (! expected)
+ {
+ b->errors = svn_error_createf(
+ SVN_ERR_TEST_FAILED, b->errors,
+ "found {%s}",
+ print_conflict(found, b->scratch_pool));
+ }
+ else if (! found)
+ {
+ b->errors = svn_error_createf(
+ SVN_ERR_TEST_FAILED, b->errors,
+ "expected {%s}",
+ print_conflict(expected, b->scratch_pool));
+ }
+ else if (expected->text_conflicted != found->text_conflicted
+ || expected->prop_conflicted != found->prop_conflicted
+ || expected->tree_conflicted != found->tree_conflicted)
+ {
+ b->errors = svn_error_createf(
+ SVN_ERR_TEST_FAILED, b->errors,
+ "expected {%s}; found {%s}",
+ print_conflict(expected, b->scratch_pool),
+ print_conflict(found, b->scratch_pool));
+ }
+
+ /* Don't terminate the comparison: accumulate all differences. */
+ return SVN_NO_ERROR;
+}
+
+static svn_error_t *
+check_db_conflicts(svn_test__sandbox_t *b,
+ const char *root_path,
+ const conflict_info_t *expected_conflicts)
+{
+ const char *base_relpath = root_path;
+ svn_sqlite__db_t *sdb;
+ int i;
+ svn_sqlite__stmt_t *stmt;
+ static const char *const statements[] = {
+ "SELECT local_relpath"
+ " FROM actual_node "
+ " WHERE conflict_data is NOT NULL "
+ " AND local_relpath = ?1 OR local_relpath LIKE ?2",
+ NULL };
+#define STMT_SELECT_ACTUAL_INFO 0
+
+ svn_boolean_t have_row;
+ apr_hash_t *found_hash = apr_hash_make(b->pool);
+ apr_hash_t *expected_hash = apr_hash_make(b->pool);
+ apr_pool_t *iterpool = svn_pool_create(b->pool);
+ apr_hash_index_t *hi;
+ comparison_baton_t comparison_baton;
+
+ comparison_baton.expected_hash = expected_hash;
+ comparison_baton.found_hash = found_hash;
+ comparison_baton.scratch_pool = b->pool;
+ comparison_baton.errors = NULL;
+
+ /* Fill ACTUAL_HASH with data from the WC DB. */
+ SVN_ERR(open_wc_db(&sdb, b->wc_abspath, statements, b->pool, b->pool));
+ SVN_ERR(svn_sqlite__get_statement(&stmt, sdb, STMT_SELECT_ACTUAL_INFO));
+ SVN_ERR(svn_sqlite__bindf(stmt, "ss", base_relpath,
+ (base_relpath[0]
+ ? apr_psprintf(b->pool, "%s/%%", base_relpath)
+ : "_%")));
+ SVN_ERR(svn_sqlite__step(&have_row, stmt));
+ while (have_row)
+ {
+ conflict_info_t *row = apr_palloc(b->pool, sizeof(*row));
+
+ row->local_relpath = svn_sqlite__column_text(stmt, 0, b->pool);
+
+ svn_hash_sets(found_hash, row->local_relpath, row);
+
+ SVN_ERR(svn_sqlite__step(&have_row, stmt));
+ }
+ SVN_ERR(svn_sqlite__reset(stmt));
+ SVN_ERR(svn_sqlite__close(sdb));
+
+ for (hi = apr_hash_first(b->pool, found_hash); hi; hi = apr_hash_next(hi))
+ {
+ svn_skel_t *conflict;
+ conflict_info_t *info = svn__apr_hash_index_val(hi);
+ const char *local_abspath;
+
+ svn_pool_clear(iterpool);
+
+ local_abspath = svn_dirent_join(b->wc_abspath, info->local_relpath,
+ iterpool);
+
+ SVN_ERR(svn_wc__db_read_conflict(&conflict, b->wc_ctx->db, local_abspath,
+ iterpool, iterpool));
+
+ SVN_TEST_ASSERT(conflict != NULL);
+
+ SVN_ERR(svn_wc__conflict_read_info(NULL, NULL,
+ &info->text_conflicted,
+ &info->prop_conflicted,
+ &info->tree_conflicted,
+ b->wc_ctx->db, local_abspath,
+ conflict,
+ iterpool, iterpool));
+ }
+
+ /* Fill EXPECTED_HASH with data from EXPECTED_ROWS. */
+ if (expected_conflicts)
+ for (i = 0; expected_conflicts[i].local_relpath != NULL; i++)
+ {
+ const conflict_info_t *row = &expected_conflicts[i];
+
+ svn_hash_sets(expected_hash, row->local_relpath, row);
+ }
+
+ /* Compare EXPECTED_HASH with ACTUAL_HASH and return any errors. */
+ SVN_ERR(svn_hash_diff(expected_hash, found_hash,
+ compare_conflict_info, &comparison_baton, b->pool));
+ return comparison_baton.errors;
+}
+
+
/* ---------------------------------------------------------------------- */
/* The test functions */
@@ -5215,9 +5364,21 @@ update_prop_mod_into_moved(const svn_tes
SVN_ERR(check_db_rows(&b, "", nodes));
}
+ {
+ conflict_info_t conflicts[] = {
+ { "A", FALSE, FALSE, TRUE },
+ {0}
+ };
+
+ SVN_ERR(check_db_conflicts(&b, "", conflicts));
+ }
+
/* Resolve should update the move. */
SVN_ERR(sbox_wc_resolve(&b, "A", svn_depth_empty,
svn_wc_conflict_choose_mine_conflict));
+
+ SVN_ERR(check_db_conflicts(&b, "", NULL));
+
{
nodes_row_t nodes[] = {
{0, "", "normal", 2, ""},
@@ -5300,6 +5461,7 @@ nested_move_update(const svn_test_opts_t
svn_wc_conflict_choose_mine_conflict));
SVN_ERR(sbox_wc_resolve(&b, "A2/B/C", svn_depth_empty,
svn_wc_conflict_choose_mine_conflict));
+ SVN_ERR(check_db_conflicts(&b, "", NULL /* no conflicts */));
{
nodes_row_t nodes[] = {
{0, "", "normal", 2, ""},
@@ -5326,6 +5488,8 @@ nested_move_update(const svn_test_opts_t
/* Update A to r3 brings no changes but updates the revisions. */
SVN_ERR(sbox_wc_update(&b, "A", 3));
+ SVN_ERR(check_db_conflicts(&b, "", NULL /* no conflicts */));
+
{
nodes_row_t nodes[] = {
{0, "", "normal", 2, ""},
@@ -5625,7 +5789,9 @@ check_tree_conflict_repos_path(svn_test_
svn_wc_conflict_version_t *version
= APR_ARRAY_IDX(locations, 0, svn_wc_conflict_version_t *);
- SVN_ERR_ASSERT(!strcmp(version->path_in_repos, repos_path1));
+ SVN_TEST_ASSERT(version != NULL);
+
+ SVN_TEST_ASSERT(!strcmp(version->path_in_repos, repos_path1));
}
if (repos_path2)
@@ -5633,7 +5799,9 @@ check_tree_conflict_repos_path(svn_test_
svn_wc_conflict_version_t *version
= APR_ARRAY_IDX(locations, 1, svn_wc_conflict_version_t *);
- SVN_ERR_ASSERT(!strcmp(version->path_in_repos, repos_path2));
+ SVN_TEST_ASSERT(version != NULL);
+
+ SVN_TEST_ASSERT(!strcmp(version->path_in_repos, repos_path2));
}
return SVN_NO_ERROR;
@@ -9021,9 +9189,16 @@ move4_update_delself_AAA(const svn_test_
/* ### These can currently only be resolved to merged ???? */
SVN_ERR(sbox_wc_resolve(&b, "D/A/A", svn_depth_empty,
- svn_wc_conflict_choose_merged));
+ svn_wc_conflict_choose_merged));
SVN_ERR(sbox_wc_resolve(&b, "A/A/A", svn_depth_empty,
- svn_wc_conflict_choose_merged));
+ svn_wc_conflict_choose_merged));
+ SVN_ERR(sbox_wc_resolve(&b, "A_moved/A/A", svn_depth_empty,
+ svn_wc_conflict_choose_merged));
+ /*SVN_ERR(check_db_conflicts(&b, "", NULL));*/
+ SVN_ERR(sbox_wc_resolve(&b, "A/A", svn_depth_empty,
+ svn_wc_conflict_choose_mine_conflict));
+ SVN_ERR(sbox_wc_resolve(&b, "BA_moved/A", svn_depth_empty,
+ svn_wc_conflict_choose_merged));
SVN_ERR(sbox_wc_resolve(&b, "", svn_depth_infinity, svn_wc_conflict_choose_mine_conflict));
/* Go back to start position */
SVN_ERR(sbox_wc_update(&b, "", 1));
@@ -9250,7 +9425,7 @@ movedhere_extract_retract(const svn_test
{1, "A/E3", "base-deleted", NO_COPY_FROM},
{1, "B2", "normal", 2, "A/B2", MOVED_HERE, "k"},
- {1, "C2", "normal", 1, "A/C2", MOVED_HERE},
+ {1, "C2", "normal", 1, "A/C2"},
{1, "D2", "normal", 1, "A/D2", MOVED_HERE},
{1, "Z", "normal", 2, "A", MOVED_HERE},
@@ -9265,9 +9440,6 @@ movedhere_extract_retract(const svn_test
{1, "Z/E3", "normal", 2, "A/E3", MOVED_HERE},
{2, "Z/B2", "normal", NO_COPY_FROM, "B2"},
- /* ### Z/C2 still contains move information, but there is no
- ### layer below it that is moved.
- ### And there is no tree conflict left */
{2, "Z/C2", "normal", NO_COPY_FROM},
{2, "Z/D2", "normal", NO_COPY_FROM, "D2"},
{2, "Z/E2", "normal", NO_COPY_FROM},
@@ -9461,7 +9633,7 @@ struct svn_test_descriptor_t test_funcs[
"del4: delete self AAA"),
SVN_TEST_OPTS_PASS(move4_update_edit_AAA,
"move4: edit AAA"),
- SVN_TEST_OPTS_XFAIL(move4_update_delete_AAA,
+ SVN_TEST_OPTS_PASS(move4_update_delete_AAA,
"move4: delete AAA"),
SVN_TEST_OPTS_PASS(move4_update_add_AAA,
"move4: add AAA"),
@@ -9469,7 +9641,7 @@ struct svn_test_descriptor_t test_funcs[
"move4: delete self AAA"),
SVN_TEST_OPTS_PASS(simple_move_bump,
"simple move bump"),
- SVN_TEST_OPTS_XFAIL(movedhere_extract_retract,
+ SVN_TEST_OPTS_PASS(movedhere_extract_retract,
"movedhere extract retract"),
SVN_TEST_NULL
};
Modified: subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_wc/wc-queries-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_wc/wc-queries-test.c?rev=1542685&r1=1542684&r2=1542685&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_wc/wc-queries-test.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_wc/wc-queries-test.c Sun Nov 17 10:02:39 2013
@@ -22,6 +22,7 @@
*/
#include "svn_pools.h"
+#include "svn_hash.h"
#include "svn_ctype.h"
#include "private/svn_dep_compat.h"
@@ -713,6 +714,105 @@ test_query_expectations(apr_pool_t *scra
return warnings;
}
+static svn_error_t *
+test_query_duplicates(apr_pool_t *scratch_pool)
+{
+ sqlite3 *sdb;
+ int i;
+ apr_pool_t *iterpool = svn_pool_create(scratch_pool);
+ svn_error_t *warnings = NULL;
+ svn_boolean_t supports_query_info;
+ apr_hash_t *sha_to_query = apr_hash_make(scratch_pool);
+
+ SVN_ERR(create_memory_db(&sdb, scratch_pool));
+
+ SVN_ERR(supported_explain_query_plan(&supports_query_info, sdb,
+ scratch_pool));
+ if (!supports_query_info)
+ {
+ SQLITE_ERR(sqlite3_close(sdb));
+ return svn_error_create(SVN_ERR_TEST_SKIPPED, NULL,
+ "Sqlite doesn't support EXPLAIN QUERY PLAN");
+ }
+
+ for (i = 0; i < STMT_SCHEMA_FIRST; i++)
+ {
+ sqlite3_stmt *stmt;
+ const char *tail;
+ int r;
+ svn_stringbuf_t *result;
+ svn_checksum_t *checksum;
+
+ if (is_schema_statement(i))
+ continue;
+
+ /* Prepare statement to find if it is a single statement. */
+ r = sqlite3_prepare_v2(sdb, wc_queries[i], -1, &stmt, &tail);
+
+ if (r != SQLITE_OK)
+ continue; /* Parse failure is already reported by 'test_parable' */
+
+ SQLITE_ERR(sqlite3_finalize(stmt));
+ if (tail[0] != '\0')
+ continue; /* Multi-queries are currently not testable */
+
+ svn_pool_clear(iterpool);
+
+ r = sqlite3_prepare_v2(sdb,
+ apr_pstrcat(iterpool,
+ "EXPLAIN ",
+ wc_queries[i],
+ NULL),
+ -1, &stmt, &tail);
+
+ if (r != SQLITE_OK)
+ continue; /* EXPLAIN not enabled or doesn't support this query */
+
+ result = svn_stringbuf_create_empty(iterpool);
+
+ while (SQLITE_ROW == (r = sqlite3_step(stmt)))
+ {
+ int col;
+
+ for (col = 0; col < sqlite3_column_count(stmt); col++)
+ {
+ const char *txt = (const char*)sqlite3_column_text(stmt, col);
+ if (txt)
+ svn_stringbuf_appendcstr(result, txt);
+
+ svn_stringbuf_appendcstr(result, "|");
+ }
+
+ svn_stringbuf_appendcstr(result, "\n");
+ }
+
+ SQLITE_ERR(sqlite3_reset(stmt));
+ SQLITE_ERR(sqlite3_finalize(stmt));
+
+ SVN_ERR(svn_checksum(&checksum, svn_checksum_sha1,
+ result->data, result->len,
+ iterpool));
+
+ {
+ const char *hex = svn_checksum_to_cstring(checksum, scratch_pool);
+ const char *other;
+
+ other = svn_hash_gets(sha_to_query, hex);
+ if (other)
+ {
+ warnings = svn_error_createf(SVN_ERR_TEST_FAILED, warnings,
+ "Query %s has an identical execution plan as %s",
+ wc_query_info[i][0], other);
+ }
+ else
+ svn_hash_sets(sha_to_query, hex, wc_query_info[i][0]);
+ }
+ }
+ SQLITE_ERR(sqlite3_close(sdb)); /* Close the DB if ok; otherwise leaked */
+
+ return warnings;
+}
+
struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
@@ -722,5 +822,7 @@ struct svn_test_descriptor_t test_funcs[
"queries are parsable"),
SVN_TEST_PASS2(test_query_expectations,
"test query expectations"),
+ SVN_TEST_PASS2(test_query_duplicates,
+ "test query duplicates"),
SVN_TEST_NULL
};
Modified: subversion/branches/invoke-diff-cmd-feature/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd?rev=1542685&r1=1542684&r2=1542685&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd (original)
+++ subversion/branches/invoke-diff-cmd-feature/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd Sun Nov 17 10:02:39 2013
@@ -22,7 +22,6 @@ SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDE
CALL ..\svn-config.cmd
IF ERRORLEVEL 1 EXIT /B 1
-ECHO ON
IF "%SVN_BRANCH%" LEQ "1.6.x" (
ECHO --- Building 1.6.x or older: Skipping bindings ---
@@ -34,7 +33,7 @@ SET result=0
python win-tests.py -d -f fsfs --javahl "%TESTDIR%\tests"
IF ERRORLEVEL 1 (
- echo [python reported error !ERRORLEVEL!]
+ echo [Test runner reported error !ERRORLEVEL!]
SET result=1
)
@@ -43,7 +42,7 @@ if "%SVN_BRANCH%" GTR "1.9." (
python win-tests.py -r -f fsfs --swig=python "%TESTDIR%\tests"
IF ERRORLEVEL 1 (
- echo [Python tests exited with error !ERRORLEVEL!]
+ echo [Test runner reported error !ERRORLEVEL!]
SET result=1
)
@@ -61,17 +60,17 @@ if "%SVN_BRANCH%" GTR "1.9." (
python subversion\bindings\swig\python\tests\run_all.py
IF ERRORLEVEL 1 (
- echo [Python tests exited with error !ERRORLEVEL!]
+ echo [Test runner reported error !ERRORLEVEL!]
SET result=1
)
)
if "%SVN_BRANCH%" GTR "1.9." (
- python win-tests.py -d -f fsfs --swig=perl "%TESTDIR%\tests"
+REM python win-tests.py -d -f fsfs --swig=perl "%TESTDIR%\tests"
IF ERRORLEVEL 1 (
- echo [Perl tests exited with error !ERRORLEVEL!]
+ echo [Test runner reported error !ERRORLEVEL!]
SET result=1
)
@@ -94,7 +93,7 @@ if "%SVN_BRANCH%" GTR "1.9." (
pushd subversion\bindings\swig\perl\native
perl -MExtUtils::Command::MM -e "test_harness()" t\*.t
IF ERRORLEVEL 1 (
- echo [Perl reported error !ERRORLEVEL!]
+ echo [Test runner reported error !ERRORLEVEL!]
SET result=1
)
popd
@@ -104,9 +103,10 @@ if "%SVN_BRANCH%" GTR "1.9." (
python win-tests.py -d -f fsfs --swig=ruby "%TESTDIR%\tests"
IF ERRORLEVEL 1 (
- echo [Ruby tests reported error !ERRORLEVEL!] (not fatal)
+ echo [Test runner reported error !ERRORLEVEL!]
REM SET result=1
)
+ taskkill /im svnserve.exe /f
)
exit /b %result%
Modified: subversion/branches/invoke-diff-cmd-feature/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd?rev=1542685&r1=1542684&r2=1542685&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd (original)
+++ subversion/branches/invoke-diff-cmd-feature/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd Sun Nov 17 10:02:39 2013
@@ -42,7 +42,7 @@ if "%SVN_BRANCH%" GTR "1.9." (
msbuild subversion_vcnet.sln /m /p:Configuration=Debug /p:Platform=win32 %DEBUG_TARGETS%
IF ERRORLEVEL 1 EXIT /B 1
-msbuild subversion_vcnet.sln /p:Configuration=Release /p:Platform=win32 %RELEASE_TARGETS%
+msbuild subversion_vcnet.sln /m /p:Configuration=Release /p:Platform=win32 %RELEASE_TARGETS%
IF ERRORLEVEL 1 EXIT /B 1
-EXIT /B 0
\ No newline at end of file
+EXIT /B 0
Modified: subversion/branches/invoke-diff-cmd-feature/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd?rev=1542685&r1=1542684&r2=1542685&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd (original)
+++ subversion/branches/invoke-diff-cmd-feature/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd Sun Nov 17 10:02:39 2013
@@ -30,5 +30,7 @@ IF ERRORLEVEL 1 EXIT /B 1
POPD
-msbuild subversion_vcnet.sln /p:Configuration=Debug /p:Platform=win32 /t:__ALL_TESTS__
+msbuild subversion_vcnet.sln /m /p:Configuration=Debug /p:Platform=win32 /t:__ALL_TESTS__
IF ERRORLEVEL 1 EXIT /B 1
+
+EXIT /B 0
Modified: subversion/branches/invoke-diff-cmd-feature/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd?rev=1542685&r1=1542684&r2=1542685&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd (original)
+++ subversion/branches/invoke-diff-cmd-feature/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd Sun Nov 17 10:02:39 2013
@@ -65,10 +65,12 @@ IF NOT "%1" == "" GOTO next
taskkill /im svnserve.exe httpd.exe /f 2> nul:
-IF NOT EXIST "%TESTDIR%\bin" MKDIR "%TESTDIR%\bin"
-xcopy /y /i ..\deps\release\bin\*.dll "%TESTDIR%\bin"
+IF "%SVN_BRANCH%" LSS "1.9." (
+ IF NOT EXIST "%TESTDIR%\bin" MKDIR "%TESTDIR%\bin"
+ xcopy /y /i ..\deps\release\bin\*.dll "%TESTDIR%\bin"
-PATH %TESTDIR%\bin;%PATH%
+ PATH %TESTDIR%\bin;!PATH!
+)
IF "%LOCAL%+%FSFS%" == "1+1" (
echo win-tests.py -c %PARALLEL% %MODE% -f fsfs %ARGS% "%TESTDIR%\tests"
Modified: subversion/branches/invoke-diff-cmd-feature/tools/dist/backport.pl
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/tools/dist/backport.pl?rev=1542685&r1=1542684&r2=1542685&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/tools/dist/backport.pl (original)
+++ subversion/branches/invoke-diff-cmd-feature/tools/dist/backport.pl Sun Nov 17 10:02:39 2013
@@ -326,7 +326,8 @@ EOF
sub sanitize_branch {
local $_ = shift;
- s#.*/##;
+ my $branches_re = quotemeta $BRANCHES;
+ s#.*$branches_re/##;
s/^\s*//;
s/\s*$//;
return $_;
Modified: subversion/branches/invoke-diff-cmd-feature/tools/examples/svnlook.py
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/tools/examples/svnlook.py?rev=1542685&r1=1542684&r2=1542685&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/tools/examples/svnlook.py (original)
+++ subversion/branches/invoke-diff-cmd-feature/tools/examples/svnlook.py Sun Nov 17 10:02:39 2013
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# svnlook.py : a Python-based replacement for svnlook
+# svnlook.py : alternative svnlook in Python with library API
#
######################################################################
# Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,34 @@
# under the License.
######################################################################
#
+# $HeadURL$
+# $LastChangedDate$
+# $LastChangedRevision$
+
+"""
+svnlook.py can also be used as a Python module::
+
+ >>> import svnlook
+ >>> svnlook = svnlook.SVNLook("/testrepo")
+ >>> svnlook.get_author()
+ 'randomjoe'
+
+
+Accessible API::
+
+[x] author
+[x] changed
+[x] date
+[ ] diff
+[x] dirs-changed
+[ ] ids
+[x] info
+[x] log
+[ ] tree
+---
+[ ] generator API to avoid passing lists
+"""
+
import sys
import time
@@ -28,86 +56,155 @@ import os
from svn import core, fs, delta, repos
-class SVNLook:
- def __init__(self, path, cmd, rev, txn):
+class SVNLook(object):
+ def __init__(self, path, rev=None, txn=None, cmd=None):
+ """
+ path - path to repository
+ rev - revision number
+ txn - name of transaction (usually the one about to be committed)
+ cmd - if set, specifies cmd_* method to execute
+
+ txn takes precedence over rev; if both are None, inspect the head revision
+ """
path = core.svn_path_canonicalize(path)
repos_ptr = repos.open(path)
self.fs_ptr = repos.fs(repos_ptr)
+ # if set, txn takes precendence
if txn:
self.txn_ptr = fs.open_txn(self.fs_ptr, txn)
else:
self.txn_ptr = None
if rev is None:
rev = fs.youngest_rev(self.fs_ptr)
+ else:
+ rev = int(rev)
self.rev = rev
- getattr(self, 'cmd_' + cmd)()
+ if cmd != None:
+ getattr(self, 'cmd_' + cmd)()
def cmd_default(self):
self.cmd_info()
self.cmd_tree()
def cmd_author(self):
- # get the author property, or empty string if the property is not present
- author = self._get_property(core.SVN_PROP_REVISION_AUTHOR) or ''
- print(author)
+ print(self.get_author() or '')
def cmd_changed(self):
- self._print_tree(ChangedEditor, pass_root=1)
+ for status, path in self.get_changed():
+ print("%-3s %s" % (status, path))
def cmd_date(self):
- if self.txn_ptr:
+ # duplicate original svnlook format, which is
+ # 2010-02-08 21:53:15 +0200 (Mon, 08 Feb 2010)
+ secs = self.get_date(unixtime=True)
+ if secs is None:
print("")
else:
- date = self._get_property(core.SVN_PROP_REVISION_DATE)
- if date:
- aprtime = core.svn_time_from_cstring(date)
- # ### convert to a time_t; this requires intimate knowledge of
- # ### the apr_time_t type
- secs = aprtime / 1000000 # aprtime is microseconds; make seconds
-
- # assume secs in local TZ, convert to tuple, and format
- ### we don't really know the TZ, do we?
- print(time.strftime('%Y-%m-%d %H:%M', time.localtime(secs)))
- else:
- print("")
+ # convert to tuple, detect time zone and format
+ stamp = time.localtime(secs)
+ isdst = stamp.tm_isdst
+ utcoffset = -(time.altzone if (time.daylight and isdst) else time.timezone) // 60
+
+ suffix = "%+03d%02d" % (utcoffset // 60, abs(utcoffset) % 60)
+ outstr = time.strftime('%Y-%m-%d %H:%M:%S ', stamp) + suffix
+ outstr += time.strftime(' (%a, %d %b %Y)', stamp)
+ print(outstr)
+
def cmd_diff(self):
self._print_tree(DiffEditor, pass_root=1)
def cmd_dirs_changed(self):
- self._print_tree(DirsChangedEditor)
+ for dir in self.get_changed_dirs():
+ print(dir)
def cmd_ids(self):
self._print_tree(Editor, base_rev=0, pass_root=1)
def cmd_info(self):
+ """print the author, data, log_size, and log message"""
self.cmd_author()
self.cmd_date()
- self.cmd_log(1)
-
- def cmd_log(self, print_size=0):
- # get the log property, or empty string if the property is not present
- log = self._get_property(core.SVN_PROP_REVISION_LOG) or ''
- if print_size:
- print(len(log))
+ log = self.get_log() or ''
+ print(len(log))
print(log)
+ def cmd_log(self):
+ print(self.get_log() or '')
+
def cmd_tree(self):
self._print_tree(Editor, base_rev=0)
+
+ # --- API getters
+ def get_author(self):
+ """return string with the author name or None"""
+ return self._get_property(core.SVN_PROP_REVISION_AUTHOR)
+
+ def get_changed(self):
+ """return list of tuples (status, path)"""
+ ret = []
+ def list_callback(status, path):
+ ret.append( (status, path) )
+ self._walk_tree(ChangedEditor, pass_root=1, callback=list_callback)
+ return ret
+
+ def get_date(self, unixtime=False):
+ """return commit timestamp in RFC 3339 format (2010-02-08T20:37:25.195000Z)
+ if unixtime is True, return unix timestamp
+ return None for a txn, or if date property is not set
+ """
+ if self.txn_ptr:
+ return None
+
+ date = self._get_property(core.SVN_PROP_REVISION_DATE)
+ if not unixtime or date == None:
+ return date
+
+ # convert to unix time
+ aprtime = core.svn_time_from_cstring(date)
+ # ### convert to a time_t; this requires intimate knowledge of
+ # ### the apr_time_t type
+ secs = aprtime / 1000000 # aprtime is microseconds; make seconds
+ return secs
+
+ def get_changed_dirs(self):
+ """return list of changed dirs
+ dir names end with trailing forward slash even on windows
+ """
+ dirlist = []
+ def list_callback(item):
+ dirlist.append(item)
+ self._walk_tree(DirsChangedEditor, callback=list_callback)
+ return dirlist
+
+ def get_log(self):
+ """return log message string or None if not present"""
+ return self._get_property(core.SVN_PROP_REVISION_LOG)
+
+
+ # --- Internal helpers
def _get_property(self, name):
if self.txn_ptr:
return fs.txn_prop(self.txn_ptr, name)
return fs.revision_prop(self.fs_ptr, self.rev, name)
def _print_tree(self, e_factory, base_rev=None, pass_root=0):
+ def print_callback(msg):
+ print(msg)
+ self._walk_tree(e_factory, base_rev, pass_root, callback=print_callback)
+
+ # svn fs, delta, repos calls needs review according to DeltaEditor documentation
+ def _walk_tree(self, e_factory, base_rev=None, pass_root=0, callback=None):
if base_rev is None:
# a specific base rev was not provided. use the transaction base,
# or the previous revision
if self.txn_ptr:
base_rev = fs.txn_base_revision(self.txn_ptr)
+ elif self.rev == 0:
+ base_rev = 0
else:
base_rev = self.rev - 1
@@ -120,10 +217,13 @@ class SVNLook:
# the base of the comparison
base_root = fs.revision_root(self.fs_ptr, base_rev)
+ if callback == None:
+ callback = lambda msg: None
+
if pass_root:
- editor = e_factory(root, base_root)
+ editor = e_factory(root, base_root, callback)
else:
- editor = e_factory()
+ editor = e_factory(callback=callback)
# construct the editor for printing these things out
e_ptr, e_baton = delta.make_editor(editor)
@@ -135,8 +235,17 @@ class SVNLook:
e_ptr, e_baton, authz_cb, 0, 1, 0, 0)
+# ---------------------------------------------------------
+# Delta Editors. For documentation see:
+# http://subversion.apache.org/docs/community-guide/#docs
+
+# this one doesn't process delete_entry, change_dir_prop, apply_text_delta,
+# change_file_prop, close_file, close_edit, abort_edit
+# ?set_target_revision
+# need review
class Editor(delta.Editor):
- def __init__(self, root=None, base_root=None):
+ def __init__(self, root=None, base_root=None, callback=None):
+ """callback argument is unused for this editor"""
self.root = root
# base_root ignored
@@ -172,7 +281,14 @@ class Editor(delta.Editor):
return ' <%s>' % fs.unparse_id(id)
return ''
+# doesn't process close_directory, apply_text_delta,
+# change_file_prop, close_file, close_edit, abort_edit
+# ?set_target_revision
class DirsChangedEditor(delta.Editor):
+ """print names of changed dirs, callback(dir) is a printer function"""
+ def __init__(self, callback):
+ self.callback = callback
+
def open_root(self, base_revision, dir_pool):
return [ 1, '' ]
@@ -201,13 +317,15 @@ class DirsChangedEditor(delta.Editor):
def _dir_changed(self, baton):
if baton[0]:
# the directory hasn't been printed yet. do it.
- print(baton[1] + '/')
+ self.callback(baton[1] + '/')
baton[0] = 0
class ChangedEditor(delta.Editor):
- def __init__(self, root, base_root):
+ def __init__(self, root, base_root, callback):
+ """callback(status, path) is a printer function"""
self.root = root
self.base_root = base_root
+ self.callback = callback
def open_root(self, base_revision, dir_pool):
return [ 1, '' ]
@@ -215,13 +333,13 @@ class ChangedEditor(delta.Editor):
def delete_entry(self, path, revision, parent_baton, pool):
### need more logic to detect 'replace'
if fs.is_dir(self.base_root, '/' + path):
- print('D ' + path + '/')
+ self.callback('D', path + '/')
else:
- print('D ' + path)
+ self.callback('D', path)
def add_directory(self, path, parent_baton,
copyfrom_path, copyfrom_revision, dir_pool):
- print('A ' + path + '/')
+ self.callback('A', path + '/')
return [ 0, path ]
def open_directory(self, path, parent_baton, base_revision, dir_pool):
@@ -230,12 +348,12 @@ class ChangedEditor(delta.Editor):
def change_dir_prop(self, dir_baton, name, value, pool):
if dir_baton[0]:
# the directory hasn't been printed yet. do it.
- print('_U ' + dir_baton[1] + '/')
+ self.callback('_U', dir_baton[1] + '/')
dir_baton[0] = 0
def add_file(self, path, parent_baton,
copyfrom_path, copyfrom_revision, file_pool):
- print('A ' + path)
+ self.callback('A', path)
return [ '_', ' ', None ]
def open_file(self, path, parent_baton, base_revision, file_pool):
@@ -257,11 +375,12 @@ class ChangedEditor(delta.Editor):
status = text_mod + prop_mod
# was there some kind of change?
if status != '_ ':
- print(status + ' ' + path)
+ self.callback(status.rstrip(), path)
class DiffEditor(delta.Editor):
- def __init__(self, root, base_root):
+ def __init__(self, root, base_root, callback=None):
+ """callback argument is unused for this editor"""
self.root = root
self.base_root = base_root
self.target_revision = 0
@@ -435,7 +554,7 @@ def main():
if not hasattr(SVNLook, 'cmd_' + cmd):
usage(1)
- SVNLook(sys.argv[1], cmd, rev, txn)
+ SVNLook(sys.argv[1], rev, txn, cmd)
if __name__ == '__main__':
main()
Propchange: subversion/branches/invoke-diff-cmd-feature/tools/examples/svnlook.py
------------------------------------------------------------------------------
svn:keywords = URL Date Revision
Modified: subversion/branches/invoke-diff-cmd-feature/tools/server-side/mod_dontdothat/mod_dontdothat.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/tools/server-side/mod_dontdothat/mod_dontdothat.c?rev=1542685&r1=1542684&r2=1542685&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/tools/server-side/mod_dontdothat/mod_dontdothat.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/tools/server-side/mod_dontdothat/mod_dontdothat.c Sun Nov 17 10:02:39 2013
@@ -30,12 +30,14 @@
#include <util_filter.h>
#include <ap_config.h>
#include <apr_strings.h>
+#include <apr_uri.h>
#include <expat.h>
#include "mod_dav_svn.h"
#include "svn_string.h"
#include "svn_config.h"
+#include "svn_path.h"
#include "private/svn_fspath.h"
module AP_MODULE_DECLARE_DATA dontdothat_module;
@@ -162,26 +164,71 @@ matches(const char *wc, const char *p)
}
}
+/* duplicate of dav_svn__log_err() from mod_dav_svn/util.c */
+static void
+log_dav_err(request_rec *r,
+ dav_error *err,
+ int level)
+{
+ dav_error *errscan;
+
+ /* Log the errors */
+ /* ### should have a directive to log the first or all */
+ for (errscan = err; errscan != NULL; errscan = errscan->prev) {
+ apr_status_t status;
+
+ if (errscan->desc == NULL)
+ continue;
+
+#if AP_MODULE_MAGIC_AT_LEAST(20091119,0)
+ status = errscan->aprerr;
+#else
+ status = errscan->save_errno;
+#endif
+
+ ap_log_rerror(APLOG_MARK, level, status, r,
+ "%s [%d, #%d]",
+ errscan->desc, errscan->status, errscan->error_id);
+ }
+}
+
static svn_boolean_t
is_this_legal(dontdothat_filter_ctx *ctx, const char *uri)
{
const char *relative_path;
const char *cleaned_uri;
const char *repos_name;
+ const char *uri_path;
int trailing_slash;
dav_error *derr;
- /* Ok, so we need to skip past the scheme, host, etc. */
- uri = ap_strstr_c(uri, "://");
- if (uri)
- uri = ap_strchr_c(uri + 3, '/');
+ /* uri can be an absolute uri or just a path, we only want the path to match
+ * against */
+ if (uri && svn_path_is_url(uri))
+ {
+ apr_uri_t parsed_uri;
+ apr_status_t rv = apr_uri_parse(ctx->r->pool, uri, &parsed_uri);
+ if (APR_SUCCESS != rv)
+ {
+ /* Error parsing the URI, log and reject request. */
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, ctx->r,
+ "mod_dontdothat: blocked request after failing "
+ "to parse uri: '%s'", uri);
+ return FALSE;
+ }
+ uri_path = parsed_uri.path;
+ }
+ else
+ {
+ uri_path = uri;
+ }
- if (uri)
+ if (uri_path)
{
const char *repos_path;
derr = dav_svn_split_uri(ctx->r,
- uri,
+ uri_path,
ctx->cfg->base_path,
&cleaned_uri,
&trailing_slash,
@@ -229,6 +276,19 @@ is_this_legal(dontdothat_filter_ctx *ctx
}
}
}
+ else
+ {
+ log_dav_err(ctx->r, derr, APLOG_ERR);
+ return FALSE;
+ }
+
+ }
+ else
+ {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r,
+ "mod_dontdothat: empty uri passed to is_this_legal(), "
+ "module bug?");
+ return FALSE;
}
return TRUE;
Modified: subversion/branches/invoke-diff-cmd-feature/win-tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/win-tests.py?rev=1542685&r1=1542684&r2=1542685&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/win-tests.py (original)
+++ subversion/branches/invoke-diff-cmd-feature/win-tests.py Sun Nov 17 10:02:39 2013
@@ -336,6 +336,10 @@ def locate_libs():
if os.path.exists(src):
copy_changed_file(src, to_dir=abs_builddir, cleanup=False)
+ for name in lib.extra_bin:
+ src = os.path.join(dir, name)
+ copy_changed_file(src, to_dir=abs_builddir)
+
# Copy the Subversion library DLLs
for i in gen_obj.graph.get_all_sources(gen_base.DT_INSTALL):