{"thread":{"id":"39386","subject":"[PATCH v9 0/5] group common commands by theme","startedAt":"2015-05-20T19:22:56Z","lastAt":"2015-05-20T21:42:12Z","messageCount":15,"participants":["Sébastien Guimmara","Eric Sunshine","Stefan Beller","Ramsay Jones"],"isPatch":true,"patchVersion":9,"patchTotal":5},"messages":[{"id":"261689","messageId":"1432149781-24596-1-git-send-email-sebastien.guimmara@gmail.com","threadId":"39386","inReplyTo":null,"subject":"[PATCH v9 0/5] group common commands by theme","fromName":"Sébastien Guimmara","fromEmail":"sebastien.guimmara@gmail.com","sentAt":"2015-05-20T19:22:56Z","receivedAt":"2015-05-20T19:22:56Z","isPatch":true,"sender":{"key":"sebastien.guimmara@gmail.com","avatar":"https://gravatar.com/avatar/05d0b6a53712c5ed78d640976986949a3bda22c0dbf5ff13cabdd12c3f4094d6?d=mp&s=160"},"body":"The major modification of this reroll [1] is the use of the perl version\nof generate-cmdlist instead of the awk one.\n\nhelp.c:\n1. change the introductory message from:\n\t\"The typical Git workflow includes:\"\nto:\n \"These are common Git commands used in various situations:\"\n\n2. include Ramsay's patch [2]\n\n[1]: v8: http://thread.gmane.org/gmane.comp.version-control.git/269305\n[2]: http://thread.gmane.org/gmane.comp.version-control.git/269387\n\nEric Sunshine (2):\n command-list: prepare machinery for upcoming \"common groups\" section\n generate-cmdlist: parse common group commands\n\nSébastien Guimmara (3):\n command-list.txt: add the common groups block\n command-list.txt: drop the \"common\" tag\n help: respect new common command grouping\n\n Documentation/cmd-list.perl | 4 ++++\n Makefile | 9 ++++----\n command-list.txt | 53 +++++++++++++++++++++++++++------------------\n generate-cmdlist.perl | 50 ++++++++++++++++++++++++++++++++++++++++++\n generate-cmdlist.sh | 23 --------------------\n help.c | 24 +++++++++++++++++++-\n 6 files changed, 114 insertions(+), 49 deletions(-)\n create mode 100755 generate-cmdlist.perl\n delete mode 100755 generate-cmdlist.sh\n\n-- \n2.4.0.GIT\n"},{"id":"261690","messageId":"1432149781-24596-2-git-send-email-sebastien.guimmara@gmail.com","threadId":"39386","inReplyTo":"1432149781-24596-1-git-send-email-sebastien.guimmara@gmail.com","subject":"[PATCH v9 1/5] command-list: prepare machinery for upcoming \"common groups\" section","fromName":"Sébastien Guimmara","fromEmail":"sebastien.guimmara@gmail.com","sentAt":"2015-05-20T19:22:57Z","receivedAt":"2015-05-20T19:22:57Z","isPatch":true,"sender":{"key":"sebastien.guimmara@gmail.com","avatar":"https://gravatar.com/avatar/05d0b6a53712c5ed78d640976986949a3bda22c0dbf5ff13cabdd12c3f4094d6?d=mp&s=160"},"body":"From: Eric Sunshine \n\nThe ultimate goal is for \"git help\" to classify common commands by\ngroup. Toward this end, a subsequent patch will add a new \"common\ngroups\" section to command-list.txt preceding the actual command list.\nAs preparation, teach existing command-list.txt parsing machinery, which\ndoesn't care about grouping, to skip over this upcoming \"common groups\"\nsection.\n\nSigned-off-by: Eric Sunshine \nSigned-off-by: Sébastien Guimmara \n---\n Documentation/cmd-list.perl | 4 ++++\n Makefile | 5 +++--\n command-list.txt | 3 ++-\n 3 files changed, 9 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/cmd-list.perl b/Documentation/cmd-list.perl\nindex 04f9977..5aa73cf 100755\n--- a/Documentation/cmd-list.perl\n+++ b/Documentation/cmd-list.perl\n@@ -38,6 +38,10 @@ sub format_one {\n \t}\n }\n \n+while (<>) {\n+\tlast if /^### command list/;\n+}\n+\n my %cmds = ();\n for (sort <>) {\n \tnext if /^#/;\ndiff --git a/Makefile b/Makefile\nindex 323c401..655740d 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -2455,7 +2455,7 @@ check-docs::\n \t\tesac ; \\\n \t\ttest -f \"Documentation/$$v.txt\" || \\\n \t\techo \"no doc: $$v\"; \\\n-\t\tsed -e '/^#/d' command-list.txt | \\\n+\t\tsed -e '1,/^### command list/d' -e '/^#/d' command-list.txt | \\\n \t\tgrep -q \"^$$v[ \t]\" || \\\n \t\tcase \"$$v\" in \\\n \t\tgit) ;; \\\n@@ -2463,7 +2463,8 @@ check-docs::\n \t\tesac ; \\\n \tdone; \\\n \t( \\\n-\t\tsed -e '/^#/d' \\\n+\t\tsed -e '1,/^### command list/d' \\\n+\t\t -e '/^#/d' \\\n \t\t -e 's/[ \t].*//' \\\n \t\t -e 's/^/listed /' command-list.txt; \\\n \t\t$(MAKE) -C Documentation print-man1 | \\\ndiff --git a/command-list.txt b/command-list.txt\nindex 54d8d21..609b344 100644\n--- a/command-list.txt\n+++ b/command-list.txt\n@@ -1,4 +1,5 @@\n-# List of known git commands.\n+# do not molest the next line\n+### command list\n # command name category [deprecated] [common]\n git-add mainporcelain common\n git-am mainporcelain\n-- \n2.4.0.GIT\n"},{"id":"261691","messageId":"1432149781-24596-3-git-send-email-sebastien.guimmara@gmail.com","threadId":"39386","inReplyTo":"1432149781-24596-1-git-send-email-sebastien.guimmara@gmail.com","subject":"[PATCH v9 2/5] command-list.txt: add the common groups block","fromName":"Sébastien Guimmara","fromEmail":"sebastien.guimmara@gmail.com","sentAt":"2015-05-20T19:22:58Z","receivedAt":"2015-05-20T19:22:58Z","isPatch":true,"sender":{"key":"sebastien.guimmara@gmail.com","avatar":"https://gravatar.com/avatar/05d0b6a53712c5ed78d640976986949a3bda22c0dbf5ff13cabdd12c3f4094d6?d=mp&s=160"},"body":"The ultimate goal is for \"git help\" to display common commands in\ngroups rather than alphabetically. As a first step, define the\ngroups in a new block, and then assign a group to each\ncommon command.\n\nAdd a block at the beginning of command-list.txt:\n\n init start a working area (see also: git help tutorial)\n worktree work on the current change (see also:[...]\n info examine the history and state (see also: git [...]\n history grow, mark and tweak your history\n remote collaborate (see also: git help workflows)\n\nstoring information about common commands group, then map each common\ncommand to a group:\n\n git-add mainporcelain common worktree\n\nHelped-by: Eric Sunshine \nHelped-by: Junio C Hamano \nHelped-by: Emma Jane Hogbin Westby \nSigned-off-by: Sébastien Guimmara \n---\n command-list.txt | 50 ++++++++++++++++++++++++++++++--------------------\n 1 file changed, 30 insertions(+), 20 deletions(-)\n\ndiff --git a/command-list.txt b/command-list.txt\nindex 609b344..c2bbdc1 100644\n--- a/command-list.txt\n+++ b/command-list.txt\n@@ -1,3 +1,13 @@\n+# common commands are grouped by themes output by 'git help'\n+# map each common command in the command list to one of these groups.\n+### common groups\n+init start a working area (see also: git help tutorial)\n+worktree work on the current change (see also: git help everyday)\n+info examine the history and state (see also: git help revisions)\n+history grow, mark and tweak your common history\n+remote collaborate (see also: git help workflows)\n+\n+# List of known git commands.\n # do not molest the next line\n ### command list\n # command name category [deprecated] [common]\n@@ -7,24 +17,24 @@ git-annotate ancillaryinterrogators\n git-apply plumbingmanipulators\n git-archimport foreignscminterface\n git-archive mainporcelain\n-git-bisect mainporcelain common\n+git-bisect mainporcelain common info\n git-blame ancillaryinterrogators\n-git-branch mainporcelain common\n+git-branch mainporcelain common history\n git-bundle mainporcelain\n git-cat-file plumbinginterrogators\n git-check-attr purehelpers\n git-check-ignore purehelpers\n git-check-mailmap purehelpers\n-git-checkout mainporcelain common\n+git-checkout mainporcelain common history\n git-checkout-index plumbingmanipulators\n git-check-ref-format purehelpers\n git-cherry ancillaryinterrogators\n git-cherry-pick mainporcelain\n git-citool mainporcelain\n git-clean mainporcelain\n-git-clone mainporcelain common\n+git-clone mainporcelain common init\n git-column purehelpers\n-git-commit mainporcelain common\n+git-commit mainporcelain common history\n git-commit-tree plumbingmanipulators\n git-config ancillarymanipulators\n git-count-objects ancillaryinterrogators\n@@ -36,14 +46,14 @@ git-cvsimport foreignscminterface\n git-cvsserver foreignscminterface\n git-daemon synchingrepositories\n git-describe mainporcelain\n-git-diff mainporcelain common\n+git-diff mainporcelain common history\n git-diff-files plumbinginterrogators\n git-diff-index plumbinginterrogators\n git-diff-tree plumbinginterrogators\n git-difftool ancillaryinterrogators\n git-fast-export ancillarymanipulators\n git-fast-import ancillarymanipulators\n-git-fetch mainporcelain common\n+git-fetch mainporcelain common remote\n git-fetch-pack synchingrepositories\n git-filter-branch ancillarymanipulators\n git-fmt-merge-msg purehelpers\n@@ -52,7 +62,7 @@ git-format-patch mainporcelain\n git-fsck ancillaryinterrogators\n git-gc mainporcelain\n git-get-tar-commit-id ancillaryinterrogators\n-git-grep mainporcelain common\n+git-grep mainporcelain common info\n git-gui mainporcelain\n git-hash-object plumbingmanipulators\n git-help ancillaryinterrogators\n@@ -61,17 +71,17 @@ git-http-fetch synchelpers\n git-http-push synchelpers\n git-imap-send foreignscminterface\n git-index-pack plumbingmanipulators\n-git-init mainporcelain common\n+git-init mainporcelain common init\n git-instaweb ancillaryinterrogators\n git-interpret-trailers purehelpers\n gitk mainporcelain\n-git-log mainporcelain common\n+git-log mainporcelain common info\n git-ls-files plumbinginterrogators\n git-ls-remote plumbinginterrogators\n git-ls-tree plumbinginterrogators\n git-mailinfo purehelpers\n git-mailsplit purehelpers\n-git-merge mainporcelain common\n+git-merge mainporcelain common history\n git-merge-base plumbinginterrogators\n git-merge-file plumbingmanipulators\n git-merge-index plumbingmanipulators\n@@ -80,7 +90,7 @@ git-mergetool ancillarymanipulators\n git-merge-tree ancillaryinterrogators\n git-mktag plumbingmanipulators\n git-mktree plumbingmanipulators\n-git-mv mainporcelain common\n+git-mv mainporcelain common worktree\n git-name-rev plumbinginterrogators\n git-notes mainporcelain\n git-p4 foreignscminterface\n@@ -91,11 +101,11 @@ git-parse-remote synchelpers\n git-patch-id purehelpers\n git-prune ancillarymanipulators\n git-prune-packed plumbingmanipulators\n-git-pull mainporcelain common\n-git-push mainporcelain common\n+git-pull mainporcelain common remote\n+git-push mainporcelain common remote\n git-quiltimport foreignscminterface\n git-read-tree plumbingmanipulators\n-git-rebase mainporcelain common\n+git-rebase mainporcelain common history\n git-receive-pack synchelpers\n git-reflog ancillarymanipulators\n git-relink ancillarymanipulators\n@@ -104,28 +114,28 @@ git-repack ancillarymanipulators\n git-replace ancillarymanipulators\n git-request-pull foreignscminterface\n git-rerere ancillaryinterrogators\n-git-reset mainporcelain common\n+git-reset mainporcelain common worktree\n git-revert mainporcelain\n git-rev-list plumbinginterrogators\n git-rev-parse ancillaryinterrogators\n-git-rm mainporcelain common\n+git-rm mainporcelain common worktree\n git-send-email foreignscminterface\n git-send-pack synchingrepositories\n git-shell synchelpers\n git-shortlog mainporcelain\n-git-show mainporcelain common\n+git-show mainporcelain common info\n git-show-branch ancillaryinterrogators\n git-show-index plumbinginterrogators\n git-show-ref plumbinginterrogators\n git-sh-i18n purehelpers\n git-sh-setup purehelpers\n git-stash mainporcelain\n-git-status mainporcelain common\n+git-status mainporcelain common info\n git-stripspace purehelpers\n git-submodule mainporcelain\n git-svn foreignscminterface\n git-symbolic-ref plumbingmanipulators\n-git-tag mainporcelain common\n+git-tag mainporcelain common history\n git-unpack-file plumbinginterrogators\n git-unpack-objects plumbingmanipulators\n git-update-index plumbingmanipulators\n-- \n2.4.0.GIT\n"},{"id":"261692","messageId":"1432149781-24596-4-git-send-email-sebastien.guimmara@gmail.com","threadId":"39386","inReplyTo":"1432149781-24596-1-git-send-email-sebastien.guimmara@gmail.com","subject":"[PATCH v9 3/5] generate-cmdlist: parse common group commands","fromName":"Sébastien Guimmara","fromEmail":"sebastien.guimmara@gmail.com","sentAt":"2015-05-20T19:22:59Z","receivedAt":"2015-05-20T19:22:59Z","isPatch":true,"sender":{"key":"sebastien.guimmara@gmail.com","avatar":"https://gravatar.com/avatar/05d0b6a53712c5ed78d640976986949a3bda22c0dbf5ff13cabdd12c3f4094d6?d=mp&s=160"},"body":"From: Eric Sunshine \n\nParse the group block to create the array of group descriptions:\n\nstatic char *common_cmd_groups[] = {\n N_(\"starting a working area\"),\n N_(\"working on the current change\"),\n N_(\"working with others\"),\n N_(\"examining the history and state\"),\n N_(\"growing, marking and tweaking your history\"),\n};\n\nthen map each element of common_cmds[] to a group via its index:\n\nstatic struct cmdname_help common_cmds[] = {\n {\"add\", N_(\"Add file contents to the index\"), 1},\n {\"branch\", N_(\"List, create, or delete branches\"), 4},\n {\"checkout\", N_(\"Checkout a branch or paths to the ...\"), 4},\n {\"clone\", N_(\"Clone a repository into a new directory\"), 0},\n {\"commit\", N_(\"Record changes to the repository\"), 4},\n ...\n};\n\nso that 'git help' can print those commands grouped by theme.\n\nOnly commands tagged with an attribute from the group block are emitted to\ncommon_cmds[].\n\n[commit message by Sébastien Guimmara ]\n\nSigned-off-by: Eric Sunshine \nSigned-off-by: Sébastien Guimmara \n---\n Makefile | 4 ++--\n generate-cmdlist.perl | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++\n generate-cmdlist.sh | 23 -----------------------\n 3 files changed, 52 insertions(+), 25 deletions(-)\n create mode 100755 generate-cmdlist.perl\n delete mode 100755 generate-cmdlist.sh\n\ndiff --git a/Makefile b/Makefile\nindex 655740d..54ec511 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1694,10 +1694,10 @@ $(BUILT_INS): git$X\n \tln -s $< $@ 2>/dev/null || \\\n \tcp $< $@\n \n-common-cmds.h: ./generate-cmdlist.sh command-list.txt\n+common-cmds.h: generate-cmdlist.perl command-list.txt\n \n common-cmds.h: $(wildcard Documentation/git-*.txt)\n-\t$(QUIET_GEN)./generate-cmdlist.sh > $@+ && mv $@+ $@\n+\t$(QUIET_GEN)$(PERL_PATH) generate-cmdlist.perl command-list.txt > $@+ && mv $@+ $@\n \n SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\\\n \t$(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\\\ndiff --git a/generate-cmdlist.perl b/generate-cmdlist.perl\nnew file mode 100755\nindex 0000000..31516e3\n--- /dev/null\n+++ b/generate-cmdlist.perl\n@@ -0,0 +1,50 @@\n+#!/usr/bin/perl\n+use strict;\n+use warnings;\n+\n+print <<\"EOT\";\n+/* Automatically generated by $0 */\n+\n+struct cmdname_help {\n+\tchar name[16];\n+\tchar help[80];\n+\tunsigned char group;\n+};\n+\n+static char *common_cmd_groups[] = {\n+EOT\n+\n+my $n = 0;\n+my %grp;\n+while (<>) {\n+\tlast if /^### command list/;\n+\tnext if (1../^### common groups/) || /^#/ || /^\\s*$/;\n+\tchop;\n+\tmy ($k, $v) = split ' ', $_, 2;\n+\t$grp{$k} = $n++;\n+\tprint \"\\tN_(\\\"$v\\\"),\\n\";\n+}\n+\n+print \"};\\n\\nstatic struct cmdname_help common_cmds[] = {\\n\";\n+\n+while (<>) {\n+\tnext if /^#/ || /^\\s*$/;\n+\tmy @tags = split;\n+\tmy $cmd = shift @tags;\n+\tfor my $t (@tags) {\n+\t\tif (exists $grp{$t}) {\n+\t\t\tmy $s;\n+\t\t\topen my $f, '<', \"Documentation/$cmd.txt\" or die;\n+\t\t\twhile (<$f>) {\n+\t\t\t\t($s) = /^$cmd - (.+)$/;\n+\t\t\t\tlast if $s;\n+\t\t\t}\n+\t\t\tclose $f;\n+\t\t\t$cmd =~ s/^git-//;\n+\t\t\tprint \"\\t{\\\"$cmd\\\", N_(\\\"$s\\\"), $grp{$t}},\\n\";\n+\t\t\tlast;\n+\t\t}\n+\t}\n+}\n+\n+print \"};\\n\";\ndiff --git a/generate-cmdlist.sh b/generate-cmdlist.sh\ndeleted file mode 100755\nindex 9a4c9b9..0000000\n--- a/generate-cmdlist.sh\n+++ /dev/null\n@@ -1,23 +0,0 @@\n-#!/bin/sh\n-\n-echo \"/* Automatically generated by $0 */\n-struct cmdname_help {\n- char name[16];\n- char help[80];\n-};\n-\n-static struct cmdname_help common_cmds[] = {\"\n-\n-sed -n -e 's/^git-\\([^ \t]*\\)[ \t].* common.*/\\1/p' command-list.txt |\n-sort |\n-while read cmd\n-do\n- sed -n '\n- /^NAME/,/git-'\"$cmd\"'/H\n- ${\n-\t x\n-\t s/.*git-'\"$cmd\"' - \\(.*\\)/ {\"'\"$cmd\"'\", N_(\"\\1\")},/\n-\t p\n- }' \"Documentation/git-$cmd.txt\"\n-done\n-echo \"};\"\n-- \n2.4.0.GIT\n"},{"id":"261693","messageId":"1432149781-24596-5-git-send-email-sebastien.guimmara@gmail.com","threadId":"39386","inReplyTo":"1432149781-24596-1-git-send-email-sebastien.guimmara@gmail.com","subject":"[PATCH v9 4/5] command-list.txt: drop the \"common\" tag","fromName":"Sébastien Guimmara","fromEmail":"sebastien.guimmara@gmail.com","sentAt":"2015-05-20T19:23:00Z","receivedAt":"2015-05-20T19:23:00Z","isPatch":true,"sender":{"key":"sebastien.guimmara@gmail.com","avatar":"https://gravatar.com/avatar/05d0b6a53712c5ed78d640976986949a3bda22c0dbf5ff13cabdd12c3f4094d6?d=mp&s=160"},"body":"command-list.sh, retired in the previous patch, was the only\nconsumer of the \"common\" tag, so drop this now-unnecessary\nattribute.\n\nbefore:\n git-add mainporcelain common worktree\n\nafter:\n git-add mainporcelain worktree\n\nHelped-by: Eric Sunshine \nSigned-off-by: Sébastien Guimmara \n---\n command-list.txt | 42 +++++++++++++++++++++---------------------\n 1 file changed, 21 insertions(+), 21 deletions(-)\n\ndiff --git a/command-list.txt b/command-list.txt\nindex c2bbdc1..080d6d9 100644\n--- a/command-list.txt\n+++ b/command-list.txt\n@@ -11,30 +11,30 @@ remote collaborate (see also: git help workflows)\n # do not molest the next line\n ### command list\n # command name category [deprecated] [common]\n-git-add mainporcelain common\n+git-add mainporcelain worktree\n git-am mainporcelain\n git-annotate ancillaryinterrogators\n git-apply plumbingmanipulators\n git-archimport foreignscminterface\n git-archive mainporcelain\n-git-bisect mainporcelain common info\n+git-bisect mainporcelain info\n git-blame ancillaryinterrogators\n-git-branch mainporcelain common history\n+git-branch mainporcelain history\n git-bundle mainporcelain\n git-cat-file plumbinginterrogators\n git-check-attr purehelpers\n git-check-ignore purehelpers\n git-check-mailmap purehelpers\n-git-checkout mainporcelain common history\n+git-checkout mainporcelain history\n git-checkout-index plumbingmanipulators\n git-check-ref-format purehelpers\n git-cherry ancillaryinterrogators\n git-cherry-pick mainporcelain\n git-citool mainporcelain\n git-clean mainporcelain\n-git-clone mainporcelain common init\n+git-clone mainporcelain init\n git-column purehelpers\n-git-commit mainporcelain common history\n+git-commit mainporcelain history\n git-commit-tree plumbingmanipulators\n git-config ancillarymanipulators\n git-count-objects ancillaryinterrogators\n@@ -46,14 +46,14 @@ git-cvsimport foreignscminterface\n git-cvsserver foreignscminterface\n git-daemon synchingrepositories\n git-describe mainporcelain\n-git-diff mainporcelain common history\n+git-diff mainporcelain history\n git-diff-files plumbinginterrogators\n git-diff-index plumbinginterrogators\n git-diff-tree plumbinginterrogators\n git-difftool ancillaryinterrogators\n git-fast-export ancillarymanipulators\n git-fast-import ancillarymanipulators\n-git-fetch mainporcelain common remote\n+git-fetch mainporcelain remote\n git-fetch-pack synchingrepositories\n git-filter-branch ancillarymanipulators\n git-fmt-merge-msg purehelpers\n@@ -62,7 +62,7 @@ git-format-patch mainporcelain\n git-fsck ancillaryinterrogators\n git-gc mainporcelain\n git-get-tar-commit-id ancillaryinterrogators\n-git-grep mainporcelain common info\n+git-grep mainporcelain info\n git-gui mainporcelain\n git-hash-object plumbingmanipulators\n git-help ancillaryinterrogators\n@@ -71,17 +71,17 @@ git-http-fetch synchelpers\n git-http-push synchelpers\n git-imap-send foreignscminterface\n git-index-pack plumbingmanipulators\n-git-init mainporcelain common init\n+git-init mainporcelain init\n git-instaweb ancillaryinterrogators\n git-interpret-trailers purehelpers\n gitk mainporcelain\n-git-log mainporcelain common info\n+git-log mainporcelain info\n git-ls-files plumbinginterrogators\n git-ls-remote plumbinginterrogators\n git-ls-tree plumbinginterrogators\n git-mailinfo purehelpers\n git-mailsplit purehelpers\n-git-merge mainporcelain common history\n+git-merge mainporcelain history\n git-merge-base plumbinginterrogators\n git-merge-file plumbingmanipulators\n git-merge-index plumbingmanipulators\n@@ -90,7 +90,7 @@ git-mergetool ancillarymanipulators\n git-merge-tree ancillaryinterrogators\n git-mktag plumbingmanipulators\n git-mktree plumbingmanipulators\n-git-mv mainporcelain common worktree\n+git-mv mainporcelain worktree\n git-name-rev plumbinginterrogators\n git-notes mainporcelain\n git-p4 foreignscminterface\n@@ -101,11 +101,11 @@ git-parse-remote synchelpers\n git-patch-id purehelpers\n git-prune ancillarymanipulators\n git-prune-packed plumbingmanipulators\n-git-pull mainporcelain common remote\n-git-push mainporcelain common remote\n+git-pull mainporcelain remote\n+git-push mainporcelain remote\n git-quiltimport foreignscminterface\n git-read-tree plumbingmanipulators\n-git-rebase mainporcelain common history\n+git-rebase mainporcelain history\n git-receive-pack synchelpers\n git-reflog ancillarymanipulators\n git-relink ancillarymanipulators\n@@ -114,28 +114,28 @@ git-repack ancillarymanipulators\n git-replace ancillarymanipulators\n git-request-pull foreignscminterface\n git-rerere ancillaryinterrogators\n-git-reset mainporcelain common worktree\n+git-reset mainporcelain worktree\n git-revert mainporcelain\n git-rev-list plumbinginterrogators\n git-rev-parse ancillaryinterrogators\n-git-rm mainporcelain common worktree\n+git-rm mainporcelain worktree\n git-send-email foreignscminterface\n git-send-pack synchingrepositories\n git-shell synchelpers\n git-shortlog mainporcelain\n-git-show mainporcelain common info\n+git-show mainporcelain info\n git-show-branch ancillaryinterrogators\n git-show-index plumbinginterrogators\n git-show-ref plumbinginterrogators\n git-sh-i18n purehelpers\n git-sh-setup purehelpers\n git-stash mainporcelain\n-git-status mainporcelain common info\n+git-status mainporcelain info\n git-stripspace purehelpers\n git-submodule mainporcelain\n git-svn foreignscminterface\n git-symbolic-ref plumbingmanipulators\n-git-tag mainporcelain common history\n+git-tag mainporcelain history\n git-unpack-file plumbinginterrogators\n git-unpack-objects plumbingmanipulators\n git-update-index plumbingmanipulators\n-- \n2.4.0.GIT\n"},{"id":"261694","messageId":"1432149781-24596-6-git-send-email-sebastien.guimmara@gmail.com","threadId":"39386","inReplyTo":"1432149781-24596-1-git-send-email-sebastien.guimmara@gmail.com","subject":"[PATCH v9 5/5] help: respect new common command grouping","fromName":"Sébastien Guimmara","fromEmail":"sebastien.guimmara@gmail.com","sentAt":"2015-05-20T19:23:01Z","receivedAt":"2015-05-20T19:23:01Z","isPatch":true,"sender":{"key":"sebastien.guimmara@gmail.com","avatar":"https://gravatar.com/avatar/05d0b6a53712c5ed78d640976986949a3bda22c0dbf5ff13cabdd12c3f4094d6?d=mp&s=160"},"body":"'git help' shows common commands in alphabetical order:\n\nThe most commonly used git commands are:\n add Add file contents to the index\n bisect Find by binary search the change that introduced a bug\n branch List, create, or delete branches\n checkout Checkout a branch or paths to the working tree\n clone Clone a repository into a new directory\n commit Record changes to the repository\n [...]\n\nwithout any indication of how commands relate to high-level\nconcepts or each other. Revise the output to explain their relationship\nwith the typical Git workflow:\n\nThese are common Git commands used in various situations:\n\nstart a working area (see also: git help tutorial)\n clone Clone a repository into a new directory\n init Create an empty Git repository or reinitialize [...]\n\nwork on the current change (see also: git help everyday)\n add Add file contents to the index\n reset Reset current HEAD to the specified state\n\nexamine the history and state (see also: git help revisions)\n log Show commit logs\n status Show the working tree status\n\n [...]\n\nHelped-by: Eric Sunshine \nSigned-off-by: Ramsay Jones \nSigned-off-by: Sébastien Guimmara \n---\n help.c | 24 +++++++++++++++++++++++-\n 1 file changed, 23 insertions(+), 1 deletion(-)\n\ndiff --git a/help.c b/help.c\nindex 2072a87..8f72051 100644\n--- a/help.c\n+++ b/help.c\n@@ -218,17 +218,39 @@ void list_commands(unsigned int colopts,\n \t}\n }\n \n+static int cmd_group_cmp(const void *elem1, const void *elem2)\n+{\n+\tconst struct cmdname_help *e1 = elem1;\n+\tconst struct cmdname_help *e2 = elem2;\n+\n+\tif (e1->group < e2->group)\n+\t\treturn -1;\n+\tif (e1->group > e2->group)\n+\t\treturn 1;\n+\treturn strcmp(e1->name, e2->name);\n+}\n+\n void list_common_cmds_help(void)\n {\n \tint i, longest = 0;\n+\tint current_grp = -1;\n \n \tfor (i = 0; i < ARRAY_SIZE(common_cmds); i++) {\n \t\tif (longest < strlen(common_cmds[i].name))\n \t\t\tlongest = strlen(common_cmds[i].name);\n \t}\n \n-\tputs(_(\"The most commonly used git commands are:\"));\n+\tqsort(common_cmds, ARRAY_SIZE(common_cmds),\n+\t\tsizeof(common_cmds[0]), cmd_group_cmp);\n+\n+\tputs(_(\"These are common Git commands used in various situations:\"));\n+\n \tfor (i = 0; i < ARRAY_SIZE(common_cmds); i++) {\n+\t\tif (common_cmds[i].group != current_grp) {\n+\t\t\tprintf(\"\\n%s\\n\", _(common_cmd_groups[common_cmds[i].group]));\n+\t\t\tcurrent_grp = common_cmds[i].group;\n+\t\t}\n+\n \t\tprintf(\" %s \", common_cmds[i].name);\n \t\tmput_char(' ', longest - strlen(common_cmds[i].name));\n \t\tputs(_(common_cmds[i].help));\n-- \n2.4.0.GIT\n"},{"id":"261695","messageId":"555CE01F.806@gmail.com","threadId":"39386","inReplyTo":"1432149781-24596-4-git-send-email-sebastien.guimmara@gmail.com","subject":"Re: [PATCH v9 3/5] generate-cmdlist: parse common group commands","fromName":"Sébastien Guimmara","fromEmail":"sebastien.guimmara@gmail.com","sentAt":"2015-05-20T19:27:27Z","receivedAt":"2015-05-20T19:27:27Z","isPatch":true,"sender":{"key":"sebastien.guimmara@gmail.com","avatar":"https://gravatar.com/avatar/05d0b6a53712c5ed78d640976986949a3bda22c0dbf5ff13cabdd12c3f4094d6?d=mp&s=160"},"body":"On 05/20/2015 09:22 PM, Sébastien Guimmara wrote:\n> From: Eric Sunshine \n>\n\nIt looks like 'git send-email' got confused with the CC field.\nI'm sorry for that.\n"},{"id":"261696","messageId":"CAPig+cSDR2qCGbAgzFm40qmBGf7cvR_ougvH9Oq-phv_q0ekNw@mail.gmail.com","threadId":"39386","inReplyTo":"1432149781-24596-1-git-send-email-sebastien.guimmara@gmail.com","subject":"Re: [PATCH v9 0/5] group common commands by theme","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-05-20T19:31:02Z","receivedAt":"2015-05-20T19:31:02Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Wed, May 20, 2015 at 3:22 PM, Sébastien Guimmara\n wrote:\n> The major modification of this reroll [1] is the use of the perl version\n> of generate-cmdlist instead of the awk one.\n>\n> help.c:\n> 1. change the introductory message from:\n> \"The typical Git workflow includes:\"\n> to:\n> \"These are common Git commands used in various situations:\"\n\nWhich is just a longer way to say what the original said:\n\n \"The most commonly used git commands are:\"\n\nI don't care strongly, but the terseness of the original has a certain appeal.\n"},{"id":"261698","messageId":"CAGZ79kYZJzM6Au2xCODFaReV=_LZ6HNi4=_24Gd5VWjpHjCB4Q@mail.gmail.com","threadId":"39386","inReplyTo":"555CE01F.806@gmail.com","subject":"Re: [PATCH v9 3/5] generate-cmdlist: parse common group commands","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2015-05-20T19:32:20Z","receivedAt":"2015-05-20T19:32:20Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Wed, May 20, 2015 at 12:27 PM, Sébastien Guimmara\n wrote:\n> On 05/20/2015 09:22 PM, Sébastien Guimmara wrote:\n>>\n>> From: Eric Sunshine \n>>\n>\n> It looks like 'git send-email' got confused with the CC field.\n> I'm sorry for that.\n>\n\nIt's to keep authorship.\n\nWhen Junio picks it up, this will show as\nauthored by Eric, signed off by both of you (Eric+Sébastien)\nand committed by Junio.\n"},{"id":"261699","messageId":"CAPig+cR_sf9Ha_Qwmo92v86rRJqGCX1dQwphTeHVck5YmWmC2g@mail.gmail.com","threadId":"39386","inReplyTo":"555CE01F.806@gmail.com","subject":"Re: [PATCH v9 3/5] generate-cmdlist: parse common group commands","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-05-20T19:32:38Z","receivedAt":"2015-05-20T19:32:38Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Wed, May 20, 2015 at 3:27 PM, Sébastien Guimmara\n wrote:\n> On 05/20/2015 09:22 PM, Sébastien Guimmara wrote:\n>>\n>> From: Eric Sunshine \n>\n> It looks like 'git send-email' got confused with the CC field.\n> I'm sorry for that.\n\nConfused in what way? The patch arrived looking sane.\n"},{"id":"261700","messageId":"555CE1BB.2040706@gmail.com","threadId":"39386","inReplyTo":"CAGZ79kYZJzM6Au2xCODFaReV=_LZ6HNi4=_24Gd5VWjpHjCB4Q@mail.gmail.com","subject":"Re: [PATCH v9 3/5] generate-cmdlist: parse common group commands","fromName":"Sébastien Guimmara","fromEmail":"sebastien.guimmara@gmail.com","sentAt":"2015-05-20T19:34:19Z","receivedAt":"2015-05-20T19:34:19Z","isPatch":true,"sender":{"key":"sebastien.guimmara@gmail.com","avatar":"https://gravatar.com/avatar/05d0b6a53712c5ed78d640976986949a3bda22c0dbf5ff13cabdd12c3f4094d6?d=mp&s=160"},"body":"On 05/20/2015 09:32 PM, Stefan Beller wrote:\n> On Wed, May 20, 2015 at 12:27 PM, Sébastien Guimmara\n> wrote:\n>> On 05/20/2015 09:22 PM, Sébastien Guimmara wrote:\n>>>\n>>> From: Eric Sunshine \n>>>\n>>\n>> It looks like 'git send-email' got confused with the CC field.\n>> I'm sorry for that.\n>>\n>\n> It's to keep authorship.\n>\n> When Junio picks it up, this will show as\n> authored by Eric, signed off by both of you (Eric+Sébastien)\n> and committed by Junio.\n>\n\nSo it's not a mistake ? I thought the 'From:' line was the email header\nas generated by git send-email that got wrongly included in the body.\nMy mistake then.\n"},{"id":"261702","messageId":"CAPig+cTM4L7Vt1gYb5zvAgt8hsqGQdLWigN_yB-VsWukNbt=zw@mail.gmail.com","threadId":"39386","inReplyTo":"1432149781-24596-3-git-send-email-sebastien.guimmara@gmail.com","subject":"Re: [PATCH v9 2/5] command-list.txt: add the common groups block","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-05-20T19:48:45Z","receivedAt":"2015-05-20T19:48:45Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Wed, May 20, 2015 at 3:22 PM, Sébastien Guimmara\n wrote:\n> The ultimate goal is for \"git help\" to display common commands in\n> groups rather than alphabetically. As a first step, define the\n> groups in a new block, and then assign a group to each\n> common command.\n>\n> Add a block at the beginning of command-list.txt:\n>\n> init start a working area (see also: git help tutorial)\n> worktree work on the current change (see also:[...]\n> info examine the history and state (see also: git [...]\n> history grow, mark and tweak your history\n> remote collaborate (see also: git help workflows)\n>\n> storing information about common commands group, then map each common\n> command to a group:\n>\n> git-add mainporcelain common worktree\n>\n> Signed-off-by: Sébastien Guimmara \n> ---\n> command-list.txt | 50 ++++++++++++++++++++++++++++++--------------------\n> 1 file changed, 30 insertions(+), 20 deletions(-)\n\nHmm, did your update to Documentation/technical/new-command.txt get\nlost? I don't see it any of the patches, but would have expected it to\nbe included in this patch which introduces the \"common groups\"\nsection.\n\n> diff --git a/command-list.txt b/command-list.txt\n> index 609b344..c2bbdc1 100644\n> --- a/command-list.txt\n> +++ b/command-list.txt\n> @@ -1,3 +1,13 @@\n> +# common commands are grouped by themes output by 'git help'\n> +# map each common command in the command list to one of these groups.\n\nDiscussed previously: It also would be a good idea to mention that the\norder in which \"git help\" displays the groups themselves is the order\nthey are declared here. Maybe just add one more line between the two\nyou already have above:\n\n # groups are output by 'git help' in the order declared here.\n\n> +### common groups\n\nIn the block below, the \"### command list\" line is protected by a \"#\ndo not molest the next line\" warning. Perhaps the same should be done\nhere? Alternately, make them more compact by incorporating the\nwarning:\n\n ### common groups (do not change this line)\n ...\n ### command list (do not change this line)\n\n?\n\n> +init start a working area (see also: git help tutorial)\n> +worktree work on the current change (see also: git help everyday)\n> +info examine the history and state (see also: git help revisions)\n> +history grow, mark and tweak your common history\n> +remote collaborate (see also: git help workflows)\n> +\n> +# List of known git commands.\n> # do not molest the next line\n> ### command list\n> # command name category [deprecated] [common]\n"},{"id":"261704","messageId":"555CE5C5.8000209@gmail.com","threadId":"39386","inReplyTo":"CAPig+cTM4L7Vt1gYb5zvAgt8hsqGQdLWigN_yB-VsWukNbt=zw@mail.gmail.com","subject":"Re: [PATCH v9 2/5] command-list.txt: add the common groups block","fromName":"Sébastien Guimmara","fromEmail":"sebastien.guimmara@gmail.com","sentAt":"2015-05-20T19:51:33Z","receivedAt":"2015-05-20T19:51:33Z","isPatch":true,"sender":{"key":"sebastien.guimmara@gmail.com","avatar":"https://gravatar.com/avatar/05d0b6a53712c5ed78d640976986949a3bda22c0dbf5ff13cabdd12c3f4094d6?d=mp&s=160"},"body":"\n\nOn 05/20/2015 09:48 PM, Eric Sunshine wrote:\n> On Wed, May 20, 2015 at 3:22 PM, Sébastien Guimmara\n> wrote:\n>> The ultimate goal is for \"git help\" to display common commands in\n>> groups rather than alphabetically. As a first step, define the\n>> groups in a new block, and then assign a group to each\n>> common command.\n>>\n>> Add a block at the beginning of command-list.txt:\n>>\n>> init start a working area (see also: git help tutorial)\n>> worktree work on the current change (see also:[...]\n>> info examine the history and state (see also: git [...]\n>> history grow, mark and tweak your history\n>> remote collaborate (see also: git help workflows)\n>>\n>> storing information about common commands group, then map each common\n>> command to a group:\n>>\n>> git-add mainporcelain common worktree\n>>\n>> Signed-off-by: Sébastien Guimmara \n>> ---\n>> command-list.txt | 50 ++++++++++++++++++++++++++++++--------------------\n>> 1 file changed, 30 insertions(+), 20 deletions(-)\n>\n> Hmm, did your update to Documentation/technical/new-command.txt get\n> lost? I don't see it any of the patches, but would have expected it to\n> be included in this patch which introduces the \"common groups\"\n> section.\n>\n\nAh, you're right. A commit got lost in the process. Will fix that. Thanks.\n\n>> diff --git a/command-list.txt b/command-list.txt\n>> index 609b344..c2bbdc1 100644\n>> --- a/command-list.txt\n>> +++ b/command-list.txt\n>> @@ -1,3 +1,13 @@\n>> +# common commands are grouped by themes output by 'git help'\n>> +# map each common command in the command list to one of these groups.\n>\n> Discussed previously: It also would be a good idea to mention that the\n> order in which \"git help\" displays the groups themselves is the order\n> they are declared here. Maybe just add one more line between the two\n> you already have above:\n>\n> # groups are output by 'git help' in the order declared here.\n>\n\nIndeed, I'll add the mention.\n\n>> +### common groups\n>\n> In the block below, the \"### command list\" line is protected by a \"#\n> do not molest the next line\" warning. Perhaps the same should be done\n> here? Alternately, make them more compact by incorporating the\n> warning:\n>\n> ### common groups (do not change this line)\n> ...\n> ### command list (do not change this line)\n>\n> ?\n>\n\nYes, it's better. I shall modify this.\n\n>> +init start a working area (see also: git help tutorial)\n>> +worktree work on the current change (see also: git help everyday)\n>> +info examine the history and state (see also: git help revisions)\n>> +history grow, mark and tweak your common history\n>> +remote collaborate (see also: git help workflows)\n>> +\n>> +# List of known git commands.\n>> # do not molest the next line\n>> ### command list\n>> # command name category [deprecated] [common]\n"},{"id":"261722","messageId":"555CFEF4.5000002@ramsay1.demon.co.uk","threadId":"39386","inReplyTo":"1432149781-24596-6-git-send-email-sebastien.guimmara@gmail.com","subject":"Re: [PATCH v9 5/5] help: respect new common command grouping","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsay1.demon.co.uk","sentAt":"2015-05-20T21:39:00Z","receivedAt":"2015-05-20T21:39:00Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"On 20/05/15 20:23, Sébastien Guimmara wrote:\n> 'git help' shows common commands in alphabetical order:\n> \n> The most commonly used git commands are:\n> add Add file contents to the index\n> bisect Find by binary search the change that introduced a bug\n> branch List, create, or delete branches\n> checkout Checkout a branch or paths to the working tree\n> clone Clone a repository into a new directory\n> commit Record changes to the repository\n> [...]\n> \n> without any indication of how commands relate to high-level\n> concepts or each other. Revise the output to explain their relationship\n> with the typical Git workflow:\n> \n> These are common Git commands used in various situations:\n> \n> start a working area (see also: git help tutorial)\n> clone Clone a repository into a new directory\n> init Create an empty Git repository or reinitialize [...]\n> \n> work on the current change (see also: git help everyday)\n> add Add file contents to the index\n> reset Reset current HEAD to the specified state\n> \n> examine the history and state (see also: git help revisions)\n> log Show commit logs\n> status Show the working tree status\n> \n> [...]\n> \n> Helped-by: Eric Sunshine \n> Signed-off-by: Ramsay Jones \n\nThis should be (at most) 'Helped-by:' - my 'contribution' was\nso minor that even a 'Helped-by:' is generous! :-D\n\nATB,\nRamsay Jones\n\n> Signed-off-by: Sébastien Guimmara \n> ---\n> help.c | 24 +++++++++++++++++++++++-\n> 1 file changed, 23 insertions(+), 1 deletion(-)\n> \n> diff --git a/help.c b/help.c\n> index 2072a87..8f72051 100644\n> --- a/help.c\n> +++ b/help.c\n> @@ -218,17 +218,39 @@ void list_commands(unsigned int colopts,\n> \t}\n> }\n> \n> +static int cmd_group_cmp(const void *elem1, const void *elem2)\n> +{\n> +\tconst struct cmdname_help *e1 = elem1;\n> +\tconst struct cmdname_help *e2 = elem2;\n> +\n> +\tif (e1->group < e2->group)\n> +\t\treturn -1;\n> +\tif (e1->group > e2->group)\n> +\t\treturn 1;\n> +\treturn strcmp(e1->name, e2->name);\n> +}\n> +\n> void list_common_cmds_help(void)\n> {\n> \tint i, longest = 0;\n> +\tint current_grp = -1;\n> \n> \tfor (i = 0; i < ARRAY_SIZE(common_cmds); i++) {\n> \t\tif (longest < strlen(common_cmds[i].name))\n> \t\t\tlongest = strlen(common_cmds[i].name);\n> \t}\n> \n> -\tputs(_(\"The most commonly used git commands are:\"));\n> +\tqsort(common_cmds, ARRAY_SIZE(common_cmds),\n> +\t\tsizeof(common_cmds[0]), cmd_group_cmp);\n> +\n> +\tputs(_(\"These are common Git commands used in various situations:\"));\n> +\n> \tfor (i = 0; i < ARRAY_SIZE(common_cmds); i++) {\n> +\t\tif (common_cmds[i].group != current_grp) {\n> +\t\t\tprintf(\"\\n%s\\n\", _(common_cmd_groups[common_cmds[i].group]));\n> +\t\t\tcurrent_grp = common_cmds[i].group;\n> +\t\t}\n> +\n> \t\tprintf(\" %s \", common_cmds[i].name);\n> \t\tmput_char(' ', longest - strlen(common_cmds[i].name));\n> \t\tputs(_(common_cmds[i].help));\n> \n"},{"id":"261723","messageId":"555CFFB4.1040406@gmail.com","threadId":"39386","inReplyTo":"555CFEF4.5000002@ramsay1.demon.co.uk","subject":"Re: [PATCH v9 5/5] help: respect new common command grouping","fromName":"Sébastien Guimmara","fromEmail":"sebastien.guimmara@gmail.com","sentAt":"2015-05-20T21:42:12Z","receivedAt":"2015-05-20T21:42:12Z","isPatch":true,"sender":{"key":"sebastien.guimmara@gmail.com","avatar":"https://gravatar.com/avatar/05d0b6a53712c5ed78d640976986949a3bda22c0dbf5ff13cabdd12c3f4094d6?d=mp&s=160"},"body":"On 05/20/2015 11:39 PM, Ramsay Jones wrote:\n> On 20/05/15 20:23, Sébastien Guimmara wrote:\n>>\n>> Helped-by: Eric Sunshine \n>> Signed-off-by: Ramsay Jones \n>\n> This should be (at most) 'Helped-by:' - my 'contribution' was\n> so minor that even a 'Helped-by:' is generous! :-D\n>\n> ATB,\n> Ramsay Jones\n\nHa! I'm still not very comfortable with picking the right\nattribution...\n"}]}