← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/knitrepo.py

  • Committer: John Arbash Meinel
  • Date: 2009-03-06 20:42:40 UTC
  • mto: This revision was merged to the branch mainline in revision 4088.
  • Revision ID: john@arbash-meinel.com-20090306204240-mzjavv31z3gu1x7i
Fix a small bug in setup.py when an extension fails to build

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/knitrepo.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
from bzrlib.lazy_import import lazy_import
18
18
lazy_import(globals(), """
53
53
    def __repr__(self):
54
54
        return 'KnitParentsProvider(%r)' % self._knit
55
55
 
 
56
    @symbol_versioning.deprecated_method(symbol_versioning.one_one)
 
57
    def get_parents(self, revision_ids):
 
58
        """See graph._StackedParentsProvider.get_parents"""
 
59
        parent_map = self.get_parent_map(revision_ids)
 
60
        return [parent_map.get(r, None) for r in revision_ids]
 
61
 
56
62
    def get_parent_map(self, keys):
57
 
        """See graph.StackedParentsProvider.get_parent_map"""
 
63
        """See graph._StackedParentsProvider.get_parent_map"""
58
64
        parent_map = {}
59
65
        for revision_id in keys:
60
66
            if revision_id is None:
85
91
        return 'KnitsParentsProvider(%r)' % self._knit
86
92
 
87
93
    def get_parent_map(self, keys):
88
 
        """See graph.StackedParentsProvider.get_parent_map"""
 
94
        """See graph._StackedParentsProvider.get_parent_map"""
89
95
        parent_map = self._knit.get_parent_map(
90
96
            [self._prefix + (key,) for key in keys])
91
97
        result = {}
207
213
        revision_id = osutils.safe_revision_id(revision_id)
208
214
        return self.get_revision_reconcile(revision_id)
209
215
 
210
 
    def _refresh_data(self):
211
 
        if not self.is_locked():
212
 
            return
213
 
        # Create a new transaction to force all knits to see the scope change.
214
 
        # This is safe because we're outside a write group.
215
 
        self.control_files._finish_transaction()
216
 
        if self.is_write_locked():
217
 
            self.control_files._set_write_transaction()
218
 
        else:
219
 
            self.control_files._set_read_transaction()
220
 
 
221
216
    @needs_write_lock
222
217
    def reconcile(self, other=None, thorough=False):
223
218
        """Reconcile this repository."""
229
224
    def _make_parents_provider(self):
230
225
        return _KnitsParentsProvider(self.revisions)
231
226
 
232
 
    def _find_inconsistent_revision_parents(self, revisions_iterator=None):
 
227
    def _find_inconsistent_revision_parents(self):
233
228
        """Find revisions with different parent lists in the revision object
234
229
        and in the index graph.
235
230
 
236
 
        :param revisions_iterator: None, or an iterator of (revid,
237
 
            Revision-or-None). This iterator controls the revisions checked.
238
231
        :returns: an iterator yielding tuples of (revison-id, parents-in-index,
239
232
            parents-in-revision).
240
233
        """
241
234
        if not self.is_locked():
242
235
            raise AssertionError()
243
236
        vf = self.revisions
244
 
        if revisions_iterator is None:
245
 
            revisions_iterator = self._iter_revisions(None)
246
 
        for revid, revision in revisions_iterator:
247
 
            if revision is None:
248
 
                pass
249
 
            parent_map = vf.get_parent_map([(revid,)])
 
237
        for index_version in vf.keys():
 
238
            parent_map = vf.get_parent_map([index_version])
250
239
            parents_according_to_index = tuple(parent[-1] for parent in
251
 
                parent_map[(revid,)])
 
240
                parent_map[index_version])
 
241
            revision = self.get_revision(index_version[-1])
252
242
            parents_according_to_revision = tuple(revision.parent_ids)
253
243
            if parents_according_to_index != parents_according_to_revision:
254
 
                yield (revid, parents_according_to_index,
 
244
                yield (index_version[-1], parents_according_to_index,
255
245
                    parents_according_to_revision)
256
246
 
257
247
    def _check_for_inconsistent_revision_parents(self):
296
286
    supports_ghosts = True
297
287
    # External lookups are not supported in this format.
298
288
    supports_external_lookups = False
299
 
    # No CHK support.
300
 
    supports_chks = False
301
289
    _fetch_order = 'topological'
302
290
    _fetch_uses_deltas = True
303
 
    fast_deltas = False
304
291
 
305
292
    def _get_inventories(self, repo_transport, repo, name='inventory'):
306
293
        mapper = versionedfile.ConstantMapper(name)
386
373
        repo.signatures = self._get_signatures(repo_transport, repo)
387
374
        repo.inventories = self._get_inventories(repo_transport, repo)
388
375
        repo.texts = self._get_texts(repo_transport, repo)
389
 
        repo.chk_bytes = None
390
376
        repo._transport = repo_transport
391
377
        return repo
392
378
 
424
410
        """See RepositoryFormat.get_format_description()."""
425
411
        return "Knit repository format 1"
426
412
 
 
413
    def check_conversion_target(self, target_format):
 
414
        pass
 
415
 
427
416
 
428
417
class RepositoryFormatKnit3(RepositoryFormatKnit):
429
418
    """Bzr repository knit format 3.
457
446
 
458
447
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
459
448
 
 
449
    def check_conversion_target(self, target_format):
 
450
        if not target_format.rich_root_data:
 
451
            raise errors.BadConversionTarget(
 
452
                'Does not support rich root data.', target_format)
 
453
        if not getattr(target_format, 'supports_tree_reference', False):
 
454
            raise errors.BadConversionTarget(
 
455
                'Does not support nested trees', target_format)
 
456
 
460
457
    def get_format_string(self):
461
458
        """See RepositoryFormat.get_format_string()."""
462
459
        return "Bazaar Knit Repository Format 3 (bzr 0.15)\n"
498
495
 
499
496
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
500
497
 
 
498
    def check_conversion_target(self, target_format):
 
499
        if not target_format.rich_root_data:
 
500
            raise errors.BadConversionTarget(
 
501
                'Does not support rich root data.', target_format)
 
502
 
501
503
    def get_format_string(self):
502
504
        """See RepositoryFormat.get_format_string()."""
503
505
        return 'Bazaar Knit Repository Format 4 (bzr 1.0)\n'