From: "SZEDER Gábor" <szeder@ira.uka.de>
To: Thomas Braun <thomas.braun@virtuell-zuhause.de>
Cc: git@vger.kernel.org, Ramkumar Ramachandra <artagnon@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
John Keeping <john@keeping.me.uk>
Subject: Re: [PATCH v2 1/2] completion: Add sequencer function
Date: Sat, 30 May 2015 21:01:03 +0200 [thread overview]
Message-ID: <20150530210103.Horde.YoJthfdQJy5oq9wT_oOl3Q1@webmail.informatik.kit.edu> (raw)
In-Reply-To: <1433001710.5113.8.camel@virtuell-zuhause.de>
Quoting Thomas Braun <thomas.braun@virtuell-zuhause.de>:
> Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de>
> ---
> contrib/completion/git-completion.bash | 48
> +++++++++++++++++++++++-----------
> 1 file changed, 33 insertions(+), 15 deletions(-)
I don't see the benefits of this change. This patch adds more than
twice as many lines as it removes, and patch 2/2 adds 8 new lines
although it could get away with only 5 without this function. To
offer sequencer options we currently go through a single if statement,
with this patch we'd go through a case statement, an if statement and
finally an &&.
Gábor
> diff --git a/contrib/completion/git-completion.bash
> b/contrib/completion/git-completion.bash
> index bfc74e9..f6e5bf6 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -851,15 +851,40 @@ __git_count_arguments ()
> printf "%d" $c
> }
>
> +__git_complete_sequencer ()
> +{
> + local dir="$(__gitdir)"
> +
> + case "$1" in
> + am)
> + if [ -d "$dir"/rebase-apply ]; then
> + __gitcomp "--skip --continue --resolved --abort"
> + return 0
> + fi
> + ;;
> + cherry-pick)
> + if [ -f "$dir"/CHERRY_PICK_HEAD ]; then
> + __gitcomp "--continue --quit --abort"
> + return 0
> + fi
> + ;;
> + rebase)
> + if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then
> + __gitcomp "--continue --skip --abort"
> + return 0
> + fi
> + ;;
> + esac
> +
> + return 1
> +}
> +
> __git_whitespacelist="nowarn warn error error-all fix"
>
> _git_am ()
> {
> - local dir="$(__gitdir)"
> - if [ -d "$dir"/rebase-apply ]; then
> - __gitcomp "--skip --continue --resolved --abort"
> - return
> - fi
> + __git_complete_sequencer "am" && return
> +
> case "$cur" in
> --whitespace=*)
> __gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
> @@ -1044,11 +1069,8 @@ _git_cherry ()
>
> _git_cherry_pick ()
> {
> - local dir="$(__gitdir)"
> - if [ -f "$dir"/CHERRY_PICK_HEAD ]; then
> - __gitcomp "--continue --quit --abort"
> - return
> - fi
> + __git_complete_sequencer "cherry-pick" && return
> +
> case "$cur" in
> --*)
> __gitcomp "--edit --no-commit --signoff --strategy= --mainline"
> @@ -1666,11 +1688,7 @@ _git_push ()
>
> _git_rebase ()
> {
> - local dir="$(__gitdir)"
> - if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then
> - __gitcomp "--continue --skip --abort"
> - return
> - fi
> + __git_complete_sequencer "rebase" && return
> __git_complete_strategy && return
> case "$cur" in
> --whitespace=*)
next prev parent reply other threads:[~2015-05-30 19:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-25 9:59 [PATCH] completion: suggest sequencer commands for revert Thomas Braun
2015-05-29 19:50 ` Junio C Hamano
2015-05-29 23:13 ` Ramkumar Ramachandra
2015-05-30 15:57 ` [PATCH v2 0/2] completion: sequencer commands Thomas Braun
2015-05-30 16:01 ` [PATCH v2 2/2] completion: suggest sequencer commands for revert Thomas Braun
2015-05-30 16:01 ` [PATCH v2 1/2] completion: Add sequencer function Thomas Braun
2015-05-30 19:01 ` SZEDER Gábor [this message]
2015-06-01 14:38 ` Junio C Hamano
2015-06-01 15:06 ` SZEDER Gábor
2015-05-30 16:02 ` Thomas Braun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150530210103.Horde.YoJthfdQJy5oq9wT_oOl3Q1@webmail.informatik.kit.edu \
--to=szeder@ira.uka.de \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=john@keeping.me.uk \
--cc=thomas.braun@virtuell-zuhause.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).