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

  • Committer: Vincent Ladeuil
  • Date: 2011-12-19 16:41:49 UTC
  • mfrom: (6386 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6387.
  • Revision ID: v.ladeuil+lp@free.fr-20111219164149-ecfrvwscqb6v77jn
Merge trunk to resolve news conflicts

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
 
17
19
import bzrlib.bzrdir
18
20
 
19
21
from cStringIO import StringIO
46
48
from bzrlib.i18n import gettext, ngettext
47
49
""")
48
50
 
 
51
# Explicitly import bzrlib.bzrdir so that the BzrProber
 
52
# is guaranteed to be registered.
 
53
import bzrlib.bzrdir
 
54
 
49
55
from bzrlib import (
50
56
    controldir,
51
57
    )
663
669
        """
664
670
        if not self._format.supports_set_append_revisions_only():
665
671
            return False
666
 
        return self.get_config(
667
 
            ).get_user_option_as_bool('append_revisions_only')
 
672
        return self.get_config_stack().get('append_revisions_only')
668
673
 
669
674
    def set_append_revisions_only(self, enabled):
670
675
        if not self._format.supports_set_append_revisions_only():
671
676
            raise errors.UpgradeRequired(self.user_url)
672
 
        if enabled:
673
 
            value = 'True'
674
 
        else:
675
 
            value = 'False'
676
 
        self.get_config().set_user_option('append_revisions_only', value,
677
 
            warn_masked=True)
 
677
        self.get_config_stack().set('append_revisions_only', enabled)
678
678
 
679
679
    def set_reference_info(self, file_id, tree_path, branch_location):
680
680
        """Set the branch location to use for a tree reference."""