1594903 - bootstrap.py with --vcs=git sets up a tree which can't push to try

Status: RESOLVED FIXED

(Firefox Build System :: Bootstrap Configuration, defect, P2)

Description

[Emily McDonough [:alaskanemily]]

Using bootstrap.py --vcs=git as specified at https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Build_Instructions/Mac_OS_X_Prerequisites sets up a repo that fails in mach try.

When performing a mach try fuzzy or mach try chooser, after selecting options, I get a "bundling N changesets" which counts up to ~75k (taking several hours), and then the error "ERROR Pushing merges is not supported yet"

Comment 1

[Mike Hommey [:glandium]]

I can't reproduce. Can you provide more information (like a complete log of the bootstrap output)?

Comment 2

[Emily McDonough [:alaskanemily]]

I believe the issue is that bootstrap.py --vcs=git checks out the github mirror rather than using git-cinnabar on the mozilla-central repo.

I can re-run the bootstrap and get the exact results though.

Comment 3

[Mike Hommey [:glandium]]

It does use git-cinnabar. https://hg.mozilla.org/mozilla-central/file/7748cc7e9b63d86a40eb4799c0830172da579c84/python/mozboot/mozboot/bootstrap.py#l752

Comment 4

[Emily McDonough [:alaskanemily]]

Ah, I think I see what happened, I didn't realize the implications when the bootstrap script printed the explanation of cloning and included an option to clone from github. Perhaps it would be good for the script to also mention that this won't work with try, if it's going to suggest that as an option?

Comment 5

[Mike Hommey [:glandium]]

Maybe we should just remove this part: https://hg.mozilla.org/mozilla-central/file/7748cc7e9b63d86a40eb4799c0830172da579c84/python/mozboot/mozboot/bootstrap.py#l118

Comment 6

[Mike Hommey [:glandium]]

Also, mach try should probably not try to push to try when it detects there is no git-cinnabar metadata available.

Comment 7

[Chris Manchester (limited bugmail, email directly)]

Yes, that should be deleted. I believe our approach for quite some time has been to make sure tools work with hg or git cinnabar. If people have other git workflows that work for them that's fine, but for the typical case something like pushing to try needs to work out of the box.

Comment 8

[Chris Manchester (limited bugmail, email directly)]

Attachment: Bug 1594903 - Remove reference to gecko-dev in bootstrap instructions.

Comment 9

[BugBot [:suhaib / :marco/ :calixte]]

There's a r+ patch which didn't land and no activity in this bug for 2 weeks.
:cmanchester, could you have a look please?
For more information, please visit auto_nag documentation.

Comment 10

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/2d48fe217dc1
Remove reference to gecko-dev in bootstrap instructions. r=dmajor

Comment 11

[Chris Manchester (limited bugmail, email directly)]

Landed now...

Comment 12

[Stefan Hindli [:stefan_hindli]]

https://hg.mozilla.org/mozilla-central/rev/2d48fe217dc1