__init__.py
394 lines
| 15.7 KiB
| text/x-python
|
PythonLexer
Edouard Gomez
|
r4513 | # convert.py Foreign SCM converter | ||
Thomas Arendsen Hein
|
r4512 | # | ||
Thomas Arendsen Hein
|
r4635 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | ||
Thomas Arendsen Hein
|
r4512 | # | ||
Martin Geisler
|
r8225 | # This software may be used and distributed according to the terms of the | ||
Matt Mackall
|
r10263 | # GNU General Public License version 2 or any later version. | ||
Martin Geisler
|
r8228 | |||
Dirkjan Ochtman
|
r8932 | '''import revisions from foreign VCS repositories into Mercurial''' | ||
Thomas Arendsen Hein
|
r4512 | |||
Patrick Mezard
|
r5621 | import convcmd | ||
Frank Kingswood
|
r7502 | import cvsps | ||
Peter Arrenbrecht
|
r7873 | import subversion | ||
Patrick Mezard
|
r13691 | from mercurial import commands, templatekw | ||
Martin Geisler
|
r6999 | from mercurial.i18n import _ | ||
Thomas Arendsen Hein
|
r4512 | |||
Augie Fackler
|
r16743 | testedwith = 'internal' | ||
Patrick Mezard
|
r5621 | # Commands definition was moved elsewhere to ease demandload job. | ||
Thomas Arendsen Hein
|
r4512 | |||
Alexis S. L. Carvalho
|
r5281 | def convert(ui, src, dest=None, revmapfile=None, **opts): | ||
Martin Geisler
|
r7598 | """convert a foreign SCM repository to a Mercurial one. | ||
Edouard Gomez
|
r4513 | |||
Patrick Mezard
|
r6976 | Accepted source formats [identifiers]: | ||
Martin Geisler
|
r9157 | |||
Patrick Mezard
|
r6976 | - Mercurial [hg] | ||
- CVS [cvs] | ||||
- Darcs [darcs] | ||||
- git [git] | ||||
- Subversion [svn] | ||||
- Monotone [mtn] | ||||
- GNU Arch [gnuarch] | ||||
Marek Kubica
|
r7053 | - Bazaar [bzr] | ||
Frank Kingswood
|
r7823 | - Perforce [p4] | ||
Edouard Gomez
|
r4513 | |||
Patrick Mezard
|
r6976 | Accepted destination formats [identifiers]: | ||
Martin Geisler
|
r9157 | |||
Patrick Mezard
|
r6976 | - Mercurial [hg] | ||
- Subversion [svn] (history on branches is not preserved) | ||||
Edouard Gomez
|
r4513 | |||
Martin Geisler
|
r9256 | If no revision is given, all revisions will be converted. | ||
Otherwise, convert will only import up to the named revision | ||||
(given in a format understood by the source). | ||||
Brendan Cully
|
r4760 | |||
Martin Geisler
|
r9256 | If no destination directory name is specified, it defaults to the | ||
Martin Geisler
|
r12185 | basename of the source with ``-hg`` appended. If the destination | ||
Martin Geisler
|
r9256 | repository doesn't exist, it will be created. | ||
Edouard Gomez
|
r4513 | |||
Martin Geisler
|
r9256 | By default, all sources except Mercurial will use --branchsort. | ||
Mercurial uses --sourcesort to preserve original revision numbers | ||||
order. Sort modes have the following effects: | ||||
Martin Geisler
|
r9103 | |||
Martin Geisler
|
r9256 | --branchsort convert from parent to child revision when possible, | ||
which means branches are usually converted one after | ||||
the other. It generates more compact repositories. | ||||
Martin Geisler
|
r9157 | |||
--datesort sort revisions by date. Converted repositories have | ||||
Martin Geisler
|
r9256 | good-looking changelogs but are often an order of | ||
magnitude larger than the same ones generated by | ||||
--branchsort. | ||||
Martin Geisler
|
r9157 | |||
Martin Geisler
|
r9256 | --sourcesort try to preserve source revisions order, only | ||
supported by Mercurial sources. | ||||
Patrick Mezard
|
r8692 | |||
Constantine Linnick
|
r18819 | --closesort try to move closed revisions as close as possible | ||
to parent branches, only supported by Mercurial | ||||
sources. | ||||
Martin Geisler
|
r12924 | If ``REVMAP`` isn't given, it will be put in a default location | ||
(``<dest>/.hg/shamap`` by default). The ``REVMAP`` is a simple | ||||
text file that maps each source commit ID to the destination ID | ||||
for that revision, like so:: | ||||
Martin Geisler
|
r9058 | |||
Martin Geisler
|
r9157 | <source ID> <destination ID> | ||
Edouard Gomez
|
r4513 | |||
Martin Geisler
|
r9256 | If the file doesn't exist, it's automatically created. It's | ||
Martin Geisler
|
r12186 | updated on each commit copied, so :hg:`convert` can be interrupted | ||
Martin Geisler
|
r9256 | and can be run repeatedly to copy new commits. | ||
Edouard Gomez
|
r4589 | |||
Martin Geisler
|
r12198 | The authormap is a simple text file that maps each source commit | ||
author to a destination commit author. It is handy for source SCMs | ||||
Mads Kiilerich
|
r17424 | that use unix logins to identify authors (e.g.: CVS). One line per | ||
Martin Geisler
|
r12198 | author mapping and the line format is:: | ||
Martin Geisler
|
r12184 | |||
source author = destination author | ||||
Empty lines and lines starting with a ``#`` are ignored. | ||||
Bryan O'Sullivan
|
r5256 | |||
Martin Geisler
|
r9256 | The filemap is a file that allows filtering and remapping of files | ||
Mads Kiilerich
|
r11523 | and directories. Each line can contain one of the following | ||
directives:: | ||||
include path/to/file-or-dir | ||||
exclude path/to/file-or-dir | ||||
Bryan O'Sullivan
|
r5256 | |||
Mads Kiilerich
|
r11523 | rename path/to/source path/to/destination | ||
Bryan O'Sullivan
|
r5256 | |||
Martin Geisler
|
r12188 | Comment lines start with ``#``. A specified path matches if it | ||
Mads Kiilerich
|
r11523 | equals the full relative name of a file or one of its parent | ||
Martin Geisler
|
r12185 | directories. The ``include`` or ``exclude`` directive with the | ||
longest matching path applies, so line order does not matter. | ||||
Thomas Arendsen Hein
|
r5760 | |||
Martin Geisler
|
r12185 | The ``include`` directive causes a file, or all files under a | ||
Martin Geisler
|
r9256 | directory, to be included in the destination repository, and the | ||
exclusion of all other files and directories not explicitly | ||||
Martin Geisler
|
r12185 | included. The ``exclude`` directive causes files or directories to | ||
be omitted. The ``rename`` directive renames a file or directory if | ||||
Patrick Mezard
|
r11685 | it is converted. To rename from a subdirectory into the root of | ||
Martin Geisler
|
r12188 | the repository, use ``.`` as the path to rename to. | ||
Bryan O'Sullivan
|
r5556 | |||
Martin Geisler
|
r9256 | The splicemap is a file that allows insertion of synthetic | ||
history, letting you specify the parents of a revision. This is | ||||
useful if you want to e.g. give a Subversion merge two parents, or | ||||
graft two disconnected series of history together. Each entry | ||||
contains a key, followed by a space, followed by one or two | ||||
Martin Geisler
|
r12184 | comma-separated values:: | ||
key parent1, parent2 | ||||
The key is the revision ID in the source | ||||
Martin Geisler
|
r9256 | revision control system whose parents should be modified (same | ||
format as a key in .hg/shamap). The values are the revision IDs | ||||
(in either the source or destination revision control system) that | ||||
Martin Geisler
|
r9634 | should be used as the new parents for that node. For example, if | ||
you have merged "release-1.0" into "trunk", then you should | ||||
specify the revision on "trunk" as the first parent and the one on | ||||
the "release-1.0" branch as the second. | ||||
Bryan O'Sullivan
|
r6143 | |||
Michael J. Pedersen
|
r8377 | The branchmap is a file that allows you to rename a branch when it is | ||
being brought in from whatever external repository. When used in | ||||
Martin Geisler
|
r9256 | conjunction with a splicemap, it allows for a powerful combination | ||
to help fix even the most badly mismanaged repositories and turn them | ||||
into nicely structured Mercurial repositories. The branchmap contains | ||||
Martin Geisler
|
r12184 | lines of the form:: | ||
original_branch_name new_branch_name | ||||
where "original_branch_name" is the name of the branch in the | ||||
source repository, and "new_branch_name" is the name of the branch | ||||
is the destination repository. No whitespace is allowed in the | ||||
branch names. This can be used to (for instance) move code in one | ||||
repository from "default" to a named branch. | ||||
Michael J. Pedersen
|
r8377 | |||
Sean Farley
|
r20375 | The closemap is a file that allows closing of a branch. This is useful if | ||
you want to close a branch. Each entry contains a revision or hash | ||||
separated by white space. | ||||
Sean Farley
|
r20379 | The tagpmap is a file that exactly analogous to the branchmap. This will | ||
rename tags on the fly and prevent the 'update tags' commit usually found | ||||
at the end of a convert process. | ||||
Patrick Mezard
|
r6169 | Mercurial Source | ||
FUJIWARA Katsunori
|
r17267 | ################ | ||
Patrick Mezard
|
r6169 | |||
Erik Zielke
|
r12922 | The Mercurial source recognizes the following configuration | ||
options, which you can set on the command line with ``--config``: | ||||
Martin Geisler
|
r12923 | :convert.hg.ignoreerrors: ignore integrity errors when reading. | ||
Use it to fix Mercurial repositories with missing revlogs, by | ||||
converting from and to Mercurial. Default is False. | ||||
Wagner Bruna
|
r13429 | :convert.hg.saverev: store original revision ID in changeset | ||
Eli Carter
|
r15300 | (forces target IDs to change). It takes a boolean argument and | ||
defaults to False. | ||||
Martin Geisler
|
r12923 | |||
Mads Kiilerich
|
r19891 | :convert.hg.revs: revset specifying the source revisions to convert. | ||
Patrick Mezard
|
r6169 | |||
Frank Kingswood
|
r6798 | CVS Source | ||
FUJIWARA Katsunori
|
r17267 | ########## | ||
Frank Kingswood
|
r6798 | |||
Martin Geisler
|
r9256 | CVS source will use a sandbox (i.e. a checked-out copy) from CVS | ||
to indicate the starting point of what will be converted. Direct | ||||
access to the repository files is not needed, unless of course the | ||||
Martin Geisler
|
r12924 | repository is ``:local:``. The conversion uses the top level | ||
directory in the sandbox to find the CVS repository, and then uses | ||||
CVS rlog commands to find files to convert. This means that unless | ||||
a filemap is given, all files under the starting directory will be | ||||
Martin Geisler
|
r9256 | converted, and that any directory reorganization in the CVS | ||
sandbox is ignored. | ||||
Frank Kingswood
|
r6798 | |||
Erik Zielke
|
r12922 | The following options can be used with ``--config``: | ||
Frank Kingswood
|
r6798 | |||
Martin Geisler
|
r12923 | :convert.cvsps.cache: Set to False to disable remote log caching, | ||
for testing and debugging purposes. Default is True. | ||||
:convert.cvsps.fuzz: Specify the maximum time (in seconds) that is | ||||
allowed between commits with identical user and log message in | ||||
a single changeset. When very large files were checked in as | ||||
part of a changeset then the default may not be long enough. | ||||
The default is 60. | ||||
:convert.cvsps.mergeto: Specify a regular expression to which | ||||
commit log messages are matched. If a match occurs, then the | ||||
conversion process will insert a dummy revision merging the | ||||
branch on which this log message occurs to the branch | ||||
indicated in the regex. Default is ``{{mergetobranch | ||||
([-\\w]+)}}`` | ||||
:convert.cvsps.mergefrom: Specify a regular expression to which | ||||
commit log messages are matched. If a match occurs, then the | ||||
conversion process will add the most recent revision on the | ||||
branch indicated in the regex as the second parent of the | ||||
changeset. Default is ``{{mergefrombranch ([-\\w]+)}}`` | ||||
Julian Cowley
|
r17974 | :convert.localtimezone: use local time (as determined by the TZ | ||
environment variable) for changeset date/times. The default | ||||
is False (use UTC). | ||||
FUJIWARA Katsunori
|
r18321 | :hooks.cvslog: Specify a Python function to be called at the end of | ||
Martin Geisler
|
r12923 | gathering the CVS log. The function is passed a list with the | ||
log entries, and can modify the entries in-place, or add or | ||||
delete them. | ||||
FUJIWARA Katsunori
|
r18321 | :hooks.cvschangesets: Specify a Python function to be called after | ||
Mads Kiilerich
|
r17251 | the changesets are calculated from the CVS log. The | ||
Martin Geisler
|
r12923 | function is passed a list with the changeset entries, and can | ||
modify the changesets in-place, or add or delete them. | ||||
Dirkjan Ochtman
|
r6923 | |||
Patrick Mezard
|
r9472 | An additional "debugcvsps" Mercurial command allows the builtin | ||
Martin Geisler
|
r9256 | changeset merging code to be run without doing a conversion. Its | ||
Patrick Mezard
|
r9472 | parameters and output are similar to that of cvsps 2.1. Please see | ||
the command help for more details. | ||||
Frank Kingswood
|
r6798 | |||
Patrick Mezard
|
r6169 | Subversion Source | ||
FUJIWARA Katsunori
|
r17267 | ################# | ||
Patrick Mezard
|
r6169 | |||
Martin Geisler
|
r9256 | Subversion source detects classical trunk/branches/tags layouts. | ||
Martin Geisler
|
r12924 | By default, the supplied ``svn://repo/path/`` source URL is | ||
converted as a single branch. If ``svn://repo/path/trunk`` exists | ||||
it replaces the default branch. If ``svn://repo/path/branches`` | ||||
exists, its subdirectories are listed as possible branches. If | ||||
``svn://repo/path/tags`` exists, it is looked for tags referencing | ||||
converted branches. Default ``trunk``, ``branches`` and ``tags`` | ||||
values can be overridden with following options. Set them to paths | ||||
Martin Geisler
|
r9256 | relative to the source URL, or leave them blank to disable auto | ||
detection. | ||||
Patrick Mezard
|
r6169 | |||
Erik Zielke
|
r12922 | The following options can be set with ``--config``: | ||
Martin Geisler
|
r12923 | :convert.svn.branches: specify the directory containing branches. | ||
Pavel Boldin
|
r13494 | The default is ``branches``. | ||
Martin Geisler
|
r12923 | |||
:convert.svn.tags: specify the directory containing tags. The | ||||
Martin Geisler
|
r12924 | default is ``tags``. | ||
Martin Geisler
|
r12923 | |||
Pavel Boldin
|
r13494 | :convert.svn.trunk: specify the name of the trunk branch. The | ||
default is ``trunk``. | ||||
Patrick Mezard
|
r6169 | |||
Julian Cowley
|
r17974 | :convert.localtimezone: use local time (as determined by the TZ | ||
environment variable) for changeset date/times. The default | ||||
is False (use UTC). | ||||
Martin Geisler
|
r9256 | Source history can be retrieved starting at a specific revision, | ||
instead of being integrally converted. Only single branch | ||||
conversions are supported. | ||||
Patrick Mezard
|
r6173 | |||
Martin Geisler
|
r12923 | :convert.svn.startrev: specify start Subversion revision number. | ||
The default is 0. | ||||
Patrick Mezard
|
r6173 | |||
Frank Kingswood
|
r7823 | Perforce Source | ||
FUJIWARA Katsunori
|
r17267 | ############### | ||
Frank Kingswood
|
r7823 | |||
Martin Geisler
|
r9256 | The Perforce (P4) importer can be given a p4 depot path or a | ||
client specification as source. It will convert all files in the | ||||
source to a flat Mercurial repository, ignoring labels, branches | ||||
and integrations. Note that when a depot path is given you then | ||||
usually should specify a target directory, because otherwise the | ||||
Martin Geisler
|
r12924 | target may be named ``...-hg``. | ||
Frank Kingswood
|
r7823 | |||
Martin Geisler
|
r9256 | It is possible to limit the amount of source history to be | ||
Erik Zielke
|
r12922 | converted by specifying an initial Perforce revision: | ||
Frank Kingswood
|
r7823 | |||
Wagner Bruna
|
r13429 | :convert.p4.startrev: specify initial Perforce revision (a | ||
Martin Geisler
|
r12923 | Perforce changelist number). | ||
Frank Kingswood
|
r7823 | |||
Patrick Mezard
|
r6169 | Mercurial Destination | ||
FUJIWARA Katsunori
|
r17267 | ##################### | ||
Bryan O'Sullivan
|
r5556 | |||
Erik Zielke
|
r12922 | The following options are supported: | ||
Martin Geisler
|
r12923 | :convert.hg.clonebranches: dispatch source branches in separate | ||
clones. The default is False. | ||||
Erik Zielke
|
r12922 | :convert.hg.tagsbranch: branch name for tag revisions, defaults to | ||
``default``. | ||||
Bryan O'Sullivan
|
r5556 | |||
Martin Geisler
|
r12923 | :convert.hg.usebranchnames: preserve branch names. The default is | ||
Wagner Bruna
|
r13429 | True. | ||
Thomas Arendsen Hein
|
r4958 | """ | ||
Patrick Mezard
|
r5621 | return convcmd.convert(ui, src, dest, revmapfile, **opts) | ||
Thomas Arendsen Hein
|
r4512 | |||
Patrick Mezard
|
r5621 | def debugsvnlog(ui, **opts): | ||
Peter Arrenbrecht
|
r7873 | return subversion.debugsvnlog(ui, **opts) | ||
Thomas Arendsen Hein
|
r4512 | |||
Frank Kingswood
|
r7502 | def debugcvsps(ui, *args, **opts): | ||
Martin Geisler
|
r7598 | '''create changeset information from CVS | ||
Frank Kingswood
|
r7502 | |||
Martin Geisler
|
r9256 | This command is intended as a debugging tool for the CVS to | ||
Mercurial converter, and can be used as a direct replacement for | ||||
cvsps. | ||||
Frank Kingswood
|
r7502 | |||
Martin Geisler
|
r9256 | Hg debugcvsps reads the CVS rlog for current directory (or any | ||
named directory) in the CVS repository, and converts the log to a | ||||
series of changesets based on matching commit log entries and | ||||
dates.''' | ||||
Frank Kingswood
|
r7502 | return cvsps.debugcvsps(ui, *args, **opts) | ||
commands.norepo += " convert debugsvnlog debugcvsps" | ||||
Patrick Mezard
|
r5127 | |||
Edouard Gomez
|
r4513 | cmdtable = { | ||
Thomas Arendsen Hein
|
r4532 | "convert": | ||
Alexis S. L. Carvalho
|
r5281 | (convert, | ||
Martin Geisler
|
r12202 | [('', 'authors', '', | ||
Martin Geisler
|
r12198 | _('username mapping filename (DEPRECATED, use --authormap instead)'), | ||
_('FILE')), | ||||
Martin Geisler
|
r12187 | ('s', 'source-type', '', | ||
_('source repository type'), _('TYPE')), | ||||
FUJIWARA Katsunori
|
r11321 | ('d', 'dest-type', '', | ||
_('destination repository type'), _('TYPE')), | ||||
Martin Geisler
|
r12187 | ('r', 'rev', '', | ||
Mads Kiilerich
|
r19864 | _('import up to source revision REV'), _('REV')), | ||
Martin Geisler
|
r12202 | ('A', 'authormap', '', | ||
Martin Geisler
|
r12198 | _('remap usernames using this file'), _('FILE')), | ||
FUJIWARA Katsunori
|
r11321 | ('', 'filemap', '', | ||
_('remap file names using contents of file'), _('FILE')), | ||||
('', 'splicemap', '', | ||||
_('splice synthesized history into place'), _('FILE')), | ||||
('', 'branchmap', '', | ||||
_('change branch names while converting'), _('FILE')), | ||||
Sean Farley
|
r20375 | ('', 'closemap', '', | ||
_('closes given revs'), _('FILE')), | ||||
Sean Farley
|
r20379 | ('', 'tagmap', '', | ||
_('change tag names while converting'), _('FILE')), | ||||
Patrick Mezard
|
r8692 | ('', 'branchsort', None, _('try to sort changesets by branches')), | ||
Patrick Mezard
|
r8690 | ('', 'datesort', None, _('try to sort changesets by date')), | ||
Constantine Linnick
|
r18819 | ('', 'sourcesort', None, _('preserve source changesets order')), | ||
('', 'closesort', None, _('try to reorder closed revisions'))], | ||||
Martin Geisler
|
r6999 | _('hg convert [OPTION]... SOURCE [DEST [REVMAP]]')), | ||
Thomas Arendsen Hein
|
r5138 | "debugsvnlog": | ||
Patrick Mezard
|
r5127 | (debugsvnlog, | ||
[], | ||||
Thomas Arendsen Hein
|
r5138 | 'hg debugsvnlog'), | ||
Frank Kingswood
|
r7502 | "debugcvsps": | ||
(debugcvsps, | ||||
[ | ||||
# Main options shared with cvsps-2.1 | ||||
Martin Geisler
|
r7598 | ('b', 'branches', [], _('only return changes on specified branches')), | ||
('p', 'prefix', '', _('prefix to remove from file names')), | ||||
Matt Mackall
|
r10282 | ('r', 'revisions', [], | ||
_('only return changes after or between specified tags')), | ||||
Martin Geisler
|
r7598 | ('u', 'update-cache', None, _("update cvs log cache")), | ||
('x', 'new-cache', None, _("create new cvs log cache")), | ||||
('z', 'fuzz', 60, _('set commit time fuzz in seconds')), | ||||
('', 'root', '', _('specify cvsroot')), | ||||
Frank Kingswood
|
r7502 | # Options specific to builtin cvsps | ||
Martin Geisler
|
r7598 | ('', 'parents', '', _('show parent changesets')), | ||
Brodie Rao
|
r16683 | ('', 'ancestors', '', | ||
_('show current changeset in ancestor branches')), | ||||
Frank Kingswood
|
r7502 | # Options that are ignored for compatibility with cvsps-2.1 | ||
Martin Geisler
|
r7735 | ('A', 'cvs-direct', None, _('ignored for compatibility')), | ||
Frank Kingswood
|
r7502 | ], | ||
Martin Geisler
|
r7735 | _('hg debugcvsps [OPTION]... [PATH]...')), | ||
Edouard Gomez
|
r4513 | } | ||
Patrick Mezard
|
r13691 | |||
def kwconverted(ctx, name): | ||||
rev = ctx.extra().get('convert_revision', '') | ||||
if rev.startswith('svn:'): | ||||
if name == 'svnrev': | ||||
return str(subversion.revsplit(rev)[2]) | ||||
elif name == 'svnpath': | ||||
return subversion.revsplit(rev)[1] | ||||
elif name == 'svnuuid': | ||||
return subversion.revsplit(rev)[0] | ||||
return rev | ||||
def kwsvnrev(repo, ctx, **args): | ||||
""":svnrev: String. Converted subversion revision number.""" | ||||
return kwconverted(ctx, 'svnrev') | ||||
def kwsvnpath(repo, ctx, **args): | ||||
""":svnpath: String. Converted subversion revision project path.""" | ||||
return kwconverted(ctx, 'svnpath') | ||||
def kwsvnuuid(repo, ctx, **args): | ||||
""":svnuuid: String. Converted subversion revision repository identifier.""" | ||||
return kwconverted(ctx, 'svnuuid') | ||||
def extsetup(ui): | ||||
templatekw.keywords['svnrev'] = kwsvnrev | ||||
templatekw.keywords['svnpath'] = kwsvnpath | ||||
templatekw.keywords['svnuuid'] = kwsvnuuid | ||||
Patrick Mezard
|
r13698 | |||
# tell hggettext to extract docstrings from these functions: | ||||
i18nfunctions = [kwsvnrev, kwsvnpath, kwsvnuuid] | ||||