Author: julianfoad
Date: Thu Feb 24 16:41:04 2022
New Revision: 1898380
URL: http://svn.apache.org/viewvc?rev=1898380&view=rev
Log:
Multi-WC-format, issue #4884: remove svn info --show-item=wc-format-min/max.
These two items were showing properties of the software, whereas 'svn info'
is intended to show properties of the working copy and versioned nodes.
(The output of 'svn --version' shows the supported WC versions.)
* subversion/include/svn_wc.h,
subversion/libsvn_wc/info.c
(svn_wc_info_t,
build_info_for_node): Remove wc-format-min and wc-format-max options.
* subversion/svn/info-cmd.c
(info_item_t,
info_item_map,
print_info_item): Remove wc-format-min and wc-format-max options.
Modified:
subversion/trunk/subversion/include/svn_wc.h
subversion/trunk/subversion/libsvn_wc/info.c
subversion/trunk/subversion/svn/info-cmd.c
Modified: subversion/trunk/subversion/include/svn_wc.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1898380&r1=1898379&r2=1898380&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Thu Feb 24 16:41:04 2022
@@ -3298,18 +3298,6 @@ typedef struct svn_wc_info_t
* @since New in 1.15.
*/
int wc_format;
-
- /**
- * The oldest supported working copy format, #SVN_WC__SUPPORTED_VERSION.
- * @since New in 1.15.
- */
- int wc_format_min;
-
- /**
- * The newest supported working copy format, #SVN_WC__VERSION.
- * @since New in 1.15.
- */
- int wc_format_max;
} svn_wc_info_t;
/**
Modified: subversion/trunk/subversion/libsvn_wc/info.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/info.c?rev=1898380&r1=1898379&r2=1898380&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/info.c (original)
+++ subversion/trunk/subversion/libsvn_wc/info.c Thu Feb 24 16:41:04 2022
@@ -105,8 +105,6 @@ build_info_for_node(svn_wc__info2_t **in
tmpinfo->wc_info = wc_info;
wc_info->copyfrom_rev = SVN_INVALID_REVNUM;
- wc_info->wc_format_min = SVN_WC__SUPPORTED_VERSION;
- wc_info->wc_format_max = SVN_WC__VERSION;
SVN_ERR(svn_wc__db_get_format(&wc_info->wc_format,
db, local_abspath, scratch_pool));
Modified: subversion/trunk/subversion/svn/info-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/info-cmd.c?rev=1898380&r1=1898379&r2=1898380&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/info-cmd.c (original)
+++ subversion/trunk/subversion/svn/info-cmd.c Thu Feb 24 16:41:04 2022
@@ -369,9 +369,7 @@ typedef enum
info_item_schedule,
info_item_depth,
info_item_changelist,
- info_item_wc_format,
- info_item_wc_format_min,
- info_item_wc_format_max
+ info_item_wc_format
} info_item_t;
/* Mapping between option keywords and info_item_t. */
@@ -399,8 +397,6 @@ static const info_item_map_t info_item_m
{ SVN__STATIC_STRING("depth"), info_item_depth },
{ SVN__STATIC_STRING("changelist"), info_item_changelist },
{ SVN__STATIC_STRING("wc-format"), info_item_wc_format },
- { SVN__STATIC_STRING("wc-format-min"), info_item_wc_format_min },
- { SVN__STATIC_STRING("wc-format-max"), info_item_wc_format_max },
};
static const apr_size_t info_item_map_len =
@@ -1251,18 +1247,6 @@ print_info_item(void *baton,
target_path, pool));
break;
- case info_item_wc_format_min:
- SVN_ERR(print_info_item_int((info->wc_info
- ? info->wc_info->wc_format_min : -1),
- target_path, pool));
- break;
-
- case info_item_wc_format_max:
- SVN_ERR(print_info_item_int((info->wc_info
- ? info->wc_info->wc_format_max : -1),
- target_path, pool));
- break;
-
case info_item_changelist:
SVN_ERR(print_info_item_string(
((info->wc_info && info->wc_info->changelist)
