← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/info.py

Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/info.py
171
171
    branch = working.branch
172
172
    basis = working.basis_tree()
173
173
    work_inv = working.inventory
174
 
    delta = diff.compare_trees(basis, working, want_unchanged=True)
 
174
    delta = working.changes_from(basis, want_unchanged=True)
175
175
    history = branch.revision_history()
176
176
    tree_last_id = working.last_revision()
177
177
 
187
187
    """Show statistics about a working tree."""
188
188
    basis = working.basis_tree()
189
189
    work_inv = working.inventory
190
 
    delta = diff.compare_trees(basis, working, want_unchanged=True)
 
190
    delta = working.changes_from(basis, want_unchanged=True)
191
191
 
192
192
    print
193
193
    print 'In the working tree:'
207
207
    print '  %8d ignored' % ignore_cnt
208
208
 
209
209
    dir_cnt = 0
210
 
    for file_id in work_inv:
211
 
        if work_inv.get_file_kind(file_id) == 'directory':
212
 
            dir_cnt += 1
 
210
    entries = work_inv.iter_entries()
 
211
    entries.next()
 
212
    dir_cnt = sum(1 for path, ie in entries if ie.kind == 'directory')
213
213
    print '  %8d versioned %s' \
214
214
          % (dir_cnt,
215
215
             plural(dir_cnt, 'subdirectory', 'subdirectories'))