← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/info.py

  • Committer: Alexander Belchenko
  • Date: 2006-07-31 16:12:57 UTC
  • mto: (1711.2.111 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1906.
  • Revision ID: bialix@ukr.net-20060731161257-91a231523255332c
new official bzr.ico

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 is not None:
 
34
    elif pl != None:
35
35
        return pl
36
36
    else:
37
37
        return 's'
173
173
    work_inv = working.inventory
174
174
    delta = working.changes_from(basis, want_unchanged=True)
175
175
    history = branch.revision_history()
176
 
    try:
177
 
        tree_last_id = working.get_parent_ids()[0]
178
 
    except IndexError:
179
 
        tree_last_id = None
 
176
    tree_last_id = working.last_revision()
180
177
 
181
178
    if len(history) and tree_last_id != history[-1]:
182
179
        tree_last_revno = branch.revision_id_to_revno(tree_last_id)
210
207
    print '  %8d ignored' % ignore_cnt
211
208
 
212
209
    dir_cnt = 0
213
 
    entries = work_inv.iter_entries()
214
 
    entries.next()
215
 
    dir_cnt = sum(1 for path, ie in entries if ie.kind == 'directory')
 
210
    for file_id in work_inv:
 
211
        if work_inv.get_file_kind(file_id) == 'directory':
 
212
            dir_cnt += 1
216
213
    print '  %8d versioned %s' \
217
214
          % (dir_cnt,
218
215
             plural(dir_cnt, 'subdirectory', 'subdirectories'))