* [PATCH 7/7] completion: remove the now unused __gitcomp_1() internal helper function
From: SZEDER Gábor @ 2012-11-17 11:05 UTC (permalink / raw)
To: git
Cc: Felipe Contreras, Jeff King, Jonathan Nieder, Junio C Hamano,
SZEDER Gábor
In-Reply-To: <1353150353-29874-1-git-send-email-szeder@ira.uka.de>
Since the __gitcomp_1() helper is basically only an implementation
detail of __gitcomp() that exists solely for performance reasons (see
ab02dfe5 (bash completion: Improve responsiveness of git-log
completion, 2008-07-13)), it's quite unlikely that anyone uses or ever
used it besides __gitcomp(). And now __gitcomp() doesn't need it
anymore either, so delete it.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
contrib/completion/git-completion.bash | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 283ef99b..a281b28d 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -56,19 +56,6 @@ __gitdir ()
fi
}
-__gitcomp_1 ()
-{
- local c IFS=$' \t\n'
- for c in $1; do
- c="$c$2"
- case $c in
- --*=*|*.) ;;
- *) c="$c " ;;
- esac
- printf '%s\n' "$c"
- done
-}
-
# The following function is based on code from:
#
# bash_completion - programmable completion functions for bash 3.2+
--
1.8.0.220.g4d14ece
^ permalink raw reply related
* [PATCH 5/7] completion: fix expansion issues in __gitcomp_nl()
From: SZEDER Gábor @ 2012-11-17 11:05 UTC (permalink / raw)
To: git
Cc: Felipe Contreras, Jeff King, Jonathan Nieder, Junio C Hamano,
SZEDER Gábor
In-Reply-To: <1353150353-29874-1-git-send-email-szeder@ira.uka.de>
The compgen Bash-builtin performs expansion on all words in the
wordlist given to its -W option, breaking Git's completion script when
refs or filenames passed to __gitcomp_nl() contain expandable
substrings. At least one user can't use ref completion at all in a
repository, which contains tags with metacharacters like
Build%20V%20${bamboo.custom.jiraversion.name}%20Build%20721
Such a ref causes a failure in compgen as it tries to expand the
variable with invalid name.
Unfortunately, compgen has no option to turn off this expansion.
However, in __gitcomp_nl() we use only a small subset of compgen's
functionality, namely the filtering of matching possible completion
words and adding a prefix and/or suffix to each of those words. So,
to avoid compgen's problematic expansion we get rid of compgen, and
implement the equivalent functionality in a small awk script. The
reason for using awk instead of sed is that awk allows plain (i.e.
non-regexp) string comparison, making quoting of regexp characters in
the current word unnecessary.
Note, that such expandable words need quoting to be of any use on the
command line. This patch doesn't perform that quoting, but it could
be implemented later on top by extending the awk script to unquote
$cur and to quote matching words. Nonetheless, this patch still a
step forward, because at least refs can be completed even in the
presence of one with metacharacters.
Also update the function's description a bit.
Reported-by: Jeroen Meijer <jjgmeijer@hotmail.com>
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
awk doesn't have a prefixcmp(). I'm no awk wizard, so I'm not sure this
is the right way to do it.
contrib/completion/git-completion.bash | 17 +++++++++++++----
t/t9902-completion.sh | 4 ++--
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index bc0657a2..65196ddd 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -249,19 +249,28 @@ __gitcomp ()
esac
}
-# Generates completion reply with compgen from newline-separated possible
-# completion words by appending a space to all of them.
+# Generates completion reply for the word in $cur from newline-separated
+# possible completion words, appending a space to all of them.
# It accepts 1 to 4 arguments:
# 1: List of possible completion words, separated by a single newline.
# 2: A prefix to be added to each possible completion word (optional).
-# 3: Generate possible completion matches for this word (optional).
+# 3: Generate possible completion matches for this word instead of $cur
+# (optional).
# 4: A suffix to be appended to each possible completion word instead of
# the default space (optional). If specified but empty, nothing is
# appended.
__gitcomp_nl ()
{
local IFS=$'\n'
- COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
+ COMPREPLY=($(awk -v pfx="${2-}" -v sfx="${4- }" -v cur="${3-$cur}" '
+ BEGIN {
+ FS="\n";
+ len=length(cur);
+ }
+ {
+ if (cur == substr($1, 1, len))
+ print pfx$1sfx;
+ }' <<< "$1" ))
}
__git_heads ()
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index a108ec1c..fa289324 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -246,7 +246,7 @@ test_expect_success '__gitcomp_nl - no suffix' '
test_cmp expected out
'
-test_expect_failure '__gitcomp_nl - doesnt fail because of invalid variable name' '
+test_expect_success '__gitcomp_nl - doesnt fail because of invalid variable name' '
(
__gitcomp_nl "$invalid_variable_name"
)
@@ -383,7 +383,7 @@ test_expect_success 'complete tree filename with spaces' '
EOF
'
-test_expect_failure 'complete tree filename with metacharacters' '
+test_expect_success 'complete tree filename with metacharacters' '
echo content >"name with \${meta}" &&
git add . &&
git commit -m meta &&
--
1.8.0.220.g4d14ece
^ permalink raw reply related
* Re: [RFC/PATCH 5/5] completion: refactor __gitcomp_1
From: Felipe Contreras @ 2012-11-17 11:27 UTC (permalink / raw)
To: SZEDER Gábor
Cc: git, Junio C Hamano, Björn Gustavsson, Shawn O. Pearce,
Robert Zeh, Peter van der Does, Jonathan Nieder, Jeff King
In-Reply-To: <20121117105837.GC12052@goldbirke>
On Sat, Nov 17, 2012 at 11:58 AM, SZEDER Gábor <szeder@ira.uka.de> wrote:
>> # The following function is based on code from:
>> @@ -249,10 +246,16 @@ __gitcomp ()
>> --*=)
>> ;;
>> *)
>> - local IFS=$'\n'
>> - __gitcompadd "$(__gitcomp_1 "${1-}" "${4-}")" "${2-}" "$cur_" ""
>> + local c IFS=$' \t\n'
>> + for c in ${1-}; do
>> + c=`__gitcomp_1 "$c${4-}"`
>
> 1. Backticks.
> 2. A subshell for every word in the wordlist?
Fine, lets make it hard for zsh then:
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -56,19 +56,6 @@ __gitdir ()
fi
}
-__gitcomp_1 ()
-{
- local c IFS=$' \t\n'
- for c in $1; do
- c="$c$2"
- case $c in
- --*=*|*.) ;;
- *) c="$c " ;;
- esac
- printf '%s\n' "$c"
- done
-}
-
# The following function is based on code from:
#
# bash_completion - programmable completion functions for bash 3.2+
@@ -241,12 +228,22 @@ __gitcomp ()
COMPREPLY=()
;;
*)
- local IFS=$'\n'
- COMPREPLY=($(compgen -P "${2-}" \
- -W "$(__gitcomp_1 "${1-}" "${4-}")" \
- -- "$cur_"))
+ local c i IFS=$' \t\n'
+ i=0
+ for c in ${1-}; do
+ c="$c${4-}"
+ case $c in
+ --*=*|*.) ;;
+ *) c="$c " ;;
+ esac
+ if [[ "$c" = "$cur_"* ]]; then
+ (( i++ ))
+ COMPREPLY[$i]="${2-}$c"
+ fi
+ done
;;
esac
+
}
# Generates completion reply with compgen from newline-separated possible
--
Felipe Contreras
^ permalink raw reply
* Re: [PATCH 6/7] completion: fix expansion issue in __gitcomp()
From: Felipe Contreras @ 2012-11-17 11:39 UTC (permalink / raw)
To: SZEDER Gábor; +Cc: git, Jeff King, Jonathan Nieder, Junio C Hamano
In-Reply-To: <1353150353-29874-7-git-send-email-szeder@ira.uka.de>
On Sat, Nov 17, 2012 at 12:05 PM, SZEDER Gábor <szeder@ira.uka.de> wrote:
> -# Generates completion reply with compgen, appending a space to possible
> -# completion words, if necessary.
> +# Generates completion reply for the word in $cur, appending a space to
> +# possible completion words, if necessary.
> # It accepts 1 to 4 arguments:
> # 1: List of possible completion words.
> # 2: A prefix to be added to each possible completion word (optional).
> -# 3: Generate possible completion matches for this word (optional).
> +# 3: Generate possible completion matches for this word instead of $cur
> +# (optional).
> # 4: A suffix to be appended to each possible completion word (optional).
> __gitcomp ()
> {
> @@ -241,10 +242,22 @@ __gitcomp ()
> COMPREPLY=()
> ;;
> *)
> - local IFS=$'\n'
> - COMPREPLY=($(compgen -P "${2-}" \
> - -W "$(__gitcomp_1 "${1-}" "${4-}")" \
> - -- "$cur_"))
> + local i=0 c IFS=$' \t\n'
> + for c in $1; do
> + case $c in
> + "$cur_"*)
> + c="$c${4-}"
> + case $c in
> + --*=*|*.) ;;
> + *) c="$c " ;;
> + esac
> + COMPREPLY[$i]="${2-}$c"
> + i=$((++i))
> + ;;
> + *)
> + ;;
> + esac
> + done
This is not quite the same as before, is it? Before the suffix would
be taken into consideration for the comparison with $cur_, but not any
more.
Cheers.
--
Felipe Contreras
^ permalink raw reply
* Re: [RFC/PATCH 4/5] completion: get rid of compgen
From: Felipe Contreras @ 2012-11-17 11:42 UTC (permalink / raw)
To: SZEDER Gábor
Cc: git, Junio C Hamano, Björn Gustavsson, Shawn O. Pearce,
Robert Zeh, Peter van der Does, Jonathan Nieder, Jeff King
In-Reply-To: <20121117110031.GE12052@goldbirke>
On Sat, Nov 17, 2012 at 12:00 PM, SZEDER Gábor <szeder@ira.uka.de> wrote:
> On Sat, Nov 17, 2012 at 02:38:17AM +0100, Felipe Contreras wrote:
>> The functionality we use is very simple, plus, this fixes a known
>> breakage 'complete tree filename with metacharacters'.
>>
>> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
>> ---
>> contrib/completion/git-completion.bash | 6 +++++-
>> 1 file changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
>> index 975ae13..ad3e1fe 100644
>> --- a/contrib/completion/git-completion.bash
>> +++ b/contrib/completion/git-completion.bash
>> @@ -227,7 +227,11 @@ fi
>>
>> __gitcompadd ()
>> {
>> - COMPREPLY=($(compgen -W "$1" -P "$2" -S "$4" -- "$3"))
>> + for x in $1; do
>> + if [[ "$x" = "$3"* ]]; then
>> + COMPREPLY+=("$2$x$4")
>> + fi
>> + done
>
> The whole point of creating __gitcomp_nl() back then was to fill
> COMPREPLY without iterating through all words in the wordlist, making
> completion faster for large number of words, e.g. a lot of refs, or
> later a lot of symbols for 'git grep' in a larger project.
>
> The loop here kills that optimization.
So your solution is to move the loop to awk? I fail to see how that
could bring more optimization, specially since it includes an extra
fork now.
--
Felipe Contreras
^ permalink raw reply
* Re: [PATCH] tcsh-completion re-using git-completion.bash
From: Felipe Contreras @ 2012-11-17 11:46 UTC (permalink / raw)
To: SZEDER Gábor; +Cc: Marc Khouzam, git
In-Reply-To: <20121117105605.GB12052@goldbirke>
On Sat, Nov 17, 2012 at 11:56 AM, SZEDER Gábor <szeder@ira.uka.de> wrote:
> On Fri, Nov 16, 2012 at 10:46:16PM +0100, Felipe Contreras wrote:
>> But even in that case, if push comes to shoves, this zsh wrapper can
>> ultimately read COMPREPLY and figure things backwards, as even more
>> previous versions did:
>>
>> http://article.gmane.org/gmane.comp.version-control.git/189310
>
> Even better. I was just going to propose that zsh's completion could
> just read the contents of COMPREPLY at the end of _git() and _gitk(),
> because this way no zsh-induced helper functions and changes would be
> needed to the completion script at all.
I would rather modify the __gitcomp function. Parsing COMPREPLY is too
cumbersome.
> However, running the completion script with Bash would also prevent
> possible issues caused by incompatibilities between the two shells
> mentioned below.
It could, but it doesn't now.
>> >> This is the equivalent of what Marc is doing, except that zsh has no
>> >> problems running bash's code. Note there's a difference with zsh's
>> >> emulation bash (or rather bourne shell, or k shell), and zsh's
>> >> emulation of bash's _completion_. The former is fine, the later is
>> >> not.
>> >
>> > There are a couple of constructs supported by Bash but not by zsh,
>> > which we usually try to avoid.
>>
>> Yes, and is that a big deal?
>
> Not that big, but I wanted to point out that it's not "fine" either.
> Just a slight maintenance burden, because we have to pay attention not
> to use such constructs.
Do we have to pay attention?
I say when we encounter one of such maintenance burden issues _then_
we think about it. In the meantime for all we know sourcing bash's
script from zsh is fine.
--
Felipe Contreras
^ permalink raw reply
* Re: [PATCH 5/7] completion: fix expansion issues in __gitcomp_nl()
From: Felipe Contreras @ 2012-11-17 11:50 UTC (permalink / raw)
To: SZEDER Gábor; +Cc: git, Jeff King, Jonathan Nieder, Junio C Hamano
In-Reply-To: <1353150353-29874-6-git-send-email-szeder@ira.uka.de>
On Sat, Nov 17, 2012 at 12:05 PM, SZEDER Gábor <szeder@ira.uka.de> wrote:
> __gitcomp_nl ()
> {
> local IFS=$'\n'
> - COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
> + COMPREPLY=($(awk -v pfx="${2-}" -v sfx="${4- }" -v cur="${3-$cur}" '
> + BEGIN {
> + FS="\n";
> + len=length(cur);
> + }
> + {
> + if (cur == substr($1, 1, len))
> + print pfx$1sfx;
> + }' <<< "$1" ))
> }
Does this really perform better than my alternative?
+ for x in $1; do
+ if [[ "$x" = "$3"* ]]; then
+ COMPREPLY+=("$2$x$4")
+ fi
+ done
--
Felipe Contreras
^ permalink raw reply
* git-credential-gnome-keyring fails at multilib
From: Peter Alfredsen @ 2012-11-17 14:05 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 1070 bytes --]
Downstream bug report: https://bugs.gentoo.org/443634
The git-credential-gnome-keyring Makefile doesn't allow overriding its
variables, making for spectacular link failure if you use CFLAGS for
aught but decoration.
gcc -g -O2 -Wall -I/usr/include/gnome-keyring-1
-I/usr/include/glib-2.0 -I/usr/lib32/glib-2.0/include -o
git-credential-gnome-keyring.o -c git-credential-gnome-keyring.c
gcc -o git-credential-gnome-keyring -Wl,--as-needed
-Wl,--hash-style=gnu -m32 git-credential-gnome-keyring.o
-lgnome-keyring -lglib-2.0
/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.2/../../../../x86_64-pc-linux-gnu/bin/ld:
i386:x86-64 architecture of input file
`git-credential-gnome-keyring.o' is incompatible with i386 output
/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.2/../../../../x86_64-pc-linux-gnu/bin/ld:
git-credential-gnome-keyring.o: file class ELFCLASS64 incompatible
with ELFCLASS32
/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.2/../../../../x86_64-pc-linux-gnu/bin/ld:
final link failed: File in wrong format
collect2: error: ld returned 1 exit status
Attached patch fixes it.
/Peter
[-- Attachment #2: git-1.8.0-gnome-keyring-multilib.patch --]
[-- Type: application/octet-stream, Size: 597 bytes --]
diff -NrU5 git-1.8.0.orig/contrib/credential/gnome-keyring/Makefile git-1.8.0/contrib/credential/gnome-keyring/Makefile
--- git-1.8.0.orig/contrib/credential/gnome-keyring/Makefile 2012-11-17 14:45:06.536641381 +0100
+++ git-1.8.0/contrib/credential/gnome-keyring/Makefile 2012-11-17 14:45:40.883442939 +0100
@@ -1,11 +1,11 @@
MAIN:=git-credential-gnome-keyring
all:: $(MAIN)
-CC = gcc
-RM = rm -f
-CFLAGS = -g -O2 -Wall
+CC ?= gcc
+RM ?= rm -f
+CFLAGS ?= -g -O2 -Wall
-include ../../../config.mak.autogen
-include ../../../config.mak
INCS:=$(shell pkg-config --cflags gnome-keyring-1)
^ permalink raw reply
* Re: [PATCH 6/7] completion: fix expansion issue in __gitcomp()
From: SZEDER Gábor @ 2012-11-17 14:09 UTC (permalink / raw)
To: Felipe Contreras; +Cc: git, Jeff King, Jonathan Nieder, Junio C Hamano
In-Reply-To: <CAMP44s3J3e_bcyoQmcdQno59dPJuJ4=7ej=-eseE5j2tteD=dA@mail.gmail.com>
On Sat, Nov 17, 2012 at 12:39:24PM +0100, Felipe Contreras wrote:
> On Sat, Nov 17, 2012 at 12:05 PM, SZEDER Gábor <szeder@ira.uka.de> wrote:
>
> > -# Generates completion reply with compgen, appending a space to possible
> > -# completion words, if necessary.
> > +# Generates completion reply for the word in $cur, appending a space to
> > +# possible completion words, if necessary.
> > # It accepts 1 to 4 arguments:
> > # 1: List of possible completion words.
> > # 2: A prefix to be added to each possible completion word (optional).
> > -# 3: Generate possible completion matches for this word (optional).
> > +# 3: Generate possible completion matches for this word instead of $cur
> > +# (optional).
> > # 4: A suffix to be appended to each possible completion word (optional).
> > __gitcomp ()
> > {
> > @@ -241,10 +242,22 @@ __gitcomp ()
> > COMPREPLY=()
> > ;;
> > *)
> > - local IFS=$'\n'
> > - COMPREPLY=($(compgen -P "${2-}" \
> > - -W "$(__gitcomp_1 "${1-}" "${4-}")" \
> > - -- "$cur_"))
> > + local i=0 c IFS=$' \t\n'
> > + for c in $1; do
> > + case $c in
> > + "$cur_"*)
> > + c="$c${4-}"
> > + case $c in
> > + --*=*|*.) ;;
> > + *) c="$c " ;;
> > + esac
> > + COMPREPLY[$i]="${2-}$c"
> > + i=$((++i))
> > + ;;
> > + *)
> > + ;;
> > + esac
> > + done
>
> This is not quite the same as before, is it? Before the suffix would
> be taken into consideration for the comparison with $cur_, but not any
> more.
That's a good catch, thanks.
I remember it puzzled me that the suffix is considered in the
comparison (and that a trailing space would be appended even after a
given suffix, too, so there seems to be no way to disable the trailing
space). However, currently it doesn't make a difference for us,
because afaics we never specify a suffix for __gitcomp(). There were
two instances in _git_config() where we specified "." as suffix, but
those two were converted to __gitcomp_nl(). I changed those callsites
back to __gitcomp() and tried to provoke wrong behavior with the above
patch, but couldn't.
Anyway, it's better to err on the safe side, so here's the fixup.
-- >8 --
Subject: [PATCH] fixup! completion: fix expansion issue in __gitcomp()
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index a1bf732f..29818fb5 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -231,9 +231,9 @@ __gitcomp ()
*)
local i=0 c IFS=$' \t\n'
for c in $1; do
+ c="$c${4-}"
case $c in
"$cur_"*)
- c="$c${4-}"
case $c in
--*=*|*.) ;;
*) c="$c " ;;
--
1.8.0.220.g4d14ece
^ permalink raw reply related
* Re: [RFC/PATCH 4/5] completion: get rid of compgen
From: SZEDER Gábor @ 2012-11-17 14:12 UTC (permalink / raw)
To: Felipe Contreras
Cc: git, Junio C Hamano, Björn Gustavsson, Shawn O. Pearce,
Robert Zeh, Peter van der Does, Jonathan Nieder, Jeff King
In-Reply-To: <CAMP44s21CUb3_KhHBfJXW+Eqd45kz1hcbx3GCbs+f0HNRDEAzw@mail.gmail.com>
On Sat, Nov 17, 2012 at 12:42:38PM +0100, Felipe Contreras wrote:
> On Sat, Nov 17, 2012 at 12:00 PM, SZEDER Gábor <szeder@ira.uka.de> wrote:
> > On Sat, Nov 17, 2012 at 02:38:17AM +0100, Felipe Contreras wrote:
> >> The functionality we use is very simple, plus, this fixes a known
> >> breakage 'complete tree filename with metacharacters'.
> >>
> >> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> >> ---
> >> contrib/completion/git-completion.bash | 6 +++++-
> >> 1 file changed, 5 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> >> index 975ae13..ad3e1fe 100644
> >> --- a/contrib/completion/git-completion.bash
> >> +++ b/contrib/completion/git-completion.bash
> >> @@ -227,7 +227,11 @@ fi
> >>
> >> __gitcompadd ()
> >> {
> >> - COMPREPLY=($(compgen -W "$1" -P "$2" -S "$4" -- "$3"))
> >> + for x in $1; do
> >> + if [[ "$x" = "$3"* ]]; then
> >> + COMPREPLY+=("$2$x$4")
> >> + fi
> >> + done
> >
> > The whole point of creating __gitcomp_nl() back then was to fill
> > COMPREPLY without iterating through all words in the wordlist, making
> > completion faster for large number of words, e.g. a lot of refs, or
> > later a lot of symbols for 'git grep' in a larger project.
> >
> > The loop here kills that optimization.
>
> So your solution is to move the loop to awk? I fail to see how that
> could bring more optimization, specially since it includes an extra
> fork now.
This patch didn't aim for more optimization, but it was definitely a
goal not to waste what we gained by creating __gitcomp_nl() in
a31e6262 (completion: optimize refs completion, 2011-10-15). However,
as it turns out the new version with awk is actually faster than
current master with compgen:
Before:
$ refs="$(for i in {0..9999} ; do echo branch$i ; done)"
$ time __gitcomp_nl "$refs"
real 0m0.242s
user 0m0.220s
sys 0m0.028s
After:
$ time __gitcomp_nl "$refs"
real 0m0.109s
user 0m0.096s
sys 0m0.012s
^ permalink raw reply
* Re: [RFC/PATCH 5/5] completion: refactor __gitcomp_1
From: SZEDER Gábor @ 2012-11-17 14:13 UTC (permalink / raw)
To: Felipe Contreras
Cc: git, Junio C Hamano, Björn Gustavsson, Shawn O. Pearce,
Robert Zeh, Peter van der Does, Jonathan Nieder, Jeff King
In-Reply-To: <CAMP44s3OG+dzxZNpR+qELvcS37KDWh+Bnf0K1zGze4f3P4OWNg@mail.gmail.com>
On Sat, Nov 17, 2012 at 12:27:40PM +0100, Felipe Contreras wrote:
> On Sat, Nov 17, 2012 at 11:58 AM, SZEDER Gábor <szeder@ira.uka.de> wrote:
>
> >> # The following function is based on code from:
> >> @@ -249,10 +246,16 @@ __gitcomp ()
> >> --*=)
> >> ;;
> >> *)
> >> - local IFS=$'\n'
> >> - __gitcompadd "$(__gitcomp_1 "${1-}" "${4-}")" "${2-}" "$cur_" ""
> >> + local c IFS=$' \t\n'
> >> + for c in ${1-}; do
> >> + c=`__gitcomp_1 "$c${4-}"`
> >
> > 1. Backticks.
> > 2. A subshell for every word in the wordlist?
>
> Fine, lets make it hard for zsh then:
No, it's about keeping it usable. With this change offering the
approximately 170 commands for 'git help <TAB>' would take more than 4
seconds on Windows.
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -56,19 +56,6 @@ __gitdir ()
> fi
> }
>
> -__gitcomp_1 ()
> -{
> - local c IFS=$' \t\n'
> - for c in $1; do
> - c="$c$2"
> - case $c in
> - --*=*|*.) ;;
> - *) c="$c " ;;
> - esac
> - printf '%s\n' "$c"
> - done
> -}
> -
> # The following function is based on code from:
> #
> # bash_completion - programmable completion functions for bash 3.2+
> @@ -241,12 +228,22 @@ __gitcomp ()
> COMPREPLY=()
> ;;
> *)
> - local IFS=$'\n'
> - COMPREPLY=($(compgen -P "${2-}" \
> - -W "$(__gitcomp_1 "${1-}" "${4-}")" \
> - -- "$cur_"))
> + local c i IFS=$' \t\n'
> + i=0
> + for c in ${1-}; do
> + c="$c${4-}"
> + case $c in
> + --*=*|*.) ;;
> + *) c="$c " ;;
> + esac
> + if [[ "$c" = "$cur_"* ]]; then
> + (( i++ ))
> + COMPREPLY[$i]="${2-}$c"
> + fi
> + done
> ;;
> esac
> +
> }
>
> # Generates completion reply with compgen from newline-separated possible
>
> --
> Felipe Contreras
^ permalink raw reply
* Re: [PATCH 5/7] completion: fix expansion issues in __gitcomp_nl()
From: SZEDER Gábor @ 2012-11-17 14:14 UTC (permalink / raw)
To: Felipe Contreras; +Cc: git, Jeff King, Jonathan Nieder, Junio C Hamano
In-Reply-To: <CAMP44s1ZgNM1WXPu_-q9aFkz8Ui3czwcUqHWvs7Yspi_p9kuNQ@mail.gmail.com>
On Sat, Nov 17, 2012 at 12:50:39PM +0100, Felipe Contreras wrote:
> On Sat, Nov 17, 2012 at 12:05 PM, SZEDER Gábor <szeder@ira.uka.de> wrote:
>
> > __gitcomp_nl ()
> > {
> > local IFS=$'\n'
> > - COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
> > + COMPREPLY=($(awk -v pfx="${2-}" -v sfx="${4- }" -v cur="${3-$cur}" '
> > + BEGIN {
> > + FS="\n";
> > + len=length(cur);
> > + }
> > + {
> > + if (cur == substr($1, 1, len))
> > + print pfx$1sfx;
> > + }' <<< "$1" ))
> > }
>
> Does this really perform better than my alternative?
>
> + for x in $1; do
> + if [[ "$x" = "$3"* ]]; then
> + COMPREPLY+=("$2$x$4")
> + fi
> + done
It does:
My version:
$ refs="$(for i in {0..9999} ; do echo branch$i ; done)"
$ time __gitcomp_nl "$refs"
real 0m0.109s
user 0m0.096s
sys 0m0.012s
Yours:
$ time __gitcomp_nl "$refs"
real 0m0.321s
user 0m0.312s
sys 0m0.008s
^ permalink raw reply
* Re: [PATCH] tcsh-completion re-using git-completion.bash
From: SZEDER Gábor @ 2012-11-17 14:17 UTC (permalink / raw)
To: Felipe Contreras; +Cc: Marc Khouzam, git
In-Reply-To: <CAMP44s3FFEGJDa6cnwVY0aJkoU_-OdvDPD0gPQtrUqdY2JCpWw@mail.gmail.com>
On Sat, Nov 17, 2012 at 12:46:27PM +0100, Felipe Contreras wrote:
> On Sat, Nov 17, 2012 at 11:56 AM, SZEDER Gábor <szeder@ira.uka.de> wrote:
> > On Fri, Nov 16, 2012 at 10:46:16PM +0100, Felipe Contreras wrote:
>
> >> But even in that case, if push comes to shoves, this zsh wrapper can
> >> ultimately read COMPREPLY and figure things backwards, as even more
> >> previous versions did:
> >>
> >> http://article.gmane.org/gmane.comp.version-control.git/189310
> >
> > Even better. I was just going to propose that zsh's completion could
> > just read the contents of COMPREPLY at the end of _git() and _gitk(),
> > because this way no zsh-induced helper functions and changes would be
> > needed to the completion script at all.
>
> I would rather modify the __gitcomp function. Parsing COMPREPLY is too
> cumbersome.
Each element of COMPREPLY contains a possible completion word. What
parsing is needed to use that, that is so cumbersome?
> > However, running the completion script with Bash would also prevent
> > possible issues caused by incompatibilities between the two shells
> > mentioned below.
>
> It could, but it doesn't now.
>
> >> >> This is the equivalent of what Marc is doing, except that zsh has no
> >> >> problems running bash's code. Note there's a difference with zsh's
> >> >> emulation bash (or rather bourne shell, or k shell), and zsh's
> >> >> emulation of bash's _completion_. The former is fine, the later is
> >> >> not.
> >> >
> >> > There are a couple of constructs supported by Bash but not by zsh,
> >> > which we usually try to avoid.
> >>
> >> Yes, and is that a big deal?
> >
> > Not that big, but I wanted to point out that it's not "fine" either.
> > Just a slight maintenance burden, because we have to pay attention not
> > to use such constructs.
>
> Do we have to pay attention?
Unless you don't mind possible breakages of zsh completion, yes.
> I say when we encounter one of such maintenance burden issues _then_
> we think about it. In the meantime for all we know sourcing bash's
> script from zsh is fine.
That's a cool argument, will remember it when it again comes to
refactoring the __gitcomp() tests. For now those tests work just
fine. When we encounter maintenance burden issues, like fixing a bug
requiring the same modification to all of those tests, then we'll
think about it. ;)
^ permalink raw reply
* using multiple version of git simultaneously
From: arif @ 2012-11-17 14:25 UTC (permalink / raw)
To: git
Hi,
I'm trying to use different version of git simultaneously. So how can i
append some suffix (like "--program-suffix=git1.8) so that i can
distinguish between different versions.
--
Cheers
arif
^ permalink raw reply
* Re: [PATCH] Rename V15_MINGW_HEADERS into CYGWIN_OLD_WINSOCK_HEADERS
From: Mark Levedahl @ 2012-11-17 14:38 UTC (permalink / raw)
To: Torsten Bögershausen; +Cc: git
In-Reply-To: <201211170809.50395.tboegi@web.de>
On 11/17/2012 02:09 AM, Torsten Bögershausen wrote:
> See commit 380a4d927bff693c42fc6b22c3547bdcaac4bdc3:
> "Update cygwin.c for new mingw-64 win32 api headers"
> Cygwin up to 1.7.16 uses some header file from the WINE project
> Cygwin 1.7.17 uses some header file from the mingw-64 project
> As the old cygwin (like 1.5) never used mingw,
> the name V15_MINGW_HEADERS is confusing.
> Rename it into CYGWIN_OLD_WINSOCK_HEADERS
>
>
> diff --git a/Makefile b/Makefile
> index c3edf8c..c2ea735 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1089,7 +1089,7 @@ ifeq ($(uname_O),Cygwin)
> NO_SYMLINK_HEAD = YesPlease
> NO_IPV6 = YesPlease
> OLD_ICONV = UnfortunatelyYes
> - V15_MINGW_HEADERS = YesPlease
> + CYGWIN_OLD_WINSOCK_HEADERS = YesPlease
>
WINSOCK is certainly a part of the win32 api implementation, but it is
is the entire win32api that changed, not just the tiny bit dealing with
sockets.
Basically, WINDOWS.h, and everything it includes, and all of the dlls it
touches, and the .o files, changed. Calling it "OLD" is not helpful,
what happens in the future with the next change? The only version info
we really have is the dll version. We are switching between the win32
api implementation shipped with cygwin dll version 1.5.x and the one
that is now current. And, the shift is not tied to any particular cygwin
1.7.x dll version either (there are no cross dependencies between the
win32api implementation and any particular dll in the 1.7.x series, just
a coincidence in time as to what packages got updated when). So my
suggestion in the bike shedding category is to
s/V15_MINGW_HEADERS/CYGWIN_V15_WIN32API/
/end of bike shedding.
If this is really worth a second patch, I'll be happy to send one :^)
Mark
^ permalink raw reply
* Re: using multiple version of git simultaneously
From: Tomas Carnecky @ 2012-11-17 14:50 UTC (permalink / raw)
To: arif, git
In-Reply-To: <k886on$nn5$1@ger.gmane.org>
On Sat, 17 Nov 2012 20:25:21 +0600, arif <aftnix@gmail.com> wrote:
> I'm trying to use different version of git simultaneously. So how can i
> append some suffix (like "--program-suffix=git1.8) so that i can
> distinguish between different versions.
Install each version into its own prefix (~/git/1.8.0/, ~/git/1.7.0/ etc).
^ permalink raw reply
* Re: Re: [PATCH v3 1/3] git-submodule add: Add -r/--record option
From: Heiko Voigt @ 2012-11-17 15:04 UTC (permalink / raw)
To: W. Trevor King
Cc: Junio C Hamano, Git, Jeff King, Phil Hord, Shawn Pearce,
Jens Lehmann, Nahor
In-Reply-To: <20121110190232.GD2739@mjolnir>
Hi,
sorry for the late reply but my git time is limited.
On Sat, Nov 10, 2012 at 02:02:32PM -0500, W. Trevor King wrote:
> On Fri, Nov 09, 2012 at 05:29:27PM +0100, Heiko Voigt wrote:
> > I think we should agree on a behavior for this option and implement it
> > the same time when add learns about it. When we were discussing floating
> > submodules as an important option for the gerrit people I already started
> > to implement a proof of concept. Please have a look here:
> >
> > https://github.com/hvoigt/git/commits/hv/floating_submodules
>
> After skimming through this, something like
>
> $ git submodule update --pull
>
> would probably be better than introducing a new command:
Yeah along the lines of that, but one thing to keep in mind:
We already have --rebase and --merge which do slightly different things
(I think). Adding --pull here should behave similar to them. Like fetch
and merge is the same to pull without submodules.
If I am understanding your goal correctly your --pull would be
different. On the other hand: A --pull makes no sense if we apply it to
the existing --merge option since it merges the recorded sha1 into the
current HEAD. Just a fetch would not really make a difference.
Thinking along the existing options I would probably still expect --pull
to merge something into the current HEAD. So maybe we have to iron out
where this command/option should go. But changing that once we have a
patch to discuss should not be that much work. So please proceed with
--pull and once we know exactly what it does we can polish that.
> On Sat, Nov 10, 2012 at 01:44:37PM -0500, W. Trevor King wrote:
> > $ git submodule pull-branch
>
> I think "floating submodules" is a misleading name for this feature
> though, since the checkout SHA is explicitly specified. We're just
> making it more convenient to explicitly update the SHA. How about
> "tracking submodules"?
Until now we have always called this workflow floating submodules. I
imaging since the submodule floats to the newest revision (whatever the
user chooses that to be) instead of staying at the recorded sha1.
"tracking submodules" sounds strange to me since the term tracked in git
is mainly used in combination with exact recorded history (e.g. tracking
branch). Since it is about *not* checking out the recorded sha1 but
something that can change I think that could cause confusion.
I think floating is a more unambiguous term and already known on the
list.
Cheers Heiko
^ permalink raw reply
* Re: Re: [PATCH v3 1/3] git-submodule add: Add -r/--record option
From: Heiko Voigt @ 2012-11-17 15:30 UTC (permalink / raw)
To: W. Trevor King
Cc: Junio C Hamano, Git, Jeff King, Phil Hord, Shawn Pearce,
Jens Lehmann, Nahor
In-Reply-To: <20121111150047.GA22608@odin.tremily.us>
Hi,
On Sun, Nov 11, 2012 at 10:00:48AM -0500, W. Trevor King wrote:
> On Sun, Nov 11, 2012 at 02:33:45AM -0800, Junio C Hamano wrote:
> In order to avoid losing (or creating) local-only submodule commits,
> I'll probably bail (with an error) on non-fast-forward pulls. Can
> anyone else think of other safety concerns?
That sounds like a good thing to do. We can allow more flexibility later
if people come up with usecases.
> This means that I'll probably drop Phil's $submodule_* export in v4,
> because the only explicit use we have for it is this branch tracking.
> I still think it is a useful idea, but it may not be useful enough to
> be worth the complexity.
Yes lets concentrate on the branch following first.
> > (2) "git diff [$path]" and friends in the superproject compares the
> > HEAD of the checkout of the submodule at $path with the tip of
> > the branch named by submodule.$name.branch in .gitmodules of
> > the superproject, instead of the commit that is recorded in the
> > index of the superproject.
> >
>
> Hmm. ???git diff??? compares the working tree with the local HEAD (just a
> SHA for submodules), so I don't think it should care about the status
> of a remote branch. This sounds like you want something like:
>
> $ git submodule foreach 'git diff origin/$submodule_branch'
>
> Perhaps this is enough motivation for keeping $submodule_* exports?
>
> > and the option were called something like "--follow-branch=$branch",
> > ???
I am not sure if hiding changes to the recorded SHA1 from the user is
such a useful thing. In the first step I would like it if it was kept
simple and only the submodule update machinery learned to follow a
branch. If that results in local changes that should be shown. The user
is still in charge of recording the updated SHA1 in his commit.
>From what I have heard of projects using this: They usually still have
something that records the SHA1s on a regular basis. Thinking further,
why not record them in git? We could add an option to update which
creates such a commit.
Since git is all about changes I am hesitant to hide them from the user.
> I'll replace -r/--record with --follow-branch in v4.
Sounds good.
Cheers Heiko
^ permalink raw reply
* Re: using multiple version of git simultaneously
From: Jeff King @ 2012-11-17 16:16 UTC (permalink / raw)
To: Tomas Carnecky; +Cc: arif, git
In-Reply-To: <1353163831-ner-9354@calvin>
On Sat, Nov 17, 2012 at 02:50:31PM +0000, Tomas Carnecky wrote:
> On Sat, 17 Nov 2012 20:25:21 +0600, arif <aftnix@gmail.com> wrote:
> > I'm trying to use different version of git simultaneously. So how can i
> > append some suffix (like "--program-suffix=git1.8) so that i can
> > distinguish between different versions.
>
> Install each version into its own prefix (~/git/1.8.0/, ~/git/1.7.0/ etc).
Once you have done that, you can also symlink the binary from each into
your regular PATH (e.g., ln -s ~/git/1.8.0/bin/git ~/bin/git.v1.8) to
make it easy to switch between them. The installed exec-path is baked in
at compile-time, so it finds the correct git sub-programs properly.
I keep a couple dozen built versions of git around like this for quick
regression testing of bugs we see on the list.
-Peff
^ permalink raw reply
* Re: [PATCH] tcsh-completion re-using git-completion.bash
From: Marc Khouzam @ 2012-11-17 17:15 UTC (permalink / raw)
To: Felipe Contreras; +Cc: Junio C Hamano, SZEDER Gábor, git
In-Reply-To: <CAMP44s0y3UPVT+ndELaKNsWXAPG3kv-Xq_Wf6ONDF3Z99A5zMQ@mail.gmail.com>
On Fri, Nov 16, 2012 at 4:56 PM, Felipe Contreras
<felipe.contreras@gmail.com> wrote:
> On Fri, Nov 16, 2012 at 10:20 PM, Junio C Hamano <gitster@pobox.com> wrote:
>
>> The point is not about the quality of zsh's emulation
>> of (k)sh when it is run under that mode, but is about not having to
>> have that logic in bash-only part in the first place.
>
> As I said, that logic can be moved away _if_ my wrapper is merged. But
> then again, that would cause regressions to existing users.
Please forgive me as I don't know the background of the efforts for
zsh git-completion or
the syntax for zsh completion, but I thought I'd mention another
approach I tried for tcsh
which may work for zsh.
I gather that using a wrapper for zsh causes concerns about
backwards-compatibility.
So, what could be done is have the bash script do both jobs: setup the
zsh completion
commands, and output the git completion using bash itself. At the top
of git-completion.bash
(or it could be even pushed at the bottom using if/else) we could use:
if [[ -n ${ZSH_VERSION-} ]]; then
# replace below by zsh completion commands calling `bash
${HOME}/.git-completion.bash`
complete git 'p/*/`bash ${HOME}/.git-completion.bash ${COMMAND_LINE}`/'
complete gitk 'p/*/`bash ${HOME}/.git-completion.bash ${COMMAND_LINE}`/'
exit
fi
That way the zsh user would still simply do 'source
~/.git-completion.bash' which would
only execute the two zsh completion setup commands. Then, when completion is
triggered, it calls `bash ${HOME}/.git-completion.bash ${COMMAND_LINE}` and
processes the output like tcsh does. This limits the zsh-specific
code to 2 lines for
the entire script.
I got this to work for tcsh (solution (B)) adding the following a the top of
git-completion.bash:
test "$tcsh" != "" && \
complete git 'p,*,`${HOME}/.git-completion.sh
"${COMMAND_LINE}"|\sort|\uniq`,' && \
complete gitk 'p,*,`${HOME}/.git-completion.sh
"${COMMAND_LINE}"|\sort|\uniq`,' && \
exit
but I didn't think people would go for that since those lines have to
work in both bash
and tcsh syntax. I thought this made the script a bit brittle.
Just a thought.
Marc
^ permalink raw reply
* Re: [PATCH] tcsh-completion re-using git-completion.bash
From: Felipe Contreras @ 2012-11-17 18:01 UTC (permalink / raw)
To: Marc Khouzam; +Cc: Junio C Hamano, SZEDER Gábor, git
In-Reply-To: <CAFj1UpFbuHVhPOQVB9-sPjW2aBN=H+OUyYnz00qASZ5ssbwmGw@mail.gmail.com>
On Sat, Nov 17, 2012 at 6:15 PM, Marc Khouzam <marc.khouzam@gmail.com> wrote:
> On Fri, Nov 16, 2012 at 4:56 PM, Felipe Contreras
> <felipe.contreras@gmail.com> wrote:
>> On Fri, Nov 16, 2012 at 10:20 PM, Junio C Hamano <gitster@pobox.com> wrote:
>>
>>> The point is not about the quality of zsh's emulation
>>> of (k)sh when it is run under that mode, but is about not having to
>>> have that logic in bash-only part in the first place.
>>
>> As I said, that logic can be moved away _if_ my wrapper is merged. But
>> then again, that would cause regressions to existing users.
>
> Please forgive me as I don't know the background of the efforts for
> zsh git-completion or
> the syntax for zsh completion, but I thought I'd mention another
> approach I tried for tcsh
> which may work for zsh.
>
> I gather that using a wrapper for zsh causes concerns about
> backwards-compatibility.
I don't see any concerns.
> if [[ -n ${ZSH_VERSION-} ]]; then
> # replace below by zsh completion commands calling `bash
> ${HOME}/.git-completion.bash`
> complete git 'p/*/`bash ${HOME}/.git-completion.bash ${COMMAND_LINE}`/'
> complete gitk 'p/*/`bash ${HOME}/.git-completion.bash ${COMMAND_LINE}`/'
That doesn't work in zsh. It might be possible to do something
similar, but it would probably require many more lines.
And we can achieve the same by essentially moving the relevant code of
my wrapper:
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -23,10 +23,6 @@
# 3) Consider changing your PS1 to also show the current branch,
# see git-prompt.sh for details.
-if [[ -n ${ZSH_VERSION-} ]]; then
- autoload -U +X bashcompinit && bashcompinit
-fi
-
case "$COMP_WORDBREAKS" in
*:*) : great ;;
*) COMP_WORDBREAKS="$COMP_WORDBREAKS:"
@@ -2404,6 +2400,32 @@ __gitk_main ()
__git_complete_revlist
}
+if [[ -n ${ZSH_VERSION-} ]]; then
+ emulate -L zsh
+
+ __gitcompadd ()
+ {
+ compadd -Q -S "$4" -P "${(M)cur#*[=:]}" -p "$2" --
${=1} && _ret=0
+ }
+
+ _git ()
+ {
+ local _ret=1
+ () {
+ emulate -L ksh
+ local cur cword prev
+ cur=${words[CURRENT-1]}
+ prev=${words[CURRENT-2]}
+ let cword=CURRENT-1
+ __${service}_main
+ }
+ let _ret && _default -S '' && _ret=0
+ return _ret
+ }
+ compdef _git git gitk
+ return
+fi
+
__git_func_wrap ()
{
if [[ -n ${ZSH_VERSION-} ]]; then
--
Felipe Contreras
^ permalink raw reply
* Re: [PATCH 5/7] completion: fix expansion issues in __gitcomp_nl()
From: Felipe Contreras @ 2012-11-17 19:08 UTC (permalink / raw)
To: SZEDER Gábor; +Cc: git, Jeff King, Jonathan Nieder, Junio C Hamano
In-Reply-To: <20121117141422.GI12052@goldbirke>
On Sat, Nov 17, 2012 at 3:14 PM, SZEDER Gábor <szeder@ira.uka.de> wrote:
> On Sat, Nov 17, 2012 at 12:50:39PM +0100, Felipe Contreras wrote:
>> On Sat, Nov 17, 2012 at 12:05 PM, SZEDER Gábor <szeder@ira.uka.de> wrote:
>>
>> > __gitcomp_nl ()
>> > {
>> > local IFS=$'\n'
>> > - COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
>> > + COMPREPLY=($(awk -v pfx="${2-}" -v sfx="${4- }" -v cur="${3-$cur}" '
>> > + BEGIN {
>> > + FS="\n";
>> > + len=length(cur);
>> > + }
>> > + {
>> > + if (cur == substr($1, 1, len))
>> > + print pfx$1sfx;
>> > + }' <<< "$1" ))
>> > }
>>
>> Does this really perform better than my alternative?
>>
>> + for x in $1; do
>> + if [[ "$x" = "$3"* ]]; then
>> + COMPREPLY+=("$2$x$4")
>> + fi
>> + done
>
> It does:
>
> My version:
>
> $ refs="$(for i in {0..9999} ; do echo branch$i ; done)"
> $ time __gitcomp_nl "$refs"
>
> real 0m0.109s
> user 0m0.096s
> sys 0m0.012s
>
> Yours:
>
> $ time __gitcomp_nl "$refs"
>
> real 0m0.321s
> user 0m0.312s
> sys 0m0.008s
Yeah, for 10000 refs, which is not the common case:
== 1 ==
SZEDER:
real 0m0.007s
user 0m0.003s
sys 0m0.000s
felipec:
real 0m0.000s
user 0m0.000s
sys 0m0.000s
== 10 ==
SZEDER:
real 0m0.004s
user 0m0.003s
sys 0m0.001s
felipec:
real 0m0.000s
user 0m0.000s
sys 0m0.000s
== 100 ==
SZEDER:
real 0m0.005s
user 0m0.002s
sys 0m0.002s
felipec:
real 0m0.002s
user 0m0.002s
sys 0m0.000s
== 1000 ==
SZEDER:
real 0m0.010s
user 0m0.008s
sys 0m0.001s
felipec:
real 0m0.018s
user 0m0.017s
sys 0m0.001s
== 10000 ==
SZEDER:
real 0m0.062s
user 0m0.060s
sys 0m0.003s
felipec:
real 0m0.175s
user 0m0.174s
sys 0m0.000s
== 100000 ==
SZEDER:
real 0m0.595s
user 0m0.593s
sys 0m0.021s
felipec:
real 0m1.848s
user 0m1.843s
sys 0m0.003s
== 1000000 ==
SZEDER:
real 0m6.258s
user 0m6.241s
sys 0m0.215s
felipec:
real 0m18.191s
user 0m18.115s
sys 0m0.045s
--
Felipe Contreras
^ permalink raw reply
* Re: Re: [PATCH v3 1/3] git-submodule add: Add -r/--record option
From: W. Trevor King @ 2012-11-17 19:20 UTC (permalink / raw)
To: Heiko Voigt
Cc: Junio C Hamano, Git, Jeff King, Phil Hord, Shawn Pearce,
Jens Lehmann, Nahor
In-Reply-To: <20121117150441.GA7695@book.hvoigt.net>
[-- Attachment #1: Type: text/plain, Size: 3410 bytes --]
On Sat, Nov 17, 2012 at 04:04:42PM +0100, Heiko Voigt wrote:
> > On Sat, Nov 10, 2012 at 01:44:37PM -0500, W. Trevor King wrote:
> > > $ git submodule pull-branch
> >
> > I think "floating submodules" is a misleading name for this feature
> > though, since the checkout SHA is explicitly specified. We're just
> > making it more convenient to explicitly update the SHA. How about
> > "tracking submodules"?
>
> Until now we have always called this workflow floating submodules. I
> imaging since the submodule floats to the newest revision (whatever the
> user chooses that to be) instead of staying at the recorded sha1.
>
> "tracking submodules" sounds strange to me since the term tracked in git
> is mainly used in combination with exact recorded history (e.g. tracking
> branch). Since it is about *not* checking out the recorded sha1 but
> something that can change I think that could cause confusion.
>
> I think floating is a more unambiguous term and already known on the
> list.
I had been getting the impression that floating submodules would
automatically update without explicit user intervention. After
re-reading your initial floating submodules post, it looks like we do
match up after the mapping:
Git Heiko Trevor
--------- ----------------- -------------
update update --checkout update
update update --pull
So I'll go back to "floating" ;).
On Sat, Nov 17, 2012 at 04:30:07PM +0100, Heiko Voigt wrote:
> > > (2) "git diff [$path]" and friends in the superproject compares the
> > > HEAD of the checkout of the submodule at $path with the tip of
> > > the branch named by submodule.$name.branch in .gitmodules of
> > > the superproject, instead of the commit that is recorded in the
> > > index of the superproject.
> > >
> >
> > Hmm. ???git diff??? compares the working tree with the local HEAD (just a
> > SHA for submodules), so I don't think it should care about the status
> > of a remote branch. This sounds like you want something like:
> >
> > $ git submodule foreach 'git diff origin/$submodule_branch'
> >
> > Perhaps this is enough motivation for keeping $submodule_* exports?
> >
> > > and the option were called something like "--follow-branch=$branch",
> > > ???
>
> I am not sure if hiding changes to the recorded SHA1 from the user is
> such a useful thing. In the first step I would like it if it was kept
> simple and only the submodule update machinery learned to follow a
> branch. If that results in local changes that should be shown. The user
> is still in charge of recording the updated SHA1 in his commit.
I understand what you're warning against here, or what it has to do
with "git diff".
> From what I have heard of projects using this: They usually still have
> something that records the SHA1s on a regular basis. Thinking further,
> why not record them in git? We could add an option to update which
> creates such a commit.
I think it's best to have users craft their own commit messages
explaining why the branch was updated. That said, an auto-generated
hint (a la "git merge") would probably be a useful extra feature.
--
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH 5/7] completion: fix expansion issues in __gitcomp_nl()
From: Felipe Contreras @ 2012-11-17 19:28 UTC (permalink / raw)
To: SZEDER Gábor; +Cc: git, Jeff King, Jonathan Nieder, Junio C Hamano
In-Reply-To: <CAMP44s2YOshWkM9n2XxxLw79=-VF8U3Q4ta1D1zgHqWH30zOmw@mail.gmail.com>
On Sat, Nov 17, 2012 at 8:08 PM, Felipe Contreras
<felipe.contreras@gmail.com> wrote:
> On Sat, Nov 17, 2012 at 3:14 PM, SZEDER Gábor <szeder@ira.uka.de> wrote:
>> On Sat, Nov 17, 2012 at 12:50:39PM +0100, Felipe Contreras wrote:
>>> On Sat, Nov 17, 2012 at 12:05 PM, SZEDER Gábor <szeder@ira.uka.de> wrote:
>>>
>>> > __gitcomp_nl ()
>>> > {
>>> > local IFS=$'\n'
>>> > - COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
>>> > + COMPREPLY=($(awk -v pfx="${2-}" -v sfx="${4- }" -v cur="${3-$cur}" '
>>> > + BEGIN {
>>> > + FS="\n";
>>> > + len=length(cur);
>>> > + }
>>> > + {
>>> > + if (cur == substr($1, 1, len))
>>> > + print pfx$1sfx;
>>> > + }' <<< "$1" ))
>>> > }
>>>
>>> Does this really perform better than my alternative?
>>>
>>> + for x in $1; do
>>> + if [[ "$x" = "$3"* ]]; then
>>> + COMPREPLY+=("$2$x$4")
>>> + fi
>>> + done
>>
>> It does:
>>
>> My version:
>>
>> $ refs="$(for i in {0..9999} ; do echo branch$i ; done)"
>> $ time __gitcomp_nl "$refs"
>>
>> real 0m0.109s
>> user 0m0.096s
>> sys 0m0.012s
>>
>> Yours:
>>
>> $ time __gitcomp_nl "$refs"
>>
>> real 0m0.321s
>> user 0m0.312s
>> sys 0m0.008s
>
> Yeah, for 10000 refs, which is not the common case:
And this beats both in every case:
while read -r x; do
if [[ "$x" == "$3"* ]]; then
COMPREPLY+=("$2$x$4")
fi
done <<< $1
== 1 ==
one:
real 0m0.004s
user 0m0.003s
sys 0m0.000s
two:
real 0m0.000s
user 0m0.000s
sys 0m0.000s
== 10 ==
one:
real 0m0.005s
user 0m0.002s
sys 0m0.002s
two:
real 0m0.000s
user 0m0.000s
sys 0m0.000s
== 100 ==
one:
real 0m0.005s
user 0m0.004s
sys 0m0.000s
two:
real 0m0.001s
user 0m0.000s
sys 0m0.000s
== 1000 ==
one:
real 0m0.010s
user 0m0.008s
sys 0m0.001s
two:
real 0m0.004s
user 0m0.004s
sys 0m0.000s
== 10000 ==
one:
real 0m0.061s
user 0m0.057s
sys 0m0.005s
two:
real 0m0.045s
user 0m0.044s
sys 0m0.000s
== 100000 ==
one:
real 0m0.582s
user 0m0.575s
sys 0m0.022s
two:
real 0m0.487s
user 0m0.482s
sys 0m0.004s
== 1000000 ==
one:
real 0m6.305s
user 0m6.284s
sys 0m0.216s
two:
real 0m5.268s
user 0m5.194s
sys 0m0.065s
--
Felipe Contreras
^ permalink raw reply
* Re: [RFC/PATCH 4/5] completion: get rid of compgen
From: Felipe Contreras @ 2012-11-17 19:33 UTC (permalink / raw)
To: SZEDER Gábor
Cc: git, Junio C Hamano, Björn Gustavsson, Shawn O. Pearce,
Robert Zeh, Peter van der Does, Jonathan Nieder, Jeff King
In-Reply-To: <20121117141215.GG12052@goldbirke>
On Sat, Nov 17, 2012 at 3:12 PM, SZEDER Gábor <szeder@ira.uka.de> wrote:
> On Sat, Nov 17, 2012 at 12:42:38PM +0100, Felipe Contreras wrote:
>> On Sat, Nov 17, 2012 at 12:00 PM, SZEDER Gábor <szeder@ira.uka.de> wrote:
>> > On Sat, Nov 17, 2012 at 02:38:17AM +0100, Felipe Contreras wrote:
>> >> The functionality we use is very simple, plus, this fixes a known
>> >> breakage 'complete tree filename with metacharacters'.
>> >>
>> >> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
>> >> ---
>> >> contrib/completion/git-completion.bash | 6 +++++-
>> >> 1 file changed, 5 insertions(+), 1 deletion(-)
>> >>
>> >> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
>> >> index 975ae13..ad3e1fe 100644
>> >> --- a/contrib/completion/git-completion.bash
>> >> +++ b/contrib/completion/git-completion.bash
>> >> @@ -227,7 +227,11 @@ fi
>> >>
>> >> __gitcompadd ()
>> >> {
>> >> - COMPREPLY=($(compgen -W "$1" -P "$2" -S "$4" -- "$3"))
>> >> + for x in $1; do
>> >> + if [[ "$x" = "$3"* ]]; then
>> >> + COMPREPLY+=("$2$x$4")
>> >> + fi
>> >> + done
>> >
>> > The whole point of creating __gitcomp_nl() back then was to fill
>> > COMPREPLY without iterating through all words in the wordlist, making
>> > completion faster for large number of words, e.g. a lot of refs, or
>> > later a lot of symbols for 'git grep' in a larger project.
>> >
>> > The loop here kills that optimization.
>>
>> So your solution is to move the loop to awk? I fail to see how that
>> could bring more optimization, specially since it includes an extra
>> fork now.
>
> This patch didn't aim for more optimization, but it was definitely a
> goal not to waste what we gained by creating __gitcomp_nl() in
> a31e6262 (completion: optimize refs completion, 2011-10-15). However,
> as it turns out the new version with awk is actually faster than
> current master with compgen:
>
> Before:
>
> $ refs="$(for i in {0..9999} ; do echo branch$i ; done)"
> $ time __gitcomp_nl "$refs"
>
> real 0m0.242s
> user 0m0.220s
> sys 0m0.028s
>
> After:
>
> $ time __gitcomp_nl "$refs"
>
> real 0m0.109s
> user 0m0.096s
> sys 0m0.012s
This one is even faster:
while read -r x; do
if [[ "$x" == "$3"* ]]; then
COMPREPLY+=("$2$x$4")
fi
done <<< $1
== 10000 ==
one:
real 0m0.148s
user 0m0.134s
sys 0m0.025s
two:
real 0m0.055s
user 0m0.054s
sys 0m0.000s
--
Felipe Contreras
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox