##// END OF EJS Templates
Merge with stable
Merge with stable

File last commit:

r10264:d6512b3e merge default
r10264:d6512b3e merge default
Show More
__init__.py
294 lines | 12.7 KiB | text/x-python | PythonLexer
Edouard Gomez
Turns convert.py into a real extension
r4513 # convert.py Foreign SCM converter
Thomas Arendsen Hein
Move convert-repo to hgext/convert/__init__.py
r4512 #
Thomas Arendsen Hein
Updated copyright notices and add "and others" to "hg version"
r4635 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
Thomas Arendsen Hein
Move convert-repo to hgext/convert/__init__.py
r4512 #
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Martin Geisler
add blank line after copyright notices and after header
r8228
Dirkjan Ochtman
extensions: fix up description lines some more
r8932 '''import revisions from foreign VCS repositories into Mercurial'''
Thomas Arendsen Hein
Move convert-repo to hgext/convert/__init__.py
r4512
Patrick Mezard
convert: move commands definition to ease demandload job (issue 860)
r5621 import convcmd
Frank Kingswood
Add debugcvsps command, replacing cvsps script
r7502 import cvsps
Peter Arrenbrecht
cleanup: drop unused imports
r7873 import subversion
Patrick Mezard
convert: move commands definition to ease demandload job (issue 860)
r5621 from mercurial import commands
Martin Geisler
i18n, convert: mark command line options for translation
r6999 from mercurial.i18n import _
Thomas Arendsen Hein
Move convert-repo to hgext/convert/__init__.py
r4512
Patrick Mezard
convert: move commands definition to ease demandload job (issue 860)
r5621 # Commands definition was moved elsewhere to ease demandload job.
Thomas Arendsen Hein
Move convert-repo to hgext/convert/__init__.py
r4512
Alexis S. L. Carvalho
convert: rename a class and a function
r5281 def convert(ui, src, dest=None, revmapfile=None, **opts):
Martin Geisler
lowercase help output...
r7598 """convert a foreign SCM repository to a Mercurial one.
Edouard Gomez
Turns convert.py into a real extension
r4513
Patrick Mezard
convert: document source and sink identifiers, fix error message
r6976 Accepted source formats [identifiers]:
Martin Geisler
commands: use minirst parser when displaying help
r9157
Patrick Mezard
convert: document source and sink identifiers, fix error message
r6976 - Mercurial [hg]
- CVS [cvs]
- Darcs [darcs]
- git [git]
- Subversion [svn]
- Monotone [mtn]
- GNU Arch [gnuarch]
Marek Kubica
convert: add bzr source
r7053 - Bazaar [bzr]
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823 - Perforce [p4]
Edouard Gomez
Turns convert.py into a real extension
r4513
Patrick Mezard
convert: document source and sink identifiers, fix error message
r6976 Accepted destination formats [identifiers]:
Martin Geisler
commands: use minirst parser when displaying help
r9157
Patrick Mezard
convert: document source and sink identifiers, fix error message
r6976 - Mercurial [hg]
- Subversion [svn] (history on branches is not preserved)
Edouard Gomez
Turns convert.py into a real extension
r4513
Martin Geisler
convert: wrap docstrings at 70 characters
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
convert: add -r argument specifying latest revision to convert
r4760
Martin Geisler
convert: wrap docstrings at 70 characters
r9256 If no destination directory name is specified, it defaults to the
basename of the source with '-hg' appended. If the destination
repository doesn't exist, it will be created.
Edouard Gomez
Turns convert.py into a real extension
r4513
Martin Geisler
convert: wrap docstrings at 70 characters
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
convert: fix inconsistent indentation in help text...
r9103
Martin Geisler
convert: wrap docstrings at 70 characters
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
commands: use minirst parser when displaying help
r9157
--datesort sort revisions by date. Converted repositories have
Martin Geisler
convert: wrap docstrings at 70 characters
r9256 good-looking changelogs but are often an order of
magnitude larger than the same ones generated by
--branchsort.
Martin Geisler
commands: use minirst parser when displaying help
r9157
Martin Geisler
convert: wrap docstrings at 70 characters
r9256 --sourcesort try to preserve source revisions order, only
supported by Mercurial sources.
Patrick Mezard
convert: default revisions order depends on source...
r8692
Patrick Mezard
convert: rename MAPFILE into REVMAP to disambiguate with filemap
r6238 If <REVMAP> isn't given, it will be put in a default location
Martin Geisler
convert: wrap docstrings at 70 characters
r9256 (<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
convert: wrapped docstrings at 78 characters
r9058
Martin Geisler
commands: use minirst parser when displaying help
r9157 <source ID> <destination ID>
Edouard Gomez
Turns convert.py into a real extension
r4513
Martin Geisler
convert: wrap docstrings at 70 characters
r9256 If the file doesn't exist, it's automatically created. It's
updated on each commit copied, so convert-repo can be interrupted
and can be run repeatedly to copy new commits.
Edouard Gomez
convert extension: Add support for username mapping...
r4589
Martin Geisler
convert: wrap docstrings at 70 characters
r9256 The [username mapping] file is a simple text file that maps each
source commit author to a destination commit author. It is handy
for source SCMs that use unix logins to identify authors (eg:
CVS). One line per author mapping and the line format is:
srcauthor=whatever string you want
Bryan O'Sullivan
convert: document filemap.
r5256
Martin Geisler
convert: wrap docstrings at 70 characters
r9256 The filemap is a file that allows filtering and remapping of files
and directories. Comment lines start with '#'. Each line can
contain one of the following directives::
Bryan O'Sullivan
convert: document filemap.
r5256
include path/to/file
exclude path/to/file
rename from/file to/file
Thomas Arendsen Hein
Removed tabs and trailing whitespace in python files
r5760
Martin Geisler
convert: wrap docstrings at 70 characters
r9256 The 'include' directive causes a file, or all files under a
directory, to be included in the destination repository, and the
exclusion of all other files and directories not explicitly
included. The 'exclude' directive causes files or directories to
be omitted. The 'rename' directive renames a file or directory. To
rename from a subdirectory into the root of the repository, use
'.' as the path to rename to.
Bryan O'Sullivan
convert: some tidyups, doc improvements, and test fixes...
r5556
Martin Geisler
convert: wrap docstrings at 70 characters
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
comma-separated values. The key is the revision ID in the source
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
convert: document parent order in splicemap help (issue1764)
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
convert: document splicemap, allow setting of multiple parents
r6143
Michael J. Pedersen
convert: adding branchmap functionality to convert extension
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
convert: wrap docstrings at 70 characters
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
lines of the form "original_branch_name new_branch_name".
"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. This can be used to (for instance) move code
in one repository from "default" to a named branch.
Michael J. Pedersen
convert: adding branchmap functionality to convert extension
r8377
Patrick Mezard
convert: improve subversion source documentation
r6169 Mercurial Source
Martin Geisler
convert: fixed typo in docstring
r9086 ----------------
Patrick Mezard
convert: improve subversion source documentation
r6169
Martin Geisler
convert: align option types in help text
r8010 --config convert.hg.ignoreerrors=False (boolean)
Patrick Mezard
convert: ignore hg source errors with hg.ignoreerrors (issue 1357)...
r7231 ignore integrity errors when reading. Use it to fix Mercurial
repositories with missing revlogs, by converting from and to
Mercurial.
Martin Geisler
convert: align option types in help text
r8010 --config convert.hg.saverev=False (boolean)
Martin Geisler
convert: wrap docstrings at 70 characters
r9256 store original revision ID in changeset (forces target IDs to
change)
Patrick Mezard
convert: implement startrev for hg source
r6885 --config convert.hg.startrev=0 (hg revision identifier)
convert start revision and its descendants
Patrick Mezard
convert: improve subversion source documentation
r6169
Frank Kingswood
convert: add documentation for CVS source
r6798 CVS Source
----------
Martin Geisler
convert: wrap docstrings at 70 characters
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
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
converted, and that any directory reorganization in the CVS
sandbox is ignored.
Frank Kingswood
convert: add documentation for CVS source
r6798
The options shown are the defaults.
Martin Geisler
convert: fix inconsistent indentation in help text...
r9103 --config convert.cvsps.cache=True (boolean)
Martin Geisler
convert: wrap docstrings at 70 characters
r9256 Set to False to disable remote log caching, for testing and
debugging purposes.
Martin Geisler
convert: fix inconsistent indentation in help text...
r9103 --config convert.cvsps.fuzz=60 (integer)
Martin Geisler
convert: wrap docstrings at 70 characters
r9256 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.
Martin Geisler
convert: fix inconsistent indentation in help text...
r9103 --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'
Martin Geisler
convert: wrap docstrings at 70 characters
r9256 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.
Martin Geisler
convert: fix inconsistent indentation in help text...
r9103 --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'
Martin Geisler
convert: wrap docstrings at 70 characters
r9256 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.
Frank Kingswood
convert: implement two hooks in builtin cvsps
r10095 --config hook.cvslog
Specify a Python function to be called at the end of 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.
--config hook.cvschangesets
Specify a Python function to be called after the changesets
are calculated from the the CVS log. The function is passed
a list with the changeset entries, and can modify the changesets
in-place, or add or delete them.
Dirkjan Ochtman
strip trailing whitespace, replace tabs by spaces
r6923
Patrick Mezard
convert/cvs: update debugcvsps documentation
r9472 An additional "debugcvsps" Mercurial command allows the builtin
Martin Geisler
convert: wrap docstrings at 70 characters
r9256 changeset merging code to be run without doing a conversion. Its
Patrick Mezard
convert/cvs: update debugcvsps documentation
r9472 parameters and output are similar to that of cvsps 2.1. Please see
the command help for more details.
Frank Kingswood
convert: add documentation for CVS source
r6798
Patrick Mezard
convert: improve subversion source documentation
r6169 Subversion Source
-----------------
Martin Geisler
convert: wrap docstrings at 70 characters
r9256 Subversion source detects classical trunk/branches/tags layouts.
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
relative to the source URL, or leave them blank to disable auto
detection.
Patrick Mezard
convert: improve subversion source documentation
r6169
--config convert.svn.branches=branches (directory name)
specify the directory containing branches
--config convert.svn.tags=tags (directory name)
specify the directory containing tags
--config convert.svn.trunk=trunk (directory name)
specify the name of the trunk branch
Martin Geisler
convert: wrap docstrings at 70 characters
r9256 Source history can be retrieved starting at a specific revision,
instead of being integrally converted. Only single branch
conversions are supported.
Patrick Mezard
convert: add shallow, single branch svn conversions via svn.startrev
r6173
--config convert.svn.startrev=0 (svn revision number)
specify start Subversion revision.
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823 Perforce Source
---------------
Martin Geisler
convert: wrap docstrings at 70 characters
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
target may be named ...-hg.
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823
Martin Geisler
convert: wrap docstrings at 70 characters
r9256 It is possible to limit the amount of source history to be
converted by specifying an initial Perforce revision.
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823
Martin Geisler
convert: align option types in help text
r8010 --config convert.p4.startrev=0 (perforce changelist number)
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823 specify initial Perforce revision.
Patrick Mezard
convert: improve subversion source documentation
r6169 Mercurial Destination
---------------------
Bryan O'Sullivan
convert: some tidyups, doc improvements, and test fixes...
r5556
--config convert.hg.clonebranches=False (boolean)
Patrick Mezard
convert: improve subversion source documentation
r6169 dispatch source branches in separate clones.
Bryan O'Sullivan
convert: some tidyups, doc improvements, and test fixes...
r5556 --config convert.hg.tagsbranch=default (branch name)
Patrick Mezard
convert: improve subversion source documentation
r6169 tag revisions branch name
Bryan O'Sullivan
convert: some tidyups, doc improvements, and test fixes...
r5556 --config convert.hg.usebranchnames=True (boolean)
Patrick Mezard
convert: improve subversion source documentation
r6169 preserve branch names
Bryan O'Sullivan
convert: some tidyups, doc improvements, and test fixes...
r5556
Thomas Arendsen Hein
Backout ad09ce1d393c and replace ''' with """ to make some highlighting happy....
r4958 """
Patrick Mezard
convert: move commands definition to ease demandload job (issue 860)
r5621 return convcmd.convert(ui, src, dest, revmapfile, **opts)
Thomas Arendsen Hein
Move convert-repo to hgext/convert/__init__.py
r4512
Patrick Mezard
convert: move commands definition to ease demandload job (issue 860)
r5621 def debugsvnlog(ui, **opts):
Peter Arrenbrecht
cleanup: drop unused imports
r7873 return subversion.debugsvnlog(ui, **opts)
Thomas Arendsen Hein
Move convert-repo to hgext/convert/__init__.py
r4512
Frank Kingswood
Add debugcvsps command, replacing cvsps script
r7502 def debugcvsps(ui, *args, **opts):
Martin Geisler
lowercase help output...
r7598 '''create changeset information from CVS
Frank Kingswood
Add debugcvsps command, replacing cvsps script
r7502
Martin Geisler
convert: wrap docstrings at 70 characters
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
Add debugcvsps command, replacing cvsps script
r7502
Martin Geisler
convert: wrap docstrings at 70 characters
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
Add debugcvsps command, replacing cvsps script
r7502 return cvsps.debugcvsps(ui, *args, **opts)
commands.norepo += " convert debugsvnlog debugcvsps"
Patrick Mezard
convert: replace fork with subprocess call.
r5127
Edouard Gomez
Turns convert.py into a real extension
r4513 cmdtable = {
Thomas Arendsen Hein
Some small cleanups for convert extension:...
r4532 "convert":
Alexis S. L. Carvalho
convert: rename a class and a function
r5281 (convert,
Martin Geisler
i18n, convert: mark command line options for translation
r6999 [('A', 'authors', '', _('username mapping filename')),
('d', 'dest-type', '', _('destination repository type')),
('', 'filemap', '', _('remap file names using contents of file')),
('r', 'rev', '', _('import up to target revision REV')),
('s', 'source-type', '', _('source repository type')),
('', 'splicemap', '', _('splice synthesized history into place')),
Michael J. Pedersen
convert: adding branchmap functionality to convert extension
r8377 ('', 'branchmap', '', _('change branch names while converting')),
Patrick Mezard
convert: default revisions order depends on source...
r8692 ('', 'branchsort', None, _('try to sort changesets by branches')),
Patrick Mezard
convert: add --sourcesort option for source specific sort...
r8690 ('', 'datesort', None, _('try to sort changesets by date')),
('', 'sourcesort', None, _('preserve source changesets order'))],
Martin Geisler
i18n, convert: mark command line options for translation
r6999 _('hg convert [OPTION]... SOURCE [DEST [REVMAP]]')),
Thomas Arendsen Hein
convert: Use debugsvnlog instead of git-like debug-svn-log.
r5138 "debugsvnlog":
Patrick Mezard
convert: replace fork with subprocess call.
r5127 (debugsvnlog,
[],
Thomas Arendsen Hein
convert: Use debugsvnlog instead of git-like debug-svn-log.
r5138 'hg debugsvnlog'),
Frank Kingswood
Add debugcvsps command, replacing cvsps script
r7502 "debugcvsps":
(debugcvsps,
[
# Main options shared with cvsps-2.1
Martin Geisler
lowercase help output...
r7598 ('b', 'branches', [], _('only return changes on specified branches')),
('p', 'prefix', '', _('prefix to remove from file names')),
('r', 'revisions', [], _('only return changes after or between specified tags')),
('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
Add debugcvsps command, replacing cvsps script
r7502 # Options specific to builtin cvsps
Martin Geisler
lowercase help output...
r7598 ('', 'parents', '', _('show parent changesets')),
('', 'ancestors', '', _('show current changeset in ancestor branches')),
Frank Kingswood
Add debugcvsps command, replacing cvsps script
r7502 # Options that are ignored for compatibility with cvsps-2.1
Martin Geisler
convert: marked string for translation
r7735 ('A', 'cvs-direct', None, _('ignored for compatibility')),
Frank Kingswood
Add debugcvsps command, replacing cvsps script
r7502 ],
Martin Geisler
convert: marked string for translation
r7735 _('hg debugcvsps [OPTION]... [PATH]...')),
Edouard Gomez
Turns convert.py into a real extension
r4513 }