Mercurial > hg
changeset 6978:2ca84555ba1f
merge with crew
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Wed, 03 Sep 2008 01:29:03 +0200 |
| parents | df96a0d1d79d (current diff) b072266a83d1 (diff) |
| children | a3fd4aa154af |
| files | |
| diffstat | 3 files changed, 23 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/__init__.py Tue Sep 02 22:04:09 2008 +0200 +++ b/hgext/convert/__init__.py Wed Sep 03 01:29:03 2008 +0200 @@ -14,18 +14,18 @@ def convert(ui, src, dest=None, revmapfile=None, **opts): """Convert a foreign SCM repository to a Mercurial one. - Accepted source formats: - - Mercurial - - CVS - - Darcs - - git - - Subversion - - Monotone - - GNU Arch + Accepted source formats [identifiers]: + - Mercurial [hg] + - CVS [cvs] + - Darcs [darcs] + - git [git] + - Subversion [svn] + - Monotone [mtn] + - GNU Arch [gnuarch] - Accepted destination formats: - - Mercurial - - Subversion (history on branches is not preserved) + Accepted destination formats [identifiers]: + - Mercurial [hg] + - Subversion [svn] (history on branches is not preserved) If no revision is given, all revisions will be converted. Otherwise, convert will only import up to the named revision (given in a format
--- a/hgext/convert/convcmd.py Tue Sep 02 22:04:09 2008 +0200 +++ b/hgext/convert/convcmd.py Wed Sep 03 01:29:03 2008 +0200 @@ -53,7 +53,7 @@ if not ui.quiet: for inst in exceptions: ui.write("%s\n" % inst) - raise util.Abort(_('%s: unknown repository type') % path) + raise util.Abort(_('%s: missing or unsupported repository') % path) def convertsink(ui, path, type): for name, sink in sink_converters:
--- a/tests/test-convert.out Tue Sep 02 22:04:09 2008 +0200 +++ b/tests/test-convert.out Wed Sep 03 01:29:03 2008 +0200 @@ -2,18 +2,18 @@ Convert a foreign SCM repository to a Mercurial one. - Accepted source formats: - - Mercurial - - CVS - - Darcs - - git - - Subversion - - Monotone - - GNU Arch + Accepted source formats [identifiers]: + - Mercurial [hg] + - CVS [cvs] + - Darcs [darcs] + - git [git] + - Subversion [svn] + - Monotone [mtn] + - GNU Arch [gnuarch] - Accepted destination formats: - - Mercurial - - Subversion (history on branches is not preserved) + Accepted destination formats [identifiers]: + - Mercurial [hg] + - Subversion [svn] (history on branches is not preserved) If no revision is given, all revisions will be converted. Otherwise, convert will only import up to the named revision (given in a format