svn commit: r1803755 - in /subversion/branches/1.9.x: ./ STATUS subversion/include/svn_client.h subversion/libsvn_client/export.c subversion/tests/cmdline/export_tests.py

2017-08-01 Thread svn-role 
Author: svn-role
Date: Wed Aug  2 04:00:25 2017
New Revision: 1803755

URL: http://svn.apache.org/viewvc?rev=1803755=rev
Log:
Merge the 1.9.x-r1802316 branch:

 * r1802080, r1802316
   Fix SEGV for 'svn export -rN WC' with relative externals.
   Justification:
 Client SEGV.
   Branch:
 ^/subversion/branches/1.9.x-r1802316
   Votes:
 +1: philip, danielsh, jamessan

Modified:
subversion/branches/1.9.x/   (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/subversion/include/svn_client.h
subversion/branches/1.9.x/subversion/libsvn_client/export.c
subversion/branches/1.9.x/subversion/tests/cmdline/export_tests.py

Propchange: subversion/branches/1.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug  2 04:00:25 2017
@@ -15,6 +15,7 @@
 /subversion/branches/1.9.x-r1757529-group:1757739-1757935
 /subversion/branches/1.9.x-r1758224-group:1758407-1758693
 /subversion/branches/1.9.x-r1785053:1786519-1794526
+/subversion/branches/1.9.x-r1802316:1802343-1803754
 /subversion/branches/1.9.x-rep-cache-db-fixes:1743185-1757778
 /subversion/branches/1.9.x-strict-rep-sharing:1786535-1795992
 
/subversion/branches/10Gb:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
@@ -106,4 +107,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663253,1663286,1663338,1663347,1663355,1663374,1663450,1663500,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665873,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,190,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667738,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1668625,1669743,1669746,1669749,166
 
9945,1670139,1670149,1670152,1670329,1670337,1670347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674626-1674627,1674785,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678755,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679240,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1682714,1682854,1683071,1683126,1683135,1683266-1683267,1683290,1683303,1683311,1683378,1683387,1684034,1684077,1684322,1684325,1684344,1684412,1684940,1685034,1685085,1686175,1686239,1686478,1686541,
 
1686543,1686554,1686557,1686802,1686888,1686984,1687029,1687304,1687389,1687769,1687776,1687812,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,1691924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135,1693138,1693159,1693886,1694023,1694194,1694481,1694929,1695022,1695600,1695606,1695681,1696222,1696225,1696387,1696695,1697381,1697384,1697387,1697664,1697824,1697835,1697845,1697914,1697967,1698106,1698312,1700130,1700215,1700219-1700220,1700740,1700951,1701064,1701206,1701270,1701298,1701598,1701603,1701611,1701633,1701638,1701646,1701736,1701792,1701797,1701838,1701997,1702198,1702200,1702203,1702218,1702231,1702237-1702239,1702247,1702288,1702299-1702300,1702310,1702397,1702407,1702467,1702472,1702474,1702478,1702533,1702549,1702553,1702565,1702891,1702974,1702991,1703470,1703475-1703477,1703544,1703581,1703675,1703688-1703689,1703740,1704292,1704573,1704821,1704847,1705060,1705062,1705064,1705088,1705328,1705843,1706241,17063

svn commit: r1803756 - /subversion/branches/1.9.x-r1802316/

2017-08-01 Thread svn-role 
Author: svn-role
Date: Wed Aug  2 04:00:41 2017
New Revision: 1803756

URL: http://svn.apache.org/viewvc?rev=1803756=rev
Log:
Remove the '1.9.x-r1802316' branch, merged in r1803755.

Removed:
subversion/branches/1.9.x-r1802316/

svn commit: r1803754 - in /subversion/branches/1.9.x: ./ STATUS subversion/svnadmin/svnadmin.c

2017-08-01 Thread svn-role 
Author: svn-role
Date: Wed Aug  2 04:00:07 2017
New Revision: 1803754

URL: http://svn.apache.org/viewvc?rev=1803754=rev
Log:
Merge r1796420 from trunk:

 * r1796420
   svnadmin: Canonicalize LOCK_PATH arguments.
   Justification:
 API violation; errors on valid input.
   Votes:
 +1: danielsh, rhuijben, jamessan

Modified:
subversion/branches/1.9.x/   (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/subversion/svnadmin/svnadmin.c

Propchange: subversion/branches/1.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug  2 04:00:07 2017
@@ -106,4 +106,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663253,1663286,1663338,1663347,1663355,1663374,1663450,1663500,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665873,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,190,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667738,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1668625,1669743,1669746,1669749,166
 
9945,1670139,1670149,1670152,1670329,1670337,1670347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674626-1674627,1674785,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678755,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679240,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1682714,1682854,1683071,1683126,1683135,1683266-1683267,1683290,1683303,1683311,1683378,1683387,1684034,1684077,1684322,1684325,1684344,1684412,1684940,1685034,1685085,1686175,1686239,1686478,1686541,
 
1686543,1686554,1686557,1686802,1686888,1686984,1687029,1687304,1687389,1687769,1687776,1687812,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,1691924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135,1693138,1693159,1693886,1694023,1694194,1694481,1694929,1695022,1695600,1695606,1695681,1696222,1696225,1696387,1696695,1697381,1697384,1697387,1697664,1697824,1697835,1697845,1697914,1697967,1698106,1698312,1700130,1700215,1700219-1700220,1700740,1700951,1701064,1701206,1701270,1701298,1701598,1701603,1701611,1701633,1701638,1701646,1701736,1701792,1701797,1701838,1701997,1702198,1702200,1702203,1702218,1702231,1702237-1702239,1702247,1702288,1702299-1702300,1702310,1702397,1702407,1702467,1702472,1702474,1702478,1702533,1702549,1702553,1702565,1702891,1702974,1702991,1703470,1703475-1703477,1703544,1703581,1703675,1703688-1703689,1703740,1704292,1704573,1704821,1704847,1705060,1705062,1705064,1705088,1705328,1705843,1706241,17063
 
23-1706324,1706375,1706428,1706432,1706437,1706783,1706983,1706999,1708699,1709388-1709389,1709553,1709562,1710104,1710167,1710215,1710290,1710558,1711250,1711346,1711507,1711510,1714314,1714358,1714790,1715224,1715232,1715262,1715777,1715793,1716808,1717154,1717869,1717871,1717873-1717875,1717878,1718167,1718267,1718269,1718484,1720015,1720643,1721174-1721175,1721285,1721488,1721648,1722164,1722860-1722861,1722879,1722887,1724448,1725180,1728308,1728387,1729060,1729519,1730856,1734106,1734926,1735179,1735826,1736432,1737122,1738259,1738659,1738828,1739278,1739280,1740252,1740254,1740316,1741071-1741073,1741078,1741096,1741200,1741206,1741401,1745515,1746053,1746277,1746364,1748514,1754190,1756266,1757529,1757532,1757539,1758128-1758130,1758153,1758202,1758204,1758207,1758209,1758224,1758269,1758385,1758781,1759116-1759124,1759686,1760570,1761334,1761653,1761755,1762338-1762339,1763934,1764034,1764676,1764851,1766240,1766323,1766327,1766352,1766590,1766699,1766704,1766711,1767768,17

svn commit: r1803722 - /subversion/branches/1.9.x/STATUS

2017-08-01 Thread jamessan 
Author: jamessan
Date: Wed Aug  2 01:35:31 2017
New Revision: 1803722

URL: http://svn.apache.org/viewvc?rev=1803722=rev
Log:
* STATUS:
  Vote +1 on the 1.9.x-r1795116 branch.
  Vote +1 on r1796420, approving.
  Vote -0 on r1802032.
  Vote +1 on the 1.9.x-r1802316 branch, approving.

Modified:
subversion/branches/1.9.x/STATUS

Modified: subversion/branches/1.9.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1803722=1803721=1803722=diff
==
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Wed Aug  2 01:35:31 2017
@@ -48,16 +48,9 @@ Candidate changes:
Branch:
  ^/subversion/branches/1.9.x-r1795116
Votes:
- +1: stefan2
+ +1: stefan2, jamessan
  +0: stsp (text conflict in subversion/tests/libsvn_fs/fs-test.c) (without 
r1796167)
 
- * r1796420
-   svnadmin: Canonicalize LOCK_PATH arguments.
-   Justification:
- API violation; errors on valid input.
-   Votes:
- +1: danielsh, rhuijben
-
  * r1802032
Install 'fsfs-stats' as a wrapper to 'svnfsfs', to which it was renamed in
r1618848.
@@ -65,15 +58,7 @@ Candidate changes:
  Backwards compatibility with 1.8.x tools/.
Votes:
  +1: danielsh
-
- * r1802080, r1802316
-   Fix SEGV for 'svn export -rN WC' with relative externals.
-   Justification:
- Client SEGV.
-   Branch:
- ^/subversion/branches/1.9.x-r1802316
-   Votes:
- +1: philip, danielsh
+ -0: jamessan ($(bindir) and $$1 should be quoted in case they contain 
shell metacharacters)
 
 Veto-blocked changes:
 =
@@ -96,3 +81,20 @@ Veto-blocked changes:
 
 Approved changes:
 =
+
+ * r1796420
+   svnadmin: Canonicalize LOCK_PATH arguments.
+   Justification:
+ API violation; errors on valid input.
+   Votes:
+ +1: danielsh, rhuijben, jamessan
+
+ * r1802080, r1802316
+   Fix SEGV for 'svn export -rN WC' with relative externals.
+   Justification:
+ Client SEGV.
+   Branch:
+ ^/subversion/branches/1.9.x-r1802316
+   Votes:
+ +1: philip, danielsh, jamessan
+

Re: svn commit: r1803639 - in /subversion/trunk: build/run_tests.py subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.c subversion/libsvn_fs_fs/transaction.c subversion/tests/cmdline/svntest/

2017-08-01 Thread Daniel Shahaf 
kot...@apache.org wrote on Tue, 01 Aug 2017 12:18 +:
> Author: kotkov
> Date: Tue Aug  1 12:18:23 2017
> New Revision: 1803639
> 
> URL: http://svn.apache.org/viewvc?rev=1803639=rev
> Log:
> fsfs: Introduce new 'compression' config option.
> 
> This option allows explicitly specifying the compression algorithm for
> format 8 repositories.  It deprecates the previously used 'compression-level'
> option.  The syntax of the new option is:
> 
>   compression = none | lz4 | zlib | zlib-1 ... zlib-9

Thanks for implementing this, Evgeny.  One comment:

> +++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Tue Aug  1 12:18:23 2017
> @@ -947,23 +1052,25 @@ write_config(svn_fs_t *fs,
>  "# " CONFIG_OPTION_MAX_LINEAR_DELTIFICATION " = 16"  
> NL
>  "###"
> NL
>  "### After deltification, we compress the data to minimize on-disk size."
> NL
> +"### This setting controls the compression algorithm, which will be used in" 
> NL
> +"### future revisions.  It can be used to either disable compression or to"  
> NL
> +"### select between available algorithms (zlib, lz4).  zlib is a general-"   
> NL
> +"### purpose compression algorithm.  lz4 is a fast compression algorithm"
> NL
> +"### which should be preferred for repositories with large and, possibly,"   
> NL
> +"### incompressible files.  Note that the compression ratio of lz4 is"   
> NL
> +"### usually lower than the one provided by zlib, but using it can"  
> NL
> +"### significantly speed up commits as well as reading the data."
> NL
> +"### The syntax of this option is:"  
> NL
> +"###   " CONFIG_OPTION_COMPRESSION " = none | lz4 | zlib | zlib-1 ... 
> zlib-9" NL
> +"### The default value is 'zlib', which is currently equivalent to 
> 'zlib-5'." NL
> +"# " CONFIG_OPTION_COMPRESSION " = zlib" 
> NL
> +"###"
> NL
> +"### DEPRECATED: The new '" CONFIG_OPTION_COMPRESSION "' option deprecates 
> previously used" NL
> +"### '" CONFIG_OPTION_COMPRESSION_LEVEL "' option, which was used to 
> configure zlib compression." NL
> +"### For compatibility with previous versions of Subversion, this option 
> can"NL
> +"### still be used (and it will result in zlib compression with the" 
> NL
> +"### corresponding compression level)."  
> NL
> +"###   " CONFIG_OPTION_COMPRESSION_LEVEL " = 0 ... 9 (default is 5)" 
> NL

The documentation implies that CONFIG_OPTION_COMPRESSION can be used
regardless of the filesystem format, …

> @@ -683,6 +683,60 @@ verify_block_size(apr_int64_t block_size
> +static svn_error_t *
> +parse_compression_option(compression_type_t *compression_type_p,
> + int *compression_level_p,
> + const char *value)
> +{
> @@ -816,6 +859,68 @@ read_config(fs_fs_data_t *ffd,
>  {
>ffd->pack_after_commit = FALSE;
>  }
> +
> +  /* Initialize compression settings in ffd. */
> +  if (ffd->format >= SVN_FS_FS__MIN_SVNDIFF2_FORMAT)
> +{
> +  svn_config_get(config, _val,
> + CONFIG_SECTION_DELTIFICATION,
> + CONFIG_OPTION_COMPRESSION, NULL);
> +  svn_config_get(config, _level_val,
> + CONFIG_SECTION_DELTIFICATION,
> + CONFIG_OPTION_COMPRESSION_LEVEL, NULL);
> +}
> +  else if (ffd->format >= SVN_FS_FS__MIN_DELTIFICATION_FORMAT)
> +{
> +  SVN_ERR(svn_config_get_int64(config, _level,
> +   CONFIG_SECTION_DELTIFICATION,
> +   CONFIG_OPTION_COMPRESSION_LEVEL,
> +   SVN_DELTA_COMPRESSION_LEVEL_DEFAULT));

… but the code only reads CONFIG_OPTION_COMPRESSION in f8 filesystems.

Given the docs as written, I would expect to be able to edit fsfs.conf
and replace 'compression-level = 4' with 'compression = zlib-4' without
doing an 'svnadmin upgrade'; so I think the SVN_FS_FS__MIN_DELTIFICATION_FORMAT
codepath should honour CONFIG_OPTION_COMPRESSION (and error out if it is
set to "lz4").

Cheers,

Daniel

> +}
> +  else if (ffd->format >= SVN_FS_FS__MIN_SVNDIFF1_FORMAT)
> +{
> +  ffd->delta_compression_type = compression_type_zlib;
> +  ffd->delta_compression_level = SVN_DELTA_COMPRESSION_LEVEL_DEFAULT;
> +}
> +  else
> +{
> +  ffd->delta_compression_type = compression_type_none;
> +  ffd->delta_compression_level = SVN_DELTA_COMPRESSION_LEVEL_NONE;
> +}
> +
>  #ifdef SVN_DEBUG
>SVN_ERR(svn_config_get_bool(config, >verify_before_commit,
>CONFIG_SECTION_DEBUG,

svn commit: r1803650 - /subversion/trunk/subversion/libsvn_ra_serf/serf.c

2017-08-01 Thread kotkov 
Author: kotkov
Date: Tue Aug  1 14:46:08 2017
New Revision: 1803650

URL: http://svn.apache.org/viewvc?rev=1803650=rev
Log:
* subversion/libsvn_ra_serf/serf.c
  (ra_serf_dup_session): Add placeholder comments for the recently added
   svn_ra_serf__session_t fields that are implicitly copied due to
   apr_pmemdup().

Modified:
subversion/trunk/subversion/libsvn_ra_serf/serf.c

Modified: subversion/trunk/subversion/libsvn_ra_serf/serf.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/serf.c?rev=1803650=1803649=1803650=diff
==
--- subversion/trunk/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/serf.c Tue Aug  1 14:46:08 2017
@@ -752,6 +752,8 @@ ra_serf_dup_session(svn_ra_session_t *ne
   /* svn_boolean_t supports_inline_props */
   /* supports_rev_rsrc_replay */
   /* supports_svndiff1 */
+  /* supports_svndiff2 */
+  /* supports_put_result_checksum */
 
   new_sess->context = serf_context_create(result_pool);

svn commit: r1803639 - in /subversion/trunk: build/run_tests.py subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.c subversion/libsvn_fs_fs/transaction.c subversion/tests/cmdline/svntest/main

2017-08-01 Thread kotkov 
Author: kotkov
Date: Tue Aug  1 12:18:23 2017
New Revision: 1803639

URL: http://svn.apache.org/viewvc?rev=1803639=rev
Log:
fsfs: Introduce new 'compression' config option.

This option allows explicitly specifying the compression algorithm for
format 8 repositories.  It deprecates the previously used 'compression-level'
option.  The syntax of the new option is:

  compression = none | lz4 | zlib | zlib-1 ... zlib-9

See the related discussion in:
  
https://lists.apache.org/thread.html/40650a309d8ff041adbb62e8ffe19cc3990b9098a032db932fabd170@%3Cdev.subversion.apache.org%3E

* subversion/libsvn_fs_fs/fs.h
  (CONFIG_OPTION_COMPRESSION): New.
  (compression_type_t): New.
  (fs_fs_data_t): Add field to store the delta compression type.

* subversion/libsvn_fs_fs/fs.h
  (write_config): Revamp the section describing delta compression.
  (parse_compression_option): New helper function.
  (read_config): Parse the new 'compression' option when working with
   newer formats, with a possible fall back to 'compression-level' in
   case it's specified explicitly.  In order to always have appropriate
   and usable compression settings in ffd, move the part of the code that
   disables compression when only svndiff0 is supported from ...

* subversion/libsvn_fs_fs/transaction.c
  (txdelta_to_svndiff): ...this function.  Adjust this function to select
   the appropriate svndiff version, depending on the options.

* win-tests.py
  (): Rename 'fsfs_compression_level' to 'fsfs_compression'.
  (_usage_exit): Adjust usage text.

* build/run_tests.py
  (): Update usage comment.
  (_init_py_tests): Pass the option as string, not int.
  (create_parser): Parse the option as string, not int.

* subversion/tests/cmdline/svntest/main.py
  (parse_options): Only allow using the --fsfs-compression option with
   --server-minor-version >= 10.
  (_create_parser): Parse the option as string, not int.
  (run_one): Pass the option as string, not int.
  (_post_create_repos): Update the code that adjusts fsfs.conf.

Modified:
subversion/trunk/build/run_tests.py
subversion/trunk/subversion/libsvn_fs_fs/fs.h
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
subversion/trunk/subversion/libsvn_fs_fs/transaction.c
subversion/trunk/subversion/tests/cmdline/svntest/main.py
subversion/trunk/win-tests.py

Modified: subversion/trunk/build/run_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/build/run_tests.py?rev=1803639=1803638=1803639=diff
==
--- subversion/trunk/build/run_tests.py (original)
+++ subversion/trunk/build/run_tests.py Tue Aug  1 12:18:23 2017
@@ -33,7 +33,7 @@
 [--httpd-version=] [--httpd-whitelist=]
 [--config-file=] [--ssl-cert=]
 [--exclusive-wc-locks] [--memcached-server=]
-[--fsfs-compression=]
+[--fsfs-compression=]
  
 
 
@@ -276,8 +276,8 @@ class TestHarness:
   cmdline.append('--exclusive-wc-locks')
 if self.opts.memcached_server is not None:
   cmdline.append('--memcached-server=%s' % self.opts.memcached_server)
-if self.opts.fsfs_compression_level is not None:
-  cmdline.append('--fsfs-compression=%d' % 
self.opts.fsfs_compression_level)
+if self.opts.fsfs_compression is not None:
+  cmdline.append('--fsfs-compression=%s' % self.opts.fsfs_compression)
 
 self.py_test_cmdline = cmdline
 
@@ -1026,9 +1026,8 @@ def create_parser():
 help='Use sqlite exclusive locking for working copies')
   parser.add_option('--memcached-server', action='store',
 help='Use memcached server at specified URL (FSFS only)')
-  parser.add_option('--fsfs-compression', action='store', type='int',
-dest="fsfs_compression_level",
-help='Set compression level (for fsfs)')
+  parser.add_option('--fsfs-compression', action='store', type='str',
+help='Set compression type (for fsfs)')
 
   parser.set_defaults(set_log_level=None)
   return parser

Modified: subversion/trunk/subversion/libsvn_fs_fs/fs.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs.h?rev=1803639=1803638=1803639=diff
==
--- subversion/trunk/subversion/libsvn_fs_fs/fs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs.h Tue Aug  1 12:18:23 2017
@@ -118,6 +118,7 @@ extern "C" {
 #define CONFIG_SECTION_DEBUG "debug"
 #define CONFIG_OPTION_PACK_AFTER_COMMIT  "pack-after-commit"
 #define CONFIG_OPTION_VERIFY_BEFORE_COMMIT "verify-before-commit"
+#define CONFIG_OPTION_COMPRESSION"compression"
 
 /* The format number of this filesystem.
This is independent of the repository format number, and
@@ -298,6 +299,13 @@ typedef struct window_cache_key_t
   apr_uint64_t item_index;
 } window_cache_key_t;
 
+typedef enum compression_type_t
+{
+

svn commit: r1803640 - /subversion/trunk/subversion/libsvn_fs_fs/fs.h

2017-08-01 Thread kotkov 
Author: kotkov
Date: Tue Aug  1 12:21:22 2017
New Revision: 1803640

URL: http://svn.apache.org/viewvc?rev=1803640=rev
Log:
* subversion/libsvn_fs_fs/fs.h
  (SVN_FS_FS__MIN_CONFIG_FILE): Fix the ordering of capability-related
   definitions by moving this define into the appropriate place.

Modified:
subversion/trunk/subversion/libsvn_fs_fs/fs.h

Modified: subversion/trunk/subversion/libsvn_fs_fs/fs.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs.h?rev=1803640=1803639=1803640=diff
==
--- subversion/trunk/subversion/libsvn_fs_fs/fs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs.h Tue Aug  1 12:21:22 2017
@@ -163,6 +163,9 @@ extern "C" {
  * issues with very old servers, restrict those options to the 1.6+ format*/
 #define SVN_FS_FS__MIN_DELTIFICATION_FORMAT 4
 
+/* The minimum format number that supports a configuration file (fsfs.conf) */
+#define SVN_FS_FS__MIN_CONFIG_FILE 4
+
 /* The 1.7-dev format, never released, that packed revprops into SQLite
revprops.db . */
 #define SVN_FS_FS__PACKED_REVPROP_SQLITE_DEV_FORMAT 5
@@ -185,9 +188,6 @@ extern "C" {
 /* The minimum format number that supports svndiff version 2. */
 #define SVN_FS_FS__MIN_SVNDIFF2_FORMAT 8
 
-/* The minimum format number that supports a configuration file (fsfs.conf) */
-#define SVN_FS_FS__MIN_CONFIG_FILE 4
-
 /* On most operating systems apr implements file locks per process, not
per file.  On Windows apr implements the locking as per file handle
locks, so we don't have to add our own mutex for just in-process

Re: svn commit: r1801940 - in /subversion/trunk: ./ notes/ subversion/include/ subversion/include/private/ subversion/libsvn_delta/ subversion/libsvn_fs_fs/ subversion/libsvn_subr/ subversion/tests/li

2017-08-01 Thread Evgeny Kotkov 
Evgeny Kotkov  writes:

> With a bit more thought on this, I agree that providing an explicit knob
> (compression = ...) in fsfs.conf would be more appropriate than what we
> have now.
>
> I had an assumption that it would be nice to keep the configuration in
> fsfs.conf and in mod_dav_svn working in a similar way.  But, as they
> have different scopes (and only the latter requires negotiation), there
> is no reason not to have the explicit configuration in fsfs.conf.  After all,
> being explicit about what gets written on the disk is better.
>
> Let me see what I can come up with regarding the new "compression = ..."
> option.

Committed in https://svn.apache.org/r1803639

Regards,
Evgeny Kotkov

svn commit: r1803637 - /subversion/branches/1.9.x/STATUS

2017-08-01 Thread danielsh 
Author: danielsh
Date: Tue Aug  1 12:09:46 2017
New Revision: 1803637

URL: http://svn.apache.org/viewvc?rev=1803637=rev
Log:
* STATUS: Vote +1 on the 1.9.x-r1802316 branch.

Modified:
subversion/branches/1.9.x/STATUS

Modified: subversion/branches/1.9.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1803637=1803636=1803637=diff
==
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Tue Aug  1 12:09:46 2017
@@ -73,7 +73,7 @@ Candidate changes:
Branch:
  ^/subversion/branches/1.9.x-r1802316
Votes:
- +1: philip
+ +1: philip, danielsh
 
 Veto-blocked changes:
 =