722451 - Should have an automated way of mirroring mozbase with m-c

Status: RESOLVED DUPLICATE of bug 702832

(Testing :: Mozbase, defect)

Description

[William Lachance (:wlach)]

We need some way of mirroring the latest version of mozbase in github into m-c such that we can create a single commit containing:

1. The files that should be removed from m-c
2. The files that should be added to m-c
3. The files that should be changed inside m-c

Note this commit should not contain "mozdevice/devicemanager", whose home inside mozilla-central is build/mobile.

Comment 1

[William Lachance (:wlach)]

Attachment: Patch to add script to automate mirroring mozbase with m-c

Here is a script which automates mirroring m-c. A work of art it is not, but hopefully it will take the guesswork out of this currently manual process. Run it by switching into the testing/mozbase directory, and executing ./sync-mozbase.sh

The script is currently written in shell because that seemed to be the simplest way to do this. This also seems to be in line with other parts of the tree where we sync from third party sources (e.g. media/libtheora/update.sh).

(review from ctalbert because he's a peer, feedback from mcote and ahal because they've done this before, and from jhammel because he's interested in the topic)

Comment 2

[Andrew Halberstadt [:ahal]]

For reference: https://wiki.mozilla.org/Auto-tools/HowTo/MirrorRepo

Comment 3

[Andrew Halberstadt [:ahal]]

Comment on attachment 592845 [details] [diff] [review]
Patch to add script to automate mirroring mozbase with m-c

Review of attachment 592845 [details] [diff] [review]:
-----------------------------------------------------------------

This script should also create a git tag called "mozilla-central".  See the reference I posted in the previous comment for more details.

Comment 4

[William Lachance (:wlach)]

(In reply to Andrew Halberstadt [:ahal] from comment #2)
> For reference: https://wiki.mozilla.org/Auto-tools/HowTo/MirrorRepo

Interesting, I wasn't aware of that. 

The idea of keeping track of the merge status via a tag is smart. Do we really want this script to create/push the tag though? It seems like that should only be done after the mirroring is actually pushed to mozilla-central, which can only happen later.

Comment 5

[Jeff Hammel]

Comment on attachment 592845 [details] [diff] [review]
Patch to add script to automate mirroring mozbase with m-c

+if [ ! -f setup_development.py ]; then

Should cd to this directory instead.

Overall I don't know what I think of this script.  Is it better to have than no script at all?  I'm not honestly sure.  I would much rather solve the mirroring problem more generally than continue to introduce one-offs.

Comment 6

[cmtalbert]

Comment on attachment 592845 [details] [diff] [review]
Patch to add script to automate mirroring mozbase with m-c

I think this is a fine start. I think that it could do a little more. Fire instance, it could add any new files to an hg queue and create the diff for you to attach to bugzilla. I like ahal idea of having it automatically create the tag for github. The tag indicates that everything from "this point"is on track for landing in mc. Trying to remember to create that tag after the mc landing us going to be tough.

Comment 7

[Mark Côté [:mcote]]

Comment on attachment 592845 [details] [diff] [review]
Patch to add script to automate mirroring mozbase with m-c

This is okay, but I agree that something should be done with the tag. I can't really see myself using it though. Lately I've actually tried applying the diff from github from the mozilla-central tag to head to the mozbase m-c directory, which seems to work.

Comment 8

[Jeff Hammel]

There is this bug, bug 787263, and bug 702832.  I'm arbitrarily picking the lowest bug # to dup against.