/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/plugins/commitfromnews/committemplate.py

  • Committer: Jelmer Vernooij
  • Date: 2017-11-19 18:35:20 UTC
  • mfrom: (6809.4.27 swap-arguments)
  • Revision ID: jelmer@jelmer.uk-20171119183520-fmw89uw30e0tbhwz
Merge lp:~jelmer/brz/swap-arguments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/commitfromnews/committemplate.py
69
69
            # changed in new version of the file. So for now a direct diff
70
70
            # using patiencediff is done.
71
71
            old_revision = self.commit.basis_tree.get_file_revision(
72
 
                found_entry.file_id)
 
72
                old_path, found_entry.file_id)
73
73
            needed = [(found_entry.file_id, found_entry.revision, 'new'),
74
74
                      (found_entry.file_id, old_revision, 'old')]
75
75
            contents = self.commit.builder.repository.iter_files_bytes(needed)