From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Cc: Daniel Hahler <genml+zsh-workers@thequod.de>
Subject: [PATCH] __git_recent_branches: Optimise.
Date: Thu, 25 Aug 2016 00:59:08 +0000 [thread overview]
Message-ID: <1472086748-16738-1-git-send-email-danielsh@fujitsu.shahaf.local2> (raw)
This improves performance from 0.6s to 0.04s (+93%) on one of Daniel Hahler's repositories.
---
Completion/Unix/Command/_git | 42 +++++++++++++++++++++++-------------------
1 file changed, 23 insertions(+), 19 deletions(-)
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 40b2c11..66fc557 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -6051,35 +6051,39 @@ __git_recent_branches__names()
#
# See workers/38592 for an equivalent long-hand implementation, and the rest
# of that thread for why this implementation was chosen instead.
+ #
+ # Note: since we obtain the "from" part of the reflog, we only obtain heads, not tags.
reply=(${${(u)${${(0)"$(_call_program reflog git reflog -1000 -z --grep-reflog='\^checkout:\ moving\ from\ ' --pretty='%gs')"}#checkout: moving from }%% *}:#[[:xdigit:]](#c40)})
}
(( $+functions[__git_recent_branches] )) ||
__git_recent_branches() {
local -a branches descriptions
- local branch description
local -a reply
+ local -aU valid_ref_names_munged=( ${"${(f)"$(_call_program valid-ref-names 'git for-each-ref --format="%(refname)" refs/heads/ refs/tags/')"}"#refs/(heads|tags)/} )
- __git_recent_branches__names \
- ; for branch in $reply
- do
- # ### We'd want to convert all $reply to $descriptions in one shot,
- # ### with this:
- # ### array=("${(ps:\0:)"$(_call_program descriptions git --no-pager log --no-walk=unsorted -z --pretty=%s ${(q)reply} --)"}")
- # ### , but git croaks if any of the positional arguments is a ref name
- # ### that has been deleted. (So does 'git rev-parse'.)
- # ### Hence, we resort to fetching the descriptions one-by-one.
- # ### This would be costly if fork() is expensive.
- description="$(_call_program description git --no-pager log --no-walk=unsorted --pretty=%s ${(q)branch} --)"
-
- # If the ref has been deleted, $description would be empty.
- if [[ -n "$description" ]]; then
- branches+=$branch
- descriptions+="${branch//:/\:}:${description}"
- fi
+ # 1. Obtain names of recently-checked-out branches from the reflog.
+ # 2. Remove ref names that that no longer exist from the list.
+ # (We must do this because #3 would otherwise croak on them.)
+ __git_recent_branches__names; branches=( ${(@)reply:*valid_ref_names_munged} )
+
+ # 3. Obtain log messages for all of them in one shot.
+ descriptions=( ${(f)"$(_call_program all-descriptions git --no-pager log --no-walk=unsorted --pretty=%s ${(q)branches} --)"} )
+
+ if (( $#branches != $#descriptions )); then
+ # ### Trouble...
+ zle -M "__git_recent_branches: \$#branches != \$#descriptions"
+ return 1
+ fi
+
+ # 4. Synthesize the data structure _describe wants.
+ local -a branches_colon_descriptions
+ local branch description
+ for branch description in ${branches:^descriptions} ; do
+ branches_colon_descriptions+="${branch//:/\:}:${description}"
done
- _describe -V -t recent-branches "recent branches" descriptions branches
+ _describe -V -t recent-branches "recent branches" branches_colon_descriptions
}
(( $+functions[__git_commits_prefer_recent] )) ||
next reply other threads:[~2016-08-25 0:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-25 0:59 Daniel Shahaf [this message]
2016-08-30 3:36 ` [PATCH] __git_recent_branches: Silence warning on an edge case Daniel Shahaf
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=1472086748-16738-1-git-send-email-danielsh@fujitsu.shahaf.local2 \
--to=d.s@daniel.shahaf.name \
--cc=genml+zsh-workers@thequod.de \
--cc=zsh-workers@zsh.org \
/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.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
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).