/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/tests/test_committemplate.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-27 01:09:28 UTC
  • mfrom: (6883.22.13 conflicts)
  • Revision ID: breezy.the.bot@gmail.com-20180327010928-z890ialzaf65trnq
Change arguments for 'modify' and 'unversion' in BranchBuilder.build_snapshot from a file-id to path.

Merged from https://code.launchpad.net/~jelmer/brz/conflicts/+merge/341069

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/commitfromnews/tests/test_committemplate.py
95
95
        builder = self.make_branch_builder('test')
96
96
        builder.start_series()
97
97
        orig_content = INITIAL_NEWS_CONTENT
98
 
        mod_content = """----------------------------
 
98
        mod_content = b"""----------------------------
99
99
commitfromnews release notes
100
100
----------------------------
101
101
 
118
118
             ('add', ('NEWS', b'foo-id', 'file', orig_content)),
119
119
             ], revision_id=b'BASE-id')
120
120
        builder.build_snapshot(None,
121
 
            [('modify', (b'foo-id', mod_content)),
 
121
            [('modify', ('NEWS', mod_content)),
122
122
             ],
123
123
            message_callback=msgeditor.generate_commit_message_template)
124
124
        builder.finish_series()
130
130
        builder = self.make_branch_builder('test')
131
131
        builder.start_series()
132
132
        orig_content = INITIAL_NEWS_CONTENT
133
 
        mod_content = """----------------------------
 
133
        mod_content = b"""----------------------------
134
134
commitfromnews release notes
135
135
----------------------------
136
136
 
155
155
             ('add', ('NEWS', b'foo-id', 'file', orig_content)),
156
156
             ], revision_id=b'BASE-id')
157
157
        builder.build_snapshot(None,
158
 
            [('modify', (b'foo-id', mod_content)),
 
158
            [('modify', ('NEWS', mod_content)),
159
159
             ],
160
160
            message_callback=msgeditor.generate_commit_message_template)
161
161
        builder.finish_series()