← Back to branch summary

~bzr/ubuntu/maverick/bzr-svn/bzr-ppa

« back to all changes in this revision

Viewing changes to repository.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-15 14:21:22 UTC
  • mto: (220.169.1)
  • mto: This revision was merged to the branch mainline in revision 416.
  • Revision ID: jelmer@samba.org-20111215142122-7aob3q0dfblc3lpc
Convert branches/tags options to config stacks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
724
724
    def store_layout(self, layout):
725
725
        """Permanantly store the layout for this repository."""
726
726
        self.set_layout(layout)
727
 
        self.get_config().set_layout(layout)
 
727
        self.get_config_stack().set('layout', str(layout))
728
728
        self._layout_source = LAYOUT_SOURCE_CONFIG
729
729
 
730
730
    def get_layout(self):
746
746
                self._layout_source = LAYOUT_SOURCE_CONFIG
747
747
                self._layout = layout.layout_registry.get(layoutname)()
748
748
        if self._layout is None:
749
 
            branches = self.get_config().get_branches()
750
 
            tags = self.get_config().get_tags()
 
749
            config_stack = self.get_config_stack()
 
750
            branches = config_stack.get('branches')
 
751
            tags = config_stack.get('tags')
751
752
            if branches is not None:
752
753
                self._layout_source = LAYOUT_SOURCE_CONFIG
753
754
                self._layout = WildcardLayout(branches, tags or [])