1277406 - Move `mach mercurial-setup` into version-control-tools and make part of `mach bootstrap`

Status: RESOLVED FIXED

(Firefox Build System :: Mach Core, enhancement)

Description

[Gregory Szorc [:gps]]

Nobody really likes `mach mercurial-setup` today. Not even me - and I wrote most of it.

I've constantly been held back making `mach mercurial-setup` better because it doesn't have unit tests. And the code has grown organically into something kind of unwieldy. There is also the issue where `mach mercurial-setup` reinvents a lot of logic from Mercurial itself and has to redundantly encode things present in version-control-tools.

Goal 1: move the `mach mercurial-setup` logic to version-control-tools, where it lives next to many of the things it is configuring and can be tested more easily.

I've also not been a fan of the integration between `mach mercurial-setup` and the rest of the setup mechanism. I'd like `mach mercurial-setup` to be part of `mach bootstrap` and would like `mach bootstrap` to also handle cloning of repos (that's a separate bug though). We can't easily put `mach mercurial-setup` inside `mach bootstrap` because of a chicken-and-egg problem: if you are running from the self-contained bootstrap.py file, you won't have the libraries needed to run `mach mercurial-setup`.

Goal 2: integrate the v-c-t based `mach mercurial-setup` into `mach bootstrap`.

Finally, nobody likes that `mach` forces you to run `mach mercurial-setup`. I've apologized for this before.

Goal 3: remove the forced running of `mach mercurial-setup` from `mach`.

Comment 1

[Gregory Szorc [:gps]]

Attachment: configobj: vendor configobj 4.7.2;

Source obtained from PyPI and imported without modifications.

Review commit: https://reviewboard.mozilla.org/r/57024/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57024/

Comment 2

[Gregory Szorc [:gps]]

Attachment: hgext: add configobj to sys.path in extensions;

Review commit: https://reviewboard.mozilla.org/r/57026/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57026/

Comment 3

[Gregory Szorc [:gps]]

Attachment: configwizard: import files from mozilla-central (bug 1277406);

The files constituting the heart of `mach mercurial-setup`
in mozilla-central have been imported. b0096c5c727749ad3e79cbdf20d2e96bd179c213
was used. Files are unmodified.

Upcoming patches will teach version-control-tools how to call into
them.

Review commit: https://reviewboard.mozilla.org/r/57028/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57028/

Comment 4

[Gregory Szorc [:gps]]

Attachment: configwizard: initial Mercurial extension implementation (bug 1277406);

We move the introduction message and basic version detection from the
old wizard to the extension. A basic test has been added.

The wizard has support for running a specific list of steps. This is
to facilitate testing. (It would be difficult to test every step in
every test.)

Review commit: https://reviewboard.mozilla.org/r/57030/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57030/

Comment 5

[Gregory Szorc [:gps]]

Attachment: configwizard: remove parsing of config from legacy code (bug 1277406);

We don't need this in the new implementation because the config is
already parsed and loaded by Mercurial.

Review commit: https://reviewboard.mozilla.org/r/57032/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57032/

Comment 6

[Gregory Szorc [:gps]]

Attachment: configwizard: prompt for username; implement config saving (bug 1277406);

This commit does a lot.

The next part of the config wizard to port is setting the username.
Since Mercurial's built-in config API doesn't support writing config
files, we need to use a separate API for that. We borrow the approach
of the old config wizard and use configobj for config file
manipulation. However, we change things up a bit.

Instead of using ConfigObj for reading and writing, we use it for
writing only. This ensures that config values from %include are
recognized by the wizard. We also remove the restriction of the
old config parser that prohibited %include from working. We do this
by normalizing %include during load and save operations.

Review commit: https://reviewboard.mozilla.org/r/57034/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57034/

Comment 7

[Gregory Szorc [:gps]]

Attachment: configwizard: add support for setting optimal diff settings (bug 1277406);

This is almost a straight port of the legacy wizard. We dropped setting
diff.unified=8 because this is holdover from the days when we
exported patches to Bugzilla after `hg export`. These days we have
tools to submit to MozReview and attach to Bugzilla. These tools should
provide appropriate context.

But diff.git and diff.showfunc are generally useful, so keep them
enabled.

Review commit: https://reviewboard.mozilla.org/r/57036/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57036/

Comment 8

[Gregory Szorc [:gps]]

Attachment: configwizard: prompt to enable color extension (bug 1277406);

Review commit: https://reviewboard.mozilla.org/r/57038/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57038/

Comment 9

[Gregory Szorc [:gps]]

Attachment: configwizard: prompt for enabling history editing extensions (bug 1277406);

Before, we prompted separately for both histedit and rebase. Let's make
it simpler by just having one prompt and enabling both.

Review commit: https://reviewboard.mozilla.org/r/57040/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57040/

Comment 10

[Gregory Szorc [:gps]]

Attachment: configwizard: remove code for enabling progress extension (bug 1277406);

It is enabled by default in Mercurial 3.5, which everyone should be
running by now.

Review commit: https://reviewboard.mozilla.org/r/57042/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57042/

Comment 11

[Gregory Szorc [:gps]]

Attachment: configwizard: remove code for bundleclone and clonebundles (bug 1277406);

clonebundles is built into Mercurial as of 3.6 and enabled by default
in 3.7. Let's not bother ourselves with this code any more: over time
people will have clonebundles enabled in the vanilla install.

Review commit: https://reviewboard.mozilla.org/r/57044/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57044/

Comment 12

[Gregory Szorc [:gps]]

Attachment: configwizard: prompt to install fsmonitor extension (bug 1277406);

Rather than port support for hgwatchman, let's drop support for it
and encourage people to upgrade to Mercurial 3.8.

Review commit: https://reviewboard.mozilla.org/r/57046/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57046/

Comment 13

[Gregory Szorc [:gps]]

Attachment: configwizard: remove code for bzpost extension (bug 1277406);

pulsebot is doing everything bzpost did. I don't think bzpost really
adds much value. Let's not prompt to enable it.

Review commit: https://reviewboard.mozilla.org/r/57048/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57048/

Comment 14

[Gregory Szorc [:gps]]

Attachment: configwizard: prompt to install the firefoxtree extension (bug 1277406);

Review commit: https://reviewboard.mozilla.org/r/57050/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57050/

Comment 15

[Gregory Szorc [:gps]]

Attachment: configwizard: prompt to install and configure code review extensions (bug 1277406);

This code is more complicated than most things. Good thing we now have
tests for it!

Review commit: https://reviewboard.mozilla.org/r/57052/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57052/

Comment 16

[Gregory Szorc [:gps]]

Attachment: configwizard: prompt to install push-to-try (bug 1277406);

Pretty straightforward. I'm tempted to consolidate this with the
"codereview" step. But I'll keep backwards compatibility for now.

Review commit: https://reviewboard.mozilla.org/r/57054/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57054/

Comment 17

[Gregory Szorc [:gps]]

Attachment: configwizard: prompt to configure wip (bug 1277406);

Should be a straight port.

Review commit: https://reviewboard.mozilla.org/r/57056/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57056/

Comment 18

[Gregory Szorc [:gps]]

Attachment: configwizard: set [hostfingerprints] when necessary (bug 1277406);

Another basic port from upstream.

At the end of this commit, config.py had no value, so it was deleted.

Review commit: https://reviewboard.mozilla.org/r/57058/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57058/

Comment 19

[Gregory Szorc [:gps]]

Attachment: configwizard: port file permissions checking (bug 1277406);

Almost a straight port.

Review commit: https://reviewboard.mozilla.org/r/57060/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57060/

Comment 20

[Gregory Szorc [:gps]]

Attachment: configwizard: remove some unused code from wizard.py (bug 1277406);

It is only adding noise at this point. Let's nuke it.

Review commit: https://reviewboard.mozilla.org/r/57062/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57062/

Comment 21

[Gregory Szorc [:gps]]

Attachment: configwizard: check for multiple version-control-tools directories (bug 1277406);

Review commit: https://reviewboard.mozilla.org/r/57064/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57064/

Comment 22

[Gregory Szorc [:gps]]

Attachment: configwizard: remove last remnants of legacy hgsetup code (bug 1277406);

We've ported nearly everything to a Mercurial extension. The remaining
items aren't super important to port - they can still live on the
mozilla-central side of the wall.

Review commit: https://reviewboard.mozilla.org/r/57066/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57066/

Comment 23

[Gregory Szorc [:gps]]

Comment on attachment 8758942 [details]
configobj: vendor configobj 4.7.2;

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57024/diff/1-2/

Comment 24

[Gregory Szorc [:gps]]

Comment on attachment 8758943 [details]
hgext: add configobj to sys.path in extensions;

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57026/diff/1-2/

Comment 25

[Gregory Szorc [:gps]]

Comment on attachment 8758944 [details]
configwizard: import files from mozilla-central (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57028/diff/1-2/

Comment 26

[Gregory Szorc [:gps]]

Comment on attachment 8758945 [details]
configwizard: initial Mercurial extension implementation (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57030/diff/1-2/

Comment 27

[Gregory Szorc [:gps]]

Comment on attachment 8758946 [details]
configwizard: remove parsing of config from legacy code (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57032/diff/1-2/

Comment 28

[Gregory Szorc [:gps]]

Comment on attachment 8758947 [details]
configwizard: prompt for username; implement config saving (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57034/diff/1-2/

Comment 29

[Gregory Szorc [:gps]]

Comment on attachment 8758948 [details]
configwizard: add support for setting optimal diff settings (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57036/diff/1-2/

Comment 30

[Gregory Szorc [:gps]]

Comment on attachment 8758949 [details]
configwizard: prompt to enable color extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57038/diff/1-2/

Comment 31

[Gregory Szorc [:gps]]

Comment on attachment 8758950 [details]
configwizard: prompt for enabling history editing extensions (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57040/diff/1-2/

Comment 32

[Gregory Szorc [:gps]]

Comment on attachment 8758951 [details]
configwizard: remove code for enabling progress extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57042/diff/1-2/

Comment 33

[Gregory Szorc [:gps]]

Comment on attachment 8758952 [details]
configwizard: remove code for bundleclone and clonebundles (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57044/diff/1-2/

Comment 34

[Gregory Szorc [:gps]]

Comment on attachment 8758953 [details]
configwizard: prompt to install fsmonitor extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57046/diff/1-2/

Comment 35

[Gregory Szorc [:gps]]

Comment on attachment 8758954 [details]
configwizard: remove code for bzpost extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57048/diff/1-2/

Comment 36

[Gregory Szorc [:gps]]

Comment on attachment 8758955 [details]
configwizard: prompt to install the firefoxtree extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57050/diff/1-2/

Comment 37

[Gregory Szorc [:gps]]

Comment on attachment 8758956 [details]
configwizard: prompt to install and configure code review extensions (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57052/diff/1-2/

Comment 38

[Gregory Szorc [:gps]]

Comment on attachment 8758957 [details]
configwizard: prompt to install push-to-try (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57054/diff/1-2/

Comment 39

[Gregory Szorc [:gps]]

Comment on attachment 8758958 [details]
configwizard: prompt to configure wip (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57056/diff/1-2/

Comment 40

[Gregory Szorc [:gps]]

Comment on attachment 8758959 [details]
configwizard: set [hostfingerprints] when necessary (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57058/diff/1-2/

Comment 41

[Gregory Szorc [:gps]]

Comment on attachment 8758960 [details]
configwizard: port file permissions checking (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57060/diff/1-2/

Comment 42

[Gregory Szorc [:gps]]

Comment on attachment 8758961 [details]
configwizard: remove some unused code from wizard.py (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57062/diff/1-2/

Comment 43

[Gregory Szorc [:gps]]

Comment on attachment 8758962 [details]
configwizard: check for multiple version-control-tools directories (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57064/diff/1-2/

Comment 44

[Gregory Szorc [:gps]]

Comment on attachment 8758963 [details]
configwizard: remove last remnants of legacy hgsetup code (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57066/diff/1-2/

Comment 45

[Gregory Szorc [:gps]]

Comment on attachment 8758947 [details]
configwizard: prompt for username; implement config saving (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57034/diff/2-3/

Comment 46

[Gregory Szorc [:gps]]

Comment on attachment 8758948 [details]
configwizard: add support for setting optimal diff settings (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57036/diff/2-3/

Comment 47

[Gregory Szorc [:gps]]

Comment on attachment 8758949 [details]
configwizard: prompt to enable color extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57038/diff/2-3/

Comment 48

[Gregory Szorc [:gps]]

Comment on attachment 8758950 [details]
configwizard: prompt for enabling history editing extensions (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57040/diff/2-3/

Comment 49

[Gregory Szorc [:gps]]

Comment on attachment 8758951 [details]
configwizard: remove code for enabling progress extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57042/diff/2-3/

Comment 50

[Gregory Szorc [:gps]]

Comment on attachment 8758952 [details]
configwizard: remove code for bundleclone and clonebundles (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57044/diff/2-3/

Comment 51

[Gregory Szorc [:gps]]

Comment on attachment 8758953 [details]
configwizard: prompt to install fsmonitor extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57046/diff/2-3/

Comment 52

[Gregory Szorc [:gps]]

Comment on attachment 8758954 [details]
configwizard: remove code for bzpost extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57048/diff/2-3/

Comment 53

[Gregory Szorc [:gps]]

Comment on attachment 8758955 [details]
configwizard: prompt to install the firefoxtree extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57050/diff/2-3/

Comment 54

[Gregory Szorc [:gps]]

Comment on attachment 8758956 [details]
configwizard: prompt to install and configure code review extensions (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57052/diff/2-3/

Comment 55

[Gregory Szorc [:gps]]

Comment on attachment 8758957 [details]
configwizard: prompt to install push-to-try (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57054/diff/2-3/

Comment 56

[Gregory Szorc [:gps]]

Comment on attachment 8758958 [details]
configwizard: prompt to configure wip (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57056/diff/2-3/

Comment 57

[Gregory Szorc [:gps]]

Comment on attachment 8758959 [details]
configwizard: set [hostfingerprints] when necessary (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57058/diff/2-3/

Comment 58

[Gregory Szorc [:gps]]

Comment on attachment 8758960 [details]
configwizard: port file permissions checking (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57060/diff/2-3/

Comment 59

[Gregory Szorc [:gps]]

Comment on attachment 8758961 [details]
configwizard: remove some unused code from wizard.py (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57062/diff/2-3/

Comment 60

[Gregory Szorc [:gps]]

Comment on attachment 8758962 [details]
configwizard: check for multiple version-control-tools directories (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57064/diff/2-3/

Comment 61

[Gregory Szorc [:gps]]

Comment on attachment 8758963 [details]
configwizard: remove last remnants of legacy hgsetup code (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57066/diff/2-3/

Comment 62

[Gregory Szorc [:gps]]

Comment on attachment 8758947 [details]
configwizard: prompt for username; implement config saving (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57034/diff/3-4/

Comment 63

[Gregory Szorc [:gps]]

Comment on attachment 8758948 [details]
configwizard: add support for setting optimal diff settings (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57036/diff/3-4/

Comment 64

[Gregory Szorc [:gps]]

Comment on attachment 8758949 [details]
configwizard: prompt to enable color extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57038/diff/3-4/

Comment 65

[Gregory Szorc [:gps]]

Comment on attachment 8758950 [details]
configwizard: prompt for enabling history editing extensions (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57040/diff/3-4/

Comment 66

[Gregory Szorc [:gps]]

Comment on attachment 8758951 [details]
configwizard: remove code for enabling progress extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57042/diff/3-4/

Comment 67

[Gregory Szorc [:gps]]

Comment on attachment 8758952 [details]
configwizard: remove code for bundleclone and clonebundles (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57044/diff/3-4/

Comment 68

[Gregory Szorc [:gps]]

Comment on attachment 8758953 [details]
configwizard: prompt to install fsmonitor extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57046/diff/3-4/

Comment 69

[Gregory Szorc [:gps]]

Comment on attachment 8758954 [details]
configwizard: remove code for bzpost extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57048/diff/3-4/

Comment 70

[Gregory Szorc [:gps]]

Comment on attachment 8758955 [details]
configwizard: prompt to install the firefoxtree extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57050/diff/3-4/

Comment 71

[Gregory Szorc [:gps]]

Comment on attachment 8758956 [details]
configwizard: prompt to install and configure code review extensions (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57052/diff/3-4/

Comment 72

[Gregory Szorc [:gps]]

Comment on attachment 8758957 [details]
configwizard: prompt to install push-to-try (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57054/diff/3-4/

Comment 73

[Gregory Szorc [:gps]]

Comment on attachment 8758958 [details]
configwizard: prompt to configure wip (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57056/diff/3-4/

Comment 74

[Gregory Szorc [:gps]]

Comment on attachment 8758959 [details]
configwizard: set [hostfingerprints] when necessary (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57058/diff/3-4/

Comment 75

[Gregory Szorc [:gps]]

Comment on attachment 8758960 [details]
configwizard: port file permissions checking (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57060/diff/3-4/

Comment 76

[Gregory Szorc [:gps]]

Comment on attachment 8758961 [details]
configwizard: remove some unused code from wizard.py (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57062/diff/3-4/

Comment 77

[Gregory Szorc [:gps]]

Comment on attachment 8758962 [details]
configwizard: check for multiple version-control-tools directories (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57064/diff/3-4/

Comment 78

[Gregory Szorc [:gps]]

Comment on attachment 8758963 [details]
configwizard: remove last remnants of legacy hgsetup code (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57066/diff/3-4/

Comment 79

[Gregory Szorc [:gps]]

Attachment: Bug 1277406 - Remove nagging to run `mach mercurial-setup` from mach;

I never really liked this. Other people had even more visceral
reactions. Let's get rid of it.

The code for touching a file when it runs has also been removed because
the only thing it was used for was the nagging feature.

Review commit: https://reviewboard.mozilla.org/r/57098/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57098/

Comment 80

[Gregory Szorc [:gps]]

Attachment: Bug 1277406 - Move `mach mercurial-setup` implementation into bootstrap;

This begins the consolidation of `mach mercurial-setup` into
`mach bootstrap`. The first step is to move the content of the
mach_commands.py file into the bootstrapper's.

I'm not crazy about adding the sys.path entry for tools/mercurial.
I intend to clean this up later.

Review commit: https://reviewboard.mozilla.org/r/57100/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57100/

Comment 81

[Gregory Szorc [:gps]]

Attachment: Bug 1277406 - Prompt to create the state directory;

Currently, on first run of `mach` it prompts you to create a state
directory. The hand-off between bootstrap and `mach` has always
bothered me because bootstrap is supposed to get your system in a good
state.

In this commit, we teach the bootstrap tool to create the state
directory when not present. This duplicates functionality from `mach`
but I'm fine with that.

In future commits, we'll build on this work to have the bootstrapper
run the Mercurial config wizard, which needs this state directory.

Review commit: https://reviewboard.mozilla.org/r/57102/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57102/

Comment 82

[Gregory Szorc [:gps]]

Attachment: Bug 1277406 - Offer to configure Mercurial during bootstrap;

If a state directory is available and we're running in interactive mode
(or have been told otherwise), we now configure Mercurial during
bootstrap.

This consists of cloning version-control-tools to the state directory
(mimicking code in `mach mercurial-setup` today) and running the
config wizard from version-control-tools.

Review commit: https://reviewboard.mozilla.org/r/57104/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/57104/

Comment 83

[Mike Hommey [:glandium]]

Comment on attachment 8758993 [details]
Bug 1277406 - Remove nagging to run `mach mercurial-setup` from mach;

https://reviewboard.mozilla.org/r/57098/#review53872

I'll repeat here what I said on irc: OH YEAH!

Comment 84

[Mike Hommey [:glandium]]

https://reviewboard.mozilla.org/r/57098/#review53874

::: tools/mercurial/mach_commands.py:47
(Diff revision 1)
> -
> -        state_path = os.path.join(state_dir, 'setup.lastcheck')
> -
> -        with open(state_path, 'a'):
> -            os.utime(state_path, None)
>  

Just noticed in the next patch that you need to remove an extra empty line here.

Comment 85

[Mike Hommey [:glandium]]

Comment on attachment 8758994 [details]
Bug 1277406 - Move `mach mercurial-setup` implementation into bootstrap;

https://reviewboard.mozilla.org/r/57100/#review53876

Thanks to mozreview for not showing the content of deleted file and cross-file block moves.

Comment 86

[Mike Hommey [:glandium]]

Comment on attachment 8758995 [details]
Bug 1277406 - Prompt to create the state directory;

https://reviewboard.mozilla.org/r/57102/#review53878

::: python/mozboot/mozboot/bootstrap.py:114
(Diff revision 1)
>      'Elementary',
>      '"elementary OS"',
>  )
>  
>  
> +def get_state_dir():

It's not clear to me why you need this here, since the existing check is in mach_bootstrap.py.

Comment 87

[Mike Hommey [:glandium]]

Comment on attachment 8758996 [details]
Bug 1277406 - Offer to configure Mercurial during bootstrap;

https://reviewboard.mozilla.org/r/57104/#review53880

::: python/mozboot/mozboot/bootstrap.py:210
(Diff revision 1)
>          self.instance.install_system_packages()
>  
>          # Like 'install_browser_packages' or 'install_mobile_android_packages'.
>          getattr(self.instance, 'install_%s_packages' % application)()
>  
> -        self.instance.ensure_mercurial_modern()
> +        hg_installed, hg_modern = self.instance.ensure_mercurial_modern()

I'm a little put off by mercurial being pushed by mach bootstrap, but this is not something this patch is changing...

Comment 88

[Gregory Szorc [:gps]]

https://reviewboard.mozilla.org/r/57102/#review53878

> It's not clear to me why you need this here, since the existing check is in mach_bootstrap.py.

Keep in mind there are 2 ways to run bootstrap: as a standalone tool and via `mach bootstrap` once you have the source tree.

The additions here and in this series are all about making the standalone invocation do more things before a source directory is available. The end goal is I want `mach bootstrap` to offer to clone the repository and more easily transition into configuring a build.

Comment 89

[Gregory Szorc [:gps]]

https://reviewboard.mozilla.org/r/57104/#review53880

> I'm a little put off by mercurial being pushed by mach bootstrap, but this is not something this patch is changing...

I would like bootstrap to offer to clone via git-cinnabar some day. I would also like to see a Git config wizard in the spirit of `mach mercurial-setup`. We kinda/sorta have the start of that in `git mozreview configure`...

Comment 90

[Gregory Szorc [:gps]]

Comment on attachment 8758942 [details]
configobj: vendor configobj 4.7.2;

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57024/diff/2-3/

Comment 91

[Gregory Szorc [:gps]]

Comment on attachment 8758943 [details]
hgext: add configobj to sys.path in extensions;

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57026/diff/2-3/

Comment 92

[Gregory Szorc [:gps]]

Comment on attachment 8758944 [details]
configwizard: import files from mozilla-central (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57028/diff/2-3/

Comment 93

[Gregory Szorc [:gps]]

Comment on attachment 8758945 [details]
configwizard: initial Mercurial extension implementation (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57030/diff/2-3/

Comment 94

[Gregory Szorc [:gps]]

Comment on attachment 8758946 [details]
configwizard: remove parsing of config from legacy code (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57032/diff/2-3/

Comment 95

[Gregory Szorc [:gps]]

Comment on attachment 8758947 [details]
configwizard: prompt for username; implement config saving (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57034/diff/4-5/

Comment 96

[Gregory Szorc [:gps]]

Comment on attachment 8758948 [details]
configwizard: add support for setting optimal diff settings (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57036/diff/4-5/

Comment 97

[Gregory Szorc [:gps]]

Comment on attachment 8758949 [details]
configwizard: prompt to enable color extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57038/diff/4-5/

Comment 98

[Gregory Szorc [:gps]]

Comment on attachment 8758950 [details]
configwizard: prompt for enabling history editing extensions (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57040/diff/4-5/

Comment 99

[Gregory Szorc [:gps]]

Comment on attachment 8758951 [details]
configwizard: remove code for enabling progress extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57042/diff/4-5/

Comment 100

[Gregory Szorc [:gps]]

Comment on attachment 8758952 [details]
configwizard: remove code for bundleclone and clonebundles (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57044/diff/4-5/

Comment 101

[Gregory Szorc [:gps]]

Comment on attachment 8758953 [details]
configwizard: prompt to install fsmonitor extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57046/diff/4-5/

Comment 102

[Gregory Szorc [:gps]]

Comment on attachment 8758954 [details]
configwizard: remove code for bzpost extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57048/diff/4-5/

Comment 103

[Gregory Szorc [:gps]]

Comment on attachment 8758955 [details]
configwizard: prompt to install the firefoxtree extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57050/diff/4-5/

Comment 104

[Gregory Szorc [:gps]]

Comment on attachment 8758956 [details]
configwizard: prompt to install and configure code review extensions (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57052/diff/4-5/

Comment 105

[Gregory Szorc [:gps]]

Comment on attachment 8758957 [details]
configwizard: prompt to install push-to-try (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57054/diff/4-5/

Comment 106

[Gregory Szorc [:gps]]

Comment on attachment 8758958 [details]
configwizard: prompt to configure wip (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57056/diff/4-5/

Comment 107

[Gregory Szorc [:gps]]

Comment on attachment 8758959 [details]
configwizard: set [hostfingerprints] when necessary (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57058/diff/4-5/

Comment 108

[Gregory Szorc [:gps]]

Comment on attachment 8758960 [details]
configwizard: port file permissions checking (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57060/diff/4-5/

Comment 109

[Gregory Szorc [:gps]]

Comment on attachment 8758961 [details]
configwizard: remove some unused code from wizard.py (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57062/diff/4-5/

Comment 110

[Gregory Szorc [:gps]]

Comment on attachment 8758962 [details]
configwizard: check for multiple version-control-tools directories (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57064/diff/4-5/

Comment 111

[Gregory Szorc [:gps]]

Comment on attachment 8758963 [details]
configwizard: remove last remnants of legacy hgsetup code (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57066/diff/4-5/

Comment 112

[:glob (Byron Jones) 🎈]

Comment on attachment 8758942 [details]
configobj: vendor configobj 4.7.2;

https://reviewboard.mozilla.org/r/57024/#review55258

Comment 113

[:glob (Byron Jones) 🎈]

Comment on attachment 8758943 [details]
hgext: add configobj to sys.path in extensions;

https://reviewboard.mozilla.org/r/57026/#review55260

Comment 114

[:glob (Byron Jones) 🎈]

Comment on attachment 8758944 [details]
configwizard: import files from mozilla-central (bug 1277406);

https://reviewboard.mozilla.org/r/57028/#review55270

Comment 115

[:glob (Byron Jones) 🎈]

i'm interested in see how this interacts with changes to mozilla-central.
can you point me to the bugs that track the changes there?  this will help with before/after testing to make sure things work as expected.

are you planning on this landing before |mach bootstrap| can clone vct?  or is the plan to ask new contributors to clone vct in addition to m-c?


once this lands i'd love to see it hooked up to vct's mozreview mach wrapper, as setting up mercurial for mozreview-only devs is useful.  but that's a story for another bug.

Comment 116

[:glob (Byron Jones) 🎈]

(In reply to Byron Jones ‹:glob› from comment #115)
> i'm interested in see how this interacts with changes to mozilla-central.

sorry; somehow i missed the other review series here.

Comment 117

[:glob (Byron Jones) 🎈]

Comment on attachment 8758945 [details]
configwizard: initial Mercurial extension implementation (bug 1277406);

https://reviewboard.mozilla.org/r/57030/#review55420

::: hgext/configwizard/__init__.py:75
(Diff revision 3)
> +
> +    if hgversion < MINIMUM_SUPPORTED_VERSION:
> +        ui.warn(VERSION_TOO_OLD)
> +        raise error.Abort('upgrade Mercurial then run again')
> +
> +    ui.prompt(INITIAL_MESSAGE, default='<RETURN>')

displaying large multi-line blocks of text as the prompt can make it harder to read due to it being a wall of yellow text.

ui.writing most of the text then prompting just the last line looks better.

this applies it to all places where multi-line text is used in ui.prompt()

Comment 118

[:glob (Byron Jones) 🎈]

Comment on attachment 8758946 [details]
configwizard: remove parsing of config from legacy code (bug 1277406);

https://reviewboard.mozilla.org/r/57032/#review55422

Comment 119

[:glob (Byron Jones) 🎈]

Comment on attachment 8758947 [details]
configwizard: prompt for username; implement config saving (bug 1277406);

https://reviewboard.mozilla.org/r/57034/#review55424

Comment 120

[:glob (Byron Jones) 🎈]

Comment on attachment 8758948 [details]
configwizard: add support for setting optimal diff settings (bug 1277406);

https://reviewboard.mozilla.org/r/57036/#review55428

::: hgext/configwizard/__init__.py:171
(Diff revision 5)
> +    showfunc = ui.configbool('diff', 'showfunc')
> +
> +    if git and showfunc:
> +        return
> +
> +    if not ui.promptchoice(BAD_DIFF_SETTINGS):

multi-line text in ui.prompt

Comment 121

[:glob (Byron Jones) 🎈]

Comment on attachment 8758949 [details]
configwizard: prompt to enable color extension (bug 1277406);

https://reviewboard.mozilla.org/r/57038/#review55430

Comment 122

[:glob (Byron Jones) 🎈]

Comment on attachment 8758950 [details]
configwizard: prompt for enabling history editing extensions (bug 1277406);

https://reviewboard.mozilla.org/r/57040/#review55432

Comment 123

[:glob (Byron Jones) 🎈]

https://reviewboard.mozilla.org/r/57034/#review55434

::: hgext/configwizard/__init__.py:203
(Diff revision 5)
> +                    # Mercurial has special syntax to include other files.
> +                    # ConfigObj doesn't recognize it. Normalize on read and
> +                    # restore on write to preserve it.

there should be a test for %include handling

Comment 124

[:glob (Byron Jones) 🎈]

Comment on attachment 8758951 [details]
configwizard: remove code for enabling progress extension (bug 1277406);

https://reviewboard.mozilla.org/r/57042/#review55438

Comment 125

[:glob (Byron Jones) 🎈]

https://reviewboard.mozilla.org/r/57044/#review55440

::: hgext/configwizard/hgsetup/config.py
(Diff revision 5)
> -        try:
> -            del ext['bundleclone']
> -        except KeyError:
> -            pass

would it be problematic if someone has both bundleclone and clonebundles installed?

Comment 126

[:glob (Byron Jones) 🎈]

Comment on attachment 8758953 [details]
configwizard: prompt to install fsmonitor extension (bug 1277406);

https://reviewboard.mozilla.org/r/57046/#review55442

::: hgext/configwizard/__init__.py:256
(Diff revision 5)
> +
> +        return
> +
> +    # Mercurial 3.8+ has fsmonitor built-in.
> +    if hgversion >= (3, 8, 0):
> +        _promptnativeextension(ui, cw, 'fsmonitor', FSMONITOR_INFO)

multi-line prompt text

Comment 127

[:glob (Byron Jones) 🎈]

Comment on attachment 8758954 [details]
configwizard: remove code for bzpost extension (bug 1277406);

https://reviewboard.mozilla.org/r/57048/#review55444

Comment 128

[:glob (Byron Jones) 🎈]

Comment on attachment 8758955 [details]
configwizard: prompt to install the firefoxtree extension (bug 1277406);

https://reviewboard.mozilla.org/r/57050/#review55266

::: hgext/configwizard/__init__.py:179
(Diff revision 5)
>  
>      if 'fsmonitor' in runsteps:
>          _checkfsmonitor(ui, cw, hgversion)
>  
> +    if 'firefoxtree' in runsteps:
> +        _promptvctextension(ui, cw, 'firefoxtree', FIREFOXTREE_INFO)

multi-line prompt text

::: hgext/configwizard/tests/test-firefoxtree.t:86
(Diff revision 5)
> +  Would you like to see a diff of the changes first (Yn)?  y
> +  --- hgrc.old
> +  +++ hgrc.new
> +  @@ -0,0 +1,2 @@
> +  +[extensions]
> +  +firefoxtree = /home/gps/src/version-control-tools/hgext/firefoxtree

(glob) the path.

::: hgext/configwizard/tests/test-firefoxtree.t:92
(Diff revision 5)
> +  
> +  Write changes to hgrc file (Yn)?  y
> +
> +  $ cat .hgrc
> +  [extensions]
> +  firefoxtree = /home/gps/src/version-control-tools/hgext/firefoxtree

(glob) the path.

Comment 129

[:glob (Byron Jones) 🎈]

Comment on attachment 8758956 [details]
configwizard: prompt to install and configure code review extensions (bug 1277406);

https://reviewboard.mozilla.org/r/57052/#review55264

::: hgext/configwizard/__init__.py:391
(Diff revision 5)
> +
> +    if ui.promptchoice('Will you be submitting commits to Mozilla (Yn)? $$ &Yes $$ &No'):
> +        return
> +
> +    confrb = False
> +    answer = ui.promptchoice(CODEREVIEW_INFO, default=0) + 1

multi-line prompt text

::: hgext/configwizard/__init__.py:431
(Diff revision 5)
> +        try:
> +            del cw.c['bugzilla'][c]
> +        except KeyError:
> +            pass
> +
> +    # TODO configure mozilla.ircnick and the "review" path

given mozilla.ircnick is required for rb to work, i think it's worth prompting for that now.

::: hgext/configwizard/tests/test-codereview.t:69
(Diff revision 5)
> +  Would you like to see a diff of the changes first (Yn)?  y
> +  --- hgrc.old
> +  +++ hgrc.new
> +  @@ -0,0 +1,2 @@
> +  +[extensions]
> +  +reviewboard = /home/gps/src/version-control-tools/hgext/reviewboard/client.py

(glob) the path.

::: hgext/configwizard/tests/test-codereview.t:75
(Diff revision 5)
> +  
> +  Write changes to hgrc file (Yn)?  y
> +
> +  $ cat .hgrc
> +  [extensions]
> +  reviewboard = /home/gps/src/version-control-tools/hgext/reviewboard/client.py

(glob) the path.

::: hgext/configwizard/tests/test-codereview.t:134
(Diff revision 5)
> +  --- hgrc.old
> +  +++ hgrc.new
> +  @@ -1,2 +1,6 @@
> +   [extensions]
> +   reviewboard = /home/gps/src/version-control-tools/hgext/reviewboard/client.py
> +  +bzexport = /home/gps/src/version-control-tools/hgext/bzexport

(glob) the path.

::: hgext/configwizard/tests/test-codereview.t:215
(Diff revision 5)
> +   reviewboard = /home/gps/src/version-control-tools/hgext/reviewboard/client.py
> +   bzexport = /home/gps/src/version-control-tools/hgext/bzexport

(glob) the paths.

Comment 130

[:glob (Byron Jones) 🎈]

Comment on attachment 8758957 [details]
configwizard: prompt to install push-to-try (bug 1277406);

https://reviewboard.mozilla.org/r/57054/#review55268

::: hgext/configwizard/__init__.py:247
(Diff revision 5)
>  
>      if 'codereview' in runsteps:
>          _checkcodereview(ui, cw)
>  
> +    if 'pushtotry' in runsteps:
> +        _promptvctextension(ui, cw, 'push-to-try', PUSHTOTRY_INFO)

multi-line prompt text

::: hgext/configwizard/tests/test-push-to-try.t:60
(Diff revision 5)
> +  Would you like to see a diff of the changes first (Yn)?  y
> +  --- hgrc.old
> +  +++ hgrc.new
> +  @@ -0,0 +1,2 @@
> +  +[extensions]
> +  +push-to-try = /home/gps/src/version-control-tools/hgext/push-to-try

(glob) the path.

::: hgext/configwizard/tests/test-push-to-try.t:66
(Diff revision 5)
> +  
> +  Write changes to hgrc file (Yn)?  y
> +
> +  $ cat .hgrc
> +  [extensions]
> +  push-to-try = /home/gps/src/version-control-tools/hgext/push-to-try

(glob) the path.

Comment 131

[:glob (Byron Jones) 🎈]

Comment on attachment 8758958 [details]
configwizard: prompt to configure wip (bug 1277406);

https://reviewboard.mozilla.org/r/57056/#review55448

Comment 132

[:glob (Byron Jones) 🎈]

Comment on attachment 8758959 [details]
configwizard: set [hostfingerprints] when necessary (bug 1277406);

https://reviewboard.mozilla.org/r/57058/#review55262

::: hgext/configwizard/__init__.py:488
(Diff revision 5)
> +    # certificates in Mercurial config files. In modern versions of
> +    # Mercurial, the system CA store is used and old, legacy TLS protocols
> +    # are disabled. The default connection/security setting should
> +    # be sufficient and pinning certificates is no longer needed.
> +    modernssl = hasattr(ssl, 'SSLContext')
> +    if hgversion < (3, 4, 0) or not modernssl:

our min version is 3.5.0; there's no need to check for < 3.4.0 anymore.

Comment 133

[:glob (Byron Jones) 🎈]

Comment on attachment 8758960 [details]
configwizard: port file permissions checking (bug 1277406);

https://reviewboard.mozilla.org/r/57060/#review55450

::: hgext/configwizard/__init__.py:607
(Diff revision 5)
> +    if sys.platform == 'win32':
> +        return
> +
> +    mode = os.stat(cw.path).st_mode
> +    if mode & (stat.S_IRWXG | stat.S_IRWXO):
> +        if ui.promptchoice(FILE_PERMISSIONS_WARNING):

multi-line prompt text

Comment 134

[:glob (Byron Jones) 🎈]

Comment on attachment 8758961 [details]
configwizard: remove some unused code from wizard.py (bug 1277406);

https://reviewboard.mozilla.org/r/57062/#review55452

Comment 135

[:glob (Byron Jones) 🎈]

Comment on attachment 8758962 [details]
configwizard: check for multiple version-control-tools directories (bug 1277406);

https://reviewboard.mozilla.org/r/57064/#review55456

::: hgext/configwizard/__init__.py:601
(Diff revision 5)
> +        i = v.index('version-control-tools')
> +        vct = v[0:i + len('version-control-tools')]
> +        seenvct.add(os.path.realpath(os.path.expanduser(vct)))
> +
> +    if len(seenvct) > 1:
> +        print(MULTIPLE_VCT % cw.path)

i suspect you want ui.write() instead pf print() here

Comment 136

[:glob (Byron Jones) 🎈]

Comment on attachment 8758963 [details]
configwizard: remove last remnants of legacy hgsetup code (bug 1277406);

https://reviewboard.mozilla.org/r/57066/#review55458

Comment 137

[Gregory Szorc [:gps]]

https://reviewboard.mozilla.org/r/57030/#review55420

> displaying large multi-line blocks of text as the prompt can make it harder to read due to it being a wall of yellow text.
> 
> ui.writing most of the text then prompting just the last line looks better.
> 
> this applies it to all places where multi-line text is used in ui.prompt()

Good catch.

Comment 138

[Gregory Szorc [:gps]]

https://reviewboard.mozilla.org/r/57044/#review55440

> would it be problematic if someone has both bundleclone and clonebundles installed?

No. Code in bundleclone deactivates itself if the Mercurial client has clonebundles support.

Comment 139

[Gregory Szorc [:gps]]

https://reviewboard.mozilla.org/r/57052/#review55264

> given mozilla.ircnick is required for rb to work, i think it's worth prompting for that now.

My goal is to do a straight port first.

One of the reasons I left this out is because I want to try connecting to BMO using the user-supplied API key. Both to verify it works (we've had reports of people not specifying a working API key) and to extract the IRC nick from the Bugzilla name field. Since we're running tests from v-c-t, we should be able to stand up a BMO instance in the test pretty easily...

Comment 140

[Gregory Szorc [:gps]]

Comment on attachment 8758942 [details]
configobj: vendor configobj 4.7.2;

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57024/diff/3-4/

Comment 141

[Gregory Szorc [:gps]]

Comment on attachment 8758943 [details]
hgext: add configobj to sys.path in extensions;

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57026/diff/3-4/

Comment 142

[Gregory Szorc [:gps]]

Comment on attachment 8758944 [details]
configwizard: import files from mozilla-central (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57028/diff/3-4/

Comment 143

[Gregory Szorc [:gps]]

Comment on attachment 8758945 [details]
configwizard: initial Mercurial extension implementation (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57030/diff/3-4/

Comment 144

[Gregory Szorc [:gps]]

Comment on attachment 8758946 [details]
configwizard: remove parsing of config from legacy code (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57032/diff/3-4/

Comment 145

[Gregory Szorc [:gps]]

Comment on attachment 8758947 [details]
configwizard: prompt for username; implement config saving (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57034/diff/5-6/

Comment 146

[Gregory Szorc [:gps]]

Comment on attachment 8758948 [details]
configwizard: add support for setting optimal diff settings (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57036/diff/5-6/

Comment 147

[Gregory Szorc [:gps]]

Comment on attachment 8758949 [details]
configwizard: prompt to enable color extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57038/diff/5-6/

Comment 148

[Gregory Szorc [:gps]]

Comment on attachment 8758950 [details]
configwizard: prompt for enabling history editing extensions (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57040/diff/5-6/

Comment 149

[Gregory Szorc [:gps]]

Comment on attachment 8758951 [details]
configwizard: remove code for enabling progress extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57042/diff/5-6/

Comment 150

[Gregory Szorc [:gps]]

Comment on attachment 8758952 [details]
configwizard: remove code for bundleclone and clonebundles (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57044/diff/5-6/

Comment 151

[Gregory Szorc [:gps]]

Comment on attachment 8758953 [details]
configwizard: prompt to install fsmonitor extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57046/diff/5-6/

Comment 152

[Gregory Szorc [:gps]]

Comment on attachment 8758954 [details]
configwizard: remove code for bzpost extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57048/diff/5-6/

Comment 153

[Gregory Szorc [:gps]]

Comment on attachment 8758955 [details]
configwizard: prompt to install the firefoxtree extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57050/diff/5-6/

Comment 154

[Gregory Szorc [:gps]]

Comment on attachment 8758956 [details]
configwizard: prompt to install and configure code review extensions (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57052/diff/5-6/

Comment 155

[Gregory Szorc [:gps]]

Comment on attachment 8758957 [details]
configwizard: prompt to install push-to-try (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57054/diff/5-6/

Comment 156

[Gregory Szorc [:gps]]

Comment on attachment 8758958 [details]
configwizard: prompt to configure wip (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57056/diff/5-6/

Comment 157

[Gregory Szorc [:gps]]

Comment on attachment 8758959 [details]
configwizard: set [hostfingerprints] when necessary (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57058/diff/5-6/

Comment 158

[Gregory Szorc [:gps]]

Comment on attachment 8758960 [details]
configwizard: port file permissions checking (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57060/diff/5-6/

Comment 159

[Gregory Szorc [:gps]]

Comment on attachment 8758961 [details]
configwizard: remove some unused code from wizard.py (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57062/diff/5-6/

Comment 160

[Gregory Szorc [:gps]]

Comment on attachment 8758962 [details]
configwizard: check for multiple version-control-tools directories (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57064/diff/5-6/

Comment 161

[Gregory Szorc [:gps]]

Comment on attachment 8758963 [details]
configwizard: remove last remnants of legacy hgsetup code (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57066/diff/5-6/

Comment 162

[:glob (Byron Jones) 🎈]

Comment on attachment 8758945 [details]
configwizard: initial Mercurial extension implementation (bug 1277406);

https://reviewboard.mozilla.org/r/57030/#review55578

Comment 163

[:glob (Byron Jones) 🎈]

Comment on attachment 8758948 [details]
configwizard: add support for setting optimal diff settings (bug 1277406);

https://reviewboard.mozilla.org/r/57036/#review55580

Comment 164

[:glob (Byron Jones) 🎈]

Comment on attachment 8758952 [details]
configwizard: remove code for bundleclone and clonebundles (bug 1277406);

https://reviewboard.mozilla.org/r/57044/#review55582

Comment 165

[:glob (Byron Jones) 🎈]

Comment on attachment 8758953 [details]
configwizard: prompt to install fsmonitor extension (bug 1277406);

https://reviewboard.mozilla.org/r/57046/#review55584

Comment 166

[:glob (Byron Jones) 🎈]

Comment on attachment 8758955 [details]
configwizard: prompt to install the firefoxtree extension (bug 1277406);

https://reviewboard.mozilla.org/r/57050/#review55586

Comment 167

[:glob (Byron Jones) 🎈]

Comment on attachment 8758956 [details]
configwizard: prompt to install and configure code review extensions (bug 1277406);

https://reviewboard.mozilla.org/r/57052/#review55588

Comment 168

[:glob (Byron Jones) 🎈]

Comment on attachment 8758957 [details]
configwizard: prompt to install push-to-try (bug 1277406);

https://reviewboard.mozilla.org/r/57054/#review55590

Comment 169

[:glob (Byron Jones) 🎈]

Comment on attachment 8758959 [details]
configwizard: set [hostfingerprints] when necessary (bug 1277406);

https://reviewboard.mozilla.org/r/57058/#review55592

Comment 170

[:glob (Byron Jones) 🎈]

Comment on attachment 8758960 [details]
configwizard: port file permissions checking (bug 1277406);

https://reviewboard.mozilla.org/r/57060/#review55594

Comment 171

[:glob (Byron Jones) 🎈]

Comment on attachment 8758962 [details]
configwizard: check for multiple version-control-tools directories (bug 1277406);

https://reviewboard.mozilla.org/r/57064/#review55596

\o/

Comment 172

[Gregory Szorc [:gps]]

Comment on attachment 8758942 [details]
configobj: vendor configobj 4.7.2;

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57024/diff/4-5/

Comment 173

[Gregory Szorc [:gps]]

Comment on attachment 8758943 [details]
hgext: add configobj to sys.path in extensions;

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57026/diff/4-5/

Comment 174

[Gregory Szorc [:gps]]

Comment on attachment 8758944 [details]
configwizard: import files from mozilla-central (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57028/diff/4-5/

Comment 175

[Gregory Szorc [:gps]]

Comment on attachment 8758945 [details]
configwizard: initial Mercurial extension implementation (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57030/diff/4-5/

Comment 176

[Gregory Szorc [:gps]]

Comment on attachment 8758946 [details]
configwizard: remove parsing of config from legacy code (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57032/diff/4-5/

Comment 177

[Gregory Szorc [:gps]]

Comment on attachment 8758947 [details]
configwizard: prompt for username; implement config saving (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57034/diff/6-7/

Comment 178

[Gregory Szorc [:gps]]

Comment on attachment 8758948 [details]
configwizard: add support for setting optimal diff settings (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57036/diff/6-7/

Comment 179

[Gregory Szorc [:gps]]

Comment on attachment 8758949 [details]
configwizard: prompt to enable color extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57038/diff/6-7/

Comment 180

[Gregory Szorc [:gps]]

Comment on attachment 8758950 [details]
configwizard: prompt for enabling history editing extensions (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57040/diff/6-7/

Comment 181

[Gregory Szorc [:gps]]

Comment on attachment 8758951 [details]
configwizard: remove code for enabling progress extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57042/diff/6-7/

Comment 182

[Gregory Szorc [:gps]]

Comment on attachment 8758952 [details]
configwizard: remove code for bundleclone and clonebundles (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57044/diff/6-7/

Comment 183

[Gregory Szorc [:gps]]

Comment on attachment 8758953 [details]
configwizard: prompt to install fsmonitor extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57046/diff/6-7/

Comment 184

[Gregory Szorc [:gps]]

Comment on attachment 8758954 [details]
configwizard: remove code for bzpost extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57048/diff/6-7/

Comment 185

[Gregory Szorc [:gps]]

Comment on attachment 8758955 [details]
configwizard: prompt to install the firefoxtree extension (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57050/diff/6-7/

Comment 186

[Gregory Szorc [:gps]]

Comment on attachment 8758956 [details]
configwizard: prompt to install and configure code review extensions (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57052/diff/6-7/

Comment 187

[Gregory Szorc [:gps]]

Comment on attachment 8758957 [details]
configwizard: prompt to install push-to-try (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57054/diff/6-7/

Comment 188

[Gregory Szorc [:gps]]

Comment on attachment 8758958 [details]
configwizard: prompt to configure wip (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57056/diff/6-7/

Comment 189

[Gregory Szorc [:gps]]

Comment on attachment 8758959 [details]
configwizard: set [hostfingerprints] when necessary (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57058/diff/6-7/

Comment 190

[Gregory Szorc [:gps]]

Comment on attachment 8758960 [details]
configwizard: port file permissions checking (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57060/diff/6-7/

Comment 191

[Gregory Szorc [:gps]]

Comment on attachment 8758961 [details]
configwizard: remove some unused code from wizard.py (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57062/diff/6-7/

Comment 192

[Gregory Szorc [:gps]]

Comment on attachment 8758962 [details]
configwizard: check for multiple version-control-tools directories (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57064/diff/6-7/

Comment 193

[Gregory Szorc [:gps]]

Comment on attachment 8758963 [details]
configwizard: remove last remnants of legacy hgsetup code (bug 1277406);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57066/diff/6-7/

Comment 194

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/306a957796de
configwizard: import files from mozilla-central ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/824f78b74941
configwizard: initial Mercurial extension implementation ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/d354d38600cd
configwizard: remove parsing of config from legacy code ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/b452920efd3c
configwizard: prompt for username; implement config saving ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/6965b178ad25
configwizard: add support for setting optimal diff settings ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/fd0ffa74cec6
configwizard: prompt to enable color extension ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/4d6869c776ac
configwizard: prompt for enabling history editing extensions ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/77ba90151ee0
configwizard: remove code for enabling progress extension ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/73c6b4e78f7a
configwizard: remove code for bundleclone and clonebundles ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/6098a9a3d3ff
configwizard: prompt to install fsmonitor extension ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/66b6c9b10287
configwizard: remove code for bzpost extension ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/b5404e1a3028
configwizard: prompt to install the firefoxtree extension ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/ea492a334043
configwizard: prompt to install and configure code review extensions ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/fa751dfe16e1
configwizard: prompt to install push-to-try ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/5fb0e772037f
configwizard: prompt to configure wip ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/b03b3747d0b8
configwizard: set [hostfingerprints] when necessary ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/1d6c24ee6478
configwizard: port file permissions checking ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/41b9df193e9b
configwizard: remove some unused code from wizard.py ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/2fe6ff0628f1
configwizard: check for multiple version-control-tools directories ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/2bd23fbed26f
configwizard: remove last remnants of legacy hgsetup code ; r=glob

Comment 195

[Gregory Szorc [:gps]]

Still have the mach series to land.

Comment 196

[Gregory Szorc [:gps]]

Attachment: Bug 1277406 - Use the bootstrapper code for `mach mercurial-setup`;

The Mercurial setup wizard has now been ported to the version-control-tools
repository, where it has testing and integrates better with Mercurial
configs.

The bootstrapper has been taught how to invoke the new version of the
Mercurial setup wizard.

This commit switched `mach mercurial-setup` to call the bootstrapper
code for invoking the Mercurial setup wizard from version-control-tools.
As of this commit, the Mercurial setup wizard in tools/mercurial is
unused.

Review commit: https://reviewboard.mozilla.org/r/58900/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/58900/

Comment 197

[Gregory Szorc [:gps]]

Attachment: Bug 1277406 - Delete now-unused Mercurial setup wizard;

The wizard has been ported to the version-control-tools repository
and in-tree consumers have been switched to consume it from there. This
code is now dead. Kill it.

References to the now-defunct code have been removed/updated.

Review commit: https://reviewboard.mozilla.org/r/58902/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/58902/

Comment 198

[Gregory Szorc [:gps]]

Attachment: Bug 1277406 - Offer to clone Firefox source repo during bootstrap;

I've always been bothered that the one-line bootstrap configures your system
then leaves you on the hook to clone source code and configure the build
system. I'd like for there to be an easy transition and a wizard that
guides you through from end to end.

This commit addresses part of the disconnect by offering to clone the
Mercurial source repository at the end of bootstrap.

We only offer to clone if we aren't running from a source checkout
(likely the one-line bootstrap invocation) and if we are in interactive
mode.

We clone from https://hg.mozilla.org/firefox - a unified Firefox repo. We
attempt to perform a streaming clone, because this will likely be the
fastest and will result in the local repository having optimal delta
chains and performance. This is ~500 MB larger than a gzip bundle and
~150 MB larger than a mozilla-central gzip bundle (the latter is likely
what is being downloaded by most users today). I think the extra 150 MB
for all changesets is beneficial to users: we want to encourage people
to use the unified repo going forward because the separate repos are not
needed.

Again, I'd like to eventually offer Git support here. Again, Mercurial is
canonical and you have to start somewhere.

Review commit: https://reviewboard.mozilla.org/r/58904/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/58904/

Comment 199

[Gregory Szorc [:gps]]

Comment on attachment 8758993 [details]
Bug 1277406 - Remove nagging to run `mach mercurial-setup` from mach;

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57098/diff/1-2/

Comment 200

[Gregory Szorc [:gps]]

Comment on attachment 8758994 [details]
Bug 1277406 - Move `mach mercurial-setup` implementation into bootstrap;

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57100/diff/1-2/

Comment 201

[Gregory Szorc [:gps]]

Comment on attachment 8758995 [details]
Bug 1277406 - Prompt to create the state directory;

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57102/diff/1-2/

Comment 202

[Gregory Szorc [:gps]]

Comment on attachment 8758996 [details]
Bug 1277406 - Offer to configure Mercurial during bootstrap;

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57104/diff/1-2/

Comment 203

[Mike Hommey [:glandium]]

Comment on attachment 8758995 [details]
Bug 1277406 - Prompt to create the state directory;

https://reviewboard.mozilla.org/r/57102/#review55810

::: python/mozboot/mozboot/bootstrap.py:64
(Diff revision 2)
>      browser=APPLICATIONS_LIST[0],
>      mobile_android_artifact_mode=APPLICATIONS_LIST[1],
>      mobile_android=APPLICATIONS_LIST[2],
>  )
>  
> +STATE_DIR_INFO = '''

I'm still not clear why this whole thing needs to be duplicated. Why not import those bits from mach_bootstrap.py instead of duplicating them?

Comment 204

[Mike Hommey [:glandium]]

Comment on attachment 8758996 [details]
Bug 1277406 - Offer to configure Mercurial during bootstrap;

https://reviewboard.mozilla.org/r/57104/#review55814

Comment 205

[Mike Hommey [:glandium]]

Comment on attachment 8761861 [details]
Bug 1277406 - Use the bootstrapper code for `mach mercurial-setup`;

https://reviewboard.mozilla.org/r/58900/#review55816

::: python/mozboot/mozboot/mach_commands.py:58
(Diff revision 1)
>          if update_only:
> -            from hgsetup.update import MercurialUpdater
> -            updater = MercurialUpdater(self._context.state_dir)
> +            bootstrap.update_vct(hg, self._context.state_dir)
> +            return
> -            result = updater.update_all()
> -        else:
> -            from hgsetup.wizard import MercurialSetupWizard
> -            wizard = MercurialSetupWizard(self._context.state_dir)
> -            result = wizard.run(map(os.path.expanduser, config_paths))
> -
> -        if result:
> -            print('(despite the failure, mach will not nag you to run '
> -                  '`mach mercurial-setup`)')
>  
> -        return result
> +        bootstrap.configure_mercurial(hg, self._context.state_dir)

I'm not particularly a fan of the
if ...:
   foo
   return
bar

form when there is nothing after bar.

if ...:
   foo
else:
   bar

is the same number of lines, after all.

Comment 206

[Mike Hommey [:glandium]]

Comment on attachment 8761862 [details]
Bug 1277406 - Delete now-unused Mercurial setup wizard;

https://reviewboard.mozilla.org/r/58902/#review55818

Comment 207

[Mike Hommey [:glandium]]

Comment on attachment 8761863 [details]
Bug 1277406 - Offer to clone Firefox source repo during bootstrap;

https://reviewboard.mozilla.org/r/58904/#review55820

::: python/mozboot/mozboot/bootstrap.py:91
(Diff revision 1)
> -obtain a copy of the source code by running:
> +'''
> +
> +SOURCE_ADVERTISE = '''
> +Source code can be obtained by running
>  
> -    hg clone https://hg.mozilla.org/mozilla-central
> +    hg clone https://hg.mozilla.org/firefox

Can we not put all eggs in the same basket, and leave the cloning from the unified repo to a separate bug?

::: python/mozboot/mozboot/bootstrap.py:263
(Diff revision 1)
> +        # Offer to clone if we're not inside a clone.
> +        checkout_type = current_vcs()
> +        have_clone = False
> +
> +        if checkout_type:
> +            have_clone = True

The funny thing is that the command might as well have been executed from a git or hg clone of something else. It's not entirely far fetched considering people are putting they $HOME under git.

Perfect enemy of done etc. but we should have a followup filed to figure out at least part of a response to that. I'm thinking checking the remotes urls, and if there's something with hg.mozilla.org or github.com/mozilla/, skip?

::: python/mozboot/mozboot/bootstrap.py:347
(Diff revision 1)
> +def clone_firefox(hg, dest):
> +    """Clone the Firefox repository to a specified destination."""
> +    print('Cloning Firefox Mercurial repository to %s' % dest)
> +
> +    try:
> +        subprocess.check_call([hg, 'config', 'ui.clonebundleprefers'])

Won't this output the value of ui.clonebundleprefers if it's set?

::: python/mozboot/mozboot/bootstrap.py:354
(Diff revision 1)
> +    # Prefer an uncompressed clone because the delta chains on the server
> +    # are optimal and will be preserved on the client, unlike with a gzip
> +    # clone.
> +    if not have_bundle_prefers:
> +        args.extend(['--config', 'ui.clonebundleprefers=VERSION=packed1'])

I'm not sure how to reconcile, from the commit message, how 500M larger download can equate to faster clone. That might be true for people in the Bay area, but it's likely not true for me, even though I have fiber.

::: python/mozboot/mozboot/bootstrap.py:389
(Diff revision 1)
> +        elif os.path.exists(git):
> +            return 'git'
> +
> +        path, child = os.path.split(path)
> +        if child == '':
> +            return None

break

Comment 208

[Mike Hommey [:glandium]]

https://reviewboard.mozilla.org/r/58904/#review55822

::: python/mozboot/mozboot/bootstrap.py:367
(Diff revision 1)
> +        '--noupdate',
> +        'https://hg.mozilla.org/firefox',
> +        dest,
> +    ])
> +
> +    subprocess.check_call(args)

The possible CalledProcessError exceptions won't be very user friendly if something goes wrong.

Comment 209

[Gregory Szorc [:gps]]

https://reviewboard.mozilla.org/r/58904/#review55948

Yeah, I'm fine moving this feature to another bug.

Comment 210

[Gregory Szorc [:gps]]

Attachment: Bug 1277406 - Remove nagging to run `mach mercurial-setup` from mach;

I never really liked this. Other people had even more visceral
reactions. Let's get rid of it.

The code for touching a file when it runs has also been removed because
the only thing it was used for was the nagging feature.

Review commit: https://reviewboard.mozilla.org/r/58982/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/58982/

Comment 211

[Gregory Szorc [:gps]]

Attachment: Bug 1277406 - Move `mach mercurial-setup` implementation into bootstrap;

This begins the consolidation of `mach mercurial-setup` into
`mach bootstrap`. The first step is to move the content of the
mach_commands.py file into the bootstrapper's.

I'm not crazy about adding the sys.path entry for tools/mercurial.
I intend to clean this up later.

Review commit: https://reviewboard.mozilla.org/r/58984/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/58984/

Comment 212

[Gregory Szorc [:gps]]

Attachment: Bug 1277406 - Prompt to create the state directory;

Currently, on first run of `mach` it prompts you to create a state
directory. The hand-off between bootstrap and `mach` has always
bothered me because bootstrap is supposed to get your system in a good
state.

In this commit, we teach the bootstrap tool to create the state
directory when not present. This duplicates functionality from `mach`.
The justification for the duplication is explained by inline comment.

In future commits, we'll build on this work to have the bootstrapper
run the Mercurial config wizard, which needs this state directory.

Review commit: https://reviewboard.mozilla.org/r/58986/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/58986/

Comment 213

[Gregory Szorc [:gps]]

Attachment: Bug 1277406 - Offer to configure Mercurial during bootstrap;

If a state directory is available and we're running in interactive mode
(or have been told otherwise), we now configure Mercurial during
bootstrap.

This consists of cloning version-control-tools to the state directory
(mimicking code in `mach mercurial-setup` today) and running the
config wizard from version-control-tools.

Code for cloning/updating repositories has been stolen from
tools/mercurial/hgsetup.

As the inline TODO notes, I'd like to eventually support
configuring Git during bootstrap. Since Mercurial is the canonical VCS
for Firefox and since we already have a Mercurial setup wizard (and
don't have a Git one yet), I don't think we should block on implementing
Git support.

Review commit: https://reviewboard.mozilla.org/r/58988/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/58988/

Comment 214

[Gregory Szorc [:gps]]

Attachment: Bug 1277406 - Use the bootstrapper code for `mach mercurial-setup`;

The Mercurial setup wizard has now been ported to the version-control-tools
repository, where it has testing and integrates better with Mercurial
configs.

The bootstrapper has been taught how to invoke the new version of the
Mercurial setup wizard.

This commit switched `mach mercurial-setup` to call the bootstrapper
code for invoking the Mercurial setup wizard from version-control-tools.
As of this commit, the Mercurial setup wizard in tools/mercurial is
unused.

Review commit: https://reviewboard.mozilla.org/r/58990/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/58990/

Comment 215

[Gregory Szorc [:gps]]

Comment on attachment 8758995 [details]
Bug 1277406 - Prompt to create the state directory;

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57102/diff/2-3/

Comment 216

[Gregory Szorc [:gps]]

Comment on attachment 8758996 [details]
Bug 1277406 - Offer to configure Mercurial during bootstrap;

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/57104/diff/2-3/

Comment 217

[Gregory Szorc [:gps]]

Comment on attachment 8761861 [details]
Bug 1277406 - Use the bootstrapper code for `mach mercurial-setup`;

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/58900/diff/1-2/

Comment 218

[Gregory Szorc [:gps]]

Comment on attachment 8761862 [details]
Bug 1277406 - Delete now-unused Mercurial setup wizard;

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/58902/diff/1-2/

Comment 219

[Mike Hommey [:glandium]]

Comment on attachment 8758995 [details]
Bug 1277406 - Prompt to create the state directory;

https://reviewboard.mozilla.org/r/57102/#review55956

Per irc, r+ on the condition that the code duplication is handled in a followup.

Comment 220

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/14c82f33bc9a
Remove nagging to run `mach mercurial-setup` from mach; r=glandium
https://hg.mozilla.org/integration/mozilla-inbound/rev/cec0b6d316a9
Move `mach mercurial-setup` implementation into bootstrap; r=glandium
https://hg.mozilla.org/integration/mozilla-inbound/rev/b4929a47dbe3
Prompt to create the state directory; r=glandium
https://hg.mozilla.org/integration/mozilla-inbound/rev/0ebec66be8cb
Offer to configure Mercurial during bootstrap; r=glandium
https://hg.mozilla.org/integration/mozilla-inbound/rev/b562b2a230b1
Use the bootstrapper code for `mach mercurial-setup`; r=glandium
https://hg.mozilla.org/integration/mozilla-inbound/rev/64255f3e255c
Delete now-unused Mercurial setup wizard; r=glandium

Comment 221

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/14c82f33bc9a
https://hg.mozilla.org/mozilla-central/rev/cec0b6d316a9
https://hg.mozilla.org/mozilla-central/rev/b4929a47dbe3
https://hg.mozilla.org/mozilla-central/rev/0ebec66be8cb
https://hg.mozilla.org/mozilla-central/rev/b562b2a230b1
https://hg.mozilla.org/mozilla-central/rev/64255f3e255c