← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-19 19:15:58 UTC
  • mfrom: (6388 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6404.
  • Revision ID: jelmer@canonical.com-20111219191558-p1k7cvhjq8l6v2gm
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
 
19
import bzrlib.bzrdir
 
20
 
17
21
from cStringIO import StringIO
18
22
 
19
23
from bzrlib.lazy_import import lazy_import
44
48
from bzrlib.i18n import gettext, ngettext
45
49
""")
46
50
 
 
51
# Explicitly import bzrlib.bzrdir so that the BzrProber
 
52
# is guaranteed to be registered.
 
53
import bzrlib.bzrdir
 
54
 
47
55
from bzrlib import (
48
56
    bzrdir,
49
57
    controldir,
662
670
        """
663
671
        if not self._format.supports_set_append_revisions_only():
664
672
            return False
665
 
        return self.get_config(
666
 
            ).get_user_option_as_bool('append_revisions_only')
 
673
        return self.get_config_stack().get('append_revisions_only')
667
674
 
668
675
    def set_append_revisions_only(self, enabled):
669
676
        if not self._format.supports_set_append_revisions_only():
670
677
            raise errors.UpgradeRequired(self.user_url)
671
 
        if enabled:
672
 
            value = 'True'
673
 
        else:
674
 
            value = 'False'
675
 
        self.get_config().set_user_option('append_revisions_only', value,
676
 
            warn_masked=True)
 
678
        self.get_config_stack().set('append_revisions_only', enabled)
677
679
 
678
680
    def set_reference_info(self, file_id, tree_path, branch_location):
679
681
        """Set the branch location to use for a tree reference."""
708
710
        """
709
711
        raise errors.UpgradeRequired(self.user_url)
710
712
 
711
 
    def get_commit_builder(self, parents, config=None, timestamp=None,
 
713
    def get_commit_builder(self, parents, config_stack=None, timestamp=None,
712
714
                           timezone=None, committer=None, revprops=None,
713
715
                           revision_id=None, lossy=False):
714
716
        """Obtain a CommitBuilder for this branch.
724
726
            represented, when pushing to a foreign VCS 
725
727
        """
726
728
 
727
 
        if config is None:
728
 
            config = self.get_config()
 
729
        if config_stack is None:
 
730
            config_stack = self.get_config_stack()
729
731
 
730
 
        return self.repository.get_commit_builder(self, parents, config,
 
732
        return self.repository.get_commit_builder(self, parents, config_stack,
731
733
            timestamp, timezone, committer, revprops, revision_id,
732
734
            lossy)
733
735