Last night I spent a huge amount of time working with Nicolas Pierron on setting up a two-way git-hg bridge to allow for those of us using git to push straight to try/central/inbound without manually importing patches into a local mercurial clone.
The basic design of the bridge is fairly simple: you have a local hg clone of mozilla-central, which has remote paths set up for try, central and inbound. It is set up as an hg-git hybrid and so the entire history is also visible via git at hg-repo/.hg/git. This is a fairly standard set up as far as hg-git goes.
Then on top of that, there’s a special git repository for each remote path in hg (try, central and inbound) inside .hg/repos. These are all set up with special git hooks such that when you push to the master branch of one of these repositories, they will automatically invoke hg-git, import the commits into hg and then invoke hg to push to the true remote repository on hg.mozilla.org.
Simple, right? Well, the good news is that for the most part, people shouldn’t need to actually set up this system. There is infrastructure in place to make it just look like a multi-user git repository that people can authenticate against and push to. So ultimately we can set this up on, say, git.mozilla.org and to push to try we just push to remote ssh://git.mozilla.org/try.git, or something. Authentication is handled by the system just by using ssh’s ForwardAgent option, so in theory it should be as secure as hg.mozilla.org (but don’t quote me on that!).
Now onto setting it up; first you have to clone mozilla-central from hg:
hg clone ssh://hg.mozilla.org/mozilla-central
Then edit the .hg/hgrc to contain the following:
[paths] mozilla-central = ssh://hg.mozilla.org/mozilla-central mozilla-inbound = ssh://hg.mozilla.org/integration/mozilla-inbound try-pushonly = ssh://hg.mozilla.org/try [extensions] hgext.bookmarks = hggit =
The -pushonly suffix on the try path tells the bridge to not bother pulling from try when synchronising the repositories. The other two will be kept in sync.
The next step is go ahead and use Ehsan’s git-mapfile to short-cut the repository creation process. By default, the bridge will use hg-git to create the embedded git repository, and doing this requires that hg-git processes every single commit in the entire repository, which takes days. The git-mapfile is the map that hg-git uses to determine which hg commit IDs correspond to which git commit IDs, and using Ehsan’s git-mapfile along with a clone of the canonical mozilla-central git repository at git://github.com/mozilla/mozilla-central.git will allow us to create these local repositories in a matter of minutes instead of days.
git clone https://github.com/ehsan/mozilla-history-tools cp mozilla-history-tools/updates/git-mapfile /path/to/your/hg/clone/.hg/git-mapfile cd /path/to/your/hg/clone/.hg git clone --bare git://github.com/mozilla/mozilla-central.git git
This lays the groundwork, but there is still a little more to do. Unfortunately, this git repository contains a huge amount of commit history from the CVS era that isn’t present in the hg repositories, so if you try and push using the bridge, hg-git will see these commits that aren’t in the hg repository and try to import all these CVS commits into hg. To work around this, we can hack the git-mapfile. The basic idea here is to grab a list of all the git commit SHA1s that correspond to CVS commits, then map those in the git-mapfile to dummy hg commits (such as “0000000000000000000000000000000000000000”). Unfortunately, hg-git requires that all the mappings are unique, so we need to generate a unique dummy commit ID for each and every CVS commit in git.
If you’re using Ehsan’s repository, go ahead and just grab my git-mapfile from http://people.mozilla.org/~gwright/git-cvs-mapfile-non-unique for just the CVS commits and pre-pend that to your .hg/git-mapfile.
Now comes the fun part; setting up the bridge itself.
git clone git://github.com/nbp/spidermonkey-dev-tools.git mkdir /path/to/your/hg/clone/.hg/bridge/ cp spidermonkey-dev-tools/git-hg-bridge/*.sh /path/to/your/hg/clone/.hg/bridge/
Then, you need to add the following to your .hg/git/config’s origin remote to ensure that the branches are set up correctly for inbound and central:
fetch = +refs/heads/master:refs/heads/mozilla-central/master fetch = +refs/heads/inbound:refs/heads/mozilla-inbound/master
This is because pull.sh expects to find the mozilla-central history at a branch called mozilla-central/master, and the inbound history at mozilla-inbound/master.
Now to create the special push-only repositories. First pull.sh needs to be modified in order to allow for the short circuiting; temporarily remove the “return 0” call on line 112 after “No update needed”, then:
cd /path/to/your/hg/clone/.hg/bridge/ ./pull.sh ../.. (Add the return 0 call back to pull.sh now)
This will create three repositories in /path/to/your/hg/clone/.hg/repos that correspond to try, mozilla-central and mozilla-inbound. If you now set these repositories as remotes in your main git working tree such as:
git remote add try /path/to/your/hg/clone/.hg/repos/try
You can just push to try by pushing to the master branch of that remote! The first push will take a while as the push-only repository has no commits in it (this should not be an issue for mozilla-central and mozilla-inbound pushes), but after that they should be nice and fast. Here’s an example:
[george@aluminium mozilla-central]$ git push -f try gwright/skia_rebase:master Counting objects: 3028016, done. Delta compression using up to 8 threads. Compressing objects: 100% (549026/549026), done. Writing objects: 100% (3028016/3028016), 729.80 MiB | 59.21 MiB/s, done. Total 3028016 (delta 2452303), reused 3015470 (delta 2440473) remote: fatal: Not a valid commit name 0000000000000000000000000000000000000000 remote: Will Force update! remote: Get git repository lock for pushing to the bridge. remote: To ./.hg/git remote: * [new branch] refs/push/master -> try-pushonly/push remote: Get mercurial repository lock for pushing from the bridge. remote: Convert changes to mercurial. remote: abort: bookmark 'try-pushonly/push' does not exist remote: importing git objects into hg remote: pushing to ssh://hg.mozilla.org/try remote: searching for changes remote: remote: adding changesets remote: remote: adding manifests remote: remote: adding file changes remote: remote: added 4 changesets with 7 changes to 877 files (+1 heads) remote: remote: Looks like you used try syntax, going ahead with the push. remote: remote: If you don't get what you expected, check http://trychooser.pub.build.mozilla.org/ for help with building your trychooser request. remote: remote: Thanks for helping save resources, you're the best! remote: remote: You can view the progress of your build at the following URL: remote: remote: https://tbpl.mozilla.org/?tree=Try&rev=b9783e130dd6 remote: remote: Trying to insert into pushlog. remote: remote: Please do not interrupt... remote: remote: Inserted into the pushlog db successfully. To /home/george/dev/hg/mozilla-central/.hg/repos/try * [new branch] gwright/skia_rebase -> master
And that’s it! Mad props to Nicolas Pierron for the huge amount of work he put in on building this solution. If you’re in the Mozilla Mountain View office, you can ping him to get access to his git push server, but hopefully Ehsan and I will work on getting an accessible server out there for everyone.