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

  • Committer: Jelmer Vernooij
  • Date: 2019-06-26 20:41:57 UTC
  • mto: This revision was merged to the branch mainline in revision 7365.
  • Revision ID: jelmer@jelmer.uk-20190626204157-bbcfo4kpvdp7iimf
https://launchpad.net/bugs/708718
Use standard syntax for the ``change_editor`` configuration option.

Use {old_path} and {new_path} rather than @old_path and @new_path.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/builtins.py
6568
6568
    editor program to decide what the file remaining in the working copy
6569
6569
    should look like.  To do this, add the configuration option
6570
6570
 
6571
 
        change_editor = PROGRAM @new_path @old_path
 
6571
        change_editor = PROGRAM {new_path} {old_path}
6572
6572
 
6573
 
    where @new_path is replaced with the path of the new version of the
6574
 
    file and @old_path is replaced with the path of the old version of
 
6573
    where {new_path} is replaced with the path of the new version of the
 
6574
    file and {old_path} is replaced with the path of the old version of
6575
6575
    the file.  The PROGRAM should save the new file with the desired
6576
6576
    contents of the file in the working tree.
6577
6577