Mercurial "server"

I've been using Mercurial for a little while, but mainly for my own use. Now though, I have a project I'm working on where two of us are building the same project, and we will probably be modifiying each other's files.

I would like to setup a Mercurial repository on a server, make that repository the "server", so my changes and the other editor's changes both push to that server (so basically the Subversion / CVS model); I like Mercurial though and don't want to switch to something like Subversion.

Here in my own network, everything is done on Linux, and my "server" has OpenSSH installed. So pushing my changes (I work on multiple computers) from one computer to the server is just a matter of "hg push"; the protocol used is SSH for transfering the changes.

The problem is that I use Linux, the server will be Windows (so no OpenSSH, right?) and the other editor will be using Windows too. As far as I know, the best way of working in Mercurial in these types of setups is for the repository to pull changes from the source, rather then the source pushing to the "server". I'm behind several firewall's (not entirely my network) and my computer won't be visible from the server, and I'm assuming the other editor will be behind a firewall too (so we can't just start up the local Mercurial HTTP server and get the "server" computer to pull from that).

What's the best way for both editors to get our changes to the server repository? (I should add that the server is a server on the Internet, so it is just as visible as something like google.com. It's a hosted Windows server, but I would probably have permission to install software if needed for this.)

Solution 1:

I believe reading the project's documentation is a nice start: https://www.mercurial-scm.org/wiki/PublishingRepositories.

Solution 2:

It might also simplify the administration to outsource it -- if you only have one repository and a couple of guys pushing/pulling it, you could do a lot worse than just hosting it somewhere like Bitbucket. (And for a one-repository solution it's actually free.)

Update: It is 2020 now and Bitbucket no longer supports mercurial, see: https://bitbucket.org/blog/sunsetting-mercurial-support-in-bitbucket

For a list of hosted or self hosted free or paid solutions see https://www.mercurial-scm.org/wiki/MercurialHosting

Solution 3:

Take a look at rhodecode it's a open source Mercurial server with many of the features that Kiln offers, including code search. It even integrates nicely with LDAP so you can authenticate HG users with your Windows domain.

Solution 4:

Update: It is 2020 now and Bitbucket no longer supports mercurial, see: https://bitbucket.org/blog/sunsetting-mercurial-support-in-bitbucket

For a list of hosted or self hosted free or paid solutions see https://www.mercurial-scm.org/wiki/MercurialHosting

I recommend putting your project on http://bitbucket.org/, a Mercurial repository hosting site.

If you don't want the source to be seen by others they have settings to create private repositories. I think you're allowed one private repository before they start charging you for it.

Edit: Bitbucket now provides unlimited private/hidden repositories.