diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2011-06-17 14:09:55 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2011-06-17 14:09:55 +0200 |
commit | 44b7aa2c61caf1363831db4fa200af183c667927 (patch) | |
tree | bcc0187ade1deeaf8fe84cd6ca4c62f72ea43734 | |
parent | 8b1853adb80ab3bd4e573520e01a8e301e613a03 (diff) | |
download | bzr-fastimport-44b7aa2c61caf1363831db4fa200af183c667927.tar.gz |
Allow fast-import-filter to be used without first argument.
-rw-r--r-- | NEWS | 3 | ||||
-rw-r--r-- | cmds.py | 2 | ||||
-rw-r--r-- | tests/test_commands.py | 13 |
3 files changed, 17 insertions, 1 deletions
@@ -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 @@ -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]) |