1844306 - Port bug 1695312: Make mach command modules be loaded selectively

Status: RESOLVED FIXED

(Thunderbird :: Upstream Synchronization, enhancement)

Description

[Geoff Lankow (:darktrojan)]

TypeError: initialize() takes 1 positional argument but 2 were given

We need to update to match this change.

Comment 1

[Geoff Lankow (:darktrojan)]

Attachment: Bug 1844306 - Port bug 1695312: Make mach command modules be loaded selectively. r=freaktechnik

Port of https://hg.mozilla.org/mozilla-central/rev/6123c201f9795aff8591aa94e8b262d9095b13e6#l1.12

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/208d0fe12095
Port bug 1695312: Make mach command modules be loaded selectively. r=freaktechnik

Comment 3

[Martin Giger [:freaktechnik]]

To fix commlint (and as such the linters failing in the CI), "all" that'd be needed is to fix the new code in m-c mach_initialize.py that tries to find the module of the commands by checking the MACH_COMMANDS dict. Obviously our commands (like commlint) don't exist in that dict.

Adding something simple like

            if not MACH_COMMANDS.get(command):
                return

in DetermineCommandVenvAction's __call__ makes commlint work again locally I think.

Comment 4

[Martin Giger [:freaktechnik]]

test and friends are fixed if I disable the command specific module loading (mach_initialize.py:707). Which seems like it would probably be an upstream bug?

Comment 5

[Martin Giger [:freaktechnik]]

I only just realized I should probably look for virtualenv_name, since that's what the upstream changes are messing with, which is what the code in mutlh does from what I can tell. However this goes way deeper than my python understanding.

Comment 6

[Rob Lemley [:rjl]]

One issue is with the early virtualenv activation. It's now done in mach's initialize function, and it's using a dictionary that's defined in the initialize function itself so it can't be easily changed.
I'm working on a patch for m-c to give us a way to hook into that.
Then yes, mutlh will likely need changes. Have to get past this first.

Comment 7

[Rob Lemley [:rjl]]

Backed out 208d0fe12095:
https://hg.mozilla.org/comm-central/rev/35d132f30a15e5f9fe7f3ac6cda6ae07ecb687e7

Comment 8

[Rob Lemley [:rjl]]

Attachment: Bug 1844306 - Port bug 1388894: Replace mach modules list with a dict of mach commands. r=#thunderbird-build-system-reviewers

Port of D136790.

Comment 9

[Rob Lemley [:rjl]]

Attachment: Bug 1844306 - Port bug 1695312: Initialize mach virtualenvs early. r=#thunderbird-build-system-reviewers

Depends on D184042

Comment 10

[Rob Lemley [:rjl]]

Attachment: Bug 1844306 - Port bug 1844417: Update mach commands to support upstream mach improvements. r=#thunderbird-build-system-reviewers

Depends on D184043

Comment 11

[Rob Lemley [:rjl]]

Attachment: Bug 1844306 - Remove obsolete Mutlh code. r=#thunderbird-build-system-reviewers

Depends on D184044

Comment 12

[Rob Lemley [:rjl]]

Bugs 1695312 and 1844417 need to be on mozilla-central.

Comment 13

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/c7ec0439a46a
Port bug 1388894: Replace mach modules list with a dict of mach commands. r=dandarnell
https://hg.mozilla.org/comm-central/rev/bb0f67546a46
Port bug 1695312: Initialize mach virtualenvs early. r=dandarnell
https://hg.mozilla.org/comm-central/rev/c2c8234342cb
Port bug 1844417: Update mach commands to support upstream mach improvements. r=dandarnell
https://hg.mozilla.org/comm-central/rev/e3ba2a727534
Remove obsolete Mutlh code. r=dandarnell

Comment 14

[Geoff Lankow (:darktrojan)]

Four patches backed out for landing too soon:
https://hg.mozilla.org/comm-central/rev/80e375426a2a29e1f9673306590fa8049265741e

Comment 15

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/18342f8a7ede
Port bug 1388894: Replace mach modules list with a dict of mach commands. r=dandarnell
https://hg.mozilla.org/comm-central/rev/e93d5e452c67
Port bug 1695312: Initialize mach virtualenvs early. r=dandarnell
https://hg.mozilla.org/comm-central/rev/ac91ab26e4d6
Port bug 1844417: Update mach commands to support upstream mach improvements. r=dandarnell
https://hg.mozilla.org/comm-central/rev/80b58987c7fb
Remove obsolete Mutlh code. r=dandarnell