← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store/versioned/__init__.py

[merge] bzr.dev 2255, resolve conflicts, update copyrights

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/versioned/__init__.py
294
294
            # so again with the passthrough
295
295
            to_transaction = PassThroughTransaction()
296
296
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
297
 
        for count, f in enumerate(file_ids):
298
 
            mutter("copy weave {%s} into %s", f, self)
299
 
            pb.update('copy', count, len(file_ids))
300
 
            # if we have it in cache, its faster.
301
 
            # joining is fast with knits, and bearable for weaves -
302
 
            # indeed the new case can be optimised if needed.
303
 
            target = self._make_new_versionedfile(f, to_transaction)
304
 
            target.join(from_store.get_weave(f, from_transaction))
305
 
        pb.finished()
 
297
        try:
 
298
            for count, f in enumerate(file_ids):
 
299
                mutter("copy weave {%s} into %s", f, self)
 
300
                pb.update('copy', count, len(file_ids))
 
301
                # if we have it in cache, its faster.
 
302
                # joining is fast with knits, and bearable for weaves -
 
303
                # indeed the new case can be optimised if needed.
 
304
                target = self._make_new_versionedfile(f, to_transaction)
 
305
                target.join(from_store.get_weave(f, from_transaction))
 
306
        finally:
 
307
            pb.finished()
306
308
 
307
309
    def total_size(self):
308
310
        count, bytes =  super(VersionedFileStore, self).total_size()