On Thu, Sep 27, 2012 at 02:43:38AM -0400, Jeff King wrote:
> Ah. The problem is that most of the load comes from my patch 4/3, which
> does a separate iteration. Here are the numbers after just patch 3:
>
> $ time __gitcomp_nl "$refs"
> real 0m0.344s
> user 0m0.392s
> sys 0m0.040s
>
> Slower, but not nearly as painful. Here are the numbers using sed[1]
> instead:
>
> $ time __gitcomp_nl "$refs"
> real 0m0.100s
> user 0m0.084s
> sys 0m0.016s
>
> So a little slower, but probably acceptable. We could maybe do the same
> trick on the output side (although it is a little trickier there,
> because we need it in a bash array). Of course, this is Linux; the fork
> for sed is way more expensive on some systems.
So something like the patch below does the quoting correctly (try
committing a file like "name with spaces" and doing "git show
HEAD:<TAB>"), and isn't too much slower:
real 0m0.114s
user 0m0.108s
sys 0m0.004s
That's almost double the time without handling quoting, but keep in mind
this is on 10,000 entries (and the real sluggishness we are trying to
avoid is an order of magnitude). So it might be acceptable.
This is just a proof-of-concept patch. We'd probably want to replace the
perl below with a more complicated sed invocation for portability (the
trickiness is that the output is shown to the user, so we very much
don't want to quote anything that does not have to be).
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index be800e0..20c09ef 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -225,6 +225,17 @@ fi
fi
fi
+# Quotes each element of a newline-delimited list for shell reuse
+__git_quote()
+{
+ echo "$1" |
+ sed "
+ s/'/'\\\\''/g
+ s/^/'/
+ s/$/'/
+ "
+}
+
# Generates completion reply with compgen, appending a space to possible
# completion words, if necessary.
# It accepts 1 to 4 arguments:
@@ -261,7 +272,10 @@ __gitcomp_nl ()
__gitcomp_nl ()
{
local IFS=$'\n'
- COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
+ COMPREPLY=($(
+ compgen -P "${2-}" -S "${4- }" -W "$(__git_quote "$1")" -- "${3-$cur}" |
+ perl -lne '/(.*?)( ?)$/; print quotemeta($1), $2'
+ ))
}
__git_heads ()
-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html