← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Andrew Bennetts
  • Date: 2008-09-08 13:38:33 UTC
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20080908133833-t0dqjya0xdx3meov
Tidy a bit of import cruft in builtins.py.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
34
34
    config,
35
35
    errors,
36
36
    globbing,
37
 
    ignores,
38
37
    log,
39
38
    merge as _mod_merge,
40
39
    merge_directive,
56
55
 
57
56
from bzrlib.commands import Command, display_command
58
57
from bzrlib.option import ListOption, Option, RegistryOption, custom_help
59
 
from bzrlib.trace import mutter, note, warning, is_quiet, info
 
58
from bzrlib.trace import mutter, note, warning, is_quiet
60
59
 
61
60
 
62
61
def tree_files(file_list, default_branch=u'.'):
2679
2678
            first=False, list_only=False,
2680
2679
            randomize=None, exclude=None, strict=False,
2681
2680
            load_list=None, debugflag=None, starting_with=None):
2682
 
        import bzrlib.ui
2683
2681
        from bzrlib.tests import selftest
2684
2682
        import bzrlib.benchmarks as benchmarks
2685
2683
        from bzrlib.benchmarks import tree_creator