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

  • Committer: Jelmer Vernooij
  • Date: 2012-03-14 15:26:01 UTC
  • mfrom: (6502 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6503.
  • Revision ID: jelmer@samba.org-20120314152601-cpclw0a3jh3qztgq
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
205
205
        """Returns a unique ID for the config."""
206
206
        raise NotImplementedError(self.config_id)
207
207
 
208
 
    @deprecated_method(deprecated_in((2, 4, 0)))
209
 
    def get_editor(self):
210
 
        """Get the users pop up editor."""
211
 
        raise NotImplementedError
212
 
 
213
208
    def get_change_editor(self, old_tree, new_tree):
214
209
        from bzrlib import diff
215
210
        cmd = self._get_change_editor()
1056
1051
        conf._create_from_string(str_or_unicode, save)
1057
1052
        return conf
1058
1053
 
1059
 
    @deprecated_method(deprecated_in((2, 4, 0)))
1060
 
    def get_editor(self):
1061
 
        return self._get_user_option('editor')
1062
 
 
1063
1054
    @needs_write_lock
1064
1055
    def set_user_option(self, option, value):
1065
1056
        """Save option and its value in the configuration."""