Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: [PATCH] compdescribe fix for unsorted groups (workers/34814) (was: Re: completion: git: --fixup: problem with _describe -2V and duplicate commit subjects)



On May 17, 11:40pm, Daniel Shahaf wrote:
} Subject: Re: [PATCH] compdescribe fix for unsorted groups (workers/34814) 
}
} Bart Schaefer wrote on Sat, May 16, 2015 at 21:07:35 -0700:
} > In any case I can't reproduce your reported problem, at least not quite
} > as you explain it above.
} > 
} > Starting from commit d52bf91659522435d68f719389095001f050b6c5, I applied
} > DH's seven patches and then your 35127

OK, now starting from commit 34a1489f436d95bc2404f8e371130a469cbccebe, I
apply 35127 and:

torch% zstyle -L
zstyle ':completion:*:messages' format %S%d%s
zstyle ':completion:*:warnings' format 'No matches for %U%d%u'
zstyle ':completion:*' format '%SCompleting %U%d%u%s'
zstyle ':completion:*' group-name ''
zstyle ':completion:*' ignore-parents parent pwd ..
zstyle ':completion::*' insert-tab 'pending=1'
zstyle ':completion:*' menu 'yes=long' 'select=long-list'
zstyle ':completion:*' verbose true
torch% git checkout 1<TAB>
Completing recent commit object name
1d5b225  -- 35100: __git_recent_commits: massage ' ->*' from heads (3 hours 
153a99d  -- 35154: NEWS on arithmetic evaluation changes (3 days ago)
15aa99b  -- 35139: complete the new (b) parameter flag (3 days ago)
1d5b225  -- 35100: __git_recent_commits: massage ' ->*' from heads (3 hours 
153a99d  -- 35154: NEWS on arithmetic evaluation changes (3 days ago)
15aa99b  -- 35139: complete the new (b) parameter flag (3 days ago)

The duplication remains annoying -- again, this is coming from commit
454f079852deb0c704870c7d5a462485f1e65bbf (workers/35101) -- but I still
can't reproduce what you're seeing.  I even whittled down to:

torch% zstyle -L   
zstyle ':completion:*' group-name ''
zstyle ':completion:*' tag-order 'commits commit-objects' '*'
torch% git checkout 1<TAB>
1d5b225  -- 35100: __git_recent_commits: massage ' ->*' from heads (3 hours 
153a99d  -- 35154: NEWS on arithmetic evaluation changes (3 days ago)
15aa99b  -- 35139: complete the new (b) parameter flag (3 days ago)
1d5b225  -- 35100: __git_recent_commits: massage ' ->*' from heads (3 hours 
153a99d  -- 35154: NEWS on arithmetic evaluation changes (3 days ago)
15aa99b  -- 35139: complete the new (b) parameter flag (3 days ago)

Is there something else being found in your git tree(s) that I don't have?

Then you have this:

} 1                          4                          dot-zsh-3.1.5-pws-17       master                     zsh-4.0-patches
} 2                          \#CVSPS.NO.BRANCH          dot-zsh-3.1.5-pws-19       zsh                        zsh-4.2-patches
} 3                          dot-zsh-3.1.5-pws-14       interrupt_abort            zsh-3.1.5-pws-16-patches   

Something is generating 1 2 3 4 as possible completions.  Do you perhaps
have a git alias for a command that's being invoked by _git, so that the
output is not as _git expects?  (The "stray" 1 in your output is the 1 on
the command line matching exactly the 1 in this listing.)



Messages sorted by: Reverse Date, Date, Thread, Author