← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/delta.py

  • Committer: Aaron Bentley
  • Date: 2008-02-24 16:42:13 UTC
  • mfrom: (3234 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3235.
  • Revision ID: aaron@aaronbentley.com-20080224164213-eza1lzru5bwuwmmj
Merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/delta.py
19
19
    osutils,
20
20
    )
21
21
from bzrlib.inventory import InventoryEntry
22
 
from bzrlib.trace import mutter
 
22
from bzrlib.trace import mutter, is_quiet
23
23
from bzrlib.symbol_versioning import deprecated_function
24
24
 
25
25
 
314
314
        :param kind: A pair of file kinds, as generated by Tree._iter_changes.
315
315
            None indicates no file present.
316
316
        """
 
317
        if is_quiet():
 
318
            return
317
319
        if paths[1] == '' and versioned == 'added' and self.suppress_root_add:
318
320
            return
319
321
        if versioned == 'unversioned':