Diff for "HgGit"

hg-git Extension

This extension is not distributed with Mercurial.

Author: Scott Chacon, Augie Fackler and Abderrahim Kitouni

Download site: http://bitbucket.org/abderrahim/hg-git

Overview

This extension adds the ability to work on a Git repository from Mercurial. It also allows using a Git server as a collaboration point for a team with developers using both Git and Mercurial.

It can convert commits/changesets losslessly from one system to another, so you can push from a Mercurial repository and another Mercurial client can pull it and their changeset node ids will be identical - Mercurial data does not get lost in translation. It is intended that Mercurial users may wish to use this to collaborate even if no Git users are involved in the project, and it may even provide some advantages if you're using Bookmarks (see below).

Commands

You can clone a Git repository as you would clone a mercurial repository, for example :

hg clone git://github.com/schacon/hg-git.git

will clone the git mirror of the hg-git repository in a directory named 'hg-git.git'.

TODO: document the difference between ssh://host/path and host:path git urls and how they map to hg.

If you want to clone a repository via ssh, you can do so using a git+ssh:// protocol prefix :

hg clone git+ssh://git@github.com/schacon/hg-git.git

This will also create a bookmark for each git branch, and add local tags default/<branch name> for each branch. This is similar to origin/<branch name> in git.

When you pull from a git repository in the [paths] section of hgrc, it will "fast-forward" the bookmarks if the branches haven't diverged. It will also create local tags as above.

When pushing to git, the following is done to determine what's pushed :

• if there are no bookmarks and the remote repository is empty, the tip is pushed as the master branch.
• for each branch in the remote repository, if there is a bookmark or a tag with the same name that points to a descendent of the head, then push it.
• if there are bookmarks with no remote branch, a new branch is created.

The bookmarks extension is not necessary, one can work using solely local tags, but it's more convenient to use it.

TODO

If you want to help with the development of hg-git, here are some things you can help with :

• push/pull -r
• incoming/outgoing

• better handling for tags (see this thread on the mailing list).

• make pushing using dulwich more efficient (faster packing, thin packs, etc).

Dependencies

This plugin is implemented entirely in Python - there are no Git binary dependencies, you do not need to have Git installed on your system. The only dependencies are Dulwich (there is currently a modified version in the repo, but it'll be soon removed) and Mercurial (it should work with Mercurial versions 1.1-1.3).

Configuration

Configure your .hgrc to enable the extension by adding following lines:

[extensions]
hgext.bookmarks = 
git = /path/to/hg-git

CategoryExtensionsByOthers