You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2014/12/14 12:52:16 UTC
svn commit: r1645441 [4/4] - in /subversion/branches/javahl-1.8-extensions:
./ subversion/ subversion/include/ subversion/include/private/
subversion/libsvn_auth_gnome_keyring/ subversion/libsvn_client/
subversion/libsvn_diff/ subversion/libsvn_fs_fs/ ...
Modified: subversion/branches/javahl-1.8-extensions/subversion/po/es.po
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/po/es.po?rev=1645441&r1=1645440&r2=1645441&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/po/es.po [UTF-8] (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/po/es.po [UTF-8] Sun Dec 14 11:52:14 2014
@@ -53,7 +53,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: subversion 1.7\n"
+"Project-Id-Version: subversion 1.8\n"
"Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
"POT-Creation-Date: 2010-11-12 08:49-0600\n"
"PO-Revision-Date: 2009-02-19 14:22-0200\n"
Modified: subversion/branches/javahl-1.8-extensions/subversion/po/fr.po
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/po/fr.po?rev=1645441&r1=1645440&r2=1645441&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/po/fr.po [UTF-8] (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/po/fr.po [UTF-8] Sun Dec 14 11:52:14 2014
@@ -22,7 +22,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: subversion 1.7\n"
+"Project-Id-Version: subversion 1.8\n"
"Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
"POT-Creation-Date: 2012-07-07 14:51+0200\n"
"PO-Revision-Date: 2012-07-07 17:04+0200\n"
Modified: subversion/branches/javahl-1.8-extensions/subversion/po/it.po
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/po/it.po?rev=1645441&r1=1645440&r2=1645441&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/po/it.po (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/po/it.po Sun Dec 14 11:52:14 2014
@@ -101,7 +101,7 @@
# working copy: copia di lavoro (CL)
msgid ""
msgstr ""
-"Project-Id-Version: subversion 1.7\n"
+"Project-Id-Version: subversion 1.8\n"
"Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
"POT-Creation-Date: 2010-11-12 08:49-0600\n"
"PO-Revision-Date: 2007-10-12 10:09+0200\n"
Modified: subversion/branches/javahl-1.8-extensions/subversion/po/ja.po
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/po/ja.po?rev=1645441&r1=1645440&r2=1645441&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/po/ja.po [UTF-8] (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/po/ja.po [UTF-8] Sun Dec 14 11:52:14 2014
@@ -195,7 +195,7 @@
# zero byte ゼロバイト文字
msgid ""
msgstr ""
-"Project-Id-Version: subversion 1.7\n"
+"Project-Id-Version: subversion 1.8\n"
"Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
"POT-Creation-Date: 2010-11-12 08:49-0600\n"
"PO-Revision-Date: 2007-10-28 01:23+0900\n"
Modified: subversion/branches/javahl-1.8-extensions/subversion/po/ko.po
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/po/ko.po?rev=1645441&r1=1645440&r2=1645441&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/po/ko.po [UTF-8] (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/po/ko.po [UTF-8] Sun Dec 14 11:52:14 2014
@@ -19,7 +19,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: subversion 1.7\n"
+"Project-Id-Version: subversion 1.8\n"
"Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
"POT-Creation-Date: 2011-03-07 00:53+0900\n"
"PO-Revision-Date: 2011-03-03 18:16+0900\n"
Modified: subversion/branches/javahl-1.8-extensions/subversion/po/nb.po
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/po/nb.po?rev=1645441&r1=1645440&r2=1645441&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/po/nb.po [UTF-8] (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/po/nb.po [UTF-8] Sun Dec 14 11:52:14 2014
@@ -87,7 +87,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: subversion 1.7\n"
+"Project-Id-Version: subversion 1.8\n"
"Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
"POT-Creation-Date: 2010-11-12 08:49-0600\n"
"PO-Revision-Date: 2009-10-14 16:21+0200\n"
Modified: subversion/branches/javahl-1.8-extensions/subversion/po/pl.po
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/po/pl.po?rev=1645441&r1=1645440&r2=1645441&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/po/pl.po [UTF-8] (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/po/pl.po [UTF-8] Sun Dec 14 11:52:14 2014
@@ -55,7 +55,7 @@
# work queue - kolejka pracy
msgid ""
msgstr ""
-"Project-Id-Version: subversion 1.7\n"
+"Project-Id-Version: subversion 1.8\n"
"Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
"POT-Creation-Date: 2010-11-12 08:49-0600\n"
"PO-Revision-Date: 2009-11-14 22:00+0100\n"
Modified: subversion/branches/javahl-1.8-extensions/subversion/po/pt_BR.po
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/po/pt_BR.po?rev=1645441&r1=1645440&r2=1645441&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/po/pt_BR.po [UTF-8] (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/po/pt_BR.po [UTF-8] Sun Dec 14 11:52:14 2014
@@ -19,7 +19,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: subversion 1.7\n"
+"Project-Id-Version: subversion 1.8\n"
"Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
"POT-Creation-Date: 2010-11-12 08:49-0600\n"
"PO-Revision-Date: 2004-07-26 19:19-300\n"
Modified: subversion/branches/javahl-1.8-extensions/subversion/po/zh_CN.po
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/po/zh_CN.po?rev=1645441&r1=1645440&r2=1645441&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/po/zh_CN.po [UTF-8] (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/po/zh_CN.po [UTF-8] Sun Dec 14 11:52:14 2014
@@ -62,7 +62,7 @@ msgstr ""
"PO-Revision-Date: 2013-07-03 16:57+0800\n"
"Last-Translator: Subversion Developers <de...@subversion.apache.org>\n"
"Language-Team: Simplified Chinese <de...@subversion.apache.org>\n"
-"Language: \n"
+"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: subversion/branches/javahl-1.8-extensions/subversion/po/zh_TW.po
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/po/zh_TW.po?rev=1645441&r1=1645440&r2=1645441&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/po/zh_TW.po [UTF-8] (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/po/zh_TW.po [UTF-8] Sun Dec 14 11:52:14 2014
@@ -22,13 +22,13 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: subversion 1.7\n"
+"Project-Id-Version: subversion 1.8\n"
"Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
"POT-Creation-Date: 2010-11-12 08:49-0600\n"
"PO-Revision-Date: 2004-09-12 22:05+0800\n"
"Last-Translator: Subversion Developers <de...@subversion.tigris.org>\n"
"Language-Team: Traditional Chinese <de...@subversion.tigris.org>\n"
-"Language: \n"
+"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: subversion/branches/javahl-1.8-extensions/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/svn/conflict-callbacks.c?rev=1645441&r1=1645440&r2=1645441&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/svn/conflict-callbacks.c (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/svn/conflict-callbacks.c Sun Dec 14 11:52:14 2014
@@ -509,24 +509,6 @@ static const resolver_option_t prop_conf
{ NULL }
};
-/* Resolver options for an obstructued addition */
-static const resolver_option_t obstructed_add_options[] =
-{
- { "mf", N_("my version"), N_("accept pre-existing item (ignore "
- "upstream addition) [mine-full]"),
- svn_wc_conflict_choose_mine_full },
- { "tf", N_("their version"), N_("accept incoming item (overwrite "
- "pre-existing item) [theirs-full]"),
- svn_wc_conflict_choose_theirs_full },
- { "p", N_("postpone"), N_("mark the conflict to be resolved later"
- " [postpone]"),
- svn_wc_conflict_choose_postpone },
- { "q", N_("quit resolution"), N_("postpone all remaining conflicts"),
- svn_wc_conflict_choose_postpone },
- { "h", N_("help"), N_("show this help (also '?')"), -1 },
- { NULL }
-};
-
/* Resolver options for a tree conflict */
static const resolver_option_t tree_conflict_options[] =
{
@@ -1132,56 +1114,6 @@ handle_tree_conflict(svn_wc_conflict_res
return SVN_NO_ERROR;
}
-/* Ask the user what to do about the obstructed add described by DESC.
- * Return the answer in RESULT. B is the conflict baton for this
- * conflict resolution session.
- * SCRATCH_POOL is used for temporary allocations. */
-static svn_error_t *
-handle_obstructed_add(svn_wc_conflict_result_t *result,
- const svn_wc_conflict_description2_t *desc,
- svn_cl__interactive_conflict_baton_t *b,
- apr_pool_t *scratch_pool)
-{
- apr_pool_t *iterpool;
-
- SVN_ERR(svn_cmdline_fprintf(
- stderr, scratch_pool,
- _("Conflict discovered when trying to add '%s'.\n"
- "An object of the same name already exists.\n"),
- svn_cl__local_style_skip_ancestor(b->path_prefix,
- desc->local_abspath,
- scratch_pool)));
-
- iterpool = svn_pool_create(scratch_pool);
- while (1)
- {
- const resolver_option_t *opt;
-
- svn_pool_clear(iterpool);
-
- SVN_ERR(prompt_user(&opt, obstructed_add_options, NULL, b->pb,
- iterpool));
- if (! opt)
- continue;
-
- if (strcmp(opt->code, "q") == 0)
- {
- result->choice = opt->choice;
- b->accept_which = svn_cl__accept_postpone;
- b->quit = TRUE;
- break;
- }
- else if (opt->choice != -1)
- {
- result->choice = opt->choice;
- break;
- }
- }
- svn_pool_destroy(iterpool);
-
- return SVN_NO_ERROR;
-}
-
/* The body of svn_cl__conflict_func_interactive(). */
static svn_error_t *
conflict_func_interactive(svn_wc_conflict_result_t **result,
@@ -1330,29 +1262,6 @@ conflict_func_interactive(svn_wc_conflic
SVN_ERR(handle_text_conflict(*result, desc, b, scratch_pool));
else if (desc->kind == svn_wc_conflict_kind_property)
SVN_ERR(handle_prop_conflict(*result, desc, b, result_pool, scratch_pool));
-
- /*
- Dealing with obstruction of additions can be tricky. The
- obstructing item could be unversioned, versioned, or even
- schedule-add. Here's a matrix of how the caller should behave,
- based on results we return.
-
- Unversioned Versioned Schedule-Add
-
- choose_mine skip addition, skip addition skip addition
- add existing item
-
- choose_theirs destroy file, schedule-delete, revert add,
- add new item. add new item. rm file,
- add new item
-
- postpone [ bail out ]
-
- */
- else if ((desc->action == svn_wc_conflict_action_add)
- && (desc->reason == svn_wc_conflict_reason_obstructed))
- SVN_ERR(handle_obstructed_add(*result, desc, b, scratch_pool));
-
else if (desc->kind == svn_wc_conflict_kind_tree)
SVN_ERR(handle_tree_conflict(*result, desc, b, scratch_pool));
Modified: subversion/branches/javahl-1.8-extensions/subversion/tests/cmdline/externals_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/tests/cmdline/externals_tests.py?rev=1645441&r1=1645440&r2=1645441&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/tests/cmdline/externals_tests.py Sun Dec 14 11:52:14 2014
@@ -2794,23 +2794,26 @@ def include_immediate_dir_externals(sbox
@Issue(4085)
-@XFail()
def shadowing(sbox):
"external shadows an existing dir"
- sbox.build(read_only=True)
+ sbox.build()
wc_dir = sbox.wc_dir
# Setup external: /A/B/F as 'C' child of /A
externals_prop = "^/A/B/F C\n"
+ change_external(sbox.ospath('A'), externals_prop, commit=False)
+
+ # An update errors out because the external is shadowed by an existing dir
+ svntest.main.run_svn("W205011: Error handling externals definition for '%s'"
+ % (sbox.wc_dir) + "/A/C", 'update', wc_dir)
+
+ # Remove the shadowed directory to unblock the external
+ svntest.main.run_svn(None, 'rm', sbox.repo_url + '/A/C', '-m', 'remove A/C')
+
+ # The next update should fetch the external and not error out
+ sbox.simple_update()
- raised = False
- try:
- change_external(sbox.ospath('A'), externals_prop, commit=False)
- except:
- raised = True
- if not raised:
- raise svntest.Failure("Creating conflicting child 'C' of 'A' didn't error")
# Test for issue #4093 'remapping a file external can segfault due to
# "deleted" props'.
@@ -3163,6 +3166,7 @@ def pinned_externals(sbox):
# The interesting values
'Z/old-plain' : Item(contents="This is the file 'mu'.\n"),
'Z/new-plain' : Item(contents="This is the file 'mu'.\n"),
+ 'Z/new-rev' : Item(contents="This is the file 'mu'.\n"),
# And verifying X
'X/D/H/psi' : Item(contents="This is the file 'psi'.\n"),
Modified: subversion/branches/javahl-1.8-extensions/subversion/tests/libsvn_diff/parse-diff-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/tests/libsvn_diff/parse-diff-test.c?rev=1645441&r1=1645440&r2=1645441&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/tests/libsvn_diff/parse-diff-test.c (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/tests/libsvn_diff/parse-diff-test.c Sun Dec 14 11:52:14 2014
@@ -132,8 +132,6 @@ static const char *bad_git_diff_header =
"diff --git foo4 b/foo4" NL
"diff --git a/foo5 b/foo5" NL
"random noise" NL
- "copy from foo5" NL
- "copy to foo5" NL
"diff --git a/foo6 b/foo6" NL
"copy from foo6" NL
"random noise" NL
Modified: subversion/branches/javahl-1.8-extensions/subversion/tests/libsvn_fs_fs/fs-pack-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/tests/libsvn_fs_fs/fs-pack-test.c?rev=1645441&r1=1645440&r2=1645441&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/tests/libsvn_fs_fs/fs-pack-test.c (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/tests/libsvn_fs_fs/fs-pack-test.c Sun Dec 14 11:52:14 2014
@@ -38,6 +38,16 @@
/*** Helper Functions ***/
+static void
+ignore_fs_warnings(void *baton, svn_error_t *err)
+{
+#ifdef SVN_DEBUG
+ SVN_DBG(("Ignoring FS warning %s\n",
+ svn_error_symbolic_name(err ? err->apr_err : 0)));
+#endif
+ return;
+}
+
/* Write the format number and maximum number of files per directory
to a new format file in PATH, overwriting a previously existing
file. Use POOL for temporary allocation.
@@ -857,6 +867,57 @@ get_set_multiple_huge_revprops_packed_fs
#undef SHARD_SIZE
/* ------------------------------------------------------------------------ */
+
+#define REPO_NAME "revprop_caching_on_off"
+static svn_error_t *
+revprop_caching_on_off(const svn_test_opts_t *opts,
+ apr_pool_t *pool)
+{
+ svn_fs_t *fs1;
+ svn_fs_t *fs2;
+ apr_hash_t *fs_config;
+ svn_string_t *value;
+ const svn_string_t *another_value_for_avoiding_warnings_from_a_broken_api;
+ const svn_string_t *new_value = svn_string_create("new", pool);
+
+ if (strcmp(opts->fs_type, "fsfs") != 0)
+ return svn_error_create(SVN_ERR_TEST_SKIPPED, NULL, NULL);
+
+ /* Open two filesystem objects, enable revision property caching
+ * in one of them. */
+ SVN_ERR(svn_test__create_fs(&fs1, REPO_NAME, opts, pool));
+
+ fs_config = apr_hash_make(pool);
+ apr_hash_set(fs_config, SVN_FS_CONFIG_FSFS_CACHE_REVPROPS,
+ APR_HASH_KEY_STRING, "1");
+
+ SVN_ERR(svn_fs_open(&fs2, svn_fs_path(fs1, pool), fs_config, pool));
+
+ /* With inefficient named atomics, the filesystem will output a warning
+ and disable the revprop caching, but we still would like to test
+ these cases. Ignore the warning(s). */
+ svn_fs_set_warning_func(fs2, ignore_fs_warnings, NULL);
+
+ SVN_ERR(svn_fs_revision_prop(&value, fs2, 0, "svn:date", pool));
+ another_value_for_avoiding_warnings_from_a_broken_api = value;
+ SVN_ERR(svn_fs_change_rev_prop2(
+ fs1, 0, "svn:date",
+ &another_value_for_avoiding_warnings_from_a_broken_api,
+ new_value, pool));
+
+ /* Expect the change to be visible through both objects.*/
+ SVN_ERR(svn_fs_revision_prop(&value, fs1, 0, "svn:date", pool));
+ SVN_TEST_STRING_ASSERT(value->data, "new");
+
+ SVN_ERR(svn_fs_revision_prop(&value, fs2, 0, "svn:date", pool));
+ SVN_TEST_STRING_ASSERT(value->data, "new");
+
+ return SVN_NO_ERROR;
+}
+
+#undef REPO_NAME
+
+/* ------------------------------------------------------------------------ */
/* The test table. */
@@ -883,5 +944,7 @@ struct svn_test_descriptor_t test_funcs[
"test file hint at shard boundary"),
SVN_TEST_OPTS_PASS(get_set_multiple_huge_revprops_packed_fs,
"set multiple huge revprops in packed FSFS"),
+ SVN_TEST_OPTS_PASS(revprop_caching_on_off,
+ "change revprops with enabled and disabled caching"),
SVN_TEST_NULL
};