summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-08-01 11:40:37 +0200
committerJelmer Vernooij <jelmer@samba.org>2011-08-01 11:40:37 +0200
commitbb48331ccc7560ce05cd83d0df17f6ff4713a15b (patch)
treeaae7e407a642f97f9fa3a436e4d333e3664dffc0
parentade5e97d7af1f1eeeb5b875b9c66fcd871412d92 (diff)
downloadbzr-fastimport-bb48331ccc7560ce05cd83d0df17f6ff4713a15b.tar.gz
Remove --branches-path and --tags-path options, which are not implemented by the underlying code yet.
-rw-r--r--NEWS4
-rw-r--r--cmds.py13
2 files changed, 5 insertions, 12 deletions
diff --git a/NEWS b/NEWS
index 2abbe54..45c601a 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,10 @@ Bug fixes
* Allow "bzr fast-import-filter" to be used without first argument.
(Jelmer Vernooij, #792935)
+* Remove --branches-path and --tags-path options from ``bzr fast-export-from-svn``.
+ These options are not supported by the underlying svn-fast-export.py yet.
+ (Jelmer Vernooij, #513747)
+
0.10 08-Mar-2011
Changes
diff --git a/cmds.py b/cmds.py
index 1147903..b8910b4 100644
--- a/cmds.py
+++ b/cmds.py
@@ -858,23 +858,12 @@ class cmd_fast_export_from_svn(Command):
"branch name and the second group is used "
"to match files.",
),
- Option('branches-path', type=str, argname="STR",
- help="Path in repo to /branches."
- ),
- Option('tags-path', type=str, argname="STR",
- help="Path in repo to /tags."
- ),
]
encoding_type = 'exact'
- def run(self, source, destination, verbose=False, trunk_path=None,
- branches_path=None, tags_path=None):
+ def run(self, source, destination, verbose=False, trunk_path=None):
load_fastimport()
from bzrlib.plugins.fastimport.exporters import fast_export_from
custom = []
if trunk_path is not None:
custom.extend(['--trunk-path', trunk_path])
- if branches_path is not None:
- custom.extend(['--branches-path', branches_path])
- if tags_path is not None:
- custom.extend(['--tags-path', tags_path])
fast_export_from(source, destination, 'svn', verbose, custom)