← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: John Arbash Meinel
  • Date: 2006-10-06 07:22:18 UTC
  • mto: This revision was merged to the branch mainline in revision 2071.
  • Revision ID: john@arbash-meinel.com-20061006072218-930b322b5d303872
Don't import 'bzrlib.tree' directly in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
37
37
    osutils,
38
38
    repository,
39
39
    transport,
 
40
    tree as _mod_tree,
40
41
    ui,
41
42
    urlutils,
42
43
    )
57
58
from bzrlib.progress import DummyProgress, ProgressPhase
58
59
from bzrlib.trace import mutter, note, log_error, warning, is_quiet, info
59
60
from bzrlib.transport.local import LocalTransport
60
 
import bzrlib.tree
61
61
 
62
62
 
63
63
def tree_files(file_list, default_branch=u'.'):
397
397
            trees = [tree]
398
398
 
399
399
        if file_list is not None:
400
 
            file_ids = bzrlib.tree.find_ids_across_trees(file_list, trees,
 
400
            file_ids = _mod_tree.find_ids_across_trees(file_list, trees,
401
401
                                                      require_versioned=True)
402
402
            # find_ids_across_trees may include some paths that don't
403
403
            # exist in 'tree'.
826
826
 
827
827
    @display_command
828
828
    def run(self, dir=u'.'):
829
 
        from bzrlib.tree import find_renames
830
829
        tree = WorkingTree.open_containing(dir)[0]
831
830
        old_inv = tree.basis_tree().inventory
832
831
        new_inv = tree.read_working_inventory()
833
 
        renames = list(find_renames(old_inv, new_inv))
 
832
        renames = list(_mod_tree.find_renames(old_inv, new_inv))
834
833
        renames.sort()
835
834
        for old_name, new_name in renames:
836
835
            self.outf.write("%s => %s\n" % (old_name, new_name))