diff options
Diffstat (limited to 'subversion/svn/help-cmd.c')
| -rw-r--r-- | subversion/svn/help-cmd.c | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/subversion/svn/help-cmd.c b/subversion/svn/help-cmd.c index b095d30fd1c2..fc3558683033 100644 --- a/subversion/svn/help-cmd.c +++ b/subversion/svn/help-cmd.c @@ -53,8 +53,9 @@ svn_cl__help(apr_getopt_t *os, N_("usage: svn <subcommand> [options] [args]\n" "Subversion command-line client.\n" "Type 'svn help <subcommand>' for help on a specific subcommand.\n" - "Type 'svn --version' to see the program version and RA modules\n" - " or 'svn --version --quiet' to see just the version number.\n" + "Type 'svn --version' to see the program version and RA modules,\n" + " 'svn --version --verbose' to see dependency versions as well,\n" + " 'svn --version --quiet' to see just the version number.\n" "\n" "Most subcommands take file and/or directory arguments, recursing\n" "on the directories. If no arguments are supplied to such a\n" @@ -147,21 +148,24 @@ svn_cl__help(apr_getopt_t *os, _("\nThe following authentication credential caches are available:\n\n")); /*### There is no API to query available providers at run time. */ + if (config_path) + { #if (defined(WIN32) && !defined(__MINGW32__)) - version_footer = - svn_stringbuf_create(apr_psprintf(pool, _("%s* Wincrypt cache in %s\n"), - version_footer->data, - svn_dirent_local_style(config_path, - pool)), - pool); + version_footer = + svn_stringbuf_create(apr_psprintf(pool, _("%s* Wincrypt cache in %s\n"), + version_footer->data, + svn_dirent_local_style(config_path, + pool)), + pool); #elif !defined(SVN_DISABLE_PLAINTEXT_PASSWORD_STORAGE) - version_footer = - svn_stringbuf_create(apr_psprintf(pool, _("%s* Plaintext cache in %s\n"), - version_footer->data, - svn_dirent_local_style(config_path, - pool)), - pool); + version_footer = + svn_stringbuf_create(apr_psprintf(pool, _("%s* Plaintext cache in %s\n"), + version_footer->data, + svn_dirent_local_style(config_path, + pool)), + pool); #endif + } #ifdef SVN_HAVE_GNOME_KEYRING svn_stringbuf_appendcstr(version_footer, "* Gnome Keyring\n"); #endif @@ -181,7 +185,7 @@ svn_cl__help(apr_getopt_t *os, opt_state ? opt_state->quiet : FALSE, opt_state ? opt_state->verbose : FALSE, version_footer->data, - help_header, /* already gettext()'d */ + _(help_header), svn_cl__cmd_table, svn_cl__options, svn_cl__global_options, |