/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 object_store.py

  • Committer: Jelmer Vernooij
  • Date: 2010-05-13 12:34:24 UTC
  • mto: (0.200.912 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100513123424-c1sk9vcg2ekrcsol
Some refactoring, support proper file ids in revision deltas.

Show diffs side-by-side

added added

removed removed

Lines of Context:
object_store.py
329
329
            try:
330
330
                return self._lookup_revision_sha1(revid)
331
331
            except errors.NoSuchRevision:
332
 
                trace.warning("Ignoring ghost parent %s", revid)
333
332
                return None
334
333
        return self.mapping.export_commit(rev, tree_sha, parent_lookup,
335
334
            roundtrip)
374
373
                root_tree[self.mapping.BZR_FILE_IDS_FILE] = ((stat.S_IFREG | 0644), b.id)
375
374
                yield self.mapping.BZR_FILE_IDS_FILE, b, None
376
375
        yield "", root_tree, root_ie
377
 
        commit_obj = self._reconstruct_commit(rev, root_tree.id, roundtrip=roundtrip)
 
376
        commit_obj = self._reconstruct_commit(rev, root_tree.id,
 
377
            roundtrip=roundtrip)
378
378
        try:
379
379
            foreign_revid, mapping = mapping_registry.parse_revision_id(
380
380
                rev.revision_id)