svn commit: r1739803 - /subversion/trunk/subversion/svn/conflict-callbacks.c

[st...@apache.org]

Author: stsp
Date: Mon Apr 18 18:09:31 2016
New Revision: 1739803

URL: http://svn.apache.org/viewvc?rev=1739803&view=rev
Log:
In the 'svn resolve' conflict prompt, make custom short option descriptions
optional. Now we can just use the option description provided by libsvn_client
in the menu, if appropriate.

* subversion/svn/conflict-callbacks.c
  (builtin_resolver_options): Remove a custom short option description.
  (prompt_string): Show the long option description if no short one is given.

Modified:
    subversion/trunk/subversion/svn/conflict-callbacks.c

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1739803&r1=1739802&r2=1739803&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Mon Apr 18 18:09:31 2016
@@ -415,7 +415,7 @@ static const resolver_option_t builtin_r
     svn_client_conflict_option_update_any_moved_away_children },
 
   /* Options for incoming file add vs local file add upon merge. */
-  { "m", N_("merge incoming file into local file"), NULL,
+  { "m", NULL, NULL,
     svn_client_conflict_option_merge_incoming_added_file_text_merge },
 
   { NULL }
@@ -554,7 +554,8 @@ prompt_string(const resolver_option_t *o
       if (! first)
         result = apr_pstrcat(pool, result, ",", SVN_VA_NULL);
       s = apr_psprintf(pool, _(" (%s) %s"),
-                       opt->code, _(opt->short_desc));
+                       opt->code,
+                       opt->short_desc ? _(opt->short_desc) : opt->long_desc);
       slen = svn_utf_cstring_utf8_width(s);
       /* Break the line if adding the next option would make it too long */
       if (this_line_len + slen > MAX_PROMPT_WIDTH)