← 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-27 14:59:51 UTC
  • mfrom: (2084.3.1 push-branch)
  • mto: This revision was merged to the branch mainline in revision 2096.
  • Revision ID: john@arbash-meinel.com-20061027145951-5b2246cdf596eb67
(Cheuksan Edward Wang) Fix copyright notice

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/info.py
1
 
# Copyright (C) 2005, 2006 by Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
# 
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
# 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
# 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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'))