/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

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
150
150
        try:
151
151
            mail_client_class = {
152
152
                None: mail_client.DefaultMail,
 
153
                # Specific clients
 
154
                'evolution': mail_client.Evolution,
 
155
                'kmail': mail_client.KMail,
 
156
                'mutt': mail_client.Mutt,
 
157
                'thunderbird': mail_client.Thunderbird,
 
158
                # Generic options
153
159
                'default': mail_client.DefaultMail,
154
160
                'editor': mail_client.Editor,
155
 
                'thunderbird': mail_client.Thunderbird,
156
 
                'evolution': mail_client.Evolution,
157
161
                'mapi': mail_client.MAPIClient,
158
162
                'xdg-email': mail_client.XDGEmail,
159
 
                'kmail': mail_client.KMail,
160
163
            }[selected_client]
161
164
        except KeyError:
162
165
            raise errors.UnknownMailClient(selected_client)
292
295
    def _get_nickname(self):
293
296
        return None
294
297
 
 
298
    def get_bzr_remote_path(self):
 
299
        try:
 
300
            return os.environ['BZR_REMOTE_PATH']
 
301
        except KeyError:
 
302
            path = self.get_user_option("bzr_remote_path")
 
303
            if path is None:
 
304
                path = 'bzr'
 
305
            return path
 
306
 
295
307
 
296
308
class IniBasedConfig(Config):
297
309
    """A configuration policy that draws from ini files."""