/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

Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
27
27
from bzrlib import (
28
28
        bzrdir,
29
29
        cache_utf8,
 
30
        config as _mod_config,
30
31
        errors,
31
32
        lockdir,
32
33
        lockable_files,
1251
1252
 
1252
1253
    def set_push_location(self, location):
1253
1254
        """See Branch.set_push_location."""
1254
 
        self.get_config().set_user_option('push_location', location, 
1255
 
                                          local=True)
 
1255
        self.get_config().set_user_option(
 
1256
            'push_location', location,
 
1257
            store=_mod_config.STORE_LOCATION_NORECURSE)
1256
1258
 
1257
1259
    @needs_write_lock
1258
1260
    def set_parent(self, url):
1473
1475
@deprecated_function(zero_eight)
1474
1476
def is_control_file(*args, **kwargs):
1475
1477
    """See bzrlib.workingtree.is_control_file."""
1476
 
    return bzrlib.workingtree.is_control_file(*args, **kwargs)
 
1478
    from bzrlib import workingtree
 
1479
    return workingtree.is_control_file(*args, **kwargs)