1309045 - Add https://hg.mozilla.org/releases/comm-esr45/ branch to releases-comm-central

Status: RESOLVED FIXED

(Developer Services :: General, task)

Description

[arlolra]

Attachment: 0001-Append-comm-esr45.patch

User Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.143 Safari/537.36

Steps to reproduce:

Similar to bug 1250618

The patch is a best attempt.  No idea if it works.

Comment 1

[hwine]

Comment on attachment 8799552 [details] [diff] [review]
0001-Append-comm-esr45.patch

:aki -- any chance you recall if converting a 'single branch' conversion into a 'multi-branch' conversion should "just work(tm)"? Or is there one time setup?

Just looking for input on that aspect -- I can take it from there if it's approved.

Comment 2

[hwine]

:arlolra - can you please add information on who will be using this, and for what purpose?

thanks

Comment 3

[hwine]

move to correct component

Comment 4

[Aki Sasaki (not active)]

Comment on attachment 8799552 [details] [diff] [review]
0001-Append-comm-esr45.patch

(In reply to Hal Wine [:hwine] (use NI) from comment #1)
> :aki -- any chance you recall if converting a 'single branch' conversion
> into a 'multi-branch' conversion should "just work(tm)"? Or is there one
> time setup?
> 
> Just looking for input on that aspect -- I can take it from there if it's
> approved.

I don't recall =P
In fact, I'm not sure I understand the question.  However, if this is a big worry point, I can dig deeper.

Comment 5

[arlolra]

(In reply to Hal Wine [:hwine] (use NI) from comment #2)
> :arlolra - can you please add information on who will be using this, and for
> what purpose?

Sure.  Just as Tor Browser maintains a fork of the esr branch on gecko-dev [0], we'd like to do the same for comm-central, for Tor Messenger [1].  We're starting to pile up a number of patches [2] (some of which are in the process of being upstreamed).  Having Mozilla sync'ing the repo to git would ease some burden on our end.

(The implication here is that I'll be knocking on your door in March when esr52 comes around, and so forth ...)

Thanks!

[0] https://gitweb.torproject.org/tor-browser.git
[1] https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger
[2] https://gitweb.torproject.org/tor-messenger-build.git/tree/projects/instantbird

Comment 6

[arlolra]

Sorry to bug ... any chance this is moving forward?

Comment 7

[Aki Sasaki (not active)]

Hal, I hear there may be plans for comm-* wrt mirroring etc; do you know more?

Comment 8

[hwine]

So recapping the situation:
 - there is a https://github.com/mozilla/releases-comm-central repository
   - however, it is actually a copy of https://hg.mozilla.org/comm-central/
   - it is being updated as a single repo to single repo conversion
 - None of the https://hg.mozilla.org/releases/comm* repositories are converted in any form

What is being asked for is essentially a "gecko-dev"[1] for comm, which involves merging multiple mercurial repositories into a single git repository. That involves potential collisions on branch and tag names. (I.e. analysis & details to be worked out.) The current repository might also need to be recreated in that process, which could break the existing sha's. (It may be simpler to stand up a new conversion, separate from the existing conversion)

Under the current[2] structure as I understand it, Thunderbird would need to staff this work, and make arrangements for operating the ongoing conversion.

In sum: the Thunderbird team would have to provide the resources to move forward with this. We can help point them to how our current machinery is set up, although it may be much more than is needed.


[1] https://github.com/mozilla/gecko-dev
[2] https://blog.mozilla.org/thunderbird/2015/12/thunderbird-active-daily-inquiries-surpass-10-million/

Comment 9

[hwine]

Happy to help with pointers to documentation, and advice - probably best to ask for that in a separate bug or email thread.

Comment 10

[Gregory Szorc [:gps]]

We have a mechanism on hg.mozilla.org for unifying multiple repositories into 1. That's how the read-only https://hg.mozilla.org/firefox repo works. We could do something similar for comm-central to make the hg -> git conversion easier.

That would involve creating a new ini file for the "unify" service and updating references to it. That code is mainly in https://hg.mozilla.org/hgcustom/version-control-tools/file/tip/ansible/roles/hg-ssh/files. See unify-mozilla-unified.ini for how the firefox repo is created.

Comment 11

[hwine]

(In reply to Gregory Szorc [:gps] from comment #10)
> We could do something similar for comm-central to make the hg -> git conversion easier.

A word of caution - we've never used vcs-sync with such a combined-in-mercurial repo. "It _should_ work", but those words have been uttered many times in the history of vcs-sync.

Comment 12

[arlolra]

Hal, thanks for the detail recap.

Gregory, that would indeed be a helpful start.  Is that something you can commit to doing?

Comment 13

[:dhouse]

This was completed. The patch was applied and it was moved into the current vcssync in bug 1286025 (see https://hg.mozilla.org/build/mozharness/annotate/ea13c025c938b2c97a793c73e366ece05d916e2d/configs/vcs_sync/build-repos.py#l125).