Re: [PATCH v7 3/4] vimdiff: add tool documentation
- From
Philippe Blain <levraiphilippeblain@gmail.com>
- Date
- Mar 29, 2022, 17:29 UTC
- Message-ID
- <1363db57-74de-226a-468f-69feffde6ba5@gmail.com>
- In-Reply-To
- <20220328223019.271270-4-greenfoo@u92.eu>
Hi Fernando,
Le 2022-03-28 à 18:30, Fernando Ramos a écrit :
Show 14 quoted lines
> + > diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh > index 542a6a75eb..9f99201bcc 100644 > --- a/git-mergetool--lib.sh > +++ b/git-mergetool--lib.sh > @@ -63,7 +63,7 @@ $(list_tool_variants)" > preamble= > fi > shown_any=yes > - printf "%s%s\n" "$per_line_prefix" "$toolname" > + printf "%s%-15s %s\n" "$per_line_prefix" "$toolname" $(diff_mode && diff_cmd_help "$toolname" || merge_cmd_help "$toolname") > fi > done >
While responding to Junio I tried removing the definition of 'diff_cmd_help' for araxis and it is still listed as "Use Araxis" in the list of values under "merge.guitool" in git-config.{1,html}.
I think that "diff_mode" that you use in the command substitution does not work for our usage in the documentation Makefile, as in that case TOOL_MODE is not defined. So a more complete tweak to the Makefile would be:
diff --git a/Documentation/Makefile b/Documentation/Makefile index ed656db2ae..c2667de7b3 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -331,12 +331,12 @@ $(mergetools_txt): mergetools-list.made mergetools-list.made: ../git-mergetool--lib.sh $(wildcard ../mergetools/*) $(QUIET_GEN) \ - $(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && \ + $(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && TOOL_MODE=diff && \ . ../git-mergetool--lib.sh && \ - show_tool_names can_diff "* " || :' >mergetools-diff.txt && \ - $(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && \ + show_tool_names can_diff' | sed -e "s/\([a-z0-9]*\)/\`\1\`;;/" >mergetools-diff.txt && \ + $(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && TOOL_MODE=merge && \ . ../git-mergetool--lib.sh && \ - show_tool_names can_merge "* " || :' >mergetools-merge.txt && \ + show_tool_names can_merge' | sed -e "s/\([a-z0-9]*\)/\`\1\`;;/" >mergetools-merge.txt && \ date >$@ TRACK_ASCIIDOCFLAGS = $(subst ','\'',$(ASCIIDOC_COMMON):$(ASCIIDOC_HTML):$(ASCIIDOC_DOCBOOK))