##// END OF EJS Templates
convert/bzr: make it work with filemaps (issue1631)...
convert/bzr: make it work with filemaps (issue1631) The bzr converter maintains a child -> parents mapping and drop entries whenever a child is read. It does not work with filemaps, getchangedfiles() may be called more than once when filtered files belong to merge revisions. getchanges() still works that way but it is not clear whether a similar issue can arise when interacting with merges.

File last commit:

r8026:683d8ebc default
r8165:78658990 default
Show More
test-convert.out
228 lines | 9.0 KiB | text/plain | TextLexer
Patrick Mezard
convert: rename MAPFILE into REVMAP to disambiguate with filemap
r6238 hg convert [OPTION]... SOURCE [DEST [REVMAP]]
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441
Martin Geisler
lowercase help output...
r7598 convert a foreign SCM repository to a Mercurial one.
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441
Patrick Mezard
convert: document source and sink identifiers, fix error message
r6976 Accepted source formats [identifiers]:
- 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]
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441
Patrick Mezard
convert: document source and sink identifiers, fix error message
r6976 Accepted destination formats [identifiers]:
- Mercurial [hg]
- Subversion [svn] (history on branches is not preserved)
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441
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).
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.
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
(<dest>/.hg/shamap by default). The <REVMAP> is a simple text
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441 file that maps each source commit ID to the destination ID for
that revision, like so:
<source ID> <destination ID>
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.
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
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:
include path/to/file
exclude path/to/file
rename from/file to/file
Thomas Arendsen Hein
Adjust changed test output after 0145f9afb0e7 (trailing whitespace)
r5761
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441 The 'include' directive causes a file, or all files under a
Benoit Boissinot
fix typo in convert help text, update test
r5488 directory, to be included in the destination repository, and the
exclusion of all other files and dirs not explicitely 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: refactor sink initialisation, to remove hardcoding of hg...
r5441
Alexis S. L. Carvalho
update output of test-convert
r6148 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
values, separated by spaces. 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 should be used as the new parents for that node.
Patrick Mezard
Fix test-convert.out after 55455556f921
r6170 Mercurial Source
-----------------
Thomas Arendsen Hein
Remove trailing spaces.
r7236 --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.
Matt Mackall
convert: change hg.saverev default to False...
r7815 --config convert.hg.saverev=False (boolean)
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
Fix test-convert.out after 55455556f921
r6170
Frank Kingswood
convert: add documentation for CVS source
r6798 CVS Source
----------
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 reorganisation in the CVS
sandbox is ignored.
Because CVS does not have changesets, it is necessary to collect
Patrick Mezard
convert: make built-in cvsps the default...
r7101 individual commits to CVS and merge them into changesets. CVS
source uses its internal changeset merging code by default but can
be configured to call the external 'cvsps' program by setting:
Thomas Arendsen Hein
convert documentation: --config argument with spaces needs quoting.
r7170 --config convert.cvsps='cvsps -A -u --cvs-direct -q'
Patrick Mezard
convert: make built-in cvsps the default...
r7101 This is a legacy option and may be removed in future.
Frank Kingswood
convert: add documentation for CVS source
r6798 The options shown are the defaults.
Internal cvsps is selected by setting
--config convert.cvsps=builtin
and has a few more configurable options:
--config convert.cvsps.fuzz=60 (integer)
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.
--config convert.cvsps.mergeto='{{mergetobranch ([-\w]+)}}'
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.
--config convert.cvsps.mergefrom='{{mergefrombranch ([-\w]+)}}'
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.
Dirkjan Ochtman
strip trailing whitespace, replace tabs by spaces
r6923
Frank Kingswood
convert: add documentation for CVS source
r6798 The hgext/convert/cvsps wrapper script allows the builtin changeset
merging code to be run without doing a conversion. Its parameters and
output are similar to that of cvsps 2.1.
Patrick Mezard
Fix test-convert.out after 55455556f921
r6170 Subversion Source
-----------------
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 overriden with following options. Set them to paths
Patrick Mezard
convert: allow svn trunk/branches/tags detection to be skipped...
r6172 relative to the source URL, or leave them blank to disable
autodetection.
Patrick Mezard
Fix test-convert.out after 55455556f921
r6170
--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
Patrick Mezard
convert: add shallow, single branch svn conversions via svn.startrev
r6173 Source history can be retrieved starting at a specific revision,
instead of being integrally converted. Only single branch
conversions are supported.
--config convert.svn.startrev=0 (svn revision number)
specify start Subversion revision.
Frank Kingswood
convert: Perforce source for conversion to Mercurial
r7823 Perforce Source
---------------
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.
It is possible to limit the amount of source history to be converted
by specifying an initial Perforce revision.
--config convert.p4.startrev=0 (perforce changelist number)
specify initial Perforce revision.
Patrick Mezard
Fix test-convert.out after 55455556f921
r6170 Mercurial Destination
---------------------
Bryan O'Sullivan
convert: some tidyups, doc improvements, and test fixes...
r5556
--config convert.hg.clonebranches=False (boolean)
Patrick Mezard
Fix test-convert.out after 55455556f921
r6170 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
Fix test-convert.out after 55455556f921
r6170 tag revisions branch name
Bryan O'Sullivan
convert: some tidyups, doc improvements, and test fixes...
r5556 --config convert.hg.usebranchnames=True (boolean)
Patrick Mezard
Fix test-convert.out after 55455556f921
r6170 preserve branch names
Bryan O'Sullivan
convert: some tidyups, doc improvements, and test fixes...
r5556
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441 options:
-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
Alexis S. L. Carvalho
update output of test-convert
r6148 --splicemap splice synthesized history into place
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441 --datesort try to sort changesets by date
use "hg -v help convert" to show global options
Bryan O'Sullivan
convert: add test
r5015 adding a
assuming destination a-hg
initializing destination a-hg repository
scanning source...
sorting...
converting...
4 a
3 b
2 c
1 d
0 e
pulling from ../a
searching for changes
no changes found
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441 % should fail
initializing destination bogusfile repository
abort: cannot create new bundle repository
% should fail
abort: Permission denied: bogusdir
% should succeed
initializing destination bogusdir repository
scanning source...
sorting...
converting...
4 a
3 b
2 c
1 d
0 e
Patrick Mezard
test-convert: test before() and after() conversion actions
r5805 % test pre and post conversion actions
run hg source pre-conversion action
run hg sink pre-conversion action
run hg sink post-conversion action
run hg source post-conversion action