diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2010-10-15 21:25:16 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2010-10-15 21:25:16 +0200 |
commit | e25eba71af9222ef5fc98b315dcf09d07589aab3 (patch) | |
tree | a9d4a0f287d5289b52a517bd34bb89262d5049b7 /branch_updater.py | |
parent | 006a3715aa455bbece6ec9e50ae8057a6c887b6b (diff) | |
download | bzr-fastimport-e25eba71af9222ef5fc98b315dcf09d07589aab3.tar.gz |
Check for availability of fastimport before running tests.
Diffstat (limited to 'branch_updater.py')
-rw-r--r-- | branch_updater.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/branch_updater.py b/branch_updater.py index 4f8de7f..039171f 100644 --- a/branch_updater.py +++ b/branch_updater.py @@ -21,9 +21,6 @@ from operator import itemgetter from bzrlib import bzrdir, errors, osutils, transport from bzrlib.trace import error, note -from fastimport.helpers import ( - single_plural, - ) from bzrlib.plugins.fastimport.helpers import ( best_format_for_objects_in_a_repository, ) @@ -153,6 +150,7 @@ class BranchUpdater(object): :return: whether the branch was changed or not """ + from fastimport.helpers import single_plural last_rev_id = self.cache_mgr.revision_ids[last_mark] revs = list(self.repo.iter_reverse_revision_history(last_rev_id)) revno = len(revs) |