From: Jacob Keller <jacob.e.keller@intel.com>
To: git@vger.kernel.org
Cc: Jonathan Nieder <jrnieder@gmail.com>,
Jacob Keller <jacob.keller@gmail.com>
Subject: [PATCH 00/11] refactor git switch completion
Date: Fri, 24 Apr 2020 19:20:33 -0700 [thread overview]
Message-ID: <20200425022045.1089291-1-jacob.e.keller@intel.com> (raw)
From: Jacob Keller <jacob.keller@gmail.com>
completion support for git switch is subpar for a number of cases. Most
notable is difference between these two completions:
$git switch <TAB>
Display all 784 possibilities? (y or n)
<list of all references and DWIM remotes>
$git switch --track<TAB>
jk-refactor-git-switch-completion master`
If --track is provided, tab completion becomes almost useless, because we
would expect to complete remote references, but instead can only complete
local branches!
This series was motivated by a desire to fix the completion for the above
two cases, but I noticed several other issues on the way, including some
issues understanding what the current logic did.
This series aims to improve the completion support, and comes with many
additional test cases that should help highlight the buggy behavior and
hopefully prevent future regressions.
The first few commits just add new test cases, most of which currently fail.
Following this is a commit to change __git_complete_refs so that it uses
"--dwim" instead of "--track", since this made reading _git_checkout() and
_git_switch() difficult to read. "--track" was both used as the "enable DWIM
remote branch names" and also the option name for --track.
Following this are some patches to extract displaying DWIM remote branch
names from __git_refs() and refactoring __git_complete_refs to take a mode
argument that switches between calling __git_heads, __git_refs, and a new
__git_remotes.
By doing this, it becomes easier to do things like complete DWIM remote
branches in addition to just regular branches, rather than all references.
With this series applied, completion for git switch behaves more like the
following examples:
$git switch <TAB>
HEAD master todo
jk-refactor-git-switch-completion next
maint pu
$git switch --track <TAB>
origin/HEAD origin/maint origin/master origin/next origin/pu
origin/todo
Jacob Keller (11):
completion: add some simple test cases for git switch completion
completion: add test showing subpar git switch completion
completion: add test highlighting subpar git switch --track completion
completion: add tests showing lack of support for git switch -c/-C
completion: remove completion for git switch --orphan
completion: rename --track option of __git_complete_refs
completion: extract function __git_dwim_remote_heads
completion: perform DWIM logic directly in __git_complete_refs
completion: fix completion for git switch with no options
completion: recognize -c/-C when completing for git switch
completion: complete remote branches for git switch --track
contrib/completion/git-completion.bash | 146 +++++++++++++++++++------
t/t9902-completion.sh | 103 +++++++++++++++++
2 files changed, 215 insertions(+), 34 deletions(-)
--
2.25.2
next reply other threads:[~2020-04-25 2:20 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-25 2:20 Jacob Keller [this message]
2020-04-25 2:20 ` [PATCH 01/11] completion: add some simple test cases for git switch completion Jacob Keller
2020-04-25 2:20 ` [PATCH 02/11] completion: add test showing subpar " Jacob Keller
2020-04-25 2:20 ` [PATCH 03/11] completion: add test highlighting subpar git switch --track completion Jacob Keller
2020-04-25 2:20 ` [PATCH 04/11] completion: add tests showing lack of support for git switch -c/-C Jacob Keller
2020-04-25 2:20 ` [PATCH 05/11] completion: add test showing subpar completion for git switch --orphan Jacob Keller
2020-04-27 23:34 ` Junio C Hamano
2020-04-28 2:12 ` Jacob Keller
2020-04-28 2:20 ` Jacob Keller
2020-04-28 16:24 ` Junio C Hamano
2020-04-28 17:32 ` Jacob Keller
2020-04-28 18:10 ` Junio C Hamano
2020-04-28 18:45 ` Jacob Keller
2020-04-28 19:16 ` Junio C Hamano
2020-04-28 20:41 ` Jacob Keller
2020-04-28 20:57 ` Junio C Hamano
2020-04-25 2:20 ` [PATCH 05/11] completion: remove " Jacob Keller
2020-04-25 2:20 ` [PATCH 06/11] completion: rename --track option of __git_complete_refs Jacob Keller
2020-04-25 2:20 ` [PATCH 07/11] completion: extract function __git_dwim_remote_heads Jacob Keller
2020-04-25 2:20 ` [PATCH 08/11] completion: perform DWIM logic directly in __git_complete_refs Jacob Keller
2020-04-25 2:20 ` [PATCH 09/11] completion: fix completion for git switch with no options Jacob Keller
2020-04-25 2:20 ` [PATCH 10/11] completion: recognize -c/-C when completing for git switch Jacob Keller
2020-04-25 2:20 ` [PATCH 11/11] completion: complete remote branches for git switch --track Jacob Keller
2020-04-25 22:14 ` [PATCH 00/11] refactor git switch completion Jacob Keller
2020-04-30 22:56 ` Junio C Hamano
2020-05-01 21:53 ` Jacob Keller
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200425022045.1089291-1-jacob.e.keller@intel.com \
--to=jacob.e.keller@intel.com \
--cc=git@vger.kernel.org \
--cc=jacob.keller@gmail.com \
--cc=jrnieder@gmail.com \
/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.
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 NNTP newsgroup(s).