← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: John Arbash Meinel
  • Date: 2010-08-02 17:16:12 UTC
  • mto: This revision was merged to the branch mainline in revision 5369.
  • Revision ID: john@arbash-meinel.com-20100802171612-rdh5ods70w2bl3j7
We also have to re-implement it for _simple_set_pyx.pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
26
26
    chk_map,
27
27
    config,
28
28
    debug,
29
 
    errors,
30
29
    fetch as _mod_fetch,
31
30
    fifo_cache,
32
31
    generate_ids,
44
43
    symbol_versioning,
45
44
    trace,
46
45
    tsort,
47
 
    ui,
48
46
    versionedfile,
49
47
    )
50
48
from bzrlib.bundle import serializer
53
51
from bzrlib.testament import Testament
54
52
""")
55
53
 
 
54
from bzrlib import (
 
55
    errors,
 
56
    registry,
 
57
    ui,
 
58
    )
56
59
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
57
60
from bzrlib.inter import InterObject
58
61
from bzrlib.inventory import (
61
64
    ROOT_ID,
62
65
    entry_factory,
63
66
    )
64
 
from bzrlib.lock import _RelockDebugMixin
65
 
from bzrlib import registry
 
67
from bzrlib.recordcounter import RecordCounter
 
68
from bzrlib.lock import _RelockDebugMixin, LogicalLockResult
66
69
from bzrlib.trace import (
67
70
    log_exception_quietly, note, mutter, mutter_callsite, warning)
68
71
 
71
74
_deprecation_warning_done = False
72
75
 
73
76
 
 
77
class IsInWriteGroupError(errors.InternalBzrError):
 
78
 
 
79
    _fmt = "May not refresh_data of repo %(repo)s while in a write group."
 
80
 
 
81
    def __init__(self, repo):
 
82
        errors.InternalBzrError.__init__(self, repo=repo)
 
83
 
 
84
 
74
85
class CommitBuilder(object):
75
86
    """Provides an interface to build up a commit.
76
87
 
278
289
 
279
290
        :param tree: The tree which is being committed.
280
291
        """
281
 
        # NB: if there are no parents then this method is not called, so no
282
 
        # need to guard on parents having length.
 
292
        if len(self.parents) == 0:
 
293
            raise errors.RootMissing()
283
294
        entry = entry_factory['directory'](tree.path2id(''), '',
284
295
            None)
285
296
        entry.revision = self._new_revision_id
860
871
        # versioned roots do not change unless the tree found a change.
861
872
 
862
873
 
863
 
class RepositoryWriteLockResult(object):
 
874
class RepositoryWriteLockResult(LogicalLockResult):
864
875
    """The result of write locking a repository.
865
876
 
866
877
    :ivar repository_token: The token obtained from the underlying lock, or
869
880
    """
870
881
 
871
882
    def __init__(self, unlock, repository_token):
 
883
        LogicalLockResult.__init__(self, unlock)
872
884
        self.repository_token = repository_token
873
 
        self.unlock = unlock
874
885
 
875
 
    def __str__(self):
 
886
    def __repr__(self):
876
887
        return "RepositoryWriteLockResult(%s, %s)" % (self.repository_token,
877
888
            self.unlock)
878
889
 
1035
1046
                " id and insertion revid (%r, %r)"
1036
1047
                % (inv.revision_id, revision_id))
1037
1048
        if inv.root is None:
1038
 
            raise AssertionError()
 
1049
            raise errors.RootMissing()
1039
1050
        return self._add_inventory_checked(revision_id, inv, parents)
1040
1051
 
1041
1052
    def _add_inventory_checked(self, revision_id, inv, parents):
1434
1445
            for repo in self._fallback_repositories:
1435
1446
                repo.lock_read()
1436
1447
            self._refresh_data()
1437
 
        return self
 
1448
        return LogicalLockResult(self.unlock)
1438
1449
 
1439
1450
    def get_physical_lock_status(self):
1440
1451
        return self.control_files.get_physical_lock_status()
1658
1669
        return missing_keys
1659
1670
 
1660
1671
    def refresh_data(self):
1661
 
        """Re-read any data needed to to synchronise with disk.
 
1672
        """Re-read any data needed to synchronise with disk.
1662
1673
 
1663
1674
        This method is intended to be called after another repository instance
1664
1675
        (such as one used by a smart server) has inserted data into the
1665
 
        repository. It may not be called during a write group, but may be
1666
 
        called at any other time.
 
1676
        repository. On all repositories this will work outside of write groups.
 
1677
        Some repository formats (pack and newer for bzrlib native formats)
 
1678
        support refresh_data inside write groups. If called inside a write
 
1679
        group on a repository that does not support refreshing in a write group
 
1680
        IsInWriteGroupError will be raised.
1667
1681
        """
1668
 
        if self.is_in_write_group():
1669
 
            raise errors.InternalBzrError(
1670
 
                "May not refresh_data while in a write group.")
1671
1682
        self._refresh_data()
1672
1683
 
1673
1684
    def resume_write_group(self, tokens):
1712
1723
                "May not fetch while in a write group.")
1713
1724
        # fast path same-url fetch operations
1714
1725
        # TODO: lift out to somewhere common with RemoteRepository
1715
 
        # <https://bugs.edge.launchpad.net/bzr/+bug/401646>
 
1726
        # <https://bugs.launchpad.net/bzr/+bug/401646>
1716
1727
        if (self.has_same_location(source)
1717
1728
            and fetch_spec is None
1718
1729
            and self._has_same_fallbacks(source)):
4273
4284
                is_resume = False
4274
4285
            try:
4275
4286
                # locked_insert_stream performs a commit|suspend.
4276
 
                return self._locked_insert_stream(stream, src_format, is_resume)
 
4287
                return self._locked_insert_stream(stream, src_format,
 
4288
                    is_resume)
4277
4289
            except:
4278
4290
                self.target_repo.abort_write_group(suppress_errors=True)
4279
4291
                raise
4326
4338
                # required if the serializers are different only in terms of
4327
4339
                # the inventory.
4328
4340
                if src_serializer == to_serializer:
4329
 
                    self.target_repo.revisions.insert_record_stream(
4330
 
                        substream)
 
4341
                    self.target_repo.revisions.insert_record_stream(substream)
4331
4342
                else:
4332
4343
                    self._extract_and_insert_revisions(substream,
4333
4344
                        src_serializer)
4441
4452
        """Create a StreamSource streaming from from_repository."""
4442
4453
        self.from_repository = from_repository
4443
4454
        self.to_format = to_format
 
4455
        self._record_counter = RecordCounter()
4444
4456
 
4445
4457
    def delta_on_metadata(self):
4446
4458
        """Return True if delta's are permitted on metadata streams.