/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/info.py

Merge bzr.dev.

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'
173
173
    work_inv = working.inventory
174
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)
207
210
    print '  %8d ignored' % ignore_cnt
208
211
 
209
212
    dir_cnt = 0
210
 
    entries = work_inv.iter_entries()
211
 
    entries.next()
212
 
    dir_cnt = sum(1 for path, ie in entries if ie.kind == 'directory')
 
213
    for file_id in work_inv:
 
214
        if (work_inv.get_file_kind(file_id) == 'directory' and 
 
215
            not work_inv.is_root(file_id)):
 
216
            dir_cnt += 1
213
217
    print '  %8d versioned %s' \
214
218
          % (dir_cnt,
215
219
             plural(dir_cnt, 'subdirectory', 'subdirectories'))