diff options
Diffstat (limited to 'branch_updater.py')
-rw-r--r-- | branch_updater.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/branch_updater.py b/branch_updater.py index c19cfef..6ec7154 100644 --- a/branch_updater.py +++ b/branch_updater.py @@ -21,7 +21,12 @@ from operator import itemgetter from bzrlib import bzrdir, errors, osutils, transport from bzrlib.trace import error, note -import helpers +from bzrlib.plugins.fastimport.fastimport.helpers import ( + single_plural, + ) +from bzrlib.plugins.fastimport.helpers import ( + best_format_for_objects_in_a_repository, + ) class BranchUpdater(object): @@ -40,7 +45,7 @@ class BranchUpdater(object): self.last_ref = last_ref self.tags = tags self._branch_format = \ - helpers.best_format_for_objects_in_a_repository(repo) + best_format_for_objects_in_a_repository(repo) def update(self): """Update the Bazaar branches and tips matching the heads. @@ -169,6 +174,6 @@ class BranchUpdater(object): if changed: tagno = len(my_tags) note("\t branch %s now has %d %s and %d %s", br.nick, - revno, helpers.single_plural(revno, "revision", "revisions"), - tagno, helpers.single_plural(tagno, "tag", "tags")) + revno, single_plural(revno, "revision", "revisions"), + tagno, single_plural(tagno, "tag", "tags")) return changed |