Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 01B3E82DB for ; Wed, 24 Aug 2011 11:29:27 +0000 (UTC) Received: (qmail 53064 invoked by uid 500); 24 Aug 2011 11:29:26 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 52907 invoked by uid 500); 24 Aug 2011 11:29:16 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 52893 invoked by uid 99); 24 Aug 2011 11:29:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Aug 2011 11:29:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Aug 2011 11:29:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3C1AC2388A1C for ; Wed, 24 Aug 2011 11:28:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1161052 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_wc/wc_db_wcroot.c subversion/tests/cmdline/special_tests.py Date: Wed, 24 Aug 2011 11:28:41 -0000 To: commits@subversion.apache.org From: hwright@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110824112841.3C1AC2388A1C@eris.apache.org> Author: hwright Date: Wed Aug 24 11:28:40 2011 New Revision: 1161052 URL: http://svn.apache.org/viewvc?rev=1161052&view=rev Log: Merge r1158187, r1158196, r1158201, r1158207 from trunk: * r1158187, r1158196, r1158201, r1158207 Fix issues #2557 and #3987: 'svn info symlink/to/wc'. Justification: The svn_wc__db api should allow passing a working copy root when that root is a symlink. Without r1158187 it allows any node in such a working copy but not the root itself. But once a child is used it would work as the working copy is cached in the svn_wc__db_t. Votes: +1: danielsh (without r1158187, so just the tests and not the fix) +1: rhuijben, cmpilato, philip Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/subversion/libsvn_wc/wc_db_wcroot.c subversion/branches/1.7.x/subversion/tests/cmdline/special_tests.py Propchange: subversion/branches/1.7.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 24 11:28:40 2011 @@ -59,4 +59,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,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,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,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,115 8303,1158309,1158407,1158419,1158421,1158436,1158455,1158616,1158634,1158854,1158893,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705 +/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,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,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,115 8201,1158207,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616,1158634,1158854,1158893,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705 Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1161052&r1=1161051&r2=1161052&view=diff ============================================================================== --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 24 11:28:40 2011 @@ -114,17 +114,6 @@ Approved changes: +1: rhuijben, cmpilato +1 (once tests pass): danielsh - * r1158187, r1158196, r1158201, r1158207 - Fix issues #2557 and #3987: 'svn info symlink/to/wc'. - Justification: - The svn_wc__db api should allow passing a working copy root when that root - is a symlink. Without r1158187 it allows any node in such a working copy - but not the root itself. But once a child is used it would work as the - working copy is cached in the svn_wc__db_t. - Votes: - +1: danielsh (without r1158187, so just the tests and not the fix) - +1: rhuijben, cmpilato, philip - * r1158617, r1158875, r1158886, r1158896, r1158919, r1158924, r1158963 Make 'svn revert' remove unversioned nodes resulting from reverting a copy. Fixes issue #3101. Modified: subversion/branches/1.7.x/subversion/libsvn_wc/wc_db_wcroot.c URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/wc_db_wcroot.c?rev=1161052&r1=1161051&r2=1161052&view=diff ============================================================================== --- subversion/branches/1.7.x/subversion/libsvn_wc/wc_db_wcroot.c (original) +++ subversion/branches/1.7.x/subversion/libsvn_wc/wc_db_wcroot.c Wed Aug 24 11:28:40 2011 @@ -100,11 +100,13 @@ get_old_version(int *version, of LOCAL_ABSPATH, using DB and SCRATCH_POOL as needed. This function may do strange things, but at long as it comes up with the - Right Answer, we should be happy. */ + Right Answer, we should be happy. + + Sets *KIND to svn_node_dir for symlinks. */ static svn_error_t * -get_path_kind(svn_wc__db_t *db, +get_path_kind(svn_node_kind_t *kind, + svn_wc__db_t *db, const char *local_abspath, - svn_node_kind_t *kind, apr_pool_t *scratch_pool) { svn_boolean_t special; @@ -132,7 +134,11 @@ get_path_kind(svn_wc__db_t *db, } SVN_ERR(svn_io_check_special_path(local_abspath, &db->parse_cache.kind, - &special /* unused */, scratch_pool)); + &special, scratch_pool)); + + /* The wcroot could be a symlink to a directory. (Issue #2557, #3987) */ + if (special) + db->parse_cache.kind = svn_node_dir; *kind = db->parse_cache.kind; return SVN_NO_ERROR; @@ -395,7 +401,7 @@ svn_wc__db_wcroot_parse_local_abspath(sv ### rid of this stat() call. it is going to happen for EVERY call ### into wc_db which references a file. calls for directories could ### get an early-exit in the hash lookup just above. */ - SVN_ERR(get_path_kind(db, local_abspath, &kind, scratch_pool)); + SVN_ERR(get_path_kind(&kind, db, local_abspath, scratch_pool)); if (kind != svn_node_dir) { /* If the node specified by the path is NOT present, then it cannot Modified: subversion/branches/1.7.x/subversion/tests/cmdline/special_tests.py URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/special_tests.py?rev=1161052&r1=1161051&r2=1161052&view=diff ============================================================================== --- subversion/branches/1.7.x/subversion/tests/cmdline/special_tests.py (original) +++ subversion/branches/1.7.x/subversion/tests/cmdline/special_tests.py Wed Aug 24 11:28:40 2011 @@ -800,6 +800,45 @@ def merge_foreign_symlink(sbox): # 'A/zeta' : Item(status='A ', wc_rev='-', props={'svn:special': '*'}), # }) +#---------------------------------------------------------------------- +@Issue(2557,3987) +@SkipUnless(svntest.main.is_posix_os) +def symlink_to_wc(sbox): + "operate on symlink to wc" + + sbox.build(read_only = True) + wc_dir = sbox.wc_dir + + # Create a symlink + symlink_path = sbox.add_wc_path('2') + assert not os.path.islink(symlink_path) + os.symlink(os.path.basename(wc_dir), symlink_path) ### implementation detail + symlink_basename = os.path.basename(symlink_path) + + # Some basic tests + wc_uuid = svntest.actions.get_wc_uuid(wc_dir) + expected_info = [{ + 'Path' : re.escape(os.path.join(symlink_path)), + 'Working Copy Root Path' : re.escape(os.path.abspath(symlink_path)), + 'Repository Root' : sbox.repo_url, + 'Repository UUID' : wc_uuid, + 'Revision' : '1', + 'Node Kind' : 'directory', + 'Schedule' : 'normal', + }, { + 'Name' : 'iota', + 'Path' : re.escape(os.path.join(symlink_path, 'iota')), + 'Working Copy Root Path' : re.escape(os.path.abspath(symlink_path)), + 'Repository Root' : sbox.repo_url, + 'Repository UUID' : wc_uuid, + 'Revision' : '1', + 'Node Kind' : 'file', + 'Schedule' : 'normal', + }] + svntest.actions.run_and_verify_info(expected_info, + symlink_path, symlink_path + '/iota') + + ######################################################################## # Run the tests @@ -824,6 +863,7 @@ test_list = [ None, unrelated_changed_special_status, symlink_destination_change, merge_foreign_symlink, + symlink_to_wc, ] if __name__ == '__main__':