D5836: zsh: fix `hg resolve` completion when in a subdirectory (issue6067)
spectral (Kyle Lippincott)
phabricator at mercurial-scm.org
Tue Feb 12 09:20:27 EST 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG61415361e906: zsh: fix `hg resolve` completion when in a subdirectory (issue6067) (authored by spectral, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D5836?vs=13763&id=14045#toc
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5836?vs=13763&id=14045
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, pulkit
Cc: pulkit, av6, mercurial-devel
More information about the Mercurial-devel
mailing list