You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2022/03/02 11:04:32 UTC
svn commit: r1898524 - in /subversion/trunk/subversion: svn/help-cmd.c tests/cmdline/getopt_tests_data/svn--version--verbose_stdout tests/cmdline/getopt_tests_data/svn--version_stdout
Author: julianfoad
Date: Wed Mar 2 11:04:31 2022
New Revision: 1898524
URL: http://svn.apache.org/viewvc?rev=1898524&view=rev
Log:
Multi-WC-format: simplify supported versions display.
Change the display format in 'svn --version' from:
| * compatible with Subversion v1.8 to v1.15 (WC format 31)
| * compatible with Subversion v1.15 (WC format 32)
to:
| * WC format 31, compatible with Subversion v1.8 and newer
| * WC format 32, compatible with Subversion v1.15 and newer
* subversion/svn/help-cmd.c
(print_supported_wc_formats): Change as above.
* subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout,
subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
Update expected output for tests.
Modified:
subversion/trunk/subversion/svn/help-cmd.c
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
Modified: subversion/trunk/subversion/svn/help-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/help-cmd.c?rev=1898524&r1=1898523&r2=1898524&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/help-cmd.c (original)
+++ subversion/trunk/subversion/svn/help-cmd.c Wed Mar 2 11:04:31 2022
@@ -54,28 +54,12 @@ print_supported_wc_formats(svn_stringbuf
for (i = 0; wc_formats[i].version_min; i++)
{
const svn_client_wc_format_t *v = &wc_formats[i];
- const char *s;
-
- if (v->version_min->major == v->version_min->major &&
- v->version_min->minor == v->version_max->minor)
- {
- s = apr_psprintf(
- pool,
- _("%scompatible with Subversion v%d.%d (WC format %d)\n"),
- prefix,
- v->version_min->major, v->version_min->minor,
- v->wc_format);
- }
- else
- {
- s = apr_psprintf(
- pool,
- _("%scompatible with Subversion v%d.%d to v%d.%d (WC format %d)\n"),
- prefix,
- v->version_min->major, v->version_min->minor,
- v->version_max->major, v->version_max->minor,
- v->wc_format);
- }
+ const svn_version_t *ver = v->version_min;
+ const char *s
+ = apr_psprintf(
+ pool,
+ _("%sWC format %d, compatible with Subversion v%d.%d and newer\n"),
+ prefix, v->wc_format, ver->major, ver->minor);
svn_stringbuf_appendcstr(output, s);
}
Modified: subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout?rev=1898524&r1=1898523&r2=1898524&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout (original)
+++ subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout Wed Mar 2 11:04:31 2022
@@ -8,8 +8,8 @@ Subversion is open source software, see
Supported working copy (WC) formats:
-* compatible with Subversion v1.8 to v1.15 (WC format 31)
-* compatible with Subversion v1.15 (WC format 32)
+* WC format 31, compatible with Subversion v1.8 and newer
+* WC format 32, compatible with Subversion v1.15 and newer
The following repository access (RA) modules are available:
Modified: subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout?rev=1898524&r1=1898523&r2=1898524&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout (original)
+++ subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout Wed Mar 2 11:04:31 2022
@@ -1,15 +1,15 @@
svn, version 1.9.0-dev (under development)
compiled Feb 26 2014, 15:15:42 on x86_64-unknown-openbsd5.5
-Copyright (C) 2014 The Apache Software Foundation.
+Copyright (C) 2012 The Apache Software Foundation.
This software consists of contributions made by many people;
see the NOTICE file for more information.
Subversion is open source software, see http://subversion.apache.org/
Supported working copy (WC) formats:
-* compatible with Subversion v1.8 to v1.15 (WC format 31)
-* compatible with Subversion v1.15 (WC format 32)
+* WC format 31, compatible with Subversion v1.8 and newer
+* WC format 32, compatible with Subversion v1.15 and newer
The following repository access (RA) modules are available:
Re: svn commit: r1898524 - in /subversion/trunk/subversion: svn/help-cmd.c tests/cmdline/getopt_tests_data/svn--version--verbose_stdout tests/cmdline/getopt_tests_data/svn--version_stdout
Posted by Julian Foad <ju...@apache.org>.
Julian Foad wrote:
> Daniel Sahlberg wrote:
>> Should the following lines also be removed [...]
> Oh yes. Thank you. Please do if you have a moment, otherwise I'll get
> to it some time this week.
I got to it now. r1898535.
I note that we might want to replace that with a matcher for variations
of the new style, but I saw there didn't seem to be a trivial way to do
so at the moment, and it can wait, so I didn't.
Thank you very much for reviewing these commits. Please keep it coming!
- Julian
Re: svn commit: r1898524 - in /subversion/trunk/subversion: svn/help-cmd.c tests/cmdline/getopt_tests_data/svn--version--verbose_stdout tests/cmdline/getopt_tests_data/svn--version_stdout
Posted by Julian Foad <ju...@apache.org>.
Daniel Sahlberg wrote:
>Should the following lines also be removed [...]
Oh yes. Thank you. Please do if you have a moment, otherwise I'll get to it some time this week.
- Julian
Re: svn commit: r1898524 - in /subversion/trunk/subversion: svn/help-cmd.c tests/cmdline/getopt_tests_data/svn--version--verbose_stdout tests/cmdline/getopt_tests_data/svn--version_stdout
Posted by Daniel Sahlberg <da...@gmail.com>.
Den ons 2 mars 2022 12:04 <ju...@apache.org> skrev:
> Modified:
> subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout?rev=1898524&r1=1898523&r2=1898524&view=diff
>
> ==============================================================================
> ---
> subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
> (original)
> +++
> subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
> Wed Mar 2 11:04:31 2022
> @@ -1,15 +1,15 @@
> svn, version 1.9.0-dev (under development)
> compiled Feb 26 2014, 15:15:42 on x86_64-unknown-openbsd5.5
>
> -Copyright (C) 2014 The Apache Software Foundation.
> +Copyright (C) 2012 The Apache Software Foundation.
> This software consists of contributions made by many people;
> see the NOTICE file for more information.
> Subversion is open source software, see http://subversion.apache.org/
>
> Supported working copy (WC) formats:
>
> -* compatible with Subversion v1.8 to v1.15 (WC format 31)
> -* compatible with Subversion v1.15 (WC format 32)
> +* WC format 31, compatible with Subversion v1.8 and newer
> +* WC format 32, compatible with Subversion v1.15 and newer
>
> The following repository access (RA) modules are available:
>
Should the following lines also be removed from
subversion/tests/cmdline/getopt_tests.py (line numbers as of r1898187)? It
seems this was in the output previously but was remove a few revisions ago
so I dont think it has to be in the regex
103 # In svn --version, the supported WC versions vary.
104 (re.compile(r'^Supported working copy (WC)
version.*$'),
105 'Supported working copy (WC) versions: from X.Y to
X.Y')
Kind regards
Daniel Sahlberg
(This was not strictly caused by this commit but I couldnt find the
original mail right now)
>
Re: svn commit: r1898524 - in /subversion/trunk/subversion: svn/help-cmd.c tests/cmdline/getopt_tests_data/svn--version--verbose_stdout tests/cmdline/getopt_tests_data/svn--version_stdout
Posted by Daniel Sahlberg <da...@gmail.com>.
Den ons 2 mars 2022 12:04 <ju...@apache.org> skrev:
> Modified:
> subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout?rev=1898524&r1=1898523&r2=1898524&view=diff
>
> ==============================================================================
> ---
> subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
> (original)
> +++
> subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
> Wed Mar 2 11:04:31 2022
> @@ -1,15 +1,15 @@
> svn, version 1.9.0-dev (under development)
> compiled Feb 26 2014, 15:15:42 on x86_64-unknown-openbsd5.5
>
> -Copyright (C) 2014 The Apache Software Foundation.
> +Copyright (C) 2012 The Apache Software Foundation.
> This software consists of contributions made by many people;
> see the NOTICE file for more information.
> Subversion is open source software, see http://subversion.apache.org/
>
> Supported working copy (WC) formats:
>
> -* compatible with Subversion v1.8 to v1.15 (WC format 31)
> -* compatible with Subversion v1.15 (WC format 32)
> +* WC format 31, compatible with Subversion v1.8 and newer
> +* WC format 32, compatible with Subversion v1.15 and newer
>
> The following repository access (RA) modules are available:
>
Should the following lines also be removed from
subversion/tests/cmdline/getopt_tests.py (line numbers as of r1898187)? It
seems this was in the output previously but was remove a few revisions ago
so I dont think it has to be in the regex
103 # In svn --version, the supported WC versions vary.
104 (re.compile(r'^Supported working copy (WC)
version.*$'),
105 'Supported working copy (WC) versions: from X.Y to
X.Y')
Kind regards
Daniel Sahlberg
(This was not strictly caused by this commit but I couldnt find the
original mail right now)
>