From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28389 invoked by alias); 13 May 2015 14:26:59 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 35105 Received: (qmail 5021 invoked from network); 13 May 2015 14:26:47 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,UNPARSEABLE_RELAY autolearn=ham version=3.3.2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=thequod.de; h= references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received:received; s=postfix2; t= 1431527205; bh=gKaRezVVDm+IufXxkGyx9ipncf9XpSmM/Vqb/ZpbUfQ=; b=N X0HWWu5J7armpCa26ETPK5gvlG+yA4JuXOD/BIwytzHQ1AJP7taSvhZr2rD++jBX BJCmjJ2sSn5D/u3mPQMwJ1GVylYcqjXM7oCsM0hcL1XzKbdfn12FF2mVcD7IXNcO gjywhyLdYNMfe3qZAD568nfu8Z7BEpLLCR+8GGxSjg= From: Daniel Hahler To: zsh-workers@zsh.org Subject: [PATCH 7/7] completion: git: add distance_from_head to __git_recent_commits Date: Wed, 13 May 2015 16:26:31 +0200 Message-Id: <1431527191-32165-8-git-send-email-genml+zsh-workers@thequod.de> X-Mailer: git-send-email 2.4.0.dirty In-Reply-To: <1431527191-32165-1-git-send-email-genml+zsh-workers@thequod.de> References: <1431527191-32165-1-git-send-email-genml+zsh-workers@thequod.de> From: Daniel Shahaf This adds the "HEAD~15" gitrevisions(7) identifier of the commit to the description, which also uniquifies, isn't redundant, and may be easier to type. Ref: zsh-workers/34820 (http://www.zsh.org/mla/workers/2015/msg00744.html) --- Completion/Unix/Command/_git | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 09ea68b..ef95dfd 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -5671,6 +5671,7 @@ __git_recent_commits () { local gitdir expl start declare -a descr tags heads commits local i j k + integer distance_from_head # Careful: most %d will expand to the empty string. Quote properly! : "${(A)commits::=${(@f)"$(_call_program commits git --no-pager log -20 --format='%h%n%D%n%s\ \(%cr\)')"}}" @@ -5679,7 +5680,19 @@ __git_recent_commits () { for i j k in "$commits[@]" ; do # Note: the after-the-colon part must be unique across the entire array; # see workers/34768 - descr+=("$i:[$i] $k") + if (( distance_from_head == 0 )); then + descr+=($i:"[HEAD] $k") + elif (( distance_from_head == 1 )); then + descr+=($i:"[HEAD^] $k") + elif (( distance_from_head == 2 )); then + descr+=($i:"[HEAD^^] $k") + elif (( distance_from_head < 10 )); then + descr+=($i:"[HEAD~$distance_from_head] $k") + else + descr+=($i:"[HEAD~$distance_from_head] $k") + fi + (( ++distance_from_head )) + j=${j%% ->*} # Remove " -> master, origin/master" etc. for j in ${(s:, :)j}; do if [[ $j == 'tag: '* ]] ; then -- 2.4.0.dirty