← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/info.py

  • Committer: John Arbash Meinel
  • Date: 2006-10-11 00:23:23 UTC
  • mfrom: (2070 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2071.
  • Revision ID: john@arbash-meinel.com-20061011002323-82ba88c293d7caff
[merge] bzr.dev 2070

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/info.py
31
31
def plural(n, base='', pl=None):
32
32
    if n == 1:
33
33
        return base
34
 
    elif pl != None:
 
34
    elif pl is not None:
35
35
        return pl
36
36
    else:
37
37
        return 's'
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
 
    tree_last_id = working.last_revision()
 
176
    try:
 
177
        tree_last_id = working.get_parent_ids()[0]
 
178
    except IndexError:
 
179
        tree_last_id = None
177
180
 
178
181
    if len(history) and tree_last_id != history[-1]:
179
182
        tree_last_revno = branch.revision_id_to_revno(tree_last_id)
187
190
    """Show statistics about a working tree."""
188
191
    basis = working.basis_tree()
189
192
    work_inv = working.inventory
190
 
    delta = diff.compare_trees(basis, working, want_unchanged=True)
 
193
    delta = working.changes_from(basis, want_unchanged=True)
191
194
 
192
195
    print
193
196
    print 'In the working tree:'
207
210
    print '  %8d ignored' % ignore_cnt
208
211
 
209
212
    dir_cnt = 0
210
 
    for file_id in work_inv:
211
 
        if work_inv.get_file_kind(file_id) == 'directory':
212
 
            dir_cnt += 1
 
213
    entries = work_inv.iter_entries()
 
214
    entries.next()
 
215
    dir_cnt = sum(1 for path, ie in entries if ie.kind == 'directory')
213
216
    print '  %8d versioned %s' \
214
217
          % (dir_cnt,
215
218
             plural(dir_cnt, 'subdirectory', 'subdirectories'))