Allow fast-import-filter to be used without first argument.

3 files changed, 17 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index 2c21aef..2abbe54 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,9 @@ Bug fixes
 * Avoid Inventory.copy, which has disappeared in newer versions of Bazaar.
   (Jelmer Vernooij, #485788)
 
+* Allow "bzr fast-import-filter" to be used without first argument.
+  (Jelmer Vernooij, #792935)
+
 0.10 08-Mar-2011
 
 Changes
diff --git a/cmds.py b/cmds.py
index 0902194..1147903 100644
--- a/cmds.py
+++ b/cmds.py
@@ -41,7 +41,7 @@ def _run(source, processor_factory, verbose=False, user_map=None, **kwargs):
 
 
 def _get_source_stream(source):
-    if source == '-':
+    if source == '-' or source is None:
         import sys
         from fastimport import helpers
         stream = helpers.binary_stream(sys.stdin)
diff --git a/tests/test_commands.py b/tests/test_commands.py
index c817a8a..1679a66 100644
--- a/tests/test_commands.py
+++ b/tests/test_commands.py
@@ -135,3 +135,16 @@ class TestFastImport(ExternalBase):
         self.build_tree_contents([('file.fi', simple_fast_import_stream)])
         data = self.run_bzr("fast-import file.fi br")[0]
         self.assertEquals(1, tree.branch.revno())
+
+
+class TestFastImportFilter(ExternalBase):
+
+    def test_empty(self):
+        self.build_tree_contents([('empty.fi', "")])
+        self.make_branch_and_tree("br")
+        self.assertEquals("", self.run_bzr("fast-import-filter -")[0])
+
+    def test_default_stdin(self):
+        self.build_tree_contents([('empty.fi', "")])
+        self.make_branch_and_tree("br")
+        self.assertEquals("", self.run_bzr("fast-import-filter")[0])