/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: 2017-11-19 17:46:48 UTC
  • mfrom: (6816.2.3 branch-builder-order)
  • Revision ID: jelmer@jelmer.uk-20171119174648-tteawslwap0zfs5i
Merge lp:~jelmer/brz/branch-builder-order

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_annotate.py
179
179
        builder = self.make_branch_builder('branch')
180
180
        builder.start_series()
181
181
        self.addCleanup(builder.finish_series)
182
 
        builder.build_snapshot('rev-1', None, [
 
182
        builder.build_snapshot(None, [
183
183
            ('add', ('', 'root-id', 'directory', None)),
184
184
            ('add', ('a', 'a-id', 'file', 'first\n')),
185
 
            ], timestamp=1166046000.00, timezone=0, committer="joe@foo.com")
186
 
        builder.build_snapshot('rev-2', ['rev-1'], [
 
185
            ], timestamp=1166046000.00, timezone=0, committer="joe@foo.com",
 
186
            revision_id='rev-1')
 
187
        builder.build_snapshot(['rev-1'], [
187
188
            ('modify', ('a-id', 'first\nsecond\n')),
188
 
            ], timestamp=1166046001.00, timezone=0, committer="joe@foo.com")
189
 
        builder.build_snapshot('rev-1_1_1', ['rev-1'], [
 
189
            ], timestamp=1166046001.00, timezone=0, committer="joe@foo.com",
 
190
            revision_id='rev-2')
 
191
        builder.build_snapshot(['rev-1'], [
190
192
            ('modify', ('a-id', 'first\nthird\n')),
191
 
            ], timestamp=1166046002.00, timezone=0, committer="barry@foo.com")
192
 
        builder.build_snapshot('rev-3', ['rev-2', 'rev-1_1_1'], [
 
193
            ], timestamp=1166046002.00, timezone=0, committer="barry@foo.com",
 
194
            revision_id='rev-1_1_1')
 
195
        builder.build_snapshot(['rev-2', 'rev-1_1_1'], [
193
196
            ('modify', ('a-id', 'first\nsecond\nthird\n')),
194
 
            ], timestamp=1166046003.00, timezone=0, committer="sal@foo.com")
 
197
            ], timestamp=1166046003.00, timezone=0, committer="sal@foo.com",
 
198
            revision_id='rev-3')
195
199
        return builder
196
200
 
197
201
    def create_deeply_merged_trees(self):
218
222
        rev-6
219
223
        """
220
224
        builder = self.create_merged_trees()
221
 
        builder.build_snapshot('rev-1_1_2', ['rev-1_1_1'], [])
222
 
        builder.build_snapshot('rev-4', ['rev-3', 'rev-1_1_2'], [])
223
 
        builder.build_snapshot('rev-1_2_1', ['rev-1_1_1'], [
 
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')
 
227
        builder.build_snapshot(['rev-1_1_1'], [
224
228
            ('modify', ('a-id', 'first\nthird\nfourth\n')),
225
 
            ], timestamp=1166046003.00, timezone=0, committer="jerry@foo.com")
226
 
        builder.build_snapshot('rev-1_2_2', ['rev-1_2_1'], [],
227
 
            timestamp=1166046004.00, timezone=0, committer="jerry@foo.com")
228
 
        builder.build_snapshot('rev-5', ['rev-4', 'rev-1_2_2'], [
 
229
            ], timestamp=1166046003.00, timezone=0, committer="jerry@foo.com",
 
230
            revision_id='rev-1_2_1')
 
231
        builder.build_snapshot(['rev-1_2_1'], [],
 
232
            timestamp=1166046004.00, timezone=0, committer="jerry@foo.com",
 
233
            revision_id='rev-1_2_2')
 
234
        builder.build_snapshot(['rev-4', 'rev-1_2_2'], [
229
235
            ('modify', ('a-id', 'first\nsecond\nthird\nfourth\n')),
230
 
            ], timestamp=1166046004.00, timezone=0, committer="jerry@foo.com")
231
 
        builder.build_snapshot('rev-1_3_1', ['rev-1_2_1'], [
 
236
            ], timestamp=1166046004.00, timezone=0, committer="jerry@foo.com",
 
237
            revision_id='rev-5')
 
238
        builder.build_snapshot(['rev-1_2_1'], [
232
239
            ('modify', ('a-id', 'first\nthird\nfourth\nfifth\nsixth\n')),
233
 
            ], timestamp=1166046005.00, timezone=0, committer="george@foo.com")
234
 
        builder.build_snapshot('rev-6', ['rev-5', 'rev-1_3_1'], [
 
240
            ], timestamp=1166046005.00, timezone=0, committer="george@foo.com",
 
241
            revision_id='rev-1_3_1')
 
242
        builder.build_snapshot(['rev-5', 'rev-1_3_1'], [
235
243
            ('modify', ('a-id',
236
244
                        'first\nsecond\nthird\nfourth\nfifth\nsixth\n')),
237
 
            ])
 
245
            ], revision_id='rev-6')
238
246
        return builder
239
247
 
240
248
    def create_duplicate_lines_tree(self):
247
255
        c_text = ''.join(l for r, l in duplicate_C)
248
256
        d_text = ''.join(l for r, l in duplicate_D)
249
257
        e_text = ''.join(l for r, l in duplicate_E)
250
 
        builder.build_snapshot('rev-base', None, [
 
258
        builder.build_snapshot(None, [
251
259
            ('add', ('', 'root-id', 'directory', None)),
252
260
            ('add', ('file', 'file-id', 'file', base_text)),
253
 
            ])
254
 
        builder.build_snapshot('rev-A', ['rev-base'], [
255
 
            ('modify', ('file-id', a_text))])
256
 
        builder.build_snapshot('rev-B', ['rev-base'], [
257
 
            ('modify', ('file-id', b_text))])
258
 
        builder.build_snapshot('rev-C', ['rev-A'], [
259
 
            ('modify', ('file-id', c_text))])
260
 
        builder.build_snapshot('rev-D', ['rev-B', 'rev-A'], [
261
 
            ('modify', ('file-id', d_text))])
262
 
        builder.build_snapshot('rev-E', ['rev-C', 'rev-D'], [
263
 
            ('modify', ('file-id', e_text))])
 
261
            ], revision_id='rev-base')
 
262
        builder.build_snapshot(['rev-base'], [
 
263
            ('modify', ('file-id', a_text))],
 
264
            revision_id='rev-A')
 
265
        builder.build_snapshot(['rev-base'], [
 
266
            ('modify', ('file-id', b_text))],
 
267
            revision_id='rev-B')
 
268
        builder.build_snapshot(['rev-A'], [
 
269
            ('modify', ('file-id', c_text))],
 
270
            revision_id='rev-C')
 
271
        builder.build_snapshot(['rev-B', 'rev-A'], [
 
272
            ('modify', ('file-id', d_text))],
 
273
            revision_id='rev-D')
 
274
        builder.build_snapshot(['rev-C', 'rev-D'], [
 
275
            ('modify', ('file-id', e_text))],
 
276
            revision_id='rev-E')
264
277
        return builder
265
278
 
266
279
    def assertAnnotateEqualDiff(self, actual, expected):