← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/log.py

  • Committer: Martin Pool
  • Date: 2009-07-01 07:29:37 UTC
  • mto: This revision was merged to the branch mainline in revision 4502.
  • Revision ID: mbp@sourcefrog.net-20090701072937-ax7x64kd9fjnohhh
Suppress now-redundant rate and time display in log+ output

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/log.py
130
130
        else:
131
131
            shown_result = self._shorten(self._strip_tuple_parens(result))
132
132
        mutter("  --> %s" % shown_result)
133
 
        # XXX: the time may be wrong when e.g. a generator object is returned from
134
 
        # an http readv, if the object is returned before the bulk data
135
 
        # is read.
136
 
        elapsed = time.time() - before
137
 
        if result_len and elapsed > 0:
138
 
            # this is the rate of higher-level data, not the raw network speed
139
 
            mutter("      %9.03fs %8dKB/s" % (elapsed, result_len/elapsed/1024))
140
 
        else:
141
 
            mutter("      %9.03fs" % (elapsed))
 
133
        # The log decorator no longer shows the elapsed time or transfer rate
 
134
        # because they're available in the log prefixes and the transport
 
135
        # activity display respectively.
 
136
        if False:
 
137
            elapsed = time.time() - before
 
138
            if result_len and elapsed > 0:
 
139
                # this is the rate of higher-level data, not the raw network speed
 
140
                mutter("      %9.03fs %8dKB/s" % (elapsed, result_len/elapsed/1024))
 
141
            else:
 
142
                mutter("      %9.03fs" % (elapsed))
142
143
        return return_result
143
144
 
144
145
    def _shorten(self, x):