summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-11-09 19:26:43 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-11-09 19:26:43 +0100
commit0043cf1d31806e7ece19ea340b45a41ba45254ab (patch)
tree4d325cb26f52a52ada6b469fbeb4fc7287191b5d
parent9cb0ba8967c1084a48daf67c38d12a42f02a79cc (diff)
downloadbzr-fastimport-0043cf1d31806e7ece19ea340b45a41ba45254ab.tar.gz
Fix import of single_plural.
-rw-r--r--exporter.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/exporter.py b/exporter.py
index df8e403..9aa3b54 100644
--- a/exporter.py
+++ b/exporter.py
@@ -40,10 +40,16 @@ from bzrlib import (
trace,
)
-from bzrlib.plugins.fastimport import helpers, marks_file
+from bzrlib.plugins.fastimport import (
+ helpers,
+ marks_file,
+ )
from fastimport import commands
-from fastimport.helpers import binary_stream
+from fastimport.helpers import (
+ binary_stream,
+ single_plural,
+ )
def _get_output_stream(destination):
@@ -178,7 +184,7 @@ class BzrFastExporter(object):
time_required = progress.str_tdelta(time.time() - self._start_time)
rc = len(self.revid_to_mark)
self.note("Exported %d %s in %s",
- rc, helpers.single_plural(rc, "revision", "revisions"),
+ rc, single_plural(rc, "revision", "revisions"),
time_required)
def print_cmd(self, cmd):