Only require passing BzrDir to bzr-specific processors.

4 files changed, 19 insertions, 11 deletions

diff --git a/__init__.py b/__init__.py
index c9de101..b7260e0 100644
--- a/__init__.py
+++ b/__init__.py
@@ -495,7 +495,7 @@ class cmd_fast_import_filter(Command):
             'include_paths': include_paths,
             'exclude_paths': exclude_paths,
             }
-        return _run(source, filter_processor.FilterProcessor, None, params,
+        return _run(source, filter_processor.FilterProcessor, params,
             verbose, user_map=user_map)
 
 
@@ -529,7 +529,7 @@ class cmd_fast_import_info(Command):
     aliases = []
     def run(self, source, verbose=False):
         from bzrlib.plugins.fastimport.processors import info_processor
-        return _run(source, info_processor.InfoProcessor, None, {}, verbose)
+        return _run(source, info_processor.InfoProcessor, {}, verbose)
 
 
 class cmd_fast_import_query(Command):
@@ -588,7 +588,7 @@ class cmd_fast_import_query(Command):
         params = helpers.defines_to_dict(commands) or {}
         if commit_mark:
             params['commit-mark'] = commit_mark
-        return _run(source, query_processor.QueryProcessor, None, params,
+        return _run(source, query_processor.QueryProcessor, params,
             verbose)
 
 
diff --git a/processors/generic_processor.py b/processors/generic_processor.py
index 7effebb..394dc06 100644
--- a/processors/generic_processor.py
+++ b/processors/generic_processor.py
@@ -123,8 +123,18 @@ class GenericProcessor(processor.ImportProcessor):
 
     def __init__(self, bzrdir, params=None, verbose=False, outf=None,
             prune_empty_dirs=True):
-        processor.ImportProcessor.__init__(self, bzrdir, params, verbose)
+        processor.ImportProcessor.__init__(self, params, verbose)
         self.prune_empty_dirs = prune_empty_dirs
+        self.bzrdir = bzrdir
+        try:
+            # Might be inside a branch
+            (self.working_tree, self.branch) = bzrdir._get_tree_branch()
+            self.repo = self.branch.repository
+        except errors.NotBranchError:
+            # Must be inside a repository
+            self.working_tree = None
+            self.branch = None
+            self.repo = bzrdir.open_repository()
 
     def pre_process(self):
         self._start_time = time.time()
diff --git a/processors/info_processor.py b/processors/info_processor.py
index 0f55f1c..a765f91 100644
--- a/processors/info_processor.py
+++ b/processors/info_processor.py
@@ -42,9 +42,8 @@ class InfoProcessor(processor.ImportProcessor):
     the source.
     """
 
-    def __init__(self, target=None, params=None, verbose=0, outf=None):
-        # Allow creation without a target
-        processor.ImportProcessor.__init__(self, target, params, verbose,
+    def __init__(self, params=None, verbose=0, outf=None):
+        processor.ImportProcessor.__init__(self, params, verbose,
             outf=outf)
 
     def pre_process(self):
diff --git a/processors/query_processor.py b/processors/query_processor.py
index 5d33a5b..76250e5 100644
--- a/processors/query_processor.py
+++ b/processors/query_processor.py
@@ -17,7 +17,7 @@
 """Import processor that queries the input (and doesn't import)."""
 
 
-from bzrlib.plugins.fastimport import (
+from fastimport import (
     commands,
     processor,
     )
@@ -32,9 +32,8 @@ class QueryProcessor(processor.ImportProcessor):
     known_params = commands.COMMAND_NAMES + commands.FILE_COMMAND_NAMES + \
         ['commit-mark']
 
-    def __init__(self, target=None, params=None, verbose=False):
-        # Allow creation without a target
-        processor.ImportProcessor.__init__(self, target, params, verbose)
+    def __init__(self, params=None, verbose=False):
+        processor.ImportProcessor.__init__(self, params, verbose)
         self.parsed_params = {}
         self.interesting_commit = None
         self._finished = False