← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Alexander Belchenko
  • Date: 2008-02-06 10:07:17 UTC
  • mfrom: (3211 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3230.
  • Revision ID: bialix@ukr.net-20080206100717-wnixj1s8u2fks08r
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
62
62
                                      zero_eight, zero_nine, zero_sixteen,
63
63
                                      zero_ninetyone,
64
64
                                      )
65
 
from bzrlib.trace import mutter, mutter_callsite, note
 
65
from bzrlib.trace import mutter, mutter_callsite, note, is_quiet
66
66
 
67
67
 
68
68
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
2129
2129
        return self.new_revno - self.old_revno
2130
2130
 
2131
2131
    def report(self, to_file):
2132
 
        if self.old_revid == self.new_revid:
2133
 
            to_file.write('No revisions to pull.\n')
2134
 
        else:
2135
 
            to_file.write('Now on revision %d.\n' % self.new_revno)
 
2132
        if not is_quiet():
 
2133
            if self.old_revid == self.new_revid:
 
2134
                to_file.write('No revisions to pull.\n')
 
2135
            else:
 
2136
                to_file.write('Now on revision %d.\n' % self.new_revno)
2136
2137
        self._show_tag_conficts(to_file)
2137
2138
 
2138
2139