← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/vf_repository.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-19 19:15:58 UTC
  • mfrom: (6388 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6404.
  • Revision ID: jelmer@canonical.com-20111219191558-p1k7cvhjq8l6v2gm
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/vf_repository.py
16
16
 
17
17
"""Repository formats built around versioned files."""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
 
20
22
from bzrlib.lazy_import import lazy_import
21
23
lazy_import(globals(), """
23
25
 
24
26
from bzrlib import (
25
27
    check,
 
28
    config as _mod_config,
26
29
    debug,
27
30
    fetch as _mod_fetch,
28
31
    fifo_cache,
106
109
    # the default CommitBuilder does not manage trees whose root is versioned.
107
110
    _versioned_root = False
108
111
 
109
 
    def __init__(self, repository, parents, config, timestamp=None,
 
112
    def __init__(self, repository, parents, config_stack, timestamp=None,
110
113
                 timezone=None, committer=None, revprops=None,
111
114
                 revision_id=None, lossy=False):
112
115
        super(VersionedFileCommitBuilder, self).__init__(repository,
113
 
            parents, config, timestamp, timezone, committer, revprops,
 
116
            parents, config_stack, timestamp, timezone, committer, revprops,
114
117
            revision_id, lossy)
115
118
        try:
116
119
            basis_id = self.parents[0]
198
201
                       properties=self._revprops)
199
202
        rev.parent_ids = self.parents
200
203
        self.repository.add_revision(self._new_revision_id, rev,
201
 
            self.new_inventory, self._config)
 
204
            self.new_inventory, self._config_stack)
202
205
        self._ensure_fallback_inventories()
203
206
        self.repository.commit_write_group()
204
207
        return self._new_revision_id
1044
1047
        # TODO: jam 20070210 Shouldn't we check rev.revision_id and
1045
1048
        #       rev.parent_ids?
1046
1049
        _mod_revision.check_not_reserved_id(revision_id)
1047
 
        if config is not None and config.signature_needed():
 
1050
        if (config is not None and
 
1051
            config.get('create_signatures') == _mod_config.SIGN_ALWAYS):
1048
1052
            if inv is None:
1049
1053
                inv = self.get_inventory(revision_id)
1050
1054
            tree = InventoryRevisionTree(self, inv, revision_id)
1283
1287
            # result['size'] = t
1284
1288
        return result
1285
1289
 
1286
 
    def get_commit_builder(self, branch, parents, config, timestamp=None,
 
1290
    def get_commit_builder(self, branch, parents, config_stack, timestamp=None,
1287
1291
                           timezone=None, committer=None, revprops=None,
1288
1292
                           revision_id=None, lossy=False):
1289
1293
        """Obtain a CommitBuilder for this repository.
1290
1294
 
1291
1295
        :param branch: Branch to commit to.
1292
1296
        :param parents: Revision ids of the parents of the new revision.
1293
 
        :param config: Configuration to use.
 
1297
        :param config_stack: Configuration stack to use.
1294
1298
        :param timestamp: Optional timestamp recorded for commit.
1295
1299
        :param timezone: Optional timezone for timestamp.
1296
1300
        :param committer: Optional committer to set for commit.
1303
1307
            raise errors.BzrError("Cannot commit directly to a stacked branch"
1304
1308
                " in pre-2a formats. See "
1305
1309
                "https://bugs.launchpad.net/bzr/+bug/375013 for details.")
1306
 
        result = self._commit_builder_class(self, parents, config,
 
1310
        result = self._commit_builder_class(self, parents, config_stack,
1307
1311
            timestamp, timezone, committer, revprops, revision_id,
1308
1312
            lossy)
1309
1313
        self.start_write_group()