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

  • Committer: Jelmer Vernooij
  • Date: 2018-06-29 20:24:31 UTC
  • mfrom: (6999 work)
  • mto: This revision was merged to the branch mainline in revision 7008.
  • Revision ID: jelmer@jelmer.uk-20180629202431-2td8kihrsthzuvau
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_annotate.py
183
183
            ('add', ('', 'root-id', 'directory', None)),
184
184
            ('add', ('a', 'a-id', 'file', 'first\n')),
185
185
            ], timestamp=1166046000.00, timezone=0, committer="joe@foo.com",
186
 
            revision_id='rev-1')
 
186
            revision_id=b'rev-1')
187
187
        builder.build_snapshot(['rev-1'], [
188
188
            ('modify', ('a', 'first\nsecond\n')),
189
189
            ], timestamp=1166046001.00, timezone=0, committer="joe@foo.com",
190
 
            revision_id='rev-2')
 
190
            revision_id=b'rev-2')
191
191
        builder.build_snapshot(['rev-1'], [
192
192
            ('modify', ('a', 'first\nthird\n')),
193
193
            ], timestamp=1166046002.00, timezone=0, committer="barry@foo.com",
194
 
            revision_id='rev-1_1_1')
 
194
            revision_id=b'rev-1_1_1')
195
195
        builder.build_snapshot(['rev-2', 'rev-1_1_1'], [
196
196
            ('modify', ('a', 'first\nsecond\nthird\n')),
197
197
            ], timestamp=1166046003.00, timezone=0, committer="sal@foo.com",
198
 
            revision_id='rev-3')
 
198
            revision_id=b'rev-3')
199
199
        return builder
200
200
 
201
201
    def create_deeply_merged_trees(self):
222
222
        rev-6
223
223
        """
224
224
        builder = self.create_merged_trees()
225
 
        builder.build_snapshot(['rev-1_1_1'], [], revision_id='rev-1_1_2')
226
 
        builder.build_snapshot(['rev-3', 'rev-1_1_2'], [], revision_id='rev-4')
 
225
        builder.build_snapshot(['rev-1_1_1'], [], revision_id=b'rev-1_1_2')
 
226
        builder.build_snapshot(['rev-3', 'rev-1_1_2'], [], revision_id=b'rev-4')
227
227
        builder.build_snapshot(['rev-1_1_1'], [
228
228
            ('modify', ('a', 'first\nthird\nfourth\n')),
229
229
            ], timestamp=1166046003.00, timezone=0, committer="jerry@foo.com",
230
 
            revision_id='rev-1_2_1')
 
230
            revision_id=b'rev-1_2_1')
231
231
        builder.build_snapshot(['rev-1_2_1'], [],
232
232
            timestamp=1166046004.00, timezone=0, committer="jerry@foo.com",
233
 
            revision_id='rev-1_2_2')
 
233
            revision_id=b'rev-1_2_2')
234
234
        builder.build_snapshot(['rev-4', 'rev-1_2_2'], [
235
235
            ('modify', ('a', 'first\nsecond\nthird\nfourth\n')),
236
236
            ], timestamp=1166046004.00, timezone=0, committer="jerry@foo.com",
237
 
            revision_id='rev-5')
 
237
            revision_id=b'rev-5')
238
238
        builder.build_snapshot(['rev-1_2_1'], [
239
239
            ('modify', ('a', 'first\nthird\nfourth\nfifth\nsixth\n')),
240
240
            ], timestamp=1166046005.00, timezone=0, committer="george@foo.com",
241
 
            revision_id='rev-1_3_1')
 
241
            revision_id=b'rev-1_3_1')
242
242
        builder.build_snapshot(['rev-5', 'rev-1_3_1'], [
243
243
            ('modify', ('a',
244
244
                        'first\nsecond\nthird\nfourth\nfifth\nsixth\n')),
245
 
            ], revision_id='rev-6')
 
245
            ], revision_id=b'rev-6')
246
246
        return builder
247
247
 
248
248
    def create_duplicate_lines_tree(self):
258
258
        builder.build_snapshot(None, [
259
259
            ('add', ('', 'root-id', 'directory', None)),
260
260
            ('add', ('file', 'file-id', 'file', base_text)),
261
 
            ], revision_id='rev-base')
 
261
            ], revision_id=b'rev-base')
262
262
        builder.build_snapshot(['rev-base'], [
263
263
            ('modify', ('file', a_text))],
264
 
            revision_id='rev-A')
 
264
            revision_id=b'rev-A')
265
265
        builder.build_snapshot(['rev-base'], [
266
266
            ('modify', ('file', b_text))],
267
 
            revision_id='rev-B')
 
267
            revision_id=b'rev-B')
268
268
        builder.build_snapshot(['rev-A'], [
269
269
            ('modify', ('file', c_text))],
270
 
            revision_id='rev-C')
 
270
            revision_id=b'rev-C')
271
271
        builder.build_snapshot(['rev-B', 'rev-A'], [
272
272
            ('modify', ('file', d_text))],
273
 
            revision_id='rev-D')
 
273
            revision_id=b'rev-D')
274
274
        builder.build_snapshot(['rev-C', 'rev-D'], [
275
275
            ('modify', ('file', e_text))],
276
 
            revision_id='rev-E')
 
276
            revision_id=b'rev-E')
277
277
        return builder
278
278
 
279
279
    def assertAnnotateEqualDiff(self, actual, expected):
414
414
        tree1.lock_read()
415
415
        self.addCleanup(tree1.unlock)
416
416
 
417
 
        revtree_1 = tree1.branch.repository.revision_tree('rev-1')
418
 
        revtree_2 = tree1.branch.repository.revision_tree('rev-2')
 
417
        revtree_1 = tree1.branch.repository.revision_tree(b'rev-1')
 
418
        revtree_2 = tree1.branch.repository.revision_tree(b'rev-2')
419
419
 
420
420
        # this passes if no exception is raised
421
421
        to_file = BytesIO()