subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1579528 - in /subversion/branches/1.8.x: ./ STATUS subversion/libsvn_client/prop_commands.c subversion/tests/cmdline/prop_tests.py
Date Thu, 20 Mar 2014 04:00:49 GMT
Author: svn-role
Date: Thu Mar 20 04:00:48 2014
New Revision: 1579528

URL: http://svn.apache.org/r1579528
Log:
Merge the r1575270 group from trunk:

 * r1575270, r1575284
   Fix inconsistent output in svn_client_proplist4 when using absolute paths.
   Notes:
     r1575284 is the test that exposes this bug.
   Justification:
     It's a regression in 1.8.8 compared to 1.8.5.
   Votes:
      +1: brane, rhuijben, philip

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/libsvn_client/prop_commands.c
    subversion/branches/1.8.x/subversion/tests/cmdline/prop_tests.py

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1575270,1575284

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1579528&r1=1579527&r2=1579528&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu Mar 20 04:00:48 2014
@@ -305,12 +305,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1575270, r1575284
-   Fix inconsistent output in svn_client_proplist4 when using absolute paths.
-   Notes:
-     r1575284 is the test that exposes this bug.
-   Justification:
-     It's a regression in 1.8.8 compared to 1.8.5.
-   Votes:
-      +1: brane, rhuijben, philip

Modified: subversion/branches/1.8.x/subversion/libsvn_client/prop_commands.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_client/prop_commands.c?rev=1579528&r1=1579527&r2=1579528&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_client/prop_commands.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_client/prop_commands.c Thu Mar 20 04:00:48
2014
@@ -1232,7 +1232,7 @@ recursive_proplist_receiver(void *baton,
          Report iprops anyway */
 
       SVN_ERR(b->wrapped_receiver(b->wrapped_receiver_baton,
-                                  b->anchor ? b->anchor : local_abspath,
+                                  b->anchor ? b->anchor : b->anchor_abspath,
                                   NULL /* prop_hash */,
                                   b->iprops,
                                   scratch_pool));

Modified: subversion/branches/1.8.x/subversion/tests/cmdline/prop_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/tests/cmdline/prop_tests.py?rev=1579528&r1=1579527&r2=1579528&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/tests/cmdline/prop_tests.py (original)
+++ subversion/branches/1.8.x/subversion/tests/cmdline/prop_tests.py Thu Mar 20 04:00:48 2014
@@ -2612,6 +2612,48 @@ def peg_rev_base_working(sbox):
                                      'propget', '--strict', 'ordinal',
                                      sbox.ospath('iota') + '@BASE')
 
+def iprops_list_abspath(sbox):
+  "test listing iprops via abspath"
+
+  sbox.build()
+
+  sbox.simple_propset('im', 'root', '')
+  sbox.simple_commit()
+
+  svntest.actions.run_and_verify_svn(None, None, [],
+                                     'switch', '^/A/D', sbox.ospath(''),
+                                     '--ignore-ancestry')
+
+  sbox.simple_propset('im', 'GammA', 'gamma')
+
+  expected_output = [
+    'Inherited properties on \'%s\',\n' % sbox.ospath('')[:-1],
+    'from \'%s\':\n' % sbox.repo_url,
+    '  im\n',
+    '    root\n',
+    'Properties on \'%s\':\n' % sbox.ospath('gamma'),
+    '  im\n',
+    '    GammA\n'
+  ]
+  svntest.actions.run_and_verify_svn(None, expected_output, [],
+                                     'pl', '-R',
+                                     '--show-inherited-props', '-v',
+                                     sbox.ospath(''))
+
+  expected_output = [
+    'Inherited properties on \'%s\',\n' % os.path.abspath(sbox.ospath('')),
+    'from \'%s\':\n' % sbox.repo_url,
+    '  im\n',
+    '    root\n',
+    'Properties on \'%s\':\n' % os.path.abspath(sbox.ospath('gamma')),
+    '  im\n',
+    '    GammA\n'
+  ]
+  svntest.actions.run_and_verify_svn(None, expected_output, [],
+                                     'pl', '-R',
+                                     '--show-inherited-props', '-v',
+                                     os.path.abspath(sbox.ospath('')))
+
 ########################################################################
 # Run the tests
 
@@ -2657,6 +2699,7 @@ test_list = [ None,
               inheritable_ignores,
               almost_known_prop_names,
               peg_rev_base_working,
+              iprops_list_abspath,
              ]
 
 if __name__ == '__main__':



Mime
View raw message