Mercurial to Git converter using git fast-import with multi repository import support
Legal
Dual-licensed under MIT
or the UNLICENSE.
Features
- Import of single and multiple Mercurial repositories to Git repository.
- Import of new revisions from previously imported Mercurial repositories to Git repository.
- Tags.
- Closed branches.
- Verification of the end result with diff.
Installation
With cargo
:
cargo install hg-git-fast-import
From source:
git clone https://github.com/kilork/hg-git-fast-import.git
cd hg-git-fast-import
cargo install --path .
Usage
hg-git-fast-import is a command-line utility, usage info can be access with --help argument:
)
Import of single repository:
<hg_repo> The
<git_repo> The
)
Import of multiple repositories:
)
Rebuild saved state of repo:
<hg_repo> The
<git_repo> The
Configuration syntax
For more advanced cases one may supply configuration in toml
format.
Single mode configuration example
# Allows to start import in of hanged heads in repository
# (currently has no effect, default value is true). Optional.
= true
# Offset for git fast-import marks in Git repository. Optional, default is 0.
= 1000
# Path prefix in target repository. If path_prefix = 'test',
# all files will be under test folder in target Git repository.
# Optional.
= 'prefix1'
# Tag prefix in target repository. Optional.
= 'prefix2-'
# Branch prefix in target repository. Optional.
= 'prefix3-'
# By default master branch is not prefixed by branch_prefix.
# This behavior can be changed by specifying this as true.
# Optional.
= false
# Mapping between authors in Mercurial and authors in Git.
# Required mainly because of Git asks for particular format "Somename <email@address>".
# But also can be used to fix typos and etc.
[]
= 'Bbb <bbb@company.xyz>'
= 'Bbb <bbb@company.xyz>'
= 'Qqq <qqq@another.dom>'
= 'My <my@normal.xyz>'
# Mapping between branches in Mercurial and branches in Git.
# Required mainly because Git does not allow some characters,
# which allowed in Mercurial, for example - spaces.
# Branches taken from mapping will not have branch_prefix,
# so it must be added to mapped values.
[]
= 'branch-in-git'
= 'othergit'
See single.toml.
With authors
and branches
subsections one can rename authors and branches during import. Offset creates marks in Git repository. Can be useful if all marks files from imported repositories planned to be analyzed together. allow_unnamed_heads
allows to start import in case of hanged heads in repository, currently this feature has no effect.
Multi mode configuration example
# Path to target git repository.
= "000_git"
# This is subsection with list of repositories to be aggregated into single repo.
# Each subsection start like this (see toml format for arrays).
[[]]
# Mercurial repository path.
= "001_hg"
# Child Git repository path.
= "001_git"
# Child repository configuration for 001_hg/001_git.
# Fields are the same as on root level in single mode configuration.
[]
= true
= 1000
= 'prefix1'
= 'prefix2-'
= 'prefix3-'
= true
# Same as authors section in single mode, but for this child repository.
[]
= 'Bbb <bbb@company.xyz>'
# Same as branches section in single mode, but for this child repository.
[]
= 'branch2'
# This sections specify to which branches would be merged migrated
# branches from this child Git repository.
[]
= 'branch2'
# Explanation: in this case branch_in_git will be a branch in 000_git repo
# and it will contain branch2 merged from remote child repository.
# This is second child repository.
[[]]
# Here we can also specify alias, this field used to add reference in target 000_git repository.
# Otherwise path_prefix is used from config section.
= "another_002"
= "002_hg"
= "002_git"
[]
= 'branch_in_hg'
# Actually this branch_in_hg is from second migrated Git repository.
# Interesting to note - both child repository branches are merged
# into single branch_in_git branch in target 000_git repository.
Each of child repositories will be imported in corresponding path_git
from configuration, then single repository from top level path_git
will reference child repositories as remote
. For remote name either alias
either path_prefix
is taken.
See multi.toml.
Authors list configuration example
= 'Bbb <bbb@company.xyz>'
= 'Bbb <bbb@company.xyz>'
= 'Qqq <qqq@another.dom>'
= 'My <my@normal.xyz>'
See authors.toml.
Requirements
- Rust 1.32 or later (2018 edition)
- Git 2.19 (optional, if you use
single
mode without repo creation) - Diff 2.8 (optional, if you do not use
--verify
) - Mercurial 4.8 (optional, if you do not need delta load of revisions)
- Python 2.7 (optional, required for
Mercurial
)
Docker support
To setup all dependencies can be a tricky task - it is possible to use docker
for running hg-git-fast-import
.
Docker installation
git clone https://github.com/kilork/hg-git-fast-import.git
cd hg-git-fast-import/docker
./build.sh
Docker running
docker run -it --rm kilork/hg-git-fast-import hg-git-fast-import --help
To mount current directory with repositories and run hg-git-fast-import
command with docker one can use wrapper hg-git-fast-import/docker/run.sh
:
cd hg-git-fast-import/docker
./run.sh
By default this will mount current directory to /repositories
dir inside docker container. This can be overriden by usage of env variable:
HG_GIT_FAST_IMPORT_VOLUME=~/sandbox:/sandbox ./run.sh single /sandbox/source_hg /sandbox/target_git