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

  • Committer: Aaron Bentley
  • Date: 2008-01-03 06:38:53 UTC
  • mto: (3144.5.2 specific-file)
  • mto: This revision was merged to the branch mainline in revision 3156.
  • Revision ID: aaron.bentley@utoronto.ca-20080103063853-7sv9zq8m87p7gzf7
Update from review

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
519
519
 
520
520
    def plan_merge(self, ver_a, ver_b, base=None):
521
521
        """See VersionedFile.plan_merge"""
522
 
        from merge import _PlanMerge
 
522
        from bzrlib.merge import _PlanMerge
523
523
        if base is None:
524
524
            return _PlanMerge(ver_a, ver_b, self).plan_merge()
525
525
        old_plan = list(_PlanMerge(ver_a, base, self).plan_merge())
527
527
        return _PlanMerge._subtract_plans(old_plan, new_plan)
528
528
 
529
529
    def plan_lca_merge(self, ver_a, ver_b, base=None):
530
 
        from merge import _PlanLCAMerge
 
530
        from bzrlib.merge import _PlanLCAMerge
531
531
        graph = self._get_graph()
532
532
        new_plan = _PlanLCAMerge(ver_a, ver_b, self, graph).plan_merge()
533
533
        if base is None:
604
604
            raise errors.RevisionNotPresent(version_id, self._file_id)
605
605
 
606
606
    def _get_graph(self):
607
 
        from graph import DictParentsProvider, Graph, _StackedParentsProvider
608
 
        from repofmt.knitrepo import _KnitParentsProvider
 
607
        from bzrlib.graph import (
 
608
            DictParentsProvider,
 
609
            Graph,
 
610
            _StackedParentsProvider,
 
611
            )
 
612
        from bzrlib.repofmt.knitrepo import _KnitParentsProvider
609
613
        parent_providers = [DictParentsProvider(self._parents)]
610
614
        for vf in self.fallback_versionedfiles:
611
615
            parent_providers.append(_KnitParentsProvider(vf))