Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
zsh: fix `hg resolve` completion when in a subdirectory (issue6067)
authorKyle Lippincott <spectral@google.com>
Mon, 04 Feb 2019 14:29:03 -0800
changeset 41681 61415361e906
parent 41680 8185c8abce87
child 41682 1ab6f5df263e
zsh: fix `hg resolve` completion when in a subdirectory (issue6067) Differential Revision: https://phab.mercurial-scm.org/D5836
contrib/zsh_completion file | annotate | diff | comparison | revisions 
--- a/contrib/zsh_completion	Sun Feb 03 19:10:39 2019 +0530
+++ b/contrib/zsh_completion	Mon Feb 04 14:29:03 2019 -0800
@@ -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)
Mercurial