/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

  • Committer: Andrew Bennetts
  • Date: 2009-09-03 02:04:04 UTC
  • mfrom: (4634.6.16 2.0)
  • mto: (4634.6.23 2.0)
  • mto: This revision was merged to the branch mainline in revision 4676.
  • Revision ID: andrew.bennetts@canonical.com-20090903020404-v68zbq8624s9y2z8
Merge lp:bzr/2.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
1222
1222
                    for record in getattr(self, kind).check(keys=keys[kind]):
1223
1223
                        if record.storage_kind == 'absent':
1224
1224
                            checker._report_items.append(
1225
 
                                'Missing inventory {%s}' % (record.key,))
 
1225
                                'Missing %s {%s}' % (kind, record.key,))
1226
1226
                        else:
1227
1227
                            last_object = self._check_record(kind, record,
1228
1228
                                checker, last_object, current_keys[(kind,) + record.key])
3844
3844
                possible_trees.append((basis_id, cache[basis_id]))
3845
3845
            basis_id, delta = self._get_delta_for_revision(tree, parent_ids,
3846
3846
                                                           possible_trees)
 
3847
            revision = self.source.get_revision(current_revision_id)
 
3848
            pending_deltas.append((basis_id, delta,
 
3849
                current_revision_id, revision.parent_ids))
3847
3850
            if self._converting_to_rich_root:
3848
3851
                self._revision_id_to_root_id[current_revision_id] = \
3849
3852
                    tree.get_root_id()
3878
3881
                    if entry.revision == file_revision:
3879
3882
                        texts_possibly_new_in_tree.remove(file_key)
3880
3883
            text_keys.update(texts_possibly_new_in_tree)
3881
 
            revision = self.source.get_revision(current_revision_id)
3882
 
            pending_deltas.append((basis_id, delta,
3883
 
                current_revision_id, revision.parent_ids))
3884
3884
            pending_revisions.append(revision)
3885
3885
            cache[current_revision_id] = tree
3886
3886
            basis_id = current_revision_id