/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: 2018-11-16 23:19:12 UTC
  • mfrom: (7180 work)
  • mto: This revision was merged to the branch mainline in revision 7294.
  • Revision ID: jelmer@jelmer.uk-20181116231912-e043vpq22bdkxa6q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/commitfromnews/committemplate.py
63
63
            return self.merge_message(content)
64
64
        else:
65
65
            # Get a diff. XXX Is this hookable? I thought it was, can't find it
66
 
            # though.... add DiffTree.diff_factories. Sadly thats not at the 
 
66
            # though.... add DiffTree.diff_factories. Sadly thats not at the
67
67
            # right level: we want to identify the changed lines, not have the
68
 
            # final diff: because we want to grab the sections for regions 
 
68
            # final diff: because we want to grab the sections for regions
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(old_path)