vcs_info on a hg repository with a git subrepository; actionformats works ok, formats does not

vcs_info on a hg repository with a git subrepository; actionformats works ok, formats does not

[Ioannis Koutras]

Dear all,

I am using zsh v5.0.0, mercurial v2.3.1 and git v1.7.12 on ArchLinux.

I have enabled and been using the vcs_info function for my prompt as following:

> autoload -Uz colors && colors
> autoload -Uz vcs_info
> zstyle ':vcs_info:*' enable git hg svn
> zstyle ':vcs_info:*' check-for-changes true
> zstyle ':vcs_info:*' get-revision true
> zstyle ':vcs_info:*' unstagedstr '!'
> zstyle ':vcs_info:hg*:*' branchformat "%b"
> zstyle ':vcs_info:hg*:*' hgrevformat "%r"
> zstyle ':vcs_info:hg*:*' get-unapplied true
> zstyle ':vcs_info:hg*:*' patch-format "mq(%g):%n/%c %p"
> zstyle ':vcs_info:hg*:*' nopatch-format "mq(%g):%n/%c %p"
> zstyle ':vcs_info:hg*' formats "(%s) [%i%u %b %m]"
> zstyle ':vcs_info:hg*' actionformats "(%s|%a) [%i%u %b %m]"
>
> local user_host="%{$terminfo[bold]$fg[green]%}%n@%m%{$reset_color%}"
> local current_dir="%{$terminfo[bold]$fg[blue]%} %~%{$reset_color%}"
> setopt PROMPT_SUBST
> precmd() { vcs_info }
> PROMPT='╭─${user_host} ${current_dir} %{$fg[green]%}${vcs_info_msg_0_}%{$reset_color%}
> ╰─%B$%b '

Generally this setup works well, there is just one case where it does
not, a mercurial repository with a git sub-repository. More
specifically, when no change has been done I get a prompt like this:

> (hg) [git --version ]

On the other hand, prompt is ok if there is a change, e.g.:

> (hg) [5! default ]

I have found out that %i is replaced by "git" and %b by "--version" in
formats, but in actionformats they seem to be properly replaced.

Apparently this is an issue of the formatting, but in previous
versions it was working. E.g. the same configuration works on another
PC with zsh v4.3.17, mercurial v2.0.2 and git v1.7.9.5. Any idea what
could be the problem?


Kind regards,

Yannis

Re: vcs_info on a hg repository with a git subrepository; actionformats works ok, formats does not

[Frank Terbeck]

Ioannis Koutras wrote:
[...]
> Generally this setup works well, there is just one case where it does
> not, a mercurial repository with a git sub-repository. More
> specifically, when no change has been done I get a prompt like this:
>
>> (hg) [git --version ]
>
> On the other hand, prompt is ok if there is a change, e.g.:
>
>> (hg) [5! default ]
>
> I have found out that %i is replaced by "git" and %b by "--version" in
> formats, but in actionformats they seem to be properly replaced.
>
> Apparently this is an issue of the formatting, but in previous
> versions it was working. E.g. the same configuration works on another
> PC with zsh v4.3.17, mercurial v2.0.2 and git v1.7.9.5. Any idea what
> could be the problem?

There were no changes in the mercurial backend between 4.3.17 and 5.0.0,
so I guess mercurial changed its output. The call responsible for the
information with your setup is probably:

  % hg --debug id -i -n -b -r.

Try those in the working and the non-working setup, is there a
difference?


Regards, Frank

(CC:ing Seth, who wrote most of the advanced hg-backend code)

Re: vcs_info on a hg repository with a git subrepository; actionformats works ok, formats does not

[Ioannis Koutras]

On Mon, Sep 17, 2012 at 4:50 PM, Frank Terbeck <ft@bewatermyfriend.org> wrote:
>   % hg --debug id -i -n -b -r.
>
> Try those in the working and the non-working setup, is there a
> difference?

I get the same output from both machines:
> 5b77e5e4bcbae0c9f6a4f1f84f51e0814b4cd77b 5 default

Is there anything else to try? By the way, the repository is public,
you may access it at https://bitbucket.org/joko/dotfiles


Regards,

Yannis

Re: vcs_info on a hg repository with a git subrepository; actionformats works ok, formats does not

[Frank Terbeck]

Ioannis Koutras wrote:
> On Mon, Sep 17, 2012 at 4:50 PM, Frank Terbeck <ft@bewatermyfriend.org> wrote:
>>   % hg --debug id -i -n -b -r.
>>
>> Try those in the working and the non-working setup, is there a
>> difference?
>
> I get the same output from both machines:
>> 5b77e5e4bcbae0c9f6a4f1f84f51e0814b4cd77b 5 default
>
> Is there anything else to try? By the way, the repository is public,
> you may access it at https://bitbucket.org/joko/dotfiles

Well, not off hand. But maybe the output of a trace could help (me or
Seth). Do this and enter the directory in question (on both machines):

  % for i in VCS_INFO_get_data_hg VCS_INFO_formats; do functions -t $i; done


Regards, Frank

Re: vcs_info on a hg repository with a git subrepository; actionformats works ok, formats does not

[Ioannis Koutras]

On Mon, Sep 17, 2012 at 5:15 PM, Frank Terbeck <ft@bewatermyfriend.org> wrote:
> Well, not off hand. But maybe the output of a trace could help (me or
> Seth). Do this and enter the directory in question (on both machines):
>
>   % for i in VCS_INFO_get_data_hg VCS_INFO_formats; do functions -t $i; done

ok, get ready for large outputs.

Non-working setup:

+VCS_INFO_get_data_hg:6> setopt localoptions extendedglob
NO_shwordsplit
+VCS_INFO_get_data_hg:8> local hgbase bmfile branchfile rebasefile
dirstatefile mqseriesfile mqstatusfile mqguardsfile patchdir mergedir
r_csetid r_lrev r_branch i_bmhash i_bmname revformat branchformat
hgactionstring hgchanges hgbmstring hgmqstring applied_string
unapplied_string guards_string
+VCS_INFO_get_data_hg:14> local -a hgid_args defrevformat
defbranchformat hgbmarks mqpatches mqseries mqguards mqunapplied
hgmisc i_patchguards i_negguards i_posguards
+VCS_INFO_get_data_hg:18> local -xA hook_com
+VCS_INFO_get_data_hg:20> hgbase=/home/MICROLAB/joko/.dotfiles
+VCS_INFO_get_data_hg:21> rrn=.dotfiles
+VCS_INFO_get_data_hg:22> r_csetid=''
+VCS_INFO_get_data_hg:23> r_lrev=''
+VCS_INFO_get_data_hg:24> patchdir=/home/MICROLAB/joko/.dotfiles/.hg/patches
+VCS_INFO_get_data_hg:25> mergedir=/home/MICROLAB/joko/.dotfiles/.hg/merge/
+VCS_INFO_get_data_hg:26> bmfile=/home/MICROLAB/joko/.dotfiles/.hg/bookmarks
+VCS_INFO_get_data_hg:27> branchfile=/home/MICROLAB/joko/.dotfiles/.hg/branch
+VCS_INFO_get_data_hg:28>
rebasefile=/home/MICROLAB/joko/.dotfiles/.hg/rebasestate
+VCS_INFO_get_data_hg:29>
dirstatefile=/home/MICROLAB/joko/.dotfiles/.hg/dirstate
+VCS_INFO_get_data_hg:30>
mqstatusfile=/home/MICROLAB/joko/.dotfiles/.hg/patches/status
+VCS_INFO_get_data_hg:31>
mqseriesfile=/home/MICROLAB/joko/.dotfiles/.hg/patches/series
+VCS_INFO_get_data_hg:32>
mqguardsfile=/home/MICROLAB/joko/.dotfiles/.hg/patches/guards
+VCS_INFO_get_data_hg:35> VCS_INFO_adjust
+VCS_INFO_adjust:5> setopt localoptions NO_shwordsplit
+VCS_INFO_adjust:7> [[ -n '' ]]
+VCS_INFO_adjust:8> return 0
+VCS_INFO_get_data_hg:39> zstyle -t :vcs_info:hg:default:.dotfiles get-revision
+VCS_INFO_get_data_hg:41> zstyle -t :vcs_info:hg:default:.dotfiles use-simple
+VCS_INFO_get_data_hg:45> hgid_args=( --debug id -i -n -b )
+VCS_INFO_get_data_hg:49> zstyle -t :vcs_info:hg:default:.dotfiles
check-for-changes
+VCS_INFO_get_data_hg:52> local HGRCPATH
+VCS_INFO_get_data_hg:54> read -r r_csetid r_lrev r_branch
+VCS_INFO_get_data_hg:53> HGRCPATH=/dev/null hg --debug id -i -n -b
+VCS_INFO_get_data_hg:59> [[ -z --version ]]
+VCS_INFO_get_data_hg:64> [[ -n --version ]]
+VCS_INFO_get_data_hg:67> [[ t == + ]]
+VCS_INFO_get_data_hg:75> [[ -d /home/MICROLAB/joko/.dotfiles/.hg/merge/ ]]
+VCS_INFO_get_data_hg:78> [[ -e /home/MICROLAB/joko/.dotfiles/.hg/rebasestate ]]
+VCS_INFO_get_data_hg:82> [[ -n vim/vim.symlink/bundle/vundle: ]]
+VCS_INFO_get_data_hg:82> defrevformat+=( %h )
+VCS_INFO_get_data_hg:83> [[ -n git ]]
+VCS_INFO_get_data_hg:83> defrevformat+=( %r )
+VCS_INFO_get_data_hg:85> zstyle -s :vcs_info:hg:default:.dotfiles
hgrevformat revformat
+VCS_INFO_get_data_hg:88> hook_com=( localrev git hash
vim/vim.symlink/bundle/vundle: )
+VCS_INFO_get_data_hg:90> VCS_INFO_hook set-hgrev-format %r
+VCS_INFO_hook:5> local hook static func
+VCS_INFO_hook:6> local -x context hook_name
+VCS_INFO_hook:7> local -xi ret
+VCS_INFO_hook:8> local -a hooks tmp
+VCS_INFO_hook:9> local -i debug
+VCS_INFO_hook:11> ret=0
+VCS_INFO_hook:12> hook_name=set-hgrev-format
+VCS_INFO_hook:13> shift
+VCS_INFO_hook:14> context=:vcs_info:hg+set-hgrev-format:default:.dotfiles
+VCS_INFO_hook:15> static=:vcs_info-static_hooks:set-hgrev-format
+VCS_INFO_hook:17> zstyle -t
:vcs_info:hg+set-hgrev-format:default:.dotfiles debug
+VCS_INFO_hook:17> debug=0
+VCS_INFO_hook:18> ((  debug  ))
+VCS_INFO_hook:24> zstyle -a :vcs_info-static_hooks:set-hgrev-format hooks hooks
+VCS_INFO_hook:25> ((  debug  ))
+VCS_INFO_hook:28> zstyle -a
:vcs_info:hg+set-hgrev-format:default:.dotfiles hooks tmp
+VCS_INFO_hook:29> ((  debug  ))
+VCS_INFO_hook:32> hooks+=( )
+VCS_INFO_hook:33> ((  0 == 0  ))
+VCS_INFO_hook:33> return 0
+VCS_INFO_get_data_hg:91> zformat -f r_lrev %r r:git
h:vim/vim.symlink/bundle/vundle:
+VCS_INFO_get_data_hg:97> hook_com=( )
+VCS_INFO_get_data_hg:100> [[ -n --version ]]
+VCS_INFO_get_data_hg:100> defbranchformat+=( %b )
+VCS_INFO_get_data_hg:101> [[ -n git ]]
+VCS_INFO_get_data_hg:101> defbranchformat+=( %r )
+VCS_INFO_get_data_hg:103> zstyle -s :vcs_info:hg:default:.dotfiles
branchformat branchformat
+VCS_INFO_get_data_hg:106> hook_com=( branch --version revision git )
+VCS_INFO_get_data_hg:108> VCS_INFO_hook set-branch-format %b
+VCS_INFO_hook:5> local hook static func
+VCS_INFO_hook:6> local -x context hook_name
+VCS_INFO_hook:7> local -xi ret
+VCS_INFO_hook:8> local -a hooks tmp
+VCS_INFO_hook:9> local -i debug
+VCS_INFO_hook:11> ret=0
+VCS_INFO_hook:12> hook_name=set-branch-format
+VCS_INFO_hook:13> shift
+VCS_INFO_hook:14> context=:vcs_info:hg+set-branch-format:default:.dotfiles
+VCS_INFO_hook:15> static=:vcs_info-static_hooks:set-branch-format
+VCS_INFO_hook:17> zstyle -t
:vcs_info:hg+set-branch-format:default:.dotfiles debug
+VCS_INFO_hook:17> debug=0
+VCS_INFO_hook:18> ((  debug  ))
+VCS_INFO_hook:24> zstyle -a :vcs_info-static_hooks:set-branch-format
hooks hooks
+VCS_INFO_hook:25> ((  debug  ))
+VCS_INFO_hook:28> zstyle -a
:vcs_info:hg+set-branch-format:default:.dotfiles hooks tmp
+VCS_INFO_hook:29> ((  debug  ))
+VCS_INFO_hook:32> hooks+=( )
+VCS_INFO_hook:33> ((  0 == 0  ))
+VCS_INFO_hook:33> return 0
+VCS_INFO_get_data_hg:109> zformat -f branchformat %b b:--version r:git
+VCS_INFO_get_data_hg:115> hook_com=( )
+VCS_INFO_get_data_hg:118> zstyle -t :vcs_info:hg:default:.dotfiles
get-bookmarks
+VCS_INFO_get_data_hg:135> zstyle -T :vcs_info:hg:default:.dotfiles get-mq
+VCS_INFO_get_data_hg:136> [[ -d /home/MICROLAB/joko/.dotfiles/.hg/patches ]]
+VCS_INFO_get_data_hg:233> hgmisc+=( )
+VCS_INFO_get_data_hg:234> hgmisc+=( )
+VCS_INFO_get_data_hg:236> backend_misc[patches]=''
+VCS_INFO_get_data_hg:237> backend_misc[bookmarks]=''
+VCS_INFO_get_data_hg:239> VCS_INFO_formats '' --version
/home/MICROLAB/joko/.dotfiles '' '' git ''
+VCS_INFO_formats:5> setopt localoptions noksharrays NO_shwordsplit
+VCS_INFO_formats:6> local msg tmp
+VCS_INFO_formats:7> local -i i
+VCS_INFO_formats:8> local -xA hook_com
+VCS_INFO_formats:12> hook_com=( action '' action_orig '' branch
--version branch_orig --version base /home/MICROLAB/joko/.dotfiles
base_orig /home/MICROLAB/joko/.dotfiles staged '' staged_orig ''
unstaged '' unstaged_orig '' revision git revision_orig git misc ''
misc_orig '' vcs hg vcs_orig hg )
+VCS_INFO_formats:30> hook_com[base-name]=.dotfiles
+VCS_INFO_formats:31> hook_com[base-name_orig]=''
+VCS_INFO_formats:32> hook_com[subdir]=+VCS_INFO_formats:32>
VCS_INFO_reposub /home/MICROLAB/joko/.dotfiles
+VCS_INFO_reposub:5> setopt localoptions extendedglob NO_shwordsplit
+VCS_INFO_reposub:6> local 'base=/home/MICROLAB/joko/.dotfiles'
+VCS_INFO_reposub:8> [[ /home/MICROLAB/joko/.dotfiles ==
/home/MICROLAB/joko/.dotfiles/* ]]
+VCS_INFO_reposub:9> printf .
+VCS_INFO_reposub:10> return 1
+VCS_INFO_formats:32> hook_com[subdir]=.
+VCS_INFO_formats:33> hook_com[subdir_orig]=.
+VCS_INFO_formats:35> VCS_INFO_hook post-backend
+VCS_INFO_hook:5> local hook static func
+VCS_INFO_hook:6> local -x context hook_name
+VCS_INFO_hook:7> local -xi ret
+VCS_INFO_hook:8> local -a hooks tmp
+VCS_INFO_hook:9> local -i debug
+VCS_INFO_hook:11> ret=0
+VCS_INFO_hook:12> hook_name=post-backend
+VCS_INFO_hook:13> shift
+VCS_INFO_hook:14> context=:vcs_info:hg+post-backend:default:.dotfiles
+VCS_INFO_hook:15> static=:vcs_info-static_hooks:post-backend
+VCS_INFO_hook:17> zstyle -t :vcs_info:hg+post-backend:default:.dotfiles debug
+VCS_INFO_hook:17> debug=0
+VCS_INFO_hook:18> ((  debug  ))
+VCS_INFO_hook:24> zstyle -a :vcs_info-static_hooks:post-backend hooks hooks
+VCS_INFO_hook:25> ((  debug  ))
+VCS_INFO_hook:28> zstyle -a
:vcs_info:hg+post-backend:default:.dotfiles hooks tmp
+VCS_INFO_hook:29> ((  debug  ))
+VCS_INFO_hook:32> hooks+=( )
+VCS_INFO_hook:33> ((  0 == 0  ))
+VCS_INFO_hook:33> return 0
+VCS_INFO_formats:52> [[ -n '' ]]
+VCS_INFO_formats:56> zstyle -a :vcs_info:hg:default:.dotfiles formats msgs
+VCS_INFO_formats:57> ((  1 < 1  ))
+VCS_INFO_formats:60> [[ -n '' ]]
+VCS_INFO_formats:65> [[ -n '' ]]
+VCS_INFO_formats:70> [[ addon != standalone ]]
+VCS_INFO_formats:70> VCS_INFO_hook pre-addon-quilt
+VCS_INFO_hook:5> local hook static func
+VCS_INFO_hook:6> local -x context hook_name
+VCS_INFO_hook:7> local -xi ret
+VCS_INFO_hook:8> local -a hooks tmp
+VCS_INFO_hook:9> local -i debug
+VCS_INFO_hook:11> ret=0
+VCS_INFO_hook:12> hook_name=pre-addon-quilt
+VCS_INFO_hook:13> shift
+VCS_INFO_hook:14> context=:vcs_info:hg+pre-addon-quilt:default:.dotfiles
+VCS_INFO_hook:15> static=:vcs_info-static_hooks:pre-addon-quilt
+VCS_INFO_hook:17> zstyle -t
:vcs_info:hg+pre-addon-quilt:default:.dotfiles debug
+VCS_INFO_hook:17> debug=0
+VCS_INFO_hook:18> ((  debug  ))
+VCS_INFO_hook:24> zstyle -a :vcs_info-static_hooks:pre-addon-quilt hooks hooks
+VCS_INFO_hook:25> ((  debug  ))
+VCS_INFO_hook:28> zstyle -a
:vcs_info:hg+pre-addon-quilt:default:.dotfiles hooks tmp
+VCS_INFO_hook:29> ((  debug  ))
+VCS_INFO_hook:32> hooks+=( )
+VCS_INFO_hook:33> ((  0 == 0  ))
+VCS_INFO_hook:33> return 0
+VCS_INFO_formats:71> local -x REPLY
+VCS_INFO_formats:72> VCS_INFO_quilt addon
+VCS_INFO_quilt:1> emulate -L zsh
+VCS_INFO_quilt:2> setopt extendedglob
+VCS_INFO_quilt:3> local 'mode=addon'
+VCS_INFO_quilt:4> local patches pc tmp qstring root
+VCS_INFO_quilt:5> local -i ret
+VCS_INFO_quilt:6> local -x context
+VCS_INFO_quilt:7> local -a applied unapplied applied_string
unapplied_string quiltcommand
+VCS_INFO_quilt:8> local -Ax hook_com
+VCS_INFO_quilt:10> context=:vcs_info:hg.quilt-addon:default:.dotfiles
+VCS_INFO_quilt:11> zstyle -t
:vcs_info:hg.quilt-addon:default:.dotfiles use-quilt
+VCS_INFO_quilt:11> return 1
+VCS_INFO_formats:73> hook_com[quilt]=''
+VCS_INFO_formats:74> unset REPLY
+VCS_INFO_formats:79> ((  1 > maxexports  ))
+VCS_INFO_formats:80> i=1
+VCS_INFO_formats:81> VCS_INFO_hook set-message 0 '(%s) [%i%u %b %m]'
+VCS_INFO_hook:5> local hook static func
+VCS_INFO_hook:6> local -x context hook_name
+VCS_INFO_hook:7> local -xi ret
+VCS_INFO_hook:8> local -a hooks tmp
+VCS_INFO_hook:9> local -i debug
+VCS_INFO_hook:11> ret=0
+VCS_INFO_hook:12> hook_name=set-message
+VCS_INFO_hook:13> shift
+VCS_INFO_hook:14> context=:vcs_info:hg+set-message:default:.dotfiles
+VCS_INFO_hook:15> static=:vcs_info-static_hooks:set-message
+VCS_INFO_hook:17> zstyle -t :vcs_info:hg+set-message:default:.dotfiles debug
+VCS_INFO_hook:17> debug=0
+VCS_INFO_hook:18> ((  debug  ))
+VCS_INFO_hook:24> zstyle -a :vcs_info-static_hooks:set-message hooks hooks
+VCS_INFO_hook:25> ((  debug  ))
+VCS_INFO_hook:28> zstyle -a
:vcs_info:hg+set-message:default:.dotfiles hooks tmp
+VCS_INFO_hook:29> ((  debug  ))
+VCS_INFO_hook:32> hooks+=( )
+VCS_INFO_hook:33> ((  0 == 0  ))
+VCS_INFO_hook:33> return 0
+VCS_INFO_formats:82> zformat -f msg '(%s) [%i%u %b %m]' a:
b:--version c: i:git m: r:.dotfiles s:hg u: Q:
R:/home/MICROLAB/joko/.dotfiles S:.
+VCS_INFO_formats:94> msgs[$i]='(hg) [git --version ]'
+VCS_INFO_formats:99> hook_com=( )
+VCS_INFO_formats:100> backend_misc=( )
+VCS_INFO_formats:101> return 0
+VCS_INFO_get_data_hg:240> return 0

Working setup:

+VCS_INFO_get_data_hg:6> setopt localoptions extendedglob
NO_shwordsplit
+VCS_INFO_get_data_hg:8> local hgbase bmfile branchfile rebasefile
dirstatefile mqseriesfile mqstatusfile mqguardsfile patchdir mergedir
r_csetid r_lrev r_branch i_bmhash i_bmname revformat branchformat
hgactionstring hgchanges hgbmstring hgmqstring applied_string
unapplied_string guards_string
+VCS_INFO_get_data_hg:14> local -a hgid_args defrevformat
defbranchformat hgbmarks mqpatches mqseries mqguards mqunapplied
hgmisc i_patchguards i_negguards i_posguards
+VCS_INFO_get_data_hg:18> local -xA hook_com
+VCS_INFO_get_data_hg:20> hgbase=/home/koutras/.dotfiles
+VCS_INFO_get_data_hg:21> rrn=.dotfiles
+VCS_INFO_get_data_hg:22> r_csetid=''
+VCS_INFO_get_data_hg:23> r_lrev=''
+VCS_INFO_get_data_hg:24> patchdir=/home/koutras/.dotfiles/.hg/patches
+VCS_INFO_get_data_hg:25> mergedir=/home/koutras/.dotfiles/.hg/merge/
+VCS_INFO_get_data_hg:26> bmfile=/home/koutras/.dotfiles/.hg/bookmarks
+VCS_INFO_get_data_hg:27> branchfile=/home/koutras/.dotfiles/.hg/branch
+VCS_INFO_get_data_hg:28> rebasefile=/home/koutras/.dotfiles/.hg/rebasestate
+VCS_INFO_get_data_hg:29> dirstatefile=/home/koutras/.dotfiles/.hg/dirstate
+VCS_INFO_get_data_hg:30>
mqstatusfile=/home/koutras/.dotfiles/.hg/patches/status
+VCS_INFO_get_data_hg:31>
mqseriesfile=/home/koutras/.dotfiles/.hg/patches/series
+VCS_INFO_get_data_hg:32>
mqguardsfile=/home/koutras/.dotfiles/.hg/patches/guards
+VCS_INFO_get_data_hg:35> VCS_INFO_adjust
+VCS_INFO_adjust:5> setopt localoptions NO_shwordsplit
+VCS_INFO_adjust:7> [[ -n '' ]]
+VCS_INFO_adjust:8> return 0
+VCS_INFO_get_data_hg:39> zstyle -t :vcs_info:hg:default:.dotfiles get-revision
+VCS_INFO_get_data_hg:41> zstyle -t :vcs_info:hg:default:.dotfiles use-simple
+VCS_INFO_get_data_hg:45> hgid_args=( --debug id -i -n -b )
+VCS_INFO_get_data_hg:49> zstyle -t :vcs_info:hg:default:.dotfiles
check-for-changes
+VCS_INFO_get_data_hg:52> local HGRCPATH
+VCS_INFO_get_data_hg:54> read -r r_csetid r_lrev r_branch
+VCS_INFO_get_data_hg:53> HGRCPATH=/dev/null hg --debug id -i -n -b
+VCS_INFO_get_data_hg:59> [[ -z default ]]
+VCS_INFO_get_data_hg:64> [[ -n default ]]
+VCS_INFO_get_data_hg:67> [[ 5 == + ]]
+VCS_INFO_get_data_hg:75> [[ -d /home/koutras/.dotfiles/.hg/merge/ ]]
+VCS_INFO_get_data_hg:78> [[ -e /home/koutras/.dotfiles/.hg/rebasestate ]]
+VCS_INFO_get_data_hg:82> [[ -n 5b77e5e4bcbae0c9f6a4f1f84f51e0814b4cd77b ]]
+VCS_INFO_get_data_hg:82> defrevformat+=( %h )
+VCS_INFO_get_data_hg:83> [[ -n 5 ]]
+VCS_INFO_get_data_hg:83> defrevformat+=( %r )
+VCS_INFO_get_data_hg:85> zstyle -s :vcs_info:hg:default:.dotfiles
hgrevformat revformat
+VCS_INFO_get_data_hg:88> hook_com=( localrev 5 hash
5b77e5e4bcbae0c9f6a4f1f84f51e0814b4cd77b )
+VCS_INFO_get_data_hg:90> VCS_INFO_hook set-hgrev-format %r
+VCS_INFO_hook:5> local hook static func
+VCS_INFO_hook:6> local -x context hook_name
+VCS_INFO_hook:7> local -xi ret
+VCS_INFO_hook:8> local -a hooks tmp
+VCS_INFO_hook:9> local -i debug
+VCS_INFO_hook:11> ret=0
+VCS_INFO_hook:12> hook_name=set-hgrev-format
+VCS_INFO_hook:13> shift
+VCS_INFO_hook:14> context=:vcs_info:hg+set-hgrev-format:default:.dotfiles
+VCS_INFO_hook:15> static=:vcs_info-static_hooks:set-hgrev-format
+VCS_INFO_hook:17> zstyle -t
:vcs_info:hg+set-hgrev-format:default:.dotfiles debug
+VCS_INFO_hook:17> debug=0
+VCS_INFO_hook:18> ((  debug  ))
+VCS_INFO_hook:24> zstyle -a :vcs_info-static_hooks:set-hgrev-format hooks hooks
+VCS_INFO_hook:25> ((  debug  ))
+VCS_INFO_hook:28> zstyle -a
:vcs_info:hg+set-hgrev-format:default:.dotfiles hooks tmp
+VCS_INFO_hook:29> ((  debug  ))
+VCS_INFO_hook:32> hooks+=( )
+VCS_INFO_hook:33> ((  0 == 0  ))
+VCS_INFO_hook:33> return 0
+VCS_INFO_get_data_hg:91> zformat -f r_lrev %r r:5
h:5b77e5e4bcbae0c9f6a4f1f84f51e0814b4cd77b
+VCS_INFO_get_data_hg:97> hook_com=( )
+VCS_INFO_get_data_hg:100> [[ -n default ]]
+VCS_INFO_get_data_hg:100> defbranchformat+=( %b )
+VCS_INFO_get_data_hg:101> [[ -n 5 ]]
+VCS_INFO_get_data_hg:101> defbranchformat+=( %r )
+VCS_INFO_get_data_hg:103> zstyle -s :vcs_info:hg:default:.dotfiles
branchformat branchformat
+VCS_INFO_get_data_hg:106> hook_com=( branch default revision 5 )
+VCS_INFO_get_data_hg:108> VCS_INFO_hook set-branch-format %b
+VCS_INFO_hook:5> local hook static func
+VCS_INFO_hook:6> local -x context hook_name
+VCS_INFO_hook:7> local -xi ret
+VCS_INFO_hook:8> local -a hooks tmp
+VCS_INFO_hook:9> local -i debug
+VCS_INFO_hook:11> ret=0
+VCS_INFO_hook:12> hook_name=set-branch-format
+VCS_INFO_hook:13> shift
+VCS_INFO_hook:14> context=:vcs_info:hg+set-branch-format:default:.dotfiles
+VCS_INFO_hook:15> static=:vcs_info-static_hooks:set-branch-format
+VCS_INFO_hook:17> zstyle -t
:vcs_info:hg+set-branch-format:default:.dotfiles debug
+VCS_INFO_hook:17> debug=0
+VCS_INFO_hook:18> ((  debug  ))
+VCS_INFO_hook:24> zstyle -a :vcs_info-static_hooks:set-branch-format
hooks hooks
+VCS_INFO_hook:25> ((  debug  ))
+VCS_INFO_hook:28> zstyle -a
:vcs_info:hg+set-branch-format:default:.dotfiles hooks tmp
+VCS_INFO_hook:29> ((  debug  ))
+VCS_INFO_hook:32> hooks+=( )
+VCS_INFO_hook:33> ((  0 == 0  ))
+VCS_INFO_hook:33> return 0
+VCS_INFO_get_data_hg:109> zformat -f branchformat %b b:default r:5
+VCS_INFO_get_data_hg:115> hook_com=( )
+VCS_INFO_get_data_hg:118> zstyle -t :vcs_info:hg:default:.dotfiles
get-bookmarks
+VCS_INFO_get_data_hg:135> zstyle -T :vcs_info:hg:default:.dotfiles get-mq
+VCS_INFO_get_data_hg:136> [[ -d /home/koutras/.dotfiles/.hg/patches ]]
+VCS_INFO_get_data_hg:233> hgmisc+=( )
+VCS_INFO_get_data_hg:234> hgmisc+=( )
+VCS_INFO_get_data_hg:236> backend_misc[patches]=''
+VCS_INFO_get_data_hg:237> backend_misc[bookmarks]=''
+VCS_INFO_get_data_hg:239> VCS_INFO_formats '' default
/home/koutras/.dotfiles '' '' 5 ''
+VCS_INFO_formats:5> setopt localoptions noksharrays NO_shwordsplit
+VCS_INFO_formats:6> local msg tmp
+VCS_INFO_formats:7> local -i i
+VCS_INFO_formats:8> local -xA hook_com
+VCS_INFO_formats:12> hook_com=( action '' action_orig '' branch
default branch_orig default base /home/koutras/.dotfiles base_orig
/home/koutras/.dotfiles staged '' staged_orig '' unstaged ''
unstaged_orig '' revision 5 revision_orig 5 misc '' misc_orig '' vcs
hg vcs_orig hg )
+VCS_INFO_formats:30> hook_com[base-name]=.dotfiles
+VCS_INFO_formats:31> hook_com[base-name_orig]=''
+VCS_INFO_formats:32> hook_com[subdir]=+VCS_INFO_formats:32>
VCS_INFO_reposub /home/koutras/.dotfiles
+VCS_INFO_reposub:5> setopt localoptions extendedglob NO_shwordsplit
+VCS_INFO_reposub:6> local 'base=/home/koutras/.dotfiles'
+VCS_INFO_reposub:8> [[ /home/koutras/.dotfiles == /home/koutras/.dotfiles/* ]]
+VCS_INFO_reposub:9> printf .
+VCS_INFO_reposub:10> return 1
+VCS_INFO_formats:32> hook_com[subdir]=.
+VCS_INFO_formats:33> hook_com[subdir_orig]=.
+VCS_INFO_formats:35> VCS_INFO_hook post-backend
+VCS_INFO_hook:5> local hook static func
+VCS_INFO_hook:6> local -x context hook_name
+VCS_INFO_hook:7> local -xi ret
+VCS_INFO_hook:8> local -a hooks tmp
+VCS_INFO_hook:9> local -i debug
+VCS_INFO_hook:11> ret=0
+VCS_INFO_hook:12> hook_name=post-backend
+VCS_INFO_hook:13> shift
+VCS_INFO_hook:14> context=:vcs_info:hg+post-backend:default:.dotfiles
+VCS_INFO_hook:15> static=:vcs_info-static_hooks:post-backend
+VCS_INFO_hook:17> zstyle -t :vcs_info:hg+post-backend:default:.dotfiles debug
+VCS_INFO_hook:17> debug=0
+VCS_INFO_hook:18> ((  debug  ))
+VCS_INFO_hook:24> zstyle -a :vcs_info-static_hooks:post-backend hooks hooks
+VCS_INFO_hook:25> ((  debug  ))
+VCS_INFO_hook:28> zstyle -a
:vcs_info:hg+post-backend:default:.dotfiles hooks tmp
+VCS_INFO_hook:29> ((  debug  ))
+VCS_INFO_hook:32> hooks+=( )
+VCS_INFO_hook:33> ((  0 == 0  ))
+VCS_INFO_hook:33> return 0
+VCS_INFO_formats:52> [[ -n '' ]]
+VCS_INFO_formats:56> zstyle -a :vcs_info:hg:default:.dotfiles formats msgs
+VCS_INFO_formats:57> ((  1 < 1  ))
+VCS_INFO_formats:60> [[ -n '' ]]
+VCS_INFO_formats:65> [[ -n '' ]]
+VCS_INFO_formats:70> [[ addon != standalone ]]
+VCS_INFO_formats:70> VCS_INFO_hook pre-addon-quilt
+VCS_INFO_hook:5> local hook static func
+VCS_INFO_hook:6> local -x context hook_name
+VCS_INFO_hook:7> local -xi ret
+VCS_INFO_hook:8> local -a hooks tmp
+VCS_INFO_hook:9> local -i debug
+VCS_INFO_hook:11> ret=0
+VCS_INFO_hook:12> hook_name=pre-addon-quilt
+VCS_INFO_hook:13> shift
+VCS_INFO_hook:14> context=:vcs_info:hg+pre-addon-quilt:default:.dotfiles
+VCS_INFO_hook:15> static=:vcs_info-static_hooks:pre-addon-quilt
+VCS_INFO_hook:17> zstyle -t
:vcs_info:hg+pre-addon-quilt:default:.dotfiles debug
+VCS_INFO_hook:17> debug=0
+VCS_INFO_hook:18> ((  debug  ))
+VCS_INFO_hook:24> zstyle -a :vcs_info-static_hooks:pre-addon-quilt hooks hooks
+VCS_INFO_hook:25> ((  debug  ))
+VCS_INFO_hook:28> zstyle -a
:vcs_info:hg+pre-addon-quilt:default:.dotfiles hooks tmp
+VCS_INFO_hook:29> ((  debug  ))
+VCS_INFO_hook:32> hooks+=( )
+VCS_INFO_hook:33> ((  0 == 0  ))
+VCS_INFO_hook:33> return 0
+VCS_INFO_formats:71> local -x REPLY
+VCS_INFO_formats:72> VCS_INFO_quilt addon
+VCS_INFO_quilt:1> emulate -L zsh
+VCS_INFO_quilt:2> setopt extendedglob
+VCS_INFO_quilt:3> local 'mode=addon'
+VCS_INFO_quilt:4> local patches pc tmp qstring root
+VCS_INFO_quilt:5> local -i ret
+VCS_INFO_quilt:6> local -x context
+VCS_INFO_quilt:7> local -a applied unapplied applied_string
unapplied_string quiltcommand
+VCS_INFO_quilt:8> local -Ax hook_com
+VCS_INFO_quilt:10> context=:vcs_info:hg.quilt-addon:default:.dotfiles
+VCS_INFO_quilt:11> zstyle -t
:vcs_info:hg.quilt-addon:default:.dotfiles use-quilt
+VCS_INFO_quilt:11> return 1
+VCS_INFO_formats:73> hook_com[quilt]=''
+VCS_INFO_formats:74> unset REPLY
+VCS_INFO_formats:79> ((  1 > maxexports  ))
+VCS_INFO_formats:80> i=1
+VCS_INFO_formats:81> VCS_INFO_hook set-message 0 '(%s) [%i%u %b %m]'
+VCS_INFO_hook:5> local hook static func
+VCS_INFO_hook:6> local -x context hook_name
+VCS_INFO_hook:7> local -xi ret
+VCS_INFO_hook:8> local -a hooks tmp
+VCS_INFO_hook:9> local -i debug
+VCS_INFO_hook:11> ret=0
+VCS_INFO_hook:12> hook_name=set-message
+VCS_INFO_hook:13> shift
+VCS_INFO_hook:14> context=:vcs_info:hg+set-message:default:.dotfiles
+VCS_INFO_hook:15> static=:vcs_info-static_hooks:set-message
+VCS_INFO_hook:17> zstyle -t :vcs_info:hg+set-message:default:.dotfiles debug
+VCS_INFO_hook:17> debug=0
+VCS_INFO_hook:18> ((  debug  ))
+VCS_INFO_hook:24> zstyle -a :vcs_info-static_hooks:set-message hooks hooks
+VCS_INFO_hook:25> ((  debug  ))
+VCS_INFO_hook:28> zstyle -a
:vcs_info:hg+set-message:default:.dotfiles hooks tmp
+VCS_INFO_hook:29> ((  debug  ))
+VCS_INFO_hook:32> hooks+=( )
+VCS_INFO_hook:33> ((  0 == 0  ))
+VCS_INFO_hook:33> return 0
+VCS_INFO_formats:82> zformat -f msg '(%s) [%i%u %b %m]' a: b:default
c: i:5 m: r:.dotfiles s:hg u: Q: R:/home/koutras/.dotfiles S:.
+VCS_INFO_formats:94> msgs[$i]='(hg) [5 default ]'
+VCS_INFO_formats:99> hook_com=( )
+VCS_INFO_formats:100> backend_misc=( )
+VCS_INFO_formats:101> return 0
+VCS_INFO_get_data_hg:240> return 0

Hope this helps!


Regards,

Yannis

Re: vcs_info on a hg repository with a git subrepository; actionformats works ok, formats does not

[Frank Terbeck]

Ioannis Koutras wrote:
[...]
> +VCS_INFO_get_data_hg:52> local HGRCPATH
> +VCS_INFO_get_data_hg:54> read -r r_csetid r_lrev r_branch
> +VCS_INFO_get_data_hg:53> HGRCPATH=/dev/null hg --debug id -i -n -b
> +VCS_INFO_get_data_hg:59> [[ -z --version ]]
> +VCS_INFO_get_data_hg:64> [[ -n --version ]]
[...]

[...]
> +VCS_INFO_get_data_hg:52> local HGRCPATH
> +VCS_INFO_get_data_hg:54> read -r r_csetid r_lrev r_branch
> +VCS_INFO_get_data_hg:53> HGRCPATH=/dev/null hg --debug id -i -n -b
> +VCS_INFO_get_data_hg:59> [[ -z default ]]
> +VCS_INFO_get_data_hg:64> [[ -n default ]]
[...]


That part of the trace corresponds to this code:

[snip]
        local HGRCPATH
        HGRCPATH="/dev/null" ${vcs_comm[cmd]} ${(z)hgid_args} 2> /dev/null \
            | read -r r_csetid r_lrev r_branch
    fi
fi

# If the user doesn't opt to invoke hg we can still get the current branch
if [[ -z ${r_branch} && -r ${branchfile} ]] ; then
    r_branch=$(< ${branchfile})
fi

# If we still don't know the branch it's safe to assume default
[[ -n ${r_branch} ]] || r_branch="default"
[snap]

Thus, the output of "HGRCPATH=/dev/null hg --debug id -i -n -b" has to
contain "--version" in its output on the non-working system. Can you
please check that again?

Regards, Frank

Re: vcs_info on a hg repository with a git subrepository; actionformats works ok, formats does not

[Seth House]

On Mon, Sep 17, 2012 at 9:01 AM, Frank Terbeck <ft@bewatermyfriend.org> wrote:
> Thus, the output of "HGRCPATH=/dev/null hg --debug id -i -n -b" has to
> contain "--version" in its output on the non-working system.

This is correct, Frank. I am able to reproduce this error (Zsh 4.3.17)
by switching between Mercurial 1.9.3 and 2.3.1.

The output for the newer Mercurial is below:

% hg --debug id -i -n -b
nested: git --version
nested: git config --bool core.bare
nested: git rev-parse HEAD
nested: git update-index -q --refresh
nested: git diff-index --quiet HEAD
4a0f6db684a9b73ca8da117d2e368d309385bc20 1 default

FYI, the difference between the above command and that command with
-r. is to determine whether the hg repo working directory had
uncommitted changes. I'm headed AFK for a few hours this morning but
I'll come back to this later today.

Re: vcs_info on a hg repository with a git subrepository; actionformats works ok, formats does not

[Frank Terbeck]

Seth House wrote:
[...]
> The output for the newer Mercurial is below:
>
> % hg --debug id -i -n -b
> nested: git --version
> nested: git config --bool core.bare
> nested: git rev-parse HEAD
> nested: git update-index -q --refresh
> nested: git diff-index --quiet HEAD
> 4a0f6db684a9b73ca8da117d2e368d309385bc20 1 default

...so, what's the solution? read data until there is no more to read and
then use the data from the last line of the output?

Regards, Frank

Re: vcs_info on a hg repository with a git subrepository; actionformats works ok, formats does not

[Seth House]

[-- Attachment #1: Type: text/plain, Size: 931 bytes --]

That may be the answer.

That said, their addition of git commands to the debug output isn't
outputting terribly useful info. I wonder if that is intentional.
Especially since the output differs with the presence of the -r flag. (I
will research.)

The --debug flag is used to get hg to output the full sha. Perhaps there is
a better way to get all req'd info.
On Sep 17, 2012 9:34 AM, "Frank Terbeck" <ft@bewatermyfriend.org> wrote:

> Seth House wrote:
> [...]
> > The output for the newer Mercurial is below:
> >
> > % hg --debug id -i -n -b
> > nested: git --version
> > nested: git config --bool core.bare
> > nested: git rev-parse HEAD
> > nested: git update-index -q --refresh
> > nested: git diff-index --quiet HEAD
> > 4a0f6db684a9b73ca8da117d2e368d309385bc20 1 default
>
> ...so, what's the solution? read data until there is no more to read and
> then use the data from the last line of the output?
>
> Regards, Frank
>

Re: vcs_info on a hg repository with a git subrepository; actionformats works ok, formats does not

[Seth House]

On Mon, Sep 17, 2012 at 9:57 AM, Seth House <seth@eseth.com> wrote:
> That said, their addition of git commands to the debug output isn't
> outputting terribly useful info. I wonder if that is intentional.

It is, indeed, intentional:
http://selenic.com/hg/diff/58a6f3f4d553/mercurial/subrepo.py

> The --debug flag is used to get hg to output the full sha.

Relying on --debug here is not ideal. Something like this was bound to
happen eventually. Unfortunately, I don't believe there's a way to
retrieve all info of interest to VCS_Info with a single call to
Mercurial. (Invoking the Python interpreter is too slow to do more
than once while drawing the shell prompt.) I have done quite a bit of
experimenting, searching, and asking on this.

I propose one of the following:

1) Alter the hg backend to work without the full 40-char hash.

The ``hg id`` command will always return a unique hash. The only thing
the full hash is being used for in the hg backend is comparisons with
MQ patches and that can be changed to be a left-match instead. We can
document why the full hash isn't available and if users are expecting
40-chars we can give an example of how to pad the value with spaces.
This changes existing behavior.

2) Continue using --debug and add a workaround for this issue.

It's plausible that the output of interest will always appear at the
bottom of the debug output. Mercurial does have a
backward-compatibility policy for its output formats but this does not
extend to debug output (obviously).

FWIW, my personal preference is the first option as I feel the 40-char
hash is rarely desired or useful in a shell prompt.

Thoughts?

Re: vcs_info on a hg repository with a git subrepository; actionformats works ok, formats does not

[Seth House]

On Mon, Sep 17, 2012 at 12:53 PM, Seth House <seth@eseth.com> wrote:
> It is, indeed, intentional:

Whoops; copied the URL from the wrong tab:

http://selenic.com/hg/file/cad35f06c031/mercurial/subrepo.py

> FWIW, my personal preference is the first option as I feel the 40-char
> hash is rarely desired or useful in a shell prompt.

Also, anecdotally, this is inline with regular Mercurial use as most
hg commands output a short hash by default. The full hash tends to be
opt-in rather than opt-out -- the opposite of git's --short /
--abbrev.