##// END OF EJS Templates
localrepo: introduce method for explicit branch cache update...
localrepo: introduce method for explicit branch cache update Currently, localrepo.branchtags() is called in two locations to update the _branchcache dict, however branchtags() itself does not update anything, it calls branchmap() to do so. This change introduces a new updatebranchcache() method that is used by both branchmap() and the calls to update the cache.

File last commit:

r11685:aade8f13 default
r12066:d01e2865 default
Show More
test-convert.out
306 lines | 12.2 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]:
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]
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]:
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)
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441
Martin Geisler
convert: wrapped docstrings at 78 characters
r9058 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).
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441
Martin Geisler
convert: wrapped docstrings at 78 characters
r9058 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.
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441
Martin Geisler
convert: wrapped docstrings at 78 characters
r9058 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
commands: use minirst parser when displaying help
r9157 --branchsort convert from parent to child revision when possible, which
means branches are usually converted one after the other. It
generates more compact repositories.
--datesort sort revisions by date. Converted repositories have good-
looking changelogs but are often an order of magnitude
larger than the same ones generated by --branchsort.
--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: wrapped docstrings at 78 characters
r9058 (<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
minirst: indent literal blocks with two spaces...
r9291 <source ID> <destination ID>
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441
Martin Geisler
convert: wrapped docstrings at 78 characters
r9058 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.
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441
Martin Geisler
convert: wrapped docstrings at 78 characters
r9058 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: refactor sink initialisation, to remove hardcoding of hg...
r5441
Martin Geisler
convert: wrapped docstrings at 78 characters
r9058 The filemap is a file that allows filtering and remapping of files and
Mads Kiilerich
convert: cleanup of filemap help text...
r11523 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
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441
Mads Kiilerich
convert: cleanup of filemap help text...
r11523 rename path/to/source path/to/destination
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441
Patrick Mezard
cleanup: typos
r11685 Comment lines start with '#'. A specified path matches if it equals the
Mads Kiilerich
convert: cleanup of filemap help text...
r11523 full relative name of a file or one of its parent directories. The
'include' or 'exclude' directive with the longest matching path applies,
so line order does not matter.
Thomas Arendsen Hein
Adjust changed test output after 0145f9afb0e7 (trailing whitespace)
r5761
Martin Geisler
convert: wrapped docstrings at 78 characters
r9058 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
Patrick Mezard
cleanup: typos
r11685 a file or directory if it is converted. To rename from a subdirectory into
Mads Kiilerich
convert: cleanup of filemap help text...
r11523 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
Martin Geisler
convert: wrapped docstrings at 78 characters
r9058 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.
Alexis S. L. Carvalho
update output of test-convert
r6148
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: wrapped docstrings at 78 characters
r9058 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
Fix test-convert.out after 55455556f921
r6170 Mercurial Source
Martin Geisler
convert: fixed typo in docstring
r9086 ----------------
Patrick Mezard
Fix test-convert.out after 55455556f921
r6170
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
minirst: add margin around definition items...
r10936
Martin Geisler
convert: align option types in help text
r8010 --config convert.hg.saverev=False (boolean)
Martin Geisler
convert: wrapped docstrings at 78 characters
r9058 store original revision ID in changeset (forces target IDs to change)
Martin Geisler
minirst: add margin around definition items...
r10936
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
----------
Martin Geisler
convert: wrapped docstrings at 78 characters
r9058 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)
Set to False to disable remote log caching, for testing and debugging
purposes.
Martin Geisler
minirst: add margin around definition items...
r10936
Martin Geisler
convert: fix inconsistent indentation in help text...
r9103 --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.
Martin Geisler
minirst: add margin around definition items...
r10936
Martin Geisler
convert: fix inconsistent indentation in help text...
r9103 --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.
Martin Geisler
minirst: add margin around definition items...
r10936
Martin Geisler
convert: fix inconsistent indentation in help text...
r9103 --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.
Martin Geisler
minirst: add margin around definition items...
r10936
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.
Martin Geisler
minirst: add margin around definition items...
r10936
Frank Kingswood
convert: implement two hooks in builtin cvsps
r10095 --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 changeset
Martin Geisler
convert: wrapped docstrings at 78 characters
r9058 merging code to be run without doing a conversion. Its parameters and
Patrick Mezard
convert/cvs: update debugcvsps documentation
r9472 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
Fix test-convert.out after 55455556f921
r6170 Subversion Source
-----------------
Martin Geisler
convert: wrapped docstrings at 78 characters
r9058 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
Fix test-convert.out after 55455556f921
r6170
--config convert.svn.branches=branches (directory name)
specify the directory containing branches
Martin Geisler
minirst: add margin around definition items...
r10936
Patrick Mezard
Fix test-convert.out after 55455556f921
r6170 --config convert.svn.tags=tags (directory name)
specify the directory containing tags
Martin Geisler
minirst: add margin around definition items...
r10936
Patrick Mezard
Fix test-convert.out after 55455556f921
r6170 --config convert.svn.trunk=trunk (directory name)
specify the name of the trunk branch
Martin Geisler
convert: wrapped docstrings at 78 characters
r9058 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: wrapped docstrings at 78 characters
r9058 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: wrapped docstrings at 78 characters
r9058 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
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.
Martin Geisler
minirst: add margin around definition items...
r10936
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
Martin Geisler
minirst: add margin around definition items...
r10936
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:
FUJIWARA Katsunori
help: show value requirement and multiple occurrence of options...
r11321 -A --authors FILE username mapping filename
-d --dest-type TYPE destination repository type
--filemap FILE remap file names using contents of file
-r --rev REV import up to target revision REV
-s --source-type TYPE source repository type
--splicemap FILE splice synthesized history into place
--branchmap FILE change branch names while converting
--branchsort try to sort changesets by branches
--datesort try to sort changesets by date
--sourcesort preserve source changesets order
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441
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
Mads Kiilerich
convert: missing p4 tool is only slightly fatal...
r7905 % converting empty dir should fail nicely
assuming destination emptydir-hg
initializing destination emptydir-hg repository
emptydir does not look like a CVS checkout
Martin Geisler
convert: write "repository" instead of "repo"...
r10938 emptydir does not look like a Git repository
emptydir does not look like a Subversion repository
emptydir is not a local Mercurial repository
emptydir does not look like a darcs repository
emptydir does not look like a monotone repository
emptydir does not look like a GNU Arch repository
emptydir does not look like a Bazaar repository
Dirkjan Ochtman
tests: fix test for convert detection of p4 repos
r8844 cannot find required "p4" tool
Mads Kiilerich
convert: missing p4 tool is only slightly fatal...
r7905 abort: emptydir: missing or unsupported repository
Patrick Mezard
convert: better error on invalid repository type
r9962 % convert with imaginary source type
initializing destination a-foo repository
abort: foo: invalid source repository type
% convert with imaginary sink type
abort: foo: invalid destination repository type
Adrian Buehlmann
store: only add new entries to the fncache file...
r10577
% testing: convert must not produce duplicate entries in fncache
initializing destination b repository
scanning source...
sorting...
converting...
4 a
3 b
2 c
1 d
0 e
% contents of fncache file:
data/a.i
data/b.i
Patrick Mezard
convert/subversion: fix default URL checker prototype
r10885 % test bogus URL
abort: bzr+ssh://foobar@selenic.com/baz: missing or unsupported repository