svn commit: r1897401 - in /subversion/trunk: ./ subversion/tests/cmdline/externals_tests.py

2022-01-23 Thread danielsh
Author: danielsh
Date: Mon Jan 24 06:47:25 2022
New Revision: 1897401

URL: http://svn.apache.org/viewvc?rev=1897401=rev
Log:
Cherry-pick r1897398,r1897399 from the pristines-on-demand branch, where they
were committed to by mistake.

* subversion/tests/cmdline/externals_tests.py
  (externals_test_setup): Clarify the docstring.  No functional change.

Modified:
subversion/trunk/   (props changed)
subversion/trunk/subversion/tests/cmdline/externals_tests.py

Propchange: subversion/trunk/
--
  Merged /subversion/branches/pristines-on-demand:r1897398-1897399

Modified: subversion/trunk/subversion/tests/cmdline/externals_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/externals_tests.py?rev=1897401=1897400=1897401=diff
==
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Mon Jan 24 
06:47:25 2022
@@ -67,14 +67,21 @@ def externals_test_setup(sbox):
 
   The arrangement of the externals in the first repository is:
 
-/A/B/ ==>  ^/A/D/gamma  gamma
-/A/C/ ==>  exdir_G  :A/D/G
-   ../../..//A/D/H@1 exdir_H
-
-/A/D/ ==>  ^/..//Aexdir_A
-   ///A/D/G/   exdir_A/G/
-   exdir_A/H -r 1   :A/D/H
-   //A/Bx/y/z/blah
+Properties on 'A/B':
+  svn:externals
+^/A/D/gamma gamma
+
+Properties on 'A/C':
+  svn:externals
+exdir_G   ://<...>//A/D/G
+../../..//A/D/H@1 exdir_H
+
+Properties on 'A/D':
+  svn:externals
+^/..//A exdir_A
+///A/D/G/ exdir_A/G/
+exdir_A/H -r 1 ://<...>//A/D/H
+//A/B x/y/z/blah
 
   A dictionary is returned keyed by the directory created by the
   external whose value is the URL of the external.




svn commit: r1897399 - /subversion/branches/pristines-on-demand/subversion/tests/cmdline/externals_tests.py

2022-01-23 Thread danielsh
Author: danielsh
Date: Mon Jan 24 06:43:43 2022
New Revision: 1897399

URL: http://svn.apache.org/viewvc?rev=1897399=rev
Log:
Further clarify a docstring.  No functional change.

* subversion/tests/cmdline/externals_tests.py
  (externals_test_setup): Use more specific metasyntactic variables.
Correct a syntax error in the non-relative URLs.

Modified:

subversion/branches/pristines-on-demand/subversion/tests/cmdline/externals_tests.py

Modified: 
subversion/branches/pristines-on-demand/subversion/tests/cmdline/externals_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand/subversion/tests/cmdline/externals_tests.py?rev=1897399=1897398=1897399=diff
==
--- 
subversion/branches/pristines-on-demand/subversion/tests/cmdline/externals_tests.py
 (original)
+++ 
subversion/branches/pristines-on-demand/subversion/tests/cmdline/externals_tests.py
 Mon Jan 24 06:43:43 2022
@@ -73,15 +73,15 @@ def externals_test_setup(sbox):
 
 Properties on 'A/C':
   svn:externals
-exdir_G   :A/D/G
+exdir_G   ://<...>//A/D/G
 ../../..//A/D/H@1 exdir_H
 
 Properties on 'A/D':
   svn:externals
 ^/..//A exdir_A
-///A/D/G/ exdir_A/G/
-exdir_A/H -r 1 :A/D/H
-//A/B x/y/z/blah
+///A/D/G/ exdir_A/G/
+exdir_A/H -r 1 ://<...>//A/D/H
+//A/B x/y/z/blah
 
   A dictionary is returned keyed by the directory created by the
   external whose value is the URL of the external.




svn commit: r1897398 - /subversion/branches/pristines-on-demand/subversion/tests/cmdline/externals_tests.py

2022-01-23 Thread danielsh
Author: danielsh
Date: Mon Jan 24 06:34:14 2022
New Revision: 1897398

URL: http://svn.apache.org/viewvc?rev=1897398=rev
Log:
Clarify a docstring.  No functional change.

* subversion/tests/cmdline/externals_tests.py
  (externals_test_setup):
Use the `svn proplist --verbose` format to list the externals created.

Modified:

subversion/branches/pristines-on-demand/subversion/tests/cmdline/externals_tests.py

Modified: 
subversion/branches/pristines-on-demand/subversion/tests/cmdline/externals_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand/subversion/tests/cmdline/externals_tests.py?rev=1897398=1897397=1897398=diff
==
--- 
subversion/branches/pristines-on-demand/subversion/tests/cmdline/externals_tests.py
 (original)
+++ 
subversion/branches/pristines-on-demand/subversion/tests/cmdline/externals_tests.py
 Mon Jan 24 06:34:14 2022
@@ -67,14 +67,21 @@ def externals_test_setup(sbox):
 
   The arrangement of the externals in the first repository is:
 
-/A/B/ ==>  ^/A/D/gamma  gamma
-/A/C/ ==>  exdir_G  :A/D/G
-   ../../..//A/D/H@1 exdir_H
-
-/A/D/ ==>  ^/..//Aexdir_A
-   ///A/D/G/   exdir_A/G/
-   exdir_A/H -r 1   :A/D/H
-   //A/Bx/y/z/blah
+Properties on 'A/B':
+  svn:externals
+^/A/D/gamma gamma
+
+Properties on 'A/C':
+  svn:externals
+exdir_G   :A/D/G
+../../..//A/D/H@1 exdir_H
+
+Properties on 'A/D':
+  svn:externals
+^/..//A exdir_A
+///A/D/G/ exdir_A/G/
+exdir_A/H -r 1 :A/D/H
+//A/B x/y/z/blah
 
   A dictionary is returned keyed by the directory created by the
   external whose value is the URL of the external.