diff options
| -rw-r--r-- | __init__.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/__init__.py b/__init__.py index a45535e..eb31d1a 100644 --- a/__init__.py +++ b/__init__.py @@ -198,8 +198,14 @@ class cmd_fast_import(Command): checkpoint=10000, count=-1, inv_cache=10, experimental=False, import_marks=None, export_marks=None): from bzrlib import bzrdir + from bzrlib.errors import BzrCommandError, NotBranchError from bzrlib.plugins.fastimport.processors import generic_processor - control, relpath = bzrdir.BzrDir.open_containing('.') + try: + control, relpath = bzrdir.BzrDir.open_containing('.') + except NotBranchError: + raise BzrCommandError("current directory has no .bzr" + " directory - use bzr init-repo or bzr init to initialize" + " before using bzr fast-import") params = { 'info': info, 'trees': trees, |