# [PATCH 0/2] completion: teach rebase and archive to use __gitcomp_builtin 4 messages from 2019-09-12 to 2019-09-12. Participants: Denton Liu, Junio C Hamano. Thread: https://gitlist.dev/t/51837 ## Denton Liu, 2019-09-12 19:43 Subject: [PATCH 0/2] completion: teach rebase and archive to use __gitcomp_builtin Message-ID: URL: https://gitlist.dev/e/cover.1568317093.git.liu.denton%40gmail.com ``` Currently, the completion function for rebase and archive don't take advantage of __gitcomp_builtin(). Teach them to use it so that future changes to options will automatically be included by the completion script with no extra work. I discovered rebase wasn't using it and fixed that and I started looking for other low-hanging fruit to fix. I deliberately left stuff like diff and log alone since that's a whole Pandora's box that I don't really want to open right now. Denton Liu (2): completion: teach rebase to use __gitcomp_builtin completion: teach archive to use __gitcomp_builtin contrib/completion/git-completion.bash | 27 ++++++++------------------ 1 file changed, 8 insertions(+), 19 deletions(-) -- 2.23.0.37.g745f681289 ``` ## Denton Liu, 2019-09-12 19:43 Subject: [PATCH 1/2] completion: teach rebase to use __gitcomp_builtin Message-ID: <7c4f2361842f5a9cbaf6130cafe1dd77f75e19e0.1568317093.git.liu.denton@gmail.com> URL: https://gitlist.dev/e/7c4f2361842f5a9cbaf6130cafe1dd77f75e19e0.1568317093.git.liu.denton%40gmail.com In-Reply-To: ``` Currently, _git_rebase() uses a hardcoded list of options for its completion. However, we can use __gitcomp_builtin() to get a dynamically generated list of completions instead. Teach _git_rebase() to use __gitcomp_builtin() so that newly implemented options in rebase will be automatically completed without any mucking around in git-completion.bash. Signed-off-by: Denton Liu --- contrib/completion/git-completion.bash | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index e087c4bf00..365edff639 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2004,15 +2004,18 @@ _git_range_diff () __git_complete_revlist } +__git_rebase_inprogress_options="--continue --skip --abort --quit --show-current-patch" +__git_rebase_interactive_inprogress_options="$__git_rebase_inprogress_options --edit-todo" + _git_rebase () { __git_find_repo_path if [ -f "$__git_repo_path"/rebase-merge/interactive ]; then - __gitcomp "--continue --skip --abort --quit --edit-todo --show-current-patch" + __gitcomp "$__git_rebase_interactive_inprogress_options" return elif [ -d "$__git_repo_path"/rebase-apply ] || \ [ -d "$__git_repo_path"/rebase-merge ]; then - __gitcomp "--continue --skip --abort --quit --show-current-patch" + __gitcomp "$__git_rebase_inprogress_options" return fi __git_complete_strategy && return @@ -2022,19 +2025,8 @@ _git_rebase () return ;; --*) - __gitcomp " - --onto --merge --strategy --interactive - --rebase-merges --preserve-merges --stat --no-stat - --committer-date-is-author-date --ignore-date - --ignore-whitespace --whitespace= - --autosquash --no-autosquash - --fork-point --no-fork-point - --autostash --no-autostash - --verify --no-verify - --keep-empty --root --force-rebase --no-ff - --rerere-autoupdate - --exec - " + __gitcomp_builtin rebase "" \ + "$__git_rebase_interactive_inprogress_options" return esac -- 2.23.0.37.g745f681289 ``` ## Denton Liu, 2019-09-12 19:43 Subject: [PATCH 2/2] completion: teach archive to use __gitcomp_builtin Message-ID: <39d6091ce636b2d732d589b55e7686796694e994.1568317093.git.liu.denton@gmail.com> URL: https://gitlist.dev/e/39d6091ce636b2d732d589b55e7686796694e994.1568317093.git.liu.denton%40gmail.com In-Reply-To: ``` Currently, _git_archive() uses a hardcoded list of options for its completion. However, we can use __gitcomp_builtin() to get a dynamically generated list of completions instead. Teach _git_archive() to use __gitcomp_builtin() so that newly implemented options in archive will be automatically completed without any mucking around in git-completion.bash. While we're at it, teach it to complete the missing `--worktree-attributes` option as well. Unfortunately, since some args are passed through from cmd_archive() to write_archive() (which calls parse_archive_args()), there's no way that a `--git-completion-helper` arg can end up reaching parse_archive_args() since the first call to parse_options() will end up calling exit(0). As a result, we have to carry the options supported by write_archive() in the hardcoded string. Signed-off-by: Denton Liu --- contrib/completion/git-completion.bash | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 365edff639..7b1ab46f0b 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1250,10 +1250,7 @@ _git_archive () return ;; --*) - __gitcomp " - --format= --list --verbose - --prefix= --remote= --exec= --output - " + __gitcomp_builtin archive "--format= --list --verbose --prefix= --worktree-attributes" return ;; esac -- 2.23.0.37.g745f681289 ``` ## Junio C Hamano, 2019-09-12 20:44 Subject: Re: [PATCH 0/2] completion: teach rebase and archive to use __gitcomp_builtin Message-ID: URL: https://gitlist.dev/e/xmqqa7b9fdmn.fsf%40gitster-ct.c.googlers.com In-Reply-To: ``` Denton Liu writes: > Currently, the completion function for rebase and archive don't take > advantage of __gitcomp_builtin(). Teach them to use it so that future > changes to options will automatically be included by the completion > script with no extra work. Nice ;-) ```