Skip to contentSkip to conversation

bash completion only provides revs, not paths

PATCH In review Uwe Kleine-König 2 participants 5 messages Jun 15, 2016

lore
Share & tools
lore

Uwe Kleine-König

author
#0 lore raw

Hello,

currently autocompletion in

ukleinek@zentaur:~/gsrc/linux-2.6 git log ar<tab>

only yields "armltd/" (i.e. the prefix of some remote tracking branches) but most of the time I want it to complete to "arch/".

I don't understand that autocompletion stuff, but probably to fix that several __git_complete_revlist should be replaced by a __git_complete_revlist_or_path. The harder part is to implement the latter function. An optimal implementation would only give back paths if there is a "--" somewhere before the cursor.

Best regards
Uwe

Signature · 3 lines
Uwe Kleine-König, Software Engineer
Digi International GmbH Branch Breisach, Küferstrasse 8, 79206 Breisach, Germany
Tax: 315/5781/0242 / VAT: DE153662976 / Reg. Amtsgericht Dortmund HRB 13962
#1 lore raw
Quoted 6 lines · Uwe Kleine-Knig

currently autocompletion in

ukleinek@zentaur:~/gsrc/linux-2.6 git log ar<tab>

only yields "armltd/" (i.e. the prefix of some remote tracking branches) but most of the time I want it to complete to "arch/".

Right. It favors refs over paths. Why? Because I complete refs more than I complete paths.

Quoted 5 lines

I don't understand that autocompletion stuff, but probably to fix that several __git_complete_revlist should be replaced by a __git_complete_revlist_or_path. The harder part is to implement the latter function. An optimal implementation would only give back paths if there is a "--" somewhere before the cursor.

Its ugly, but if we only do path name completion after a -- then we can just return "" as the options to bash, and it will go off and do the path name completion itself. If we do path names and and refs at the same time, that's a disaster waiting to happen. We would have to do the path name completion ourselves.

How is this?

--8<--
bash completion: Completely only path names after -- in options

If the user has inserted a -- before the current argument we are being asked to complete they are most likely trying to force Git into treating this argument as a path name, and not as a ref. We should allow bash to complete it as a path from the local working directory.

Suggested-by Uwe Kleine-Knig <[email protected]>
Signed-off-by Shawn O. Pearce <[email protected]>
---
 contrib/completion/git-completion.bash |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)
contrib/completion/git-completion.bash +14 -1
index 0f5d30c..8d8405e 100755
@@ -308,7 +308,20 @@ __git_complete_file ()
 
 __git_complete_revlist ()
 {
-	local pfx cur="${COMP_WORDS[COMP_CWORD]}"
+	local c=1 pfx cur
+
+	while [ $c -lt $COMP_CWORD ]; do
+		cur="${COMP_WORDS[c]}"
+		case "$cur" in
+		--)
+			COMPREPLY=()
+			return
+			;;
+		esac
+		c=$((++c))
+	done
+
+	cur="${COMP_WORDS[COMP_CWORD]}"
 	case "$cur" in
 	*...*)
 		pfx="${cur%...*}..."
Signature · 5 lines
1.5.5.1.141.gd55b


-- 
Shawn.
author
#2 lore raw

Hello Shawn,

Quoted 17 lines · Shawn O. Pearce
Quoted 6 lines · Uwe Kleine-Knig

currently autocompletion in

ukleinek@zentaur:~/gsrc/linux-2.6 git log ar<tab>

only yields "armltd/" (i.e. the prefix of some remote tracking branches) but most of the time I want it to complete to "arch/".

Right. It favors refs over paths. Why? Because I complete refs more than I complete paths.

Quoted 5 lines

I don't understand that autocompletion stuff, but probably to fix that several __git_complete_revlist should be replaced by a __git_complete_revlist_or_path. The harder part is to implement the latter function. An optimal implementation would only give back paths if there is a "--" somewhere before the cursor.

Quoted 5 lines

Its ugly, but if we only do path name completion after a -- then we can just return "" as the options to bash, and it will go off and do the path name completion itself. If we do path names and and refs at the same time, that's a disaster waiting to happen. We would have to do the path name completion ourselves.

I thought compgen can be used for that:

	ukleinek@zentaur:~/gsrc/linux-2.6$ compgen -f ar
	arch
Quoted 1 line

How is this?

I like it and have already applied it.

Quoted 9 lines

--8<--
bash completion: Completely only path names after -- in options

If the user has inserted a -- before the current argument we are being asked to complete they are most likely trying to force Git into treating this argument as a path name, and not as a ref. We should allow bash to complete it as a path from the local working directory.

Suggested-by Uwe Kleine-Knig <[email protected]>

There is a letter missing in my name. I wonder why it's always the only non-ascii one :-)

Best regards and thanks,
Uwe

Signature · 3 lines
Uwe Kleine-König, Software Engineer
Digi International GmbH Branch Breisach, Küferstrasse 8, 79206 Breisach, Germany
Tax: 315/5781/0242 / VAT: DE153662976 / Reg. Amtsgericht Dortmund HRB 13962
#3 lore raw

PATCH 1/1 bash completion only provides revs, not paths

Quoted 3 lines · Uwe Kleine-Knig
Quoted 1 line

How is this?

I like it and have already applied it.

...

Quoted 4 lines
Quoted 1 line
Suggested-by Uwe Kleine-Knig <[email protected]>

There is a letter missing in my name. I wonder why it's always the only non-ascii one :-)

Damn. I'm sorry. My mailer seems to be dropping it when I quote you, and I copied your name from the "... wrote:" line at the top of my message. I should have copied from the
To: header, where it hasn't been munged.

Fixed commit message below.

--8<--
bash completion: Completely only path names after -- in options

If the user has inserted a -- before the current argument we are being asked to complete they are most likely trying to force Git into treating this argument as a path name, and not as a ref. We should allow bash to complete it as a path from the local working directory.

Tested-by Uwe Kleine-König <[email protected]>
Signed-off-by Shawn O. Pearce <[email protected]>
---
 contrib/completion/git-completion.bash |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)
contrib/completion/git-completion.bash +14 -1
index 0f5d30c..8d8405e 100755
@@ -308,7 +308,20 @@ __git_complete_file ()
 
 __git_complete_revlist ()
 {
-	local pfx cur="${COMP_WORDS[COMP_CWORD]}"
+	local c=1 pfx cur
+
+	while [ $c -lt $COMP_CWORD ]; do
+		cur="${COMP_WORDS[c]}"
+		case "$cur" in
+		--)
+			COMPREPLY=()
+			return
+			;;
+		esac
+		c=$((++c))
+	done
+
+	cur="${COMP_WORDS[COMP_CWORD]}"
 	case "$cur" in
 	*...*)
 		pfx="${cur%...*}..."
Signature · 5 lines
1.5.5.1.141.gd55b


-- 
Shawn.
author
#4 lore raw

Hello,

Quoted 7 lines · Shawn O. Pearce
Quoted 3 lines · Uwe Kleine-Knig
Quoted 1 line

How is this?

I like it and have already applied it.

...

Quoted 2 lines
Quoted 1 line
Suggested-by Uwe Kleine-Knig <[email protected]>
Quoted 7 lines
Quoted 2 lines

There is a letter missing in my name. I wonder why it's always the only non-ascii one :-)

Damn. I'm sorry. My mailer seems to be dropping it when I quote you, and I copied your name from the "... wrote:" line at the top of my message. I should have copied from the
To: header, where it hasn't been munged.

Fine.

BTW, even with your patch the problem still exists for git-diff. I havn't yet looked into it.

Uwe

Signature · 3 lines
Uwe Kleine-König, Software Engineer
Digi International GmbH Branch Breisach, Küferstrasse 8, 79206 Breisach, Germany
Tax: 315/5781/0242 / VAT: DE153662976 / Reg. Amtsgericht Dortmund HRB 13962