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

  • Committer: Jelmer Vernooij
  • Date: 2019-07-25 23:22:30 UTC
  • mfrom: (7374 work)
  • mto: This revision was merged to the branch mainline in revision 7376.
  • Revision ID: jelmer@jelmer.uk-20190725232230-9b4x1nn0m19j1oh0
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/config.py
91
91
 
92
92
from breezy import (
93
93
    atomicfile,
 
94
    cmdline,
94
95
    controldir,
95
96
    debug,
96
97
    directory_service,
328
329
        cmd = self._get_change_editor()
329
330
        if cmd is None:
330
331
            return None
 
332
        cmd = cmd.replace('@old_path', '{old_path}')
 
333
        cmd = cmd.replace('@new_path', '{new_path}')
 
334
        cmd = cmdline.split(cmd)
 
335
        if '{old_path}' not in cmd:
 
336
            cmd.extend(['{old_path}', '{new_path}'])
331
337
        return diff.DiffFromTool.from_string(cmd, old_tree, new_tree,
332
338
                                             sys.stdout)
333
339
 
831
837
        return POLICY_NONE
832
838
 
833
839
    def _get_change_editor(self):
834
 
        return self.get_user_option('change_editor')
 
840
        return self.get_user_option('change_editor', expand=False)
835
841
 
836
842
    def _get_signature_checking(self):
837
843
        """See Config._get_signature_checking."""
2554
2560
    Option('language',
2555
2561
           help='Language to translate messages into.'))
2556
2562
option_registry.register(
2557
 
    Option('locks.steal_dead', default=False, from_unicode=bool_from_store,
 
2563
    Option('locks.steal_dead', default=True, from_unicode=bool_from_store,
2558
2564
           help='''\
2559
2565
Steal locks that appears to be dead.
2560
2566
 
2664
2670
           help="If we wait for a new request from a client for more than"
2665
2671
                " X seconds, consider the client idle, and hangup."))
2666
2672
option_registry.register(
 
2673
    Option('ssh',
 
2674
           default=None, override_from_env=['BRZ_SSH'],
 
2675
           help='SSH vendor to use.'))
 
2676
option_registry.register(
2667
2677
    Option('stacked_on_location',
2668
2678
           default=None,
2669
2679
           help="""The location where this branch is stacked on."""))