← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/log.py

Merge bzr.dev 4187, and revert the change to fix refcycle issues.

I apparently didn't run the smart fetch tests. Which show that we access inv+chk pages
as a fulltext, and then insert the stream, which expects to get the block as a compressed
block. :(.
Need to rethink how to do it, possibly with weakrefs.


This also brings in CommitBuilder.record_iter_changes() and the updates to btree_index
and backing indices.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/log.py
128
128
        elapsed = time.time() - before
129
129
        if result_len and elapsed > 0:
130
130
            # this is the rate of higher-level data, not the raw network speed
131
 
            mutter("      %9.03fs %8dkB/s" % (elapsed, result_len/elapsed/1024))
 
131
            mutter("      %9.03fs %8dKB/s" % (elapsed, result_len/elapsed/1024))
132
132
        else:
133
133
            mutter("      %9.03fs" % (elapsed))
134
134
        return result