Author: rinrab
Date: Mon Jun 9 12:22:26 2025
New Revision: 1926278
URL: http://svn.apache.org/viewvc?rev=1926278&view=rev
Log:
On the 'utf8-cmdline-prototype' branch: sync with trunk, resolving conflicts.
Modified:
subversion/branches/utf8-cmdline-prototype/ (props changed)
subversion/branches/utf8-cmdline-prototype/build/cmake/FindSerf.cmake
subversion/branches/utf8-cmdline-prototype/subversion/include/private/svn_opt_private.h
subversion/branches/utf8-cmdline-prototype/subversion/include/svn_version.h
subversion/branches/utf8-cmdline-prototype/subversion/libsvn_client/cmdline.c
subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/opt.c
subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/opt_subcommand.c
subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/sysinfo.c
subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/sysinfo.h
subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/version.c
subversion/branches/utf8-cmdline-prototype/subversion/libsvn_wc/adm_files.c
Propchange: subversion/branches/utf8-cmdline-prototype/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1926037-1926277
Modified: subversion/branches/utf8-cmdline-prototype/build/cmake/FindSerf.cmake
URL: http://svn.apache.org/viewvc/subversion/branches/utf8-cmdline-prototype/build/cmake/FindSerf.cmake?rev=1926278&r1=1926277&r2=1926278&view=diff
==============================================================================
--- subversion/branches/utf8-cmdline-prototype/build/cmake/FindSerf.cmake (original)
+++ subversion/branches/utf8-cmdline-prototype/build/cmake/FindSerf.cmake Mon Jun 9 12:22:26 2025
@@ -19,16 +19,22 @@
# FindSerf.cmake -- CMake module for Serf library
#
+include(GNUInstallDirs)
+
find_path(Serf_INCLUDE_DIR
NAMES serf.h
PATH_SUFFIXES
include
+ "${CMAKE_INSTALL_INCLUDEDIR}"
+ include/serf-2
+ "${CMAKE_INSTALL_INCLUDEDIR}/serf-2"
include/serf-1
+ "${CMAKE_INSTALL_INCLUDEDIR}/serf-1"
)
find_library(Serf_LIBRARY
- NAMES serf-1
- PATH_SUFFIXES lib
+ NAMES serf-2 serf-1
+ PATH_SUFFIXES lib "${CMAKE_INSTALL_LIBDIR}"
)
mark_as_advanced(
Modified: subversion/branches/utf8-cmdline-prototype/subversion/include/private/svn_opt_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/utf8-cmdline-prototype/subversion/include/private/svn_opt_private.h?rev=1926278&r1=1926277&r2=1926278&view=diff
==============================================================================
--- subversion/branches/utf8-cmdline-prototype/subversion/include/private/svn_opt_private.h (original)
+++ subversion/branches/utf8-cmdline-prototype/subversion/include/private/svn_opt_private.h Mon Jun 9 12:22:26 2025
@@ -90,16 +90,13 @@ svn_opt__arg_canonicalize_path(const cha
apr_pool_t *pool);
/*
- * Pull remaining target arguments from OS into *TARGETS_P,
- * converting them to UTF-8, followed by targets from KNOWN_TARGETS
- * (which might come from, for example, the "--targets" command line
- * option), which are already in UTF-8.
+ * Processes arguments from from @a utf8_input_targets into @a targets_p.
*
* On each URL target, do some IRI-to-URI encoding and some
* auto-escaping. On each local path, canonicalize case and path
* separators.
*
- * Allocate *TARGETS_P and its elements in POOL.
+ * Allocate @a targets_p and its elements in @a pool.
*
* If a path has the same name as a Subversion working copy
* administrative directory, return SVN_ERR_RESERVED_FILENAME_SPECIFIED;
@@ -110,8 +107,8 @@ svn_opt__arg_canonicalize_path(const cha
* the operation before returning the error(s).
*/
svn_error_t *
-svn_opt__args_to_target_array(apr_array_header_t **targets_p,
- apr_getopt_t *os,
+svn_opt__process_target_array(apr_array_header_t **targets_p,
+ apr_array_header_t *utf8_input_targets,
const apr_array_header_t *known_targets,
apr_pool_t *pool);
Modified: subversion/branches/utf8-cmdline-prototype/subversion/include/svn_version.h
URL: http://svn.apache.org/viewvc/subversion/branches/utf8-cmdline-prototype/subversion/include/svn_version.h?rev=1926278&r1=1926277&r2=1926278&view=diff
==============================================================================
--- subversion/branches/utf8-cmdline-prototype/subversion/include/svn_version.h (original)
+++ subversion/branches/utf8-cmdline-prototype/subversion/include/svn_version.h Mon Jun 9 12:22:26 2025
@@ -391,6 +391,16 @@ const char *
svn_version_ext_runtime_osname(const svn_version_extended_t *ext_info);
/**
+ * Accessor for svn_version_extended_t.
+ *
+ * @return The name of the current locale character set.
+ *
+ * @since New in 1.15.
+ */
+const char *
+svn_version_ext_character_encoding(const svn_version_extended_t *ext_info);
+
+/**
* Dependent library information.
* Describes the name and versions of known dependencies
* used by libsvn_subr.
Modified: subversion/branches/utf8-cmdline-prototype/subversion/libsvn_client/cmdline.c
URL: http://svn.apache.org/viewvc/subversion/branches/utf8-cmdline-prototype/subversion/libsvn_client/cmdline.c?rev=1926278&r1=1926277&r2=1926278&view=diff
==============================================================================
--- subversion/branches/utf8-cmdline-prototype/subversion/libsvn_client/cmdline.c (original)
+++ subversion/branches/utf8-cmdline-prototype/subversion/libsvn_client/cmdline.c Mon Jun 9 12:22:26 2025
@@ -148,7 +148,7 @@ find_root_url(const char **root_url_p,
}
-/* Note: This is substantially copied from svn_opt__args_to_target_array() in
+/* Note: This is substantially copied from svn_opt__process_target_array() in
* order to move to libsvn_client while maintaining backward compatibility. */
svn_error_t *
svn_client__process_target_array(apr_array_header_t **targets_p,
Modified: subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/opt.c
URL: http://svn.apache.org/viewvc/subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/opt.c?rev=1926278&r1=1926277&r2=1926278&view=diff
==============================================================================
--- subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/opt.c (original)
+++ subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/opt.c Mon Jun 9 12:22:26 2025
@@ -218,6 +218,8 @@ svn_opt_parse_path(svn_opt_revision_t *r
return SVN_NO_ERROR;
}
+/* Note: This is substantially copied into svn_client_args_to_target_array() in
+ * order to move to libsvn_client while maintaining backward compatibility. */
svn_error_t *
svn_opt__args_to_target_array(apr_array_header_t **targets_p,
apr_getopt_t *os,
Modified: subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/opt_subcommand.c
URL: http://svn.apache.org/viewvc/subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/opt_subcommand.c?rev=1926278&r1=1926277&r2=1926278&view=diff
==============================================================================
--- subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/opt_subcommand.c (original)
+++ subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/opt_subcommand.c Mon Jun 9 12:22:26 2025
@@ -491,6 +491,9 @@ svn_opt__print_version_info(const char *
svn_version_ext_runtime_osname(info)));
}
+ SVN_ERR(svn_cmdline_printf(pool, _(" - character encoding: %s\n"),
+ svn_version_ext_character_encoding(info)));
+
libs = svn_version_ext_linked_libs(info);
if (libs && libs->nelts)
{
Modified: subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/sysinfo.c
URL: http://svn.apache.org/viewvc/subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/sysinfo.c?rev=1926278&r1=1926277&r2=1926278&view=diff
==============================================================================
--- subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/sysinfo.c (original)
+++ subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/sysinfo.c Mon Jun 9 12:22:26 2025
@@ -35,6 +35,7 @@
#include <apr_thread_proc.h>
#include <apr_version.h>
#include <apu_version.h>
+#include <apr_portable.h> /* for apr_os_locale_encoding() */
#include "svn_pools.h"
#include "svn_ctype.h"
@@ -137,6 +138,12 @@ svn_sysinfo__release_name(apr_pool_t *po
#endif
}
+const char *
+svn_sysinfo__character_encoding(apr_pool_t *pool)
+{
+ return apr_os_locale_encoding(pool);
+}
+
const apr_array_header_t *
svn_sysinfo__linked_libs(apr_pool_t *pool)
{
Modified: subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/sysinfo.h
URL: http://svn.apache.org/viewvc/subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/sysinfo.h?rev=1926278&r1=1926277&r2=1926278&view=diff
==============================================================================
--- subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/sysinfo.h (original)
+++ subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/sysinfo.h Mon Jun 9 12:22:26 2025
@@ -45,6 +45,12 @@ const char *svn_sysinfo__canonical_host(
*/
const char *svn_sysinfo__release_name(apr_pool_t *pool);
+/* Return the name of the current locale character set.
+ *
+ * All allocations are done in POOL.
+ */
+const char *svn_sysinfo__character_encoding(apr_pool_t *pool);
+
/* Return an array of svn_version_linked_lib_t of descriptions of the
* link-time and run-time versions of dependent libraries, or NULL of
* the info is not available.
Modified: subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/version.c
URL: http://svn.apache.org/viewvc/subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/version.c?rev=1926278&r1=1926277&r2=1926278&view=diff
==============================================================================
--- subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/version.c (original)
+++ subversion/branches/utf8-cmdline-prototype/subversion/libsvn_subr/version.c Mon Jun 9 12:22:26 2025
@@ -116,12 +116,13 @@ svn_ver_check_list2(const svn_version_t
struct svn_version_extended_t
{
- const char *build_date; /* Compilation date */
- const char *build_time; /* Compilation time */
- const char *build_host; /* Build canonical host name */
- const char *copyright; /* Copyright notice (localized) */
- const char *runtime_host; /* Runtime canonical host name */
- const char *runtime_osname; /* Running OS release name */
+ const char *build_date; /* Compilation date */
+ const char *build_time; /* Compilation time */
+ const char *build_host; /* Build canonical host name */
+ const char *copyright; /* Copyright notice (localized) */
+ const char *runtime_host; /* Runtime canonical host name */
+ const char *runtime_osname; /* Running OS release name */
+ const char *character_encoding; /* Encoding of the current locale */
/* Array of svn_version_ext_linked_lib_t describing dependent
libraries. */
@@ -153,6 +154,7 @@ svn_version_extended(svn_boolean_t verbo
{
info->runtime_host = svn_sysinfo__canonical_host(pool);
info->runtime_osname = svn_sysinfo__release_name(pool);
+ info->character_encoding = svn_sysinfo__character_encoding(pool);
info->linked_libs = svn_sysinfo__linked_libs(pool);
info->loaded_libs = svn_sysinfo__loaded_libs(pool);
}
@@ -197,6 +199,12 @@ svn_version_ext_runtime_osname(const svn
return ext_info->runtime_osname;
}
+const char *
+svn_version_ext_character_encoding(const svn_version_extended_t *ext_info)
+{
+ return ext_info->character_encoding;
+}
+
const apr_array_header_t *
svn_version_ext_linked_libs(const svn_version_extended_t *ext_info)
{
Modified: subversion/branches/utf8-cmdline-prototype/subversion/libsvn_wc/adm_files.c
URL: http://svn.apache.org/viewvc/subversion/branches/utf8-cmdline-prototype/subversion/libsvn_wc/adm_files.c?rev=1926278&r1=1926277&r2=1926278&view=diff
==============================================================================
--- subversion/branches/utf8-cmdline-prototype/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/branches/utf8-cmdline-prototype/subversion/libsvn_wc/adm_files.c Mon Jun 9 12:22:26 2025
@@ -83,7 +83,7 @@ svn_wc_set_adm_dir(const char *name, apr
FIXME:
An identical list is used in
- libsvn_subr/opt.c:svn_opt__args_to_target_array(),
+ libsvn_subr/opt.c:svn_opt__process_target_array(),
but that function can't use this list, because that use would
create a circular dependency between libsvn_wc and libsvn_subr.
Make sure changes to the lists are always synchronized! */
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.