1597894 - moz-phab 0.1.61 fails to detect correct git-cinnabar configuration

Status: RESOLVED FIXED

(Conduit :: moz-phab, defect, P1)

Description

[Philip Chimento [:ptomato]]

Since updating to moz-phab 0.1.61 it has stopped working in my git-cinnabar-based checkout.

$ moz-phab submit --upstream=bookmarks/central
Determining the commit range using upstream "bookmarks/central"
Git Cinnabar extension is required to work on this repository.
Local VCS (git) is different from the one defined in the repository (hg).

I do have git-cinnabar installed and in my path and it worked fine before the update. From reading the source code it looks like it is checking to see whether the string cinnabar is present in git help --all, which it is not, so I don't think this is a 100% accurate way to check if git-cinnabar is present.

$ git-cinnabar
usage: git-cinnabar [-h] [--version [{cinnabar,module,helper}]]
                    {data,fsck,upgrade,reclone,fetch,hg2git,git2hg,bundle,unbundle,rollback,python,download}
                    ...
git-cinnabar: error: too few arguments
$ git cinnabar
usage: git-cinnabar [-h] [--version [{cinnabar,module,helper}]]
                    {data,fsck,upgrade,reclone,fetch,hg2git,git2hg,bundle,rollback,python,download}
                    ...
git-cinnabar: error: too few arguments
$ git help --all | grep cinnabar
$

Downgrading to moz-phab 0.1.60 fixes the problem.

Comment 1

[:glob ✱]

With glandium's help it's probably that this is caused by the git-cinnabar script being installed into the git-* binaries live, which impacts the help output in unexpected ways.

If it isn't in --help we should look in the path provided by git --exec-path.

I'll investigate.

Comment 2

[:glob ✱]

Attachment: Bug 1597894: Improve cinnabar detection; r=zalun

Comment 3

[:glob ✱]

https://github.com/mozilla-conduit/review/commit/ba441c931c36141d605c84f8a90ef926ba9ed7a8