/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

  • Committer: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/info.py
1
1
# Copyright (C) 2005, 2006, 2007 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
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
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
__all__ = ['show_bzrdir_info']
18
18
 
261
261
 
262
262
    dir_cnt = 0
263
263
    for file_id in work_inv:
264
 
        if (work_inv.get_file_kind(file_id) == 'directory' and 
 
264
        if (work_inv.get_file_kind(file_id) == 'directory' and
265
265
            not work_inv.is_root(file_id)):
266
266
            dir_cnt += 1
267
267
    outfile.write('  %8d versioned %s\n' % (dir_cnt,
376
376
    elif branch is not None:
377
377
        _show_missing_revisions_branch(branch, outfile)
378
378
    if branch is not None:
379
 
        stats = _show_branch_stats(branch, verbose==2, outfile)
 
379
        show_committers = verbose >= 2
 
380
        stats = _show_branch_stats(branch, show_committers, outfile)
380
381
    else:
381
382
        stats = repository.gather_stats()
382
383
    if branch is None and working is None: