@matheusbsbs / matheus-bagliano / commits / 224147704a

help: respect new common command grouping

'git help' shows common commands in alphabetical order: The most commonly used git commands are: add Add file contents to the index bisect Find by binary search the change that introduced a bug branch List, create, or delete branches checkout Checkout a branch or paths to the working tree clone Clone a repository into a new directory commit Record changes to the repository [...] without any indication of how commands relate to high-level concepts or each other. Revise the output to explain their relationship with the typical Git workflow: These are common Git commands used in various situations: start a working area (see also: git help tutorial) clone Clone a repository into a new directory init Create an empty Git repository or reinitialize [...] work on the current change (see also: git help everyday) add Add file contents to the index reset Reset current HEAD to the specified state examine the history and state (see also: git help revisions) log Show commit logs status Show the working tree status [...] Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Sébastien Guimmara <sebastien.guimmara@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Sébastien Guimmara committed May 21, 2015 at 19:39 UTC 224147704a3696d396dae005c280f7a25de407c7

1 file changed +23 -1

help.c

+23 -1

@@ -218,17 +218,39 @@ void list_commands(unsigned int colopts,

218 }

219 }

220

221 +static int cmd_group_cmp(const void *elem1, const void *elem2)

222 +{

223 + const struct cmdname_help *e1 = elem1;

224 + const struct cmdname_help *e2 = elem2;

225 +

226 + if (e1->group < e2->group)

227 + return -1;

228 + if (e1->group > e2->group)

229 + return 1;

230 + return strcmp(e1->name, e2->name);

231 +}

232 +

233 void list_common_cmds_help(void)

234 {

235 int i, longest = 0;

236 + int current_grp = -1;

237

238 for (i = 0; i < ARRAY_SIZE(common_cmds); i++) {

239 if (longest < strlen(common_cmds[i].name))

240 longest = strlen(common_cmds[i].name);

241 }

242

230 - puts(_("The most commonly used git commands are:"));

243 + qsort(common_cmds, ARRAY_SIZE(common_cmds),

244 + sizeof(common_cmds[0]), cmd_group_cmp);

245 +

246 + puts(_("These are common Git commands used in various situations:"));

247 +

248 for (i = 0; i < ARRAY_SIZE(common_cmds); i++) {

249 + if (common_cmds[i].group != current_grp) {

250 + printf("\n%s\n", _(common_cmd_groups[common_cmds[i].group]));

251 + current_grp = common_cmds[i].group;

252 + }

253 +

254 printf(" %s ", common_cmds[i].name);

255 mput_char(' ', longest - strlen(common_cmds[i].name));

256 puts(_(common_cmds[i].help));