From patchwork Thu May 28 18:10:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Keller X-Patchwork-Id: 11576427 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D834E92A for ; Thu, 28 May 2020 18:11:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CB77C208B8 for ; Thu, 28 May 2020 18:11:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391477AbgE1SK7 (ORCPT ); Thu, 28 May 2020 14:10:59 -0400 Received: from mga07.intel.com ([134.134.136.100]:18378 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391465AbgE1SK4 (ORCPT ); Thu, 28 May 2020 14:10:56 -0400 IronPort-SDR: SbijS5NPBs6vPlKZY2nVuRSp3Aw6EGcxZzOtSBumM1jHoEGT9LtNiwPV3aQTLvPv7qTj/vhygp 1NZF2w5I4Djg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 May 2020 11:10:52 -0700 IronPort-SDR: uM5uAZIa3WvV3YcldIrTY7XqnVvZVl78b106K/abjBXQeNjnNGZHmMJA3NMOnFwaGeep7wcGXx wpmf8Q6IT3mA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,445,1583222400"; d="scan'208";a="267301361" Received: from jekeller-desk.amr.corp.intel.com ([10.166.241.33]) by orsmga003.jf.intel.com with ESMTP; 28 May 2020 11:10:51 -0700 From: Jacob Keller To: git@vger.kernel.org Cc: Jonathan Nieder , Junio C Hamano , Jacob Keller Subject: [PATCH v3 14/16] completion: improve handling of --track in switch/checkout Date: Thu, 28 May 2020 11:10:46 -0700 Message-Id: <20200528181048.3509470-15-jacob.e.keller@intel.com> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200528181048.3509470-1-jacob.e.keller@intel.com> References: <20200528181048.3509470-1-jacob.e.keller@intel.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Jacob Keller Current completion for the --track option of git switch and git checkout is sub par. In addition to the DWIM logic of a bare branch name, --track has DWIM logic to convert specified remote/branch names into a local branch tracking that remote. For example $git switch --track origin/master This will create a local branch name master, that tracks the master branch of the origin remote. In fact, git switch --track on its own will not accept other forms of references. These must instead be specified manually via the -c/-C/-b/-B options. Introduce __git_remote_heads() and the "remote-heads" mode for __git_complete_refs. Use this when the --track option is provided while completing in _git_switch and _git_checkout. Just as in the --detach case, we never enable DWIM mode for --track, because it doesn't make sense. It should be noted that completion support is still a bit sub par when it comes to handling -c/-C and --orphan. This will be resolved in a future change. Signed-off-by: Jacob Keller --- contrib/completion/git-completion.bash | 24 ++++++++++++++++++++++-- t/t9902-completion.sh | 6 ++---- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 38b5a5a0d874..4cdf09987725 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -624,6 +624,19 @@ __git_heads () "refs/heads/$cur_*" "refs/heads/$cur_*/**" } +# Lists branches from remote repositories. +# 1: A prefix to be added to each listed branch (optional). +# 2: List only branches matching this word (optional; list all branches if +# unset or empty). +# 3: A suffix to be appended to each listed branch (optional). +__git_remote_heads () +{ + local pfx="${1-}" cur_="${2-}" sfx="${3-}" + + __git for-each-ref --format="${pfx//\%/%%}%(refname:strip=2)$sfx" \ + "refs/remotes/$cur_*" "refs/remotes/$cur_*/**" +} + # Lists tags from the local repository. # Accepts the same positional parameters as __git_heads() above. __git_tags () @@ -783,8 +796,9 @@ __git_refs () # --sfx=: A suffix to be appended to each ref instead of the default # space. # --mode=: What set of refs to complete, one of 'refs' (the default) to -# complete all refs, 'heads' to complete only branches. Note -# that --remote is only compatible with --mode=refs. +# complete all refs, 'heads' to complete only branches, or +# 'remote-heads' to complete only remote branches. Note that +# --remote is only compatible with --mode=refs. __git_complete_refs () { local remote dwim pfx cur_="$cur" sfx=" " mode="refs" @@ -810,6 +824,8 @@ __git_complete_refs () __gitcomp_direct "$(__git_refs "$remote" "" "$pfx" "$cur_" "$sfx")" ;; heads) __gitcomp_direct "$(__git_heads "$pfx" "$cur_" "$sfx")" ;; + remote-heads) + __gitcomp_direct "$(__git_remote_heads "$pfx" "$cur_" "$sfx")" ;; *) return 1 ;; esac @@ -1492,6 +1508,8 @@ _git_checkout () if [ -n "$(__git_find_on_cmdline "-d --detach")" ]; then __git_complete_refs --mode="refs" + elif [ -n "$(__git_find_on_cmdline "--track")" ]; then + __git_complete_refs --mode="remote-heads" else __git_complete_refs $dwim_opt --mode="refs" fi @@ -2347,6 +2365,8 @@ _git_switch () if [ -n "$(__git_find_on_cmdline "-d --detach")" ]; then __git_complete_refs --mode="refs" + elif [ -n "$(__git_find_on_cmdline "--track")" ]; then + __git_complete_refs --mode="remote-heads" else __git_complete_refs $dwim_opt --mode="heads" fi diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 7e56a62a9bb3..f8319868080f 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -1405,16 +1405,14 @@ test_expect_success 'git checkout - with -d, complete only references' ' EOF ' -#TODO: --track should only complete fully specified remote branches -test_expect_failure 'git switch - with --track, complete only remote branches' ' +test_expect_success 'git switch - with --track, complete only remote branches' ' test_completion "git switch --track " <<-\EOF other/branch-in-other Z other/master-in-other Z EOF ' -#TODO: --track should only complete fully specified remote branches -test_expect_failure 'git checkout - with --track, complete only remote branches' ' +test_expect_success 'git checkout - with --track, complete only remote branches' ' test_completion "git checkout --track " <<-\EOF other/branch-in-other Z other/master-in-other Z