/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/knit.py

  • Committer: John Arbash Meinel
  • Date: 2009-12-02 23:09:40 UTC
  • mfrom: (4853.1.1 whitespace)
  • mto: This revision was merged to the branch mainline in revision 4856.
  • Revision ID: john@arbash-meinel.com-20091202230940-7n2aydoxngdqxzld
Strip trailing whitespace from doc files by Patrick Regan.

Resolve one small conflict with another doc edit.
Also, revert the changes to all the .pdf and .png files. We shouldn't
be touching them as they are pure-binary files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008 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
73
73
    trace,
74
74
    tsort,
75
75
    tuned_gzip,
76
 
    ui,
77
76
    )
78
77
""")
79
78
from bzrlib import (
1756
1755
        :return: An iterator over (line, key).
1757
1756
        """
1758
1757
        if pb is None:
1759
 
            pb = ui.ui_factory.nested_progress_bar()
 
1758
            pb = progress.DummyProgress()
1760
1759
        keys = set(keys)
1761
1760
        total = len(keys)
1762
1761
        done = False