~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/delta.py

  • Committer: James Westby
  • Date: 2008-01-28 21:46:16 UTC
  • mto: (3209.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3210.
  • Revision ID: jw+debian@jameswestby.net-20080128214616-9l1gs91fgnk41wex
Make pull --quiet more quiet. Fixes #185907.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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':