summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2012-02-28 17:25:07 +0100
committerJelmer Vernooij <jelmer@samba.org>2012-02-28 17:25:07 +0100
commitd50ed6882b977386689d097821d5fcefcebdd07e (patch)
tree07648cd869abf54a568181171ddcba9f80771c19
parentffc93497ad16ea54faffd7ba76e5ce2c9186d714 (diff)
downloadbzr-fastimport-d50ed6882b977386689d097821d5fcefcebdd07e.tar.gz
remove more references to fast-export-from-*.
-rw-r--r--__init__.py23
-rw-r--r--cmds.py20
-rw-r--r--info.py7
3 files changed, 12 insertions, 38 deletions
diff --git a/__init__.py b/__init__.py
index 6821602..656bea8 100644
--- a/__init__.py
+++ b/__init__.py
@@ -24,12 +24,6 @@ Source it.
The normal import recipe is::
- bzr fast-export-from-xxx SOURCE project.fi
- bzr fast-import project.fi project.bzr
-
-If fast-export-from-xxx doesn't exist yet for the tool you're importing
-from, the alternative recipe is::
-
front-end > project.fi
bzr fast-import project.fi project.bzr
@@ -41,22 +35,7 @@ compressed to gzip format after it is generated like this::
bzr fast-import project.fi.gz project.bzr
The list of known front-ends and their status is documented on
-http://bazaar-vcs.org/BzrFastImport/FrontEnds. The fast-export-from-xxx
-commands provide simplified access to these so that the majority of users
-can generate a fast-import dump file without needing to study up on all
-the options - and the best combination of them to use - for the front-end
-relevant to them. In some cases, a fast-export-from-xxx wrapper will require
-that certain dependencies are installed so it checks for these before
-starting. A wrapper may also provide a limited set of options. See the
-online help for the individual commands for details::
-
- bzr help fast-export-from-cvs
- bzr help fast-export-from-darcs
- bzr help fast-export-from-hg
- bzr help fast-export-from-git
- bzr help fast-export-from-mtn
- bzr help fast-export-from-p4
- bzr help fast-export-from-svn
+http://bazaar-vcs.org/BzrFastImport/FrontEnds.
Once a fast-import dump file is created, it can be imported into a
Bazaar repository using the fast-import command. If required, you can
diff --git a/cmds.py b/cmds.py
index 424a7ff..402967b 100644
--- a/cmds.py
+++ b/cmds.py
@@ -72,16 +72,15 @@ class cmd_fast_import(Command):
bzr fast-import project.fi project.bzr
Numerous commands are provided for generating a fast-import file
- to use as input. These are named fast-export-from-xxx where xxx
- is one of cvs, darcs, git, hg, mtn, p4 or svn.
+ to use as input.
To specify standard input as the input stream, use a
source name of '-' (instead of project.fi). If the source name
ends in '.gz', it is assumed to be compressed in gzip format.
-
+
project.bzr will be created if it doesn't exist. If it exists
already, it should be empty or be an existing Bazaar repository
or branch. If not specified, the current directory is assumed.
-
+
fast-import will intelligently select the format to use when
creating a repository or branch. If you are running Bazaar 1.17
up to Bazaar 2.0, the default format for Bazaar 2.x ("2a") is used.
@@ -200,27 +199,30 @@ class cmd_fast_import(Command):
Import a Subversion repository into Bazaar::
- bzr fast-export-from-svn /svn/repo/path project.fi
+ svn-fast-export /svn/repo/path > project.fi
bzr fast-import project.fi project.bzr
Import a CVS repository into Bazaar::
- bzr fast-export-from-cvs /cvs/repo/path project.fi
+ cvs2git /cvs/repo/path > project.fi
bzr fast-import project.fi project.bzr
Import a Git repository into Bazaar::
- bzr fast-export-from-git /git/repo/path project.fi
+ cd /git/repo/path
+ git fast-export --all > project.fi
bzr fast-import project.fi project.bzr
Import a Mercurial repository into Bazaar::
- bzr fast-export-from-hg /hg/repo/path project.fi
+ cd /hg/repo/path
+ hg fast-export > project.fi
bzr fast-import project.fi project.bzr
Import a Darcs repository into Bazaar::
- bzr fast-export-from-darcs /darcs/repo/path project.fi
+ cd /darcs/repo/path
+ darcs-fast-export > project.fi
bzr fast-import project.fi project.bzr
"""
hidden = False
diff --git a/info.py b/info.py
index 0e630b6..3d5ee75 100644
--- a/info.py
+++ b/info.py
@@ -6,13 +6,6 @@ bzr_commands = [
"fast-import-info",
"fast-import-query",
"fast-export",
- "fast-export-from-cvs",
- "fast-export-from-darcs",
- "fast-export-from-hg",
- "fast-export-from-git",
- "fast-export-from-mtn",
- "fast-export-from-p4",
- "fast-export-from-svn",
]
bzr_plugin_version = (0, 13, 0, 'dev', 0)