← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-24 01:35:56 UTC
  • mto: This revision was merged to the branch mainline in revision 6464.
  • Revision ID: jelmer@samba.org-20120124013556-kq6eew03kjqi16rl
Fix more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
849
849
            tree = work_tree
850
850
            extra_trees = []
851
851
 
 
852
        self.add_cleanup(tree.lock_read().unlock)
852
853
        if file_list is not None:
853
854
            file_ids = tree.paths2ids(file_list, trees=extra_trees,
854
855
                                      require_versioned=True)
855
856
            # find_ids_across_trees may include some paths that don't
856
857
            # exist in 'tree'.
857
 
            entries = sorted(
858
 
                (tree.id2path(file_id), tree.inventory[file_id])
859
 
                for file_id in file_ids if tree.has_id(file_id))
 
858
            entries = tree.iter_entries_by_dir(specific_file_ids=file_ids)
860
859
        else:
861
 
            entries = tree.root_inventory.entries()
 
860
            entries = tree.iter_entries_by_dir()
862
861
 
863
 
        self.cleanup_now()
864
 
        for path, entry in entries:
 
862
        for path, entry in sorted(entries):
865
863
            if kind and kind != entry.kind:
866
864
                continue
 
865
            if path == "":
 
866
                continue
867
867
            if show_ids:
868
868
                self.outf.write('%-50s %s\n' % (path, entry.file_id))
869
869
            else: