/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

Merge lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
57
57
    ROOT_ID,
58
58
    entry_factory,
59
59
    )
 
60
from bzrlib.lock import _RelockDebugMixin
60
61
from bzrlib import registry
61
62
from bzrlib.trace import (
62
63
    log_exception_quietly, note, mutter, mutter_callsite, warning)
856
857
# Repositories
857
858
 
858
859
 
859
 
class Repository(object):
 
860
class Repository(_RelockDebugMixin):
860
861
    """Repository holding history for one or more branches.
861
862
 
862
863
    The repository holds and retrieves historical information including
1381
1382
        locked = self.is_locked()
1382
1383
        result = self.control_files.lock_write(token=token)
1383
1384
        if not locked:
 
1385
            self._note_lock('w')
1384
1386
            for repo in self._fallback_repositories:
1385
1387
                # Writes don't affect fallback repos
1386
1388
                repo.lock_read()
1391
1393
        locked = self.is_locked()
1392
1394
        self.control_files.lock_read()
1393
1395
        if not locked:
 
1396
            self._note_lock('r')
1394
1397
            for repo in self._fallback_repositories:
1395
1398
                repo.lock_read()
1396
1399
            self._refresh_data()
2330
2333
        num_file_ids = len(file_ids)
2331
2334
        for file_id, altered_versions in file_ids.iteritems():
2332
2335
            if pb is not None:
2333
 
                pb.update("fetch texts", count, num_file_ids)
 
2336
                pb.update("Fetch texts", count, num_file_ids)
2334
2337
            count += 1
2335
2338
            yield ("file", file_id, altered_versions)
2336
2339
 
3586
3589
                self.target.texts.insert_record_stream(
3587
3590
                    self.source.texts.get_record_stream(
3588
3591
                        self.source.texts.keys(), 'topological', False))
3589
 
                pb.update('copying inventory', 0, 1)
 
3592
                pb.update('Copying inventory', 0, 1)
3590
3593
                self.target.inventories.insert_record_stream(
3591
3594
                    self.source.inventories.get_record_stream(
3592
3595
                        self.source.inventories.keys(), 'topological', False))
4079
4082
                                                  self.source_repo.is_shared())
4080
4083
        converted.lock_write()
4081
4084
        try:
4082
 
            self.step('Copying content into repository.')
 
4085
            self.step('Copying content')
4083
4086
            self.source_repo.copy_content_into(converted)
4084
4087
        finally:
4085
4088
            converted.unlock()
4086
 
        self.step('Deleting old repository content.')
 
4089
        self.step('Deleting old repository content')
4087
4090
        self.repo_dir.transport.delete_tree('repository.backup')
4088
 
        self.pb.note('repository converted')
 
4091
        ui.ui_factory.note('repository converted')
4089
4092
 
4090
4093
    def step(self, message):
4091
4094
        """Update the pb by a step."""