1128586 - Make mach mercurial-setup work with a non-py2exe mercurial

Status: VERIFIED FIXED

(Firefox Build System :: Mach Core, enhancement)

Description

[Gregory Szorc [:gps]]

Looks like the "find a binary" logic in mach mercurial-setup could use some work. See bug 545432 comment #40.

Comment 1

[Hector Zhao [:hectorz]]

Just FYI, with these changes:

cp /path/to/mozilla-build/python/{lib/site-packages/setuptools/cli.exe,Scripts/hg.exe}
mv /path/to/mozilla-build/python/Scripts/hg{,-script.py}

I can use |mach mercurial-setup| to update ~/.hgrc and update version-control-tools w/o noticing any issue.

It seems a similar wrapper exe can be built by |python setup.py build_hgexe|, but I have no idea how to confirm it or how to do it with pip.

I hope this information could be of some help.

Comment 2

[Ryan VanderMeulen [:RyanVM]]

Yeah, I think we'd have to unpack the tar archive and manually run setup.py in order to use the build_hgexe option. Unfortunate that pip doesn't provide a way to run custom setup.py options AFAICT.

Comment 3

[Ryan VanderMeulen [:RyanVM]]

Pretty sure I've got this working now with build_hgexe. Will post a test build soon once I can test a bit locally.

Comment 4

[Ryan VanderMeulen [:RyanVM]]

OK, this generates the stub exe via build_hgexe. A cursory bit of testing says that it works as expected. Give it a shot and let me know please :)

http://people.mozilla.org/~rvandermeulen/MozillaBuildSetup2.0.0pre5.exe

sha1sum 8c12494706ae0cfc9d3ae17b2d1f803d76291297

Comment 5

[Hector Zhao [:hectorz]]

(In reply to Ryan VanderMeulen [:RyanVM UTC-4] from comment #4)
> OK, this generates the stub exe via build_hgexe. A cursory bit of testing
> says that it works as expected. Give it a shot and let me know please :)
> 
> http://people.mozilla.org/~rvandermeulen/MozillaBuildSetup2.0.0pre5.exe
> 
> sha1sum 8c12494706ae0cfc9d3ae17b2d1f803d76291297

I have to |mv /c/mozilla-build-test/python/Scripts/hg{,exe.py}| for mach to pick up hg.exe instead of hg.

Comment 6

[Gregory Szorc [:gps]]

Attachment: Properly look for Mercurial version

`mercurial version` doesn't always print the version number. `mercurial
--version` does. Use the latter.

Comment 7

[Gregory Szorc [:gps]]

Attachment: Prefer hg.exe over hg

This is needed for compatibility with an upcoming release of
MozillaBuild, which distributes Mercurial as a Python package, not as a
standalone Windows program. As a result, it introduces "hg" into $PATH,
which "which" will happily prefer as the "hg" binary. This upsets
subprocess. So, we explicitly prefer "hg.exe" over "hg".

We could accomplish the same thing by calling which.whichall() and
sorting results. But this is more code and IMO not worth the effort to
implement.

Comment 8

[Gregory Szorc [:gps]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/d439522e45ae
https://hg.mozilla.org/integration/mozilla-inbound/rev/ae91360cc160

Comment 9

[Gregory Szorc [:gps]]

I guess the landed patches address the needinfo :)

Comment 10

[Gregory Szorc [:gps]]

#fail

Comment 11

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/8e80ee81ed02
https://hg.mozilla.org/releases/mozilla-aurora/rev/a27d9552ca78

Comment 12

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-release/rev/49abfe1a8ef8
https://hg.mozilla.org/releases/mozilla-release/rev/a0b48af4bb54

Comment 13

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-beta/rev/49abfe1a8ef8
https://hg.mozilla.org/releases/mozilla-beta/rev/a0b48af4bb54

Comment 14

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-b2g37_v2_2/rev/5b5b40559674
https://hg.mozilla.org/releases/mozilla-b2g37_v2_2/rev/6edced5c6828

https://hg.mozilla.org/releases/mozilla-b2g34_v2_1/rev/4ebdd5415e9a
https://hg.mozilla.org/releases/mozilla-b2g34_v2_1/rev/1118e759cc2a

https://hg.mozilla.org/releases/mozilla-b2g32_v2_0/rev/d01a1f925ca1

https://hg.mozilla.org/releases/mozilla-esr31/rev/8ab58180c92f

Comment 15

[Kai-Zhen Li [:seinlin][:kli]]

https://hg.mozilla.org/releases/mozilla-b2g34_v2_1s/rev/1118e759cc2a

Comment 16

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/d439522e45ae
https://hg.mozilla.org/mozilla-central/rev/ae91360cc160

Comment 17

[Gregory Szorc [:gps]]

We may have set a record for most uplifts before a mozilla-central merge :)

Comment 18

[Ryan VanderMeulen [:RyanVM]]

(In reply to Hector Zhao [:hectorz] from comment #5)
> I have to |mv /c/mozilla-build-test/python/Scripts/hg{,exe.py}| for mach to
> pick up hg.exe instead of hg.

Better now after the patches that gps landed?

Comment 19

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/releases/mozilla-esr31/rev/8ab58180c92f

Comment 20

[Hector Zhao [:hectorz]]

(In reply to Ryan VanderMeulen [:RyanVM UTC-4] from comment #18)
> (In reply to Hector Zhao [:hectorz] from comment #5)
> > I have to |mv /c/mozilla-build-test/python/Scripts/hg{,exe.py}| for mach to
> > pick up hg.exe instead of hg.
> 
> Better now after the patches that gps landed?

Yes, I changed it back and everything works fine.

Comment 21

[Ryan VanderMeulen [:RyanVM]]

Awesome, thanks for confirming!

Comment 22

[Ryan VanderMeulen [:RyanVM]]

And the ugly-as-sin packaging patch to build hg.exe:
http://hg.mozilla.org/mozilla-build/rev/02826b9b3d53

I'd like to talk upstream into building hg.exe by default when |setup.py install| is invoked without --pure as it would make all of this go away and would be inconsequential to the final build.