git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Britton Leo Kerin <britton.kerin@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Patrick Steinhardt <ps@pks.im>,
	Britton Leo Kerin <britton.kerin@gmail.com>
Subject: [PATCH v3 2/5] completion: git-log opts to bisect visualize
Date: Thu, 18 Jan 2024 11:43:20 -0900	[thread overview]
Message-ID: <20240118204323.1113859-3-britton.kerin@gmail.com> (raw)
In-Reply-To: <20240118204323.1113859-1-britton.kerin@gmail.com>

To do this the majority of _git_log has been factored out into the new
__git_complete_log_opts.  This is needed because the visualize command
accepts git-log options but not rev arguments (they are fixed to the
commits under bisection).

__git_complete_log_opts has a precondition that COMPREPLY be empty.  In
a completion context it doesn't seem advisable to implement
preconditions as noisy or hard failures, so instead it becomes a no-op
on violation.  This should be detectable and quick to debug for devels,
without ever aggravating a user (besides completion failure).

Signed-off-by: Britton Leo Kerin <britton.kerin@gmail.com>
---
 contrib/completion/git-completion.bash | 30 +++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 15d22ff7d9..c16aded36c 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1472,6 +1472,16 @@ _git_bisect ()
 			;;
 		esac
 		;;
+	visualize)
+		case "$cur" in
+		-*)
+			__git_complete_log_opts
+			return
+			;;
+		*)
+			;;
+		esac
+		;;
 	esac
 
 	case "$subcommand" in
@@ -2074,10 +2084,14 @@ __git_diff_merges_opts="off none on first-parent 1 separate m combined c dense-c
 __git_log_pretty_formats="oneline short medium full fuller reference email raw format: tformat: mboxrd"
 __git_log_date_formats="relative iso8601 iso8601-strict rfc2822 short local default human raw unix auto: format:"
 
-_git_log ()
+
+# Check for only porcelain (i.e. not git-rev-list) option (not argument)
+# and selected option argument completions for git-log options and if any
+# are found put them in COMPREPLY.  COMPREPLY must be empty at the start,
+# and will be empty on return if no candidates are found.
+__git_complete_log_opts ()
 {
-	__git_has_doubledash && return
-	__git_find_repo_path
+	[ -z "$COMPREPLY" ] || return 1   # Precondition
 
 	local merge=""
 	if [ -f "$__git_repo_path/MERGE_HEAD" ]; then
@@ -2171,6 +2185,16 @@ _git_log ()
 		return
 		;;
 	esac
+}
+
+_git_log ()
+{
+	__git_has_doubledash && return
+	__git_find_repo_path
+
+        __git_complete_log_opts
+        [ -z "$COMPREPLY" ] || return
+
 	__git_complete_revlist
 }
 
-- 
2.43.0


  parent reply	other threads:[~2024-01-18 20:43 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-02 19:57 [RFC PATCH 0/6] completion: improvements for git-bisect Britton Leo Kerin
2024-01-10  2:03 ` [PATCH v2 0/5] " Britton Leo Kerin
2024-01-18 20:43   ` [PATCH v3 " Britton Leo Kerin
2024-01-18 20:43     ` [PATCH v3 1/5] completion: complete new old actions, start opts Britton Leo Kerin
2024-01-19  7:04       ` Patrick Steinhardt
2024-01-18 20:43     ` Britton Leo Kerin [this message]
2024-01-19  7:04       ` [PATCH v3 2/5] completion: git-log opts to bisect visualize Patrick Steinhardt
2024-01-18 20:43     ` [PATCH v3 3/5] completion: move to maintain define-before-use Britton Leo Kerin
2024-01-19  7:04       ` Patrick Steinhardt
2024-01-18 20:43     ` [PATCH v3 4/5] completion: custom git-bisect terms Britton Leo Kerin
2024-01-19  7:04       ` Patrick Steinhardt
2024-01-18 20:43     ` [PATCH v3 5/5] completion: git-bisect view recognized but not completed Britton Leo Kerin
2024-01-19  7:05       ` Patrick Steinhardt
2024-01-19  7:05     ` [PATCH v3 0/5] completion: improvements for git-bisect Patrick Steinhardt
2024-01-19 18:27       ` Junio C Hamano
2024-01-26  0:23       ` Britton Kerin
2024-01-28 22:34     ` [PATCH v4 0/8] " Britton Leo Kerin
2024-01-28 22:34       ` [PATCH v4 1/8] completion: bisect: complete bad, new, old, and help subcommands Britton Leo Kerin
2024-02-01  9:55         ` Patrick Steinhardt
2024-01-28 22:34       ` [PATCH v4 2/8] completion: bisect: complete custom terms and related options Britton Leo Kerin
2024-02-01  9:55         ` Patrick Steinhardt
2024-01-28 22:34       ` [PATCH v4 3/8] completion: bisect: complete missing --first-parent and --no-checkout options Britton Leo Kerin
2024-01-28 22:34       ` [PATCH v4 4/8] completion: new function __git_complete_log_opts Britton Leo Kerin
2024-01-28 22:34       ` [PATCH v4 5/8] completion: log: use __git_complete_log_opts Britton Leo Kerin
2024-02-01  9:55         ` Patrick Steinhardt
2024-01-28 22:34       ` [PATCH v4 6/8] completion: bisect: complete log opts for visualize subcommand Britton Leo Kerin
2024-01-28 22:34       ` [PATCH v4 7/8] completion: bisect: recognize but do not complete view subcommand Britton Leo Kerin
2024-01-28 22:34       ` [PATCH v4 8/8] completion: add tests for git-bisect Britton Leo Kerin
2024-01-30  5:47         ` Junio C Hamano
2024-02-01  9:55         ` Patrick Steinhardt
2024-02-01  9:55       ` [PATCH v4 0/8] completion: improvements " Patrick Steinhardt
2024-02-06  2:09       ` [PATCH v5 0/7] " Britton Leo Kerin
2024-02-06  2:09         ` [PATCH v5 1/7] completion: tests: always use 'master' for default initial branch name Britton Leo Kerin
2024-02-06  2:09         ` [PATCH v5 2/7] completion: bisect: complete bad, new, old, and help subcommands Britton Leo Kerin
2024-02-06  7:40           ` Patrick Steinhardt
2024-02-06  2:09         ` [PATCH v5 3/7] completion: bisect: complete custom terms and related options Britton Leo Kerin
2024-02-06  7:40           ` Patrick Steinhardt
2024-02-06  2:09         ` [PATCH v5 4/7] completion: bisect: complete missing --first-parent and --no-checkout options Britton Leo Kerin
2024-02-06  2:09         ` [PATCH v5 5/7] completion: new function __git_complete_log_opts Britton Leo Kerin
2024-02-06  7:40           ` Patrick Steinhardt
2024-02-06  2:09         ` [PATCH v5 6/7] completion: bisect: complete log opts for visualize subcommand Britton Leo Kerin
2024-02-06  2:09         ` [PATCH v5 7/7] completion: bisect: recognize but do not complete view subcommand Britton Leo Kerin
2024-02-06  7:40         ` [PATCH v5 0/7] completion: improvements for git-bisect Patrick Steinhardt
2024-02-06 21:50         ` [PATCH v6 " Britton Leo Kerin
2024-02-06 21:50           ` [PATCH v6 1/7] completion: tests: always use 'master' for default initial branch name Britton Leo Kerin
2024-02-06 21:50           ` [PATCH v6 2/7] completion: bisect: complete bad, new, old, and help subcommands Britton Leo Kerin
2024-02-06 21:50           ` [PATCH v6 3/7] completion: bisect: complete custom terms and related options Britton Leo Kerin
2024-02-06 21:50           ` [PATCH v6 4/7] completion: bisect: complete missing --first-parent and --no-checkout options Britton Leo Kerin
2024-02-06 21:50           ` [PATCH v6 5/7] completion: new function __git_complete_log_opts Britton Leo Kerin
2024-02-06 21:50           ` [PATCH v6 6/7] completion: bisect: complete log opts for visualize subcommand Britton Leo Kerin
2024-02-06 21:50           ` [PATCH v6 7/7] completion: bisect: recognize but do not complete view subcommand Britton Leo Kerin
2024-02-06 22:58           ` [PATCH v6 0/7] completion: improvements for git-bisect Junio C Hamano
2024-02-07  5:26             ` Patrick Steinhardt
     [not found] ` <20240110020347.673155-1-britton.kerin@gmail.com>
2024-01-10  2:03   ` [PATCH v2 1/5] completion: complete new old actions, start opts Britton Leo Kerin
2024-01-10  2:03   ` [PATCH v2 2/5] completion: git-log opts to bisect visualize Britton Leo Kerin
2024-01-10  2:03   ` [PATCH v2 3/5] completion: move to maintain define-before-use Britton Leo Kerin
2024-01-10  2:03   ` [PATCH v2 4/5] completion: custom git-bisect terms Britton Leo Kerin
2024-01-10  2:03   ` [PATCH v2 5/5] " Britton Leo Kerin

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=20240118204323.1113859-3-britton.kerin@gmail.com \
    --to=britton.kerin@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=ps@pks.im \
    /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).