subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1186322 - in /subversion/branches/1.7.x-issue4035-r1185738: ./ subversion/libsvn_wc/entries.c subversion/tests/cmdline/authz_tests.py subversion/tests/cmdline/upgrade_tests.py
Date Wed, 19 Oct 2011 16:50:21 GMT
Author: philip
Date: Wed Oct 19 16:50:20 2011
New Revision: 1186322

URL: http://svn.apache.org/viewvc?rev=1186322&view=rev
Log:
On 1.7.x-issue4035-r1185738 branch: merge r1185768, r1185886 and r1186240.

Modified:
    subversion/branches/1.7.x-issue4035-r1185738/   (props changed)
    subversion/branches/1.7.x-issue4035-r1185738/subversion/libsvn_wc/entries.c
    subversion/branches/1.7.x-issue4035-r1185738/subversion/tests/cmdline/authz_tests.py
    subversion/branches/1.7.x-issue4035-r1185738/subversion/tests/cmdline/upgrade_tests.py

Propchange: subversion/branches/1.7.x-issue4035-r1185738/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 16:50:20 2011
@@ -64,4 +64,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,1181155,1181609,
 1181666,1182115,1182527,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185763,1186092,1186101,1186107,1186109
+/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,1181155,1181609,
 1181666,1182115,1182527,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185763,1185768,1185886,1186092,1186101,1186107,1186109,1186240

Modified: subversion/branches/1.7.x-issue4035-r1185738/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4035-r1185738/subversion/libsvn_wc/entries.c?rev=1186322&r1=1186321&r2=1186322&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4035-r1185738/subversion/libsvn_wc/entries.c (original)
+++ subversion/branches/1.7.x-issue4035-r1185738/subversion/libsvn_wc/entries.c Wed Oct 19
16:50:20 2011
@@ -1462,6 +1462,8 @@ insert_node(svn_sqlite__db_t *sdb,
     SVN_ERR(svn_sqlite__bind_text(stmt, 8, "incomplete"));
   else if (node->presence == svn_wc__db_status_excluded)
     SVN_ERR(svn_sqlite__bind_text(stmt, 8, "excluded"));
+  else if (node->presence == svn_wc__db_status_server_excluded)
+    SVN_ERR(svn_sqlite__bind_text(stmt, 8, "absent"));
 
   if (node->kind == svn_node_none)
     SVN_ERR(svn_sqlite__bind_text(stmt, 10, "unknown"));
@@ -1693,10 +1695,10 @@ write_entry(struct write_baton **entry_n
       SVN_ERR_ASSERT(!entry->incomplete);
       base_node->presence = svn_wc__db_status_not_present;
     }
-
-  if (entry->absent)
+  else if (entry->absent)
     {
-      SVN_ERR_ASSERT(base_node && !working_node);
+      SVN_ERR_ASSERT(base_node && !working_node && !below_working_node);
+      SVN_ERR_ASSERT(!entry->incomplete);
       base_node->presence = svn_wc__db_status_server_excluded;
     }
 
@@ -1869,9 +1871,22 @@ write_entry(struct write_baton **entry_n
 
       if (entry->deleted)
         {
-          base_node->presence = svn_wc__db_status_not_present;
+          SVN_ERR_ASSERT(base_node->presence == svn_wc__db_status_not_present);
+          /* ### should be svn_node_unknown, but let's store what we have. */
+          base_node->kind = entry->kind;
+        }
+      else if (entry->absent)
+        {
+          SVN_ERR_ASSERT(base_node->presence 
+                                == svn_wc__db_status_server_excluded);
           /* ### should be svn_node_unknown, but let's store what we have. */
           base_node->kind = entry->kind;
+
+          /* Store the most likely revision in the node to avoid
+             base nodes without a valid revision. Of course
+             we remember that the data is still incomplete. */
+          if (!SVN_IS_VALID_REVNUM(base_node->revision) && parent_node->base)
+            base_node->revision = parent_node->base->revision;
         }
       else
         {

Modified: subversion/branches/1.7.x-issue4035-r1185738/subversion/tests/cmdline/authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4035-r1185738/subversion/tests/cmdline/authz_tests.py?rev=1186322&r1=1186321&r2=1186322&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4035-r1185738/subversion/tests/cmdline/authz_tests.py (original)
+++ subversion/branches/1.7.x-issue4035-r1185738/subversion/tests/cmdline/authz_tests.py Wed
Oct 19 16:50:20 2011
@@ -33,6 +33,9 @@ import svntest
 from svntest.main import write_restrictive_svnserve_conf
 from svntest.main import write_authz_file
 from svntest.main import server_authz_has_aliases
+from upgrade_tests import (replace_sbox_with_tarfile,
+                           replace_sbox_repo_with_tarfile,
+                           wc_is_too_old_regex)
 
 # (abbreviation)
 Item = svntest.wc.StateItem
@@ -1352,6 +1355,41 @@ def wc_commit_error_handling(sbox):
                                      'ci', wc_dir, '-m', '')
 
 
+@Skip(svntest.main.is_ra_type_file)
+def upgrade_absent(sbox):
+  "upgrade absent nodes to server-excluded"
+
+  # Install wc and repos
+  replace_sbox_with_tarfile(sbox, 'upgrade_absent.tar.bz2')
+  replace_sbox_repo_with_tarfile(sbox, 'upgrade_absent_repos.tar.bz2')
+
+  # Update config for authz
+  svntest.main.write_restrictive_svnserve_conf(sbox.repo_dir)
+  svntest.main.write_authz_file(sbox, { "/"      : "*=rw",
+                                        "/A/B"   : "*=",
+                                        "/A/B/E" : "jrandom = rw"})
+
+  # Attempt to use the working copy, this should give an error
+  expected_stderr = wc_is_too_old_regex
+  svntest.actions.run_and_verify_svn(None, None, expected_stderr,
+                                     'info', sbox.wc_dir)
+
+  # Now upgrade the working copy
+  svntest.actions.run_and_verify_svn(None, None, [],
+                                     'upgrade', sbox.wc_dir)
+
+  # Relocate to allow finding the repository
+  svntest.actions.run_and_verify_svn(None, None, [], 'relocate',
+                                     'svn://127.0.0.1/authz_tests-2',
+                                     sbox.repo_url, sbox.wc_dir)  
+
+  expected_output = svntest.wc.State(sbox.wc_dir, {
+  })
+
+  # Expect no changes and certainly no errors
+  svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output,
+                                        None, None)
+
 ########################################################################
 # Run the tests
 
@@ -1380,6 +1418,7 @@ test_list = [ None,
               authz_tree_conflict,
               wc_delete,
               wc_commit_error_handling,
+              upgrade_absent,
              ]
 serial_only = True
 

Modified: subversion/branches/1.7.x-issue4035-r1185738/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4035-r1185738/subversion/tests/cmdline/upgrade_tests.py?rev=1186322&r1=1186321&r2=1186322&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4035-r1185738/subversion/tests/cmdline/upgrade_tests.py
(original)
+++ subversion/branches/1.7.x-issue4035-r1185738/subversion/tests/cmdline/upgrade_tests.py
Wed Oct 19 16:50:20 2011
@@ -1198,35 +1198,7 @@ def upgrade_file_externals(sbox):
       'alpha' : {'pname3' : 'pvalue3' },
       })
 
-@Skip(svntest.main.is_ra_type_file)
-@XFail()
-def upgrade_absent(sbox):
-  "upgrade absent nodes"
-  
-  # Install wc and repos
-  replace_sbox_with_tarfile(sbox, 'upgrade_absent.tar.bz2')
-  replace_sbox_repo_with_tarfile(sbox, 'upgrade_absent_repos.tar.bz2')
-  
-  # Update config for authz
-  write_restrictive_svnserve_conf(sbox.repo_dir)
-  write_authz_file(sbox, {"/": "*=rw", "/A/B": "*=", "/A/B/E": "jrandom = rw"})
-  
-  # Attempt to use the working copy, this should give an error
-  expected_stderr = wc_is_too_old_regex
-  svntest.actions.run_and_verify_svn(None, None, expected_stderr,
-                                     'info', sbox.wc_dir)
-  # Now upgrade the working copy
-  svntest.actions.run_and_verify_svn(None, None, [],
-                                     'upgrade', sbox.wc_dir)
 
-  # 
-  svntest.actions.run_and_verify_svn(None, None, [], 'relocate',
-                                     'svn://127.0.0.1/authz_tests-2',
-                                     sbox.repo_url, sbox.wc_dir)  
-
-  # This currently fails because the absent node is incorrectly upgraded
-  sbox.simple_update()
-  
 @Issue(4035)
 def upgrade_missing_replaced(sbox):
   "upgrade with missing replaced dir"
@@ -1306,7 +1278,6 @@ test_list = [ None,
               upgrade_with_missing_subdir,
               upgrade_locked,
               upgrade_file_externals,
-              upgrade_absent,
               upgrade_missing_replaced,
              ]
 



Mime
View raw message