[PATCH] remote: unify main and subcommand usage strings

[Thomas Rast <tr@thomasrast.ch>]

We had separate usages for each subcommand, and for the main command,
even though the latter is essentially a concatenation of all of the
former.  This leads to a lot of duplication and unnecessary
differences, e.g., in the 'set-head' case the two strings differ only
in a space.

Unify the strings in the usages by putting each of them in a variable,
and assembling the usage arrays from them.

Note that this patch changes the usage strings for the following
subcommands:

- prune and show: the individual usage only said [<options>].  Kept
  the snippet from the main usage, which is more specific.

- set-branches: kept the main usage, which is more concise in saying
  that --add is optional

Reported-by: Trần Ngọc Quân <vnwildman@gmail.com>
Signed-off-by: Thomas Rast <tr@thomasrast.ch>
---

Trần Ngọc Quân <vnwildman@gmail.com> wrote:
> On 02/11/2013 09:23, Jiang Xin wrote:
> > Confirmed, there is a typo in builtin/remote.c line 15. Have you send
> > patch to this list for this, Trần?
> >
> This is minor error, so let Junio C Hamano do it!

Dunno, this generally isn't the nicest way to get things done, nor the
most productive use of maintainer bandwidth.

How about patching it like this instead?  That should prevent similar
issues from cropping up again.


 builtin/remote.c | 70 +++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 47 insertions(+), 23 deletions(-)

diff --git a/builtin/remote.c b/builtin/remote.c
index 4e14891..2f6366a 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -7,67 +7,91 @@
 #include "run-command.h"
 #include "refs.h"
 
+static const char builtin_remote_add_usage_str[] =
+	N_("git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] "
+	   "[--mirror=<fetch|push>] <name> <url>");
+static const char builtin_remote_rename_usage_str[] =
+	N_("git remote rename <old> <new>");
+static const char builtin_remote_rm_usage_str[] =
+	N_("git remote remove <name>");
+static const char builtin_remote_sethead_usage_str[] =
+	N_("git remote set-head <name> (-a | --auto | -d | --delete | <branch>)");
+static const char builtin_remote_setbranches_usage_str[] =
+	N_("git remote set-branches [--add] <name> <branch>...");
+static const char builtin_remote_show_usage_str[] =
+	N_("git remote [-v | --verbose] show [-n] <name>");
+static const char builtin_remote_prune_usage_str[] =
+	N_("git remote prune [-n | --dry-run] <name>");
+static const char builtin_remote_update_usage_str[] =
+	N_("git remote [-v | --verbose] update [-p | --prune] "
+	   "[(<group> | <remote>)...]");
+static const char builtin_remote_seturl_usage_str[] =
+	N_("git remote set-url [--push] <name> <newurl> [<oldurl>]");
+static const char builtin_remote_seturl_add_usage_str[] =
+	N_("git remote set-url --add <name> <newurl>");
+static const char builtin_remote_seturl_delete_usage_str[] =
+	N_("git remote set-url --delete <name> <url>");
+
 static const char * const builtin_remote_usage[] = {
 	N_("git remote [-v | --verbose]"),
-	N_("git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--mirror=<fetch|push>] <name> <url>"),
-	N_("git remote rename <old> <new>"),
-	N_("git remote remove <name>"),
-	N_("git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"),
-	N_("git remote [-v | --verbose] show [-n] <name>"),
-	N_("git remote prune [-n | --dry-run] <name>"),
-	N_("git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"),
-	N_("git remote set-branches [--add] <name> <branch>..."),
-	N_("git remote set-url [--push] <name> <newurl> [<oldurl>]"),
-	N_("git remote set-url --add <name> <newurl>"),
-	N_("git remote set-url --delete <name> <url>"),
+	builtin_remote_add_usage_str,
+	builtin_remote_rename_usage_str,
+	builtin_remote_rm_usage_str,
+	builtin_remote_sethead_usage_str,
+	builtin_remote_show_usage_str,
+	builtin_remote_prune_usage_str,
+	builtin_remote_update_usage_str,
+	builtin_remote_setbranches_usage_str,
+	builtin_remote_seturl_usage_str,
+	builtin_remote_seturl_add_usage_str,
+	builtin_remote_seturl_delete_usage_str,
 	NULL
 };
 
 static const char * const builtin_remote_add_usage[] = {
-	N_("git remote add [<options>] <name> <url>"),
+	builtin_remote_add_usage_str,
 	NULL
 };
 
 static const char * const builtin_remote_rename_usage[] = {
-	N_("git remote rename <old> <new>"),
+	builtin_remote_rename_usage_str,
 	NULL
 };
 
 static const char * const builtin_remote_rm_usage[] = {
-	N_("git remote remove <name>"),
+	builtin_remote_rm_usage_str,
 	NULL
 };
 
 static const char * const builtin_remote_sethead_usage[] = {
-	N_("git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"),
+	builtin_remote_sethead_usage_str,
 	NULL
 };
 
 static const char * const builtin_remote_setbranches_usage[] = {
-	N_("git remote set-branches <name> <branch>..."),
-	N_("git remote set-branches --add <name> <branch>..."),
+	builtin_remote_setbranches_usage_str,
 	NULL
 };
 
 static const char * const builtin_remote_show_usage[] = {
-	N_("git remote show [<options>] <name>"),
+	builtin_remote_show_usage_str,
 	NULL
 };
 
 static const char * const builtin_remote_prune_usage[] = {
-	N_("git remote prune [<options>] <name>"),
+	builtin_remote_prune_usage_str,
 	NULL
 };
 
 static const char * const builtin_remote_update_usage[] = {
-	N_("git remote update [<options>] [<group> | <remote>]..."),
+	builtin_remote_update_usage_str,
 	NULL
 };
 
 static const char * const builtin_remote_seturl_usage[] = {
-	N_("git remote set-url [--push] <name> <newurl> [<oldurl>]"),
-	N_("git remote set-url --add <name> <newurl>"),
-	N_("git remote set-url --delete <name> <url>"),
+	builtin_remote_seturl_usage_str,
+	builtin_remote_seturl_add_usage_str,
+	builtin_remote_seturl_delete_usage_str,
 	NULL
 };
 
-- 
1.8.4.2.838.g4c8c068