comparison contrib/zsh_completion @ 41681:61415361e906

zsh: fix `hg resolve` completion when in a subdirectory (issue6067) Differential Revision: https://phab.mercurial-scm.org/D5836
author Kyle Lippincott <spectral@google.com>
date Mon, 04 Feb 2019 14:29:03 -0800
parents d365e2b7aa2a
children 0c0e54bcea9b
comparison
equal deleted inserted replaced
41680:8185c8abce87 41681:61415361e906
246 _hg_resolve() { 246 _hg_resolve() {
247 local rstate rpath 247 local rstate rpath
248 248
249 [[ -d $PREFIX ]] || PREFIX=$PREFIX:h 249 [[ -d $PREFIX ]] || PREFIX=$PREFIX:h
250 250
251 _hg_cmd resolve -l ./$PREFIX | while read rstate rpath 251 _hg_cmd resolve -l ./$PREFIX -T '{mergestatus}\ {relpath\(path\)}\\n' | while read rstate rpath
252 do 252 do
253 [[ $rstate == 'R' ]] && resolved_files+=($rpath) 253 [[ $rstate == 'R' ]] && resolved_files+=($rpath)
254 [[ $rstate == 'U' ]] && unresolved_files+=($rpath) 254 [[ $rstate == 'U' ]] && unresolved_files+=($rpath)
255 done 255 done
256 } 256 }