D5836: zsh: fix `hg resolve` completion when in a subdirectory (issue6067)
spectral (Kyle Lippincott)
phabricator at mercurial-scm.org
Mon Feb 4 22:29:14 UTC 2019
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5836
AFFECTED FILES
contrib/zsh_completion
CHANGE DETAILS
diff --git a/contrib/zsh_completion b/contrib/zsh_completion
--- a/contrib/zsh_completion
+++ b/contrib/zsh_completion
@@ -248,7 +248,7 @@
[[ -d $PREFIX ]] || PREFIX=$PREFIX:h
- _hg_cmd resolve -l ./$PREFIX | while read rstate rpath
+ _hg_cmd resolve -l ./$PREFIX -T'{mergestatus}\ {relpath\(path\)}\\n' | while read rstate rpath
do
[[ $rstate == 'R' ]] && resolved_files+=($rpath)
[[ $rstate == 'U' ]] && unresolved_files+=($rpath)
To: spectral, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list