/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/repofmt/pack_repo.py

  • Committer: Andrew Bennetts
  • Date: 2008-01-14 22:45:15 UTC
  • mfrom: (3179 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3180.
  • Revision ID: andrew.bennetts@canonical.com-20080114224515-izp51fxci3hhopap
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/pack_repo.py
1648
1648
    def _abort_write_group(self):
1649
1649
        # FIXME: just drop the transient index.
1650
1650
        # forget what names there are
1651
 
        self._new_pack.abort()
1652
 
        self._remove_pack_indices(self._new_pack)
1653
 
        self._new_pack = None
 
1651
        if self._new_pack is not None:
 
1652
            self._new_pack.abort()
 
1653
            self._remove_pack_indices(self._new_pack)
 
1654
            self._new_pack = None
1654
1655
        self.repo._text_knit = None
1655
1656
 
1656
1657
    def _commit_write_group(self):
1925
1926
            found_parents[key[0]] = parents
1926
1927
        return found_parents
1927
1928
 
 
1929
    def has_revisions(self, revision_ids):
 
1930
        """See Repository.has_revisions()."""
 
1931
        revision_ids = set(revision_ids)
 
1932
        result = revision_ids.intersection(
 
1933
            set([None, _mod_revision.NULL_REVISION]))
 
1934
        revision_ids.difference_update(result)
 
1935
        index = self._pack_collection.revision_index.combined_index
 
1936
        keys = [(revision_id,) for revision_id in revision_ids]
 
1937
        result.update(node[1][0] for node in index.iter_entries(keys))
 
1938
        return result
 
1939
 
1928
1940
    def _make_parents_provider(self):
1929
1941
        return graph.CachingParentsProvider(self)
1930
1942