← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

(vila) Migrate more branch config options to config stacks. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1187
1187
 
1188
1188
    def get_child_submit_format(self):
1189
1189
        """Return the preferred format of submissions to this branch."""
1190
 
        return self.get_config().get_user_option("child_submit_format")
 
1190
        return self.get_config_stack().get('child_submit_format')
1191
1191
 
1192
1192
    def get_submit_branch(self):
1193
1193
        """Return the submit location of the branch.
1196
1196
        pattern is that the user can override it by specifying a
1197
1197
        location.
1198
1198
        """
1199
 
        return self.get_config().get_user_option('submit_branch')
 
1199
        return self.get_config_stack().get('submit_branch')
1200
1200
 
1201
1201
    def set_submit_branch(self, location):
1202
1202
        """Return the submit location of the branch.
1205
1205
        pattern is that the user can override it by specifying a
1206
1206
        location.
1207
1207
        """
1208
 
        self.get_config().set_user_option('submit_branch', location,
1209
 
            warn_masked=True)
 
1208
        self.get_config_stack().set('submit_branch', location)
1210
1209
 
1211
1210
    def get_public_branch(self):
1212
1211
        """Return the public location of the branch.
1225
1224
        self._set_config_location('public_branch', location)
1226
1225
 
1227
1226
    def get_push_location(self):
1228
 
        """Return the None or the location to push this branch to."""
1229
 
        push_loc = self.get_config().get_user_option('push_location')
1230
 
        return push_loc
 
1227
        """Return None or the location to push this branch to."""
 
1228
        return self.get_config_stack().get('push_location')
1231
1229
 
1232
1230
    def set_push_location(self, location):
1233
1231
        """Set a new push location for this branch."""
3006
3004
        return self._get_config_location('bound_location', config=conf)
3007
3005
 
3008
3006
    def get_bound_location(self):
3009
 
        """See Branch.set_push_location."""
 
3007
        """See Branch.get_bound_location."""
3010
3008
        return self._get_bound_location(True)
3011
3009
 
3012
3010
    def get_old_bound_location(self):