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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-12-23 03:21:37 UTC
  • mfrom: (7290.1.45 diff-using-fix)
  • Revision ID: breezy.the.bot@gmail.com-20191223032137-m60b7q9g22ow423i
Fix 'bzr diff --using' when no variables are specified in the template.

Merged from https://code.launchpad.net/~jelmer/brz/diff-using-fix/+merge/377088

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/diff.py
795
795
        my_map = {'old_path': old_path, 'new_path': new_path}
796
796
        command = [t.format(**my_map) for t in
797
797
                   self.command_template]
 
798
        if command == self.command_template:
 
799
            command += [old_path, new_path]
798
800
        if sys.platform == 'win32':  # Popen doesn't accept unicode on win32
799
801
            command_encoded = []
800
802
            for c in command: