← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-07-25 14:45:20 UTC
  • mfrom: (3363.9.8 plan_merge)
  • Revision ID: pqm@pqm.ubuntu.com-20080725144520-ir7276gij462t1te
Implement plan_merge and set_parent_ids on PreviewTree

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
374
374
        return vf.plan_lca_merge(last_revision_a, last_revision_b,
375
375
                                 last_revision_base)
376
376
 
 
377
    def _iter_parent_trees(self):
 
378
        """Iterate through parent trees, defaulting to Tree.revision_tree."""
 
379
        for revision_id in self.get_parent_ids():
 
380
            try:
 
381
                yield self.revision_tree(revision_id)
 
382
            except errors.NoSuchRevisionInTree:
 
383
                yield self.repository.revision_tree(revision_id)
 
384
 
 
385
    @staticmethod
 
386
    def _file_revision(revision_tree, file_id):
 
387
        """Determine the revision associated with a file in a given tree."""
 
388
        revision_tree.lock_read()
 
389
        try:
 
390
            return revision_tree.inventory[file_id].revision
 
391
        finally:
 
392
            revision_tree.unlock()
 
393
 
377
394
    def _get_file_revision(self, file_id, vf, tree_revision):
378
395
        """Ensure that file_id, tree_revision is in vf to plan the merge."""
379
 
        def file_revision(revision_tree):
380
 
            revision_tree.lock_read()
381
 
            try:
382
 
                return revision_tree.inventory[file_id].revision
383
 
            finally:
384
 
                revision_tree.unlock()
385
 
 
386
 
        def iter_parent_trees():
387
 
            for revision_id in self.get_parent_ids():
388
 
                try:
389
 
                    yield self.revision_tree(revision_id)
390
 
                except:
391
 
                    yield self.repository.revision_tree(revision_id)
392
396
 
393
397
        if getattr(self, '_repository', None) is None:
394
398
            last_revision = tree_revision
395
 
            parent_keys = [(file_id, file_revision(t)) for t in
396
 
                iter_parent_trees()]
 
399
            parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
 
400
                self._iter_parent_trees()]
397
401
            vf.add_lines((file_id, last_revision), parent_keys,
398
402
                         self.get_file(file_id).readlines())
399
403
            repo = self.branch.repository
400
404
            base_vf = repo.texts
401
405
        else:
402
 
            last_revision = file_revision(self)
 
406
            last_revision = self._file_revision(self, file_id)
403
407
            base_vf = self._repository.texts
404
408
        if base_vf not in vf.fallback_versionedfiles:
405
409
            vf.fallback_versionedfiles.append(base_vf)