Author: hwright
Date: Mon Nov 28 21:54:20 2011
New Revision: 1207643
URL: http://svn.apache.org/viewvc?rev=1207643&view=rev
Log:
Merge r1188652, r1188677, r1188762 from trunk:
* r1188652, r1188677, r1188762
Fix issue 4042, commit incomplete directory asserts.
Justification:
Regression from 1.6.
Votes:
+1: philip, rhuijben, pburba
Added:
subversion/branches/1.7.x/subversion/tests/libsvn_wc/wc-incomplete-tester.c
- copied, changed from r1188652,
subversion/trunk/subversion/tests/libsvn_wc/wc-incomplete-tester.c
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/build.conf
subversion/branches/1.7.x/subversion/libsvn_wc/adm_ops.c
subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.c
subversion/branches/1.7.x/subversion/tests/cmdline/commit_tests.py
subversion/branches/1.7.x/subversion/tests/cmdline/svntest/actions.py
subversion/branches/1.7.x/subversion/tests/cmdline/svntest/main.py
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 21:54:20 2011
@@ -69,4 +69,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,115
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,1178280,1178282,1178942,1179680,1179767,1180154,1181090,
1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188774,1189190,1189261,1189395,1189580,1189665,1197135,1197998,1199876,1199950,1200837,1201002,1201824,1202135,1202187,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205193,1205726,1205839,1205848,1206523,1206533
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,115
6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,1178280,1178282,1178942,1179680,1179767,1180154,1181090,
1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1197135,1197998,1199876,1199950,1200837,1201002,1201824,1202135,1202187,1202630,1202807,1203546,1203651,1203653,1204167,1204478,1204610,1204673,1205193,1205726,1205839,1205848,1206523,1206533
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1207643&r1=1207642&r2=1207643&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Nov 28 21:54:20 2011
@@ -100,10 +100,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1188652, r1188677, r1188762
- Fix issue 4042, commit incomplete directory asserts.
- Justification:
- Regression from 1.6.
- Votes:
- +1: philip, rhuijben, pburba
Modified: subversion/branches/1.7.x/build.conf
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/build.conf?rev=1207643&r1=1207642&r2=1207643&view=diff
==============================================================================
--- subversion/branches/1.7.x/build.conf (original)
+++ subversion/branches/1.7.x/build.conf Mon Nov 28 21:54:20 2011
@@ -1006,6 +1006,14 @@ install = test
libs = libsvn_wc libsvn_subr apriconv apr
testing = skip
+[wc-incomplete-tester]
+type = exe
+path = subversion/tests/libsvn_wc
+sources = wc-incomplete-tester.c
+install = test
+libs = libsvn_wc libsvn_subr apriconv apr
+testing = skip
+
# ----------------------------------------------------------------------------
#
# EXTERNAL TARGETS (NO BUILD NEEDED)
@@ -1115,7 +1123,7 @@ libs = __ALL__
diff-diff3-test
ra-local-test
svndiff-test vdelta-test
- entries-dump atomic-ra-revprop-change wc-lock-tester
+ entries-dump atomic-ra-revprop-change wc-lock-tester
wc-incomplete-tester
diff diff3 diff4
client-test
tree-conflict-data-test db-test pristine-store-test entries-compat-test
Modified: subversion/branches/1.7.x/subversion/libsvn_wc/adm_ops.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/adm_ops.c?rev=1207643&r1=1207642&r2=1207643&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/adm_ops.c Mon Nov 28
21:54:20 2011
@@ -174,6 +174,7 @@ process_committed_leaf(svn_wc__db_t *db,
}
SVN_ERR_ASSERT(status == svn_wc__db_status_normal
+ || status == svn_wc__db_status_incomplete
|| status == svn_wc__db_status_added);
if (kind != svn_wc__db_kind_dir)
Modified: subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.c?rev=1207643&r1=1207642&r2=1207643&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/wc_db.c Mon Nov 28 21:54:20
2011
@@ -8269,6 +8269,7 @@ commit_node(void *baton,
apr_int64_t repos_id;
const char *repos_relpath;
apr_int64_t op_depth;
+ svn_wc__db_status_t old_presence;
/* If we are adding a file or directory, then we need to get
repository information from the parent node since "this node" does
@@ -8331,6 +8332,8 @@ commit_node(void *baton,
if (cb->keep_changelist && have_act)
changelist = svn_sqlite__column_text(stmt_act, 1, scratch_pool);
+ old_presence = svn_sqlite__column_token(stmt_info, 3, presence_map);
+
/* ### other stuff? */
SVN_ERR(svn_sqlite__reset(stmt_info));
@@ -8386,8 +8389,10 @@ commit_node(void *baton,
else
parent_relpath = svn_relpath_dirname(local_relpath, scratch_pool);
- /* ### other presences? or reserve that for separate functions? */
- new_presence = svn_wc__db_status_normal;
+ /* Preserve any incomplete status */
+ new_presence = (old_presence == svn_wc__db_status_incomplete
+ ? svn_wc__db_status_incomplete
+ : svn_wc__db_status_normal);
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
STMT_APPLY_CHANGES_TO_BASE_NODE));
Modified: subversion/branches/1.7.x/subversion/tests/cmdline/commit_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/commit_tests.py?rev=1207643&r1=1207642&r2=1207643&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/tests/cmdline/commit_tests.py
(original)
+++ subversion/branches/1.7.x/subversion/tests/cmdline/commit_tests.py Mon Nov
28 21:54:20 2011
@@ -2803,6 +2803,28 @@ def commit_multiple_nested_deletes(sbox)
svntest.main.run_svn(None, 'ci', A, A_B, '-m', 'Q')
+@Issue(4042)
+def commit_incomplete(sbox):
+ "commit an incomplete dir"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ sbox.simple_propset('pname', 'pval', 'A/B')
+ svntest.actions.set_incomplete(sbox.ospath('A/B'), 1)
+
+ expected_output = svntest.wc.State(wc_dir, {
+ 'A/B' : Item(verb='Sending'),
+ })
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ expected_status.tweak('A/B', status='! ', wc_rev=2)
+
+ svntest.actions.run_and_verify_commit(wc_dir,
+ expected_output,
+ expected_status,
+ None,
+ wc_dir)
+
########################################################################
# Run the tests
@@ -2871,6 +2893,7 @@ test_list = [ None,
tree_conflicts_block_commit,
tree_conflicts_resolved,
commit_multiple_nested_deletes,
+ commit_incomplete,
]
if __name__ == '__main__':
Modified: subversion/branches/1.7.x/subversion/tests/cmdline/svntest/actions.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/svntest/actions.py?rev=1207643&r1=1207642&r2=1207643&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/tests/cmdline/svntest/actions.py
(original)
+++ subversion/branches/1.7.x/subversion/tests/cmdline/svntest/actions.py Mon
Nov 28 21:54:20 2011
@@ -1748,6 +1748,11 @@ def lock_admin_dir(wc_dir, recursive=Fal
svntest.main.run_wc_lock_tester(recursive, wc_dir)
+def set_incomplete(wc_dir, revision):
+ "Make wc_dir incomplete at revision"
+
+ svntest.main.run_wc_incomplete_tester(wc_dir, revision)
+
def get_wc_uuid(wc_dir):
"Return the UUID of the working copy at WC_DIR."
return run_and_parse_info(wc_dir)[0]['Repository UUID']
Modified: subversion/branches/1.7.x/subversion/tests/cmdline/svntest/main.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/svntest/main.py?rev=1207643&r1=1207642&r2=1207643&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/tests/cmdline/svntest/main.py
(original)
+++ subversion/branches/1.7.x/subversion/tests/cmdline/svntest/main.py Mon Nov
28 21:54:20 2011
@@ -164,6 +164,7 @@ entriesdump_binary = os.path.abspath('en
atomic_ra_revprop_change_binary = os.path.abspath('atomic-ra-revprop-change' +
\
_exe)
wc_lock_tester_binary = os.path.abspath('../libsvn_wc/wc-lock-tester' + _exe)
+wc_incomplete_tester_binary =
os.path.abspath('../libsvn_wc/wc-incomplete-tester' + _exe)
svnmucc_binary=os.path.abspath('../../../tools/client-side/svnmucc/svnmucc' + \
_exe)
@@ -682,6 +683,10 @@ def run_wc_lock_tester(recursive, path):
option = "-1"
return run_command(wc_lock_tester_binary, False, False, option, path)
+def run_wc_incomplete_tester(wc_dir, revision):
+ "Run the wc-incomplete tool, returning its exit code, stdout and stderr"
+ return run_command(wc_incomplete_tester_binary, False, False,
+ wc_dir, revision)
def youngest(repos_path):
"run 'svnlook youngest' on REPOS_PATH, returns revision as int"
Copied:
subversion/branches/1.7.x/subversion/tests/libsvn_wc/wc-incomplete-tester.c
(from r1188652,
subversion/trunk/subversion/tests/libsvn_wc/wc-incomplete-tester.c)
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/libsvn_wc/wc-incomplete-tester.c?p2=subversion/branches/1.7.x/subversion/tests/libsvn_wc/wc-incomplete-tester.c&p1=subversion/trunk/subversion/tests/libsvn_wc/wc-incomplete-tester.c&r1=1188652&r2=1207643&rev=1207643&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/wc-incomplete-tester.c
(original)
+++ subversion/branches/1.7.x/subversion/tests/libsvn_wc/wc-incomplete-tester.c
Mon Nov 28 21:54:20 2011
@@ -29,15 +29,15 @@
#include <stdio.h>
#include <stdlib.h>
-static
-svn_error_t *incomplete(const char *wc_path,
- const char *rev_str,
- const char *repos_relpath,
- apr_pool_t *pool)
+static svn_error_t *
+incomplete(const char *wc_path,
+ const char *rev_str,
+ const char *repos_relpath,
+ apr_pool_t *pool)
{
svn_wc_context_t *wc_ctx;
const char *local_abspath;
- svn_revnum_t revnum;
+ apr_int64_t revnum;
SVN_ERR(svn_wc_context_create(&wc_ctx, NULL, pool, pool));
@@ -60,7 +60,7 @@ svn_error_t *incomplete(const char *wc_p
SVN_ERR(svn_wc__db_temp_op_start_directory_update(wc_ctx->db,
local_abspath,
repos_relpath,
- revnum,
+ (svn_revnum_t)revnum,
pool));
return SVN_NO_ERROR;
