Re: [PATCH 2/3] vcs_info/cvs: set vcs_comm[basedir] in VCS_INFO_detect_cvs

[Aleksandr Mezin <mezin.alexander@gmail.com>]

On Fri, Nov 29, 2019 at 3:34 AM Daniel Shahaf <d.s@daniel.shahaf.name> wrote:
>
> Daniel Shahaf wrote on Thu, Nov 28, 2019 at 11:13:44 +0000:
> > Aleksandr Mezin wrote on Tue, 26 Nov 2019 10:22 +00:00:
> > > On Tue, Nov 26, 2019 at 10:52 AM Daniel Shahaf <d.s@daniel.shahaf.name> wrote:
> > > > % cd foo
> > > > [shows hg info]
> > > > % export GIT_WORK_TREE=${PWD/foo/bar} GIT_DIR=${PWD/foo/bar}/.git
> > > > [shows git info]
> > > > %
> > >
> > > Interesting. I didn't notice that GIT_INFO_detect_git checks the exit
> > > code of `git rev-parse --is-inside-work-tree`, not the actual value.
> >
> > I think it should check both the exit code and the output.
>
> Sorry, I didn't look closely enough.  In the example I gave (quoted above),
> --is-inside-work-tree prints "false" and exits with code 0.  In that situation,
> I think VCS_INFO_detect_git should detect git, and it does.  All in all,
> I think the current code is correct, and could be optimized further with:
>
> [[[
> diff --git a/Functions/VCS_Info/Backends/VCS_INFO_detect_git b/Functions/VCS_Info/Backends/VCS_INFO_detect_git
> index 61bc483e3..e4191f474 100644
> --- a/Functions/VCS_Info/Backends/VCS_INFO_detect_git
> +++ b/Functions/VCS_Info/Backends/VCS_INFO_detect_git
> @@ -6,8 +6,7 @@ setopt localoptions NO_shwordsplit
>
>  [[ $1 == '--flavours' ]] && { print -l git-p4 git-svn; return 0 }
>
> -if VCS_INFO_check_com ${vcs_comm[cmd]} && ${vcs_comm[cmd]} rev-parse --is-inside-work-tree &> /dev/null ; then
> -    vcs_comm[gitdir]="$(${vcs_comm[cmd]} rev-parse --git-dir 2> /dev/null)" || return 1
> +if VCS_INFO_check_com ${vcs_comm[cmd]} && vcs_comm[gitdir]="$(${vcs_comm[cmd]} rev-parse --git-dir 2> /dev/null)" ; then
>      if   [[ -d ${vcs_comm[gitdir]}/svn ]]             ; then vcs_comm[overwrite_name]='git-svn'
>      elif [[ -d ${vcs_comm[gitdir]}/refs/remotes/p4 ]] ; then vcs_comm[overwrite_name]='git-p4' ; fi
>      return 0
> ]]]
>
> WDYT?
>
> Cheers,
>
> Daniel

Then I don't see a sane way to choose which VCS to show, other than
how it's already done (first one detected from 'enabled'). For
example, a hg work tree in cwd, and GIT_WORK_TREE is set to something
else (maybe parent directory, maybe ../other-dir). Which one (hg or
git) to choose? Why?

I guess I'll have to live with my own fork of vcs_info, because any
changes there will break it for someone else.