/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_revisionspec.py

  • Committer: Jelmer Vernooij
  • Date: 2020-05-06 02:13:25 UTC
  • mfrom: (7490.7.21 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200506021325-awbmmqu1zyorz7sj
Merge 3.1 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_revisionspec.py
23
23
    )
24
24
from breezy.tests import TestCaseWithTransport
25
25
from breezy.revisionspec import (
 
26
    InvalidRevisionSpec,
26
27
    RevisionInfo,
27
28
    RevisionSpec,
28
29
    RevisionSpec_dwim,
50
51
        self.tree.lock_write()
51
52
        self.addCleanup(self.tree.unlock)
52
53
        self.tree.add(['a'])
53
 
        self.tree.commit('a', rev_id='r1')
 
54
        self.tree.commit('a', rev_id=b'r1')
54
55
 
55
56
        self.tree2 = self.tree.controldir.sprout('tree2').open_workingtree()
56
 
        self.tree2.commit('alt', rev_id='alt_r2')
 
57
        self.tree2.commit('alt', rev_id=b'alt_r2')
57
58
 
58
59
        self.tree.merge_from_branch(self.tree2.branch)
59
 
        self.tree.commit('second', rev_id='r2')
 
60
        self.tree.commit('second', rev_id=b'r2')
60
61
 
61
62
    def get_in_history(self, revision_spec):
62
63
        return spec_in_history(revision_spec, self.tree.branch)
75
76
                      invalid_as_revision_id=True):
76
77
        try:
77
78
            self.get_in_history(revision_spec)
78
 
        except errors.InvalidRevisionSpec as e:
 
79
        except InvalidRevisionSpec as e:
79
80
            self.assertEqual(revision_spec, e.spec)
80
81
            self.assertEqual(extra, e.extra)
81
82
        else:
85
86
            try:
86
87
                spec = RevisionSpec.from_string(revision_spec)
87
88
                spec.as_revision_id(self.tree.branch)
88
 
            except errors.InvalidRevisionSpec as e:
 
89
            except InvalidRevisionSpec as e:
89
90
                self.assertEqual(revision_spec, e.spec)
90
91
                self.assertEqual(extra, e.extra)
91
92
            else:
123
124
        self.assertEqual((self.tree.branch, None), spec.last_call)
124
125
 
125
126
 
126
 
 
127
127
class TestOddRevisionSpec(TestRevisionSpec):
128
128
    """Test things that aren't normally thought of as revision specs"""
129
129
 
140
140
 
141
141
    def _match_on(self, branch, revs):
142
142
        if self.spec == "bork":
143
 
            return RevisionInfo.from_revision_id(branch, "r1")
 
143
            return RevisionInfo.from_revision_id(branch, b"r1")
144
144
        else:
145
 
            raise errors.InvalidRevisionSpec(self.spec, branch)
 
145
            raise InvalidRevisionSpec(self.spec, branch)
146
146
 
147
147
 
148
148
class TestRevisionSpec_dwim(TestRevisionSpec):
150
150
    # Don't need to test revno's explicitly since TRS_revno already
151
151
    # covers that well for us
152
152
    def test_dwim_spec_revno(self):
153
 
        self.assertInHistoryIs(2, 'r2', '2')
154
 
        self.assertAsRevisionId('alt_r2', '1.1.1')
 
153
        self.assertInHistoryIs(2, b'r2', '2')
 
154
        self.assertAsRevisionId(b'alt_r2', '1.1.1')
155
155
 
156
156
    def test_dwim_spec_revid(self):
157
 
        self.assertInHistoryIs(2, 'r2', 'r2')
 
157
        self.assertInHistoryIs(2, b'r2', 'r2')
158
158
 
159
159
    def test_dwim_spec_tag(self):
160
 
        self.tree.branch.tags.set_tag('footag', 'r1')
161
 
        self.assertAsRevisionId('r1', 'footag')
 
160
        self.tree.branch.tags.set_tag('footag', b'r1')
 
161
        self.assertAsRevisionId(b'r1', 'footag')
162
162
        self.tree.branch.tags.delete_tag('footag')
163
 
        self.assertRaises(errors.InvalidRevisionSpec,
164
 
                          self.get_in_history, 'footag')
 
163
        self.assertRaises(InvalidRevisionSpec, self.get_in_history, 'footag')
165
164
 
166
165
    def test_dwim_spec_tag_that_looks_like_revno(self):
167
166
        # Test that we slip past revno with things that look like revnos,
168
167
        # but aren't.  Tags are convenient for testing this since we can
169
168
        # make them look however we want.
170
 
        self.tree.branch.tags.set_tag('3', 'r2')
171
 
        self.assertAsRevisionId('r2', '3')
 
169
        self.tree.branch.tags.set_tag('3', b'r2')
 
170
        self.assertAsRevisionId(b'r2', '3')
172
171
        self.build_tree(['tree/b'])
173
172
        self.tree.add(['b'])
174
 
        self.tree.commit('b', rev_id='r3')
175
 
        self.assertAsRevisionId('r3', '3')
 
173
        self.tree.commit('b', rev_id=b'r3')
 
174
        self.assertAsRevisionId(b'r3', '3')
176
175
 
177
176
    def test_dwim_spec_date(self):
178
 
        self.assertAsRevisionId('r1', 'today')
 
177
        self.assertAsRevisionId(b'r1', 'today')
179
178
 
180
179
    def test_dwim_spec_branch(self):
181
 
        self.assertInHistoryIs(None, 'alt_r2', 'tree2')
 
180
        self.assertInHistoryIs(None, b'alt_r2', 'tree2')
182
181
 
183
182
    def test_dwim_spec_nonexistent(self):
184
183
        self.assertInvalid('somethingrandom', invalid_as_revision_id=False)
190
189
 
191
190
    def test_append_dwim_revspec(self):
192
191
        original_dwim_revspecs = list(RevisionSpec_dwim._possible_revspecs)
 
192
 
193
193
        def reset_dwim_revspecs():
194
194
            RevisionSpec_dwim._possible_revspecs = original_dwim_revspecs
195
195
        self.addCleanup(reset_dwim_revspecs)
196
196
        RevisionSpec_dwim.append_possible_revspec(RevisionSpec_bork)
197
 
        self.assertAsRevisionId('r1', 'bork')
 
197
        self.assertAsRevisionId(b'r1', 'bork')
198
198
 
199
199
    def test_append_lazy_dwim_revspec(self):
200
200
        original_dwim_revspecs = list(RevisionSpec_dwim._possible_revspecs)
 
201
 
201
202
        def reset_dwim_revspecs():
202
203
            RevisionSpec_dwim._possible_revspecs = original_dwim_revspecs
203
204
        self.addCleanup(reset_dwim_revspecs)
204
205
        RevisionSpec_dwim.append_possible_lazy_revspec(
205
206
            "breezy.tests.test_revisionspec", "RevisionSpec_bork")
206
 
        self.assertAsRevisionId('r1', 'bork')
 
207
        self.assertAsRevisionId(b'r1', 'bork')
207
208
 
208
209
 
209
210
class TestRevisionSpec_revno(TestRevisionSpec):
210
211
 
211
212
    def test_positive_int(self):
212
 
        self.assertInHistoryIs(0, 'null:', '0')
213
 
        self.assertInHistoryIs(1, 'r1', '1')
214
 
        self.assertInHistoryIs(2, 'r2', '2')
 
213
        self.assertInHistoryIs(0, b'null:', '0')
 
214
        self.assertInHistoryIs(1, b'r1', '1')
 
215
        self.assertInHistoryIs(2, b'r2', '2')
215
216
        self.assertInvalid('3')
216
217
 
217
218
    def test_dotted_decimal(self):
218
 
        self.assertInHistoryIs(None, 'alt_r2', '1.1.1')
 
219
        self.assertInHistoryIs(None, b'alt_r2', '1.1.1')
219
220
        self.assertInvalid('1.1.123')
220
221
 
221
222
    def test_negative_int(self):
222
 
        self.assertInHistoryIs(2, 'r2', '-1')
223
 
        self.assertInHistoryIs(1, 'r1', '-2')
 
223
        self.assertInHistoryIs(2, b'r2', '-1')
 
224
        self.assertInHistoryIs(1, b'r1', '-2')
224
225
 
225
 
        self.assertInHistoryIs(1, 'r1', '-3')
226
 
        self.assertInHistoryIs(1, 'r1', '-4')
227
 
        self.assertInHistoryIs(1, 'r1', '-100')
 
226
        self.assertInHistoryIs(1, b'r1', '-3')
 
227
        self.assertInHistoryIs(1, b'r1', '-4')
 
228
        self.assertInHistoryIs(1, b'r1', '-100')
228
229
 
229
230
    def test_positive(self):
230
 
        self.assertInHistoryIs(0, 'null:', 'revno:0')
231
 
        self.assertInHistoryIs(1, 'r1', 'revno:1')
232
 
        self.assertInHistoryIs(2, 'r2', 'revno:2')
 
231
        self.assertInHistoryIs(0, b'null:', 'revno:0')
 
232
        self.assertInHistoryIs(1, b'r1', 'revno:1')
 
233
        self.assertInHistoryIs(2, b'r2', 'revno:2')
233
234
 
234
235
        self.assertInvalid('revno:3')
235
236
 
236
237
    def test_negative(self):
237
 
        self.assertInHistoryIs(2, 'r2', 'revno:-1')
238
 
        self.assertInHistoryIs(1, 'r1', 'revno:-2')
 
238
        self.assertInHistoryIs(2, b'r2', 'revno:-1')
 
239
        self.assertInHistoryIs(1, b'r1', 'revno:-2')
239
240
 
240
 
        self.assertInHistoryIs(1, 'r1', 'revno:-3')
241
 
        self.assertInHistoryIs(1, 'r1', 'revno:-4')
 
241
        self.assertInHistoryIs(1, b'r1', 'revno:-3')
 
242
        self.assertInHistoryIs(1, b'r1', 'revno:-4')
242
243
 
243
244
    def test_invalid_number(self):
244
245
        # Get the right exception text
245
246
        try:
246
247
            int('X')
247
248
        except ValueError as e:
248
 
            pass
249
 
        self.assertInvalid('revno:X', extra='\n' + str(e))
 
249
            self.assertInvalid('revno:X', extra='\n' + str(e))
 
250
        else:
 
251
            self.fail()
250
252
 
251
253
    def test_missing_number_and_branch(self):
252
254
        self.assertInvalid('revno::',
256
258
        try:
257
259
            int('X')
258
260
        except ValueError as e:
259
 
            pass
260
 
        self.assertInvalid('revno:X:tree2', extra='\n' + str(e))
 
261
            self.assertInvalid('revno:X:tree2', extra='\n' + str(e))
 
262
        else:
 
263
            self.fail()
261
264
 
262
265
    def test_non_exact_branch(self):
263
266
        # It seems better to require an exact path to the branch
272
275
        self.assertNotEqual(self.tree.branch.base, revinfo.branch.base)
273
276
        self.assertEqual(self.tree2.branch.base, revinfo.branch.base)
274
277
        self.assertEqual(2, revinfo.revno)
275
 
        self.assertEqual('alt_r2', revinfo.rev_id)
 
278
        self.assertEqual(b'alt_r2', revinfo.rev_id)
276
279
 
277
280
    def test_int_with_branch(self):
278
281
        revinfo = self.get_in_history('2:tree2')
279
282
        self.assertNotEqual(self.tree.branch.base, revinfo.branch.base)
280
283
        self.assertEqual(self.tree2.branch.base, revinfo.branch.base)
281
284
        self.assertEqual(2, revinfo.revno)
282
 
        self.assertEqual('alt_r2', revinfo.rev_id)
 
285
        self.assertEqual(b'alt_r2', revinfo.rev_id)
283
286
 
284
287
    def test_with_url(self):
285
288
        url = self.get_url() + '/tree2'
287
290
        self.assertNotEqual(self.tree.branch.base, revinfo.branch.base)
288
291
        self.assertEqual(self.tree2.branch.base, revinfo.branch.base)
289
292
        self.assertEqual(2, revinfo.revno)
290
 
        self.assertEqual('alt_r2', revinfo.rev_id)
 
293
        self.assertEqual(b'alt_r2', revinfo.rev_id)
291
294
 
292
295
    def test_negative_with_url(self):
293
296
        url = self.get_url() + '/tree2'
295
298
        self.assertNotEqual(self.tree.branch.base, revinfo.branch.base)
296
299
        self.assertEqual(self.tree2.branch.base, revinfo.branch.base)
297
300
        self.assertEqual(2, revinfo.revno)
298
 
        self.assertEqual('alt_r2', revinfo.rev_id)
 
301
        self.assertEqual(b'alt_r2', revinfo.rev_id)
299
302
 
300
303
    def test_different_history_lengths(self):
301
304
        # Make sure we use the revisions and offsets in the supplied branch
302
305
        # not the ones in the original branch.
303
 
        self.tree2.commit('three', rev_id='r3')
304
 
        self.assertInHistoryIs(3, 'r3', 'revno:3:tree2')
305
 
        self.assertInHistoryIs(3, 'r3', 'revno:-1:tree2')
 
306
        self.tree2.commit('three', rev_id=b'r3')
 
307
        self.assertInHistoryIs(3, b'r3', 'revno:3:tree2')
 
308
        self.assertInHistoryIs(3, b'r3', 'revno:-1:tree2')
306
309
 
307
310
    def test_invalid_branch(self):
308
311
        self.assertRaises(errors.NotBranchError,
309
312
                          self.get_in_history, 'revno:-1:tree3')
310
313
 
311
314
    def test_invalid_revno_in_branch(self):
312
 
        self.tree.commit('three', rev_id='r3')
 
315
        self.tree.commit('three', rev_id=b'r3')
313
316
        self.assertInvalid('revno:3:tree2')
314
317
 
315
318
    def test_revno_n_path(self):
317
320
        wta = self.make_branch_and_tree('a')
318
321
        ba = wta.branch
319
322
 
320
 
        wta.commit('Commit one', rev_id='a@r-0-1')
321
 
        wta.commit('Commit two', rev_id='a@r-0-2')
322
 
        wta.commit('Commit three', rev_id='a@r-0-3')
 
323
        wta.commit('Commit one', rev_id=b'a@r-0-1')
 
324
        wta.commit('Commit two', rev_id=b'a@r-0-2')
 
325
        wta.commit('Commit three', rev_id=b'a@r-0-3')
323
326
 
324
327
        wtb = self.make_branch_and_tree('b')
325
328
        bb = wtb.branch
326
329
 
327
 
        wtb.commit('Commit one', rev_id='b@r-0-1')
328
 
        wtb.commit('Commit two', rev_id='b@r-0-2')
329
 
        wtb.commit('Commit three', rev_id='b@r-0-3')
330
 
 
331
 
 
332
 
        self.assertEqual((1, 'a@r-0-1'),
 
330
        wtb.commit('Commit one', rev_id=b'b@r-0-1')
 
331
        wtb.commit('Commit two', rev_id=b'b@r-0-2')
 
332
        wtb.commit('Commit three', rev_id=b'b@r-0-3')
 
333
 
 
334
        self.assertEqual((1, b'a@r-0-1'),
333
335
                         spec_in_history('revno:1:a/', ba))
334
336
        # The argument of in_history should be ignored since it is
335
337
        # redundant with the path in the spec.
336
 
        self.assertEqual((1, 'a@r-0-1'),
 
338
        self.assertEqual((1, b'a@r-0-1'),
337
339
                         spec_in_history('revno:1:a/', None))
338
 
        self.assertEqual((1, 'a@r-0-1'),
 
340
        self.assertEqual((1, b'a@r-0-1'),
339
341
                         spec_in_history('revno:1:a/', bb))
340
 
        self.assertEqual((2, 'b@r-0-2'),
 
342
        self.assertEqual((2, b'b@r-0-2'),
341
343
                         spec_in_history('revno:2:b/', None))
342
344
 
343
345
    def test_as_revision_id(self):
344
 
        self.assertAsRevisionId('null:', '0')
345
 
        self.assertAsRevisionId('r1', '1')
346
 
        self.assertAsRevisionId('r2', '2')
347
 
        self.assertAsRevisionId('r1', '-2')
348
 
        self.assertAsRevisionId('r2', '-1')
349
 
        self.assertAsRevisionId('alt_r2', '1.1.1')
 
346
        self.assertAsRevisionId(b'null:', '0')
 
347
        self.assertAsRevisionId(b'r1', '1')
 
348
        self.assertAsRevisionId(b'r2', '2')
 
349
        self.assertAsRevisionId(b'r1', '-2')
 
350
        self.assertAsRevisionId(b'r2', '-1')
 
351
        self.assertAsRevisionId(b'alt_r2', '1.1.1')
350
352
 
351
353
    def test_as_tree(self):
352
354
        tree = self.get_as_tree('0')
353
355
        self.assertEqual(_mod_revision.NULL_REVISION, tree.get_revision_id())
354
356
        tree = self.get_as_tree('1')
355
 
        self.assertEqual('r1', tree.get_revision_id())
 
357
        self.assertEqual(b'r1', tree.get_revision_id())
356
358
        tree = self.get_as_tree('2')
357
 
        self.assertEqual('r2', tree.get_revision_id())
 
359
        self.assertEqual(b'r2', tree.get_revision_id())
358
360
        tree = self.get_as_tree('-2')
359
 
        self.assertEqual('r1', tree.get_revision_id())
 
361
        self.assertEqual(b'r1', tree.get_revision_id())
360
362
        tree = self.get_as_tree('-1')
361
 
        self.assertEqual('r2', tree.get_revision_id())
 
363
        self.assertEqual(b'r2', tree.get_revision_id())
362
364
        tree = self.get_as_tree('1.1.1')
363
 
        self.assertEqual('alt_r2', tree.get_revision_id())
 
365
        self.assertEqual(b'alt_r2', tree.get_revision_id())
364
366
 
365
367
 
366
368
class TestRevisionSpec_revid(TestRevisionSpec):
368
370
    def test_in_history(self):
369
371
        # We should be able to access revisions that are directly
370
372
        # in the history.
371
 
        self.assertInHistoryIs(1, 'r1', 'revid:r1')
372
 
        self.assertInHistoryIs(2, 'r2', 'revid:r2')
 
373
        self.assertInHistoryIs(1, b'r1', 'revid:r1')
 
374
        self.assertInHistoryIs(2, b'r2', 'revid:r2')
373
375
 
374
376
    def test_missing(self):
375
377
        self.assertInvalid('revid:r3', invalid_as_revision_id=False)
376
378
 
377
379
    def test_merged(self):
378
380
        """We can reach revisions in the ancestry"""
379
 
        self.assertInHistoryIs(None, 'alt_r2', 'revid:alt_r2')
 
381
        self.assertInHistoryIs(None, b'alt_r2', 'revid:alt_r2')
380
382
 
381
383
    def test_not_here(self):
382
 
        self.tree2.commit('alt third', rev_id='alt_r3')
 
384
        self.tree2.commit('alt third', rev_id=b'alt_r3')
383
385
        # It exists in tree2, but not in tree
384
386
        self.assertInvalid('revid:alt_r3', invalid_as_revision_id=False)
385
387
 
386
388
    def test_in_repository(self):
387
389
        """We can get any revision id in the repository"""
388
390
        # XXX: This may change in the future, but for now, it is true
389
 
        self.tree2.commit('alt third', rev_id='alt_r3')
390
 
        self.tree.branch.fetch(self.tree2.branch, 'alt_r3')
391
 
        self.assertInHistoryIs(None, 'alt_r3', 'revid:alt_r3')
 
391
        self.tree2.commit('alt third', rev_id=b'alt_r3')
 
392
        self.tree.branch.fetch(self.tree2.branch, b'alt_r3')
 
393
        self.assertInHistoryIs(None, b'alt_r3', 'revid:alt_r3')
392
394
 
393
395
    def test_unicode(self):
394
396
        """We correctly convert a unicode ui string to an encoded revid."""
395
397
        revision_id = u'\N{SNOWMAN}'.encode('utf-8')
396
398
        self.tree.commit('unicode', rev_id=revision_id)
397
399
        self.assertInHistoryIs(3, revision_id, u'revid:\N{SNOWMAN}')
398
 
        self.assertInHistoryIs(3, revision_id, 'revid:' + revision_id)
 
400
        self.assertInHistoryIs(3, revision_id, 'revid:' +
 
401
                               revision_id.decode('utf-8'))
399
402
 
400
403
    def test_as_revision_id(self):
401
 
        self.assertAsRevisionId('r1', 'revid:r1')
402
 
        self.assertAsRevisionId('r2', 'revid:r2')
403
 
        self.assertAsRevisionId('alt_r2', 'revid:alt_r2')
 
404
        self.assertAsRevisionId(b'r1', 'revid:r1')
 
405
        self.assertAsRevisionId(b'r2', 'revid:r2')
 
406
        self.assertAsRevisionId(b'alt_r2', 'revid:alt_r2')
404
407
 
405
408
 
406
409
class TestRevisionSpec_last(TestRevisionSpec):
407
410
 
408
411
    def test_positive(self):
409
 
        self.assertInHistoryIs(2, 'r2', 'last:1')
410
 
        self.assertInHistoryIs(1, 'r1', 'last:2')
411
 
        self.assertInHistoryIs(0, 'null:', 'last:3')
 
412
        self.assertInHistoryIs(2, b'r2', 'last:1')
 
413
        self.assertInHistoryIs(1, b'r1', 'last:2')
 
414
        self.assertInHistoryIs(0, b'null:', 'last:3')
412
415
 
413
416
    def test_empty(self):
414
 
        self.assertInHistoryIs(2, 'r2', 'last:')
 
417
        self.assertInHistoryIs(2, b'r2', 'last:')
415
418
 
416
419
    def test_negative(self):
417
420
        self.assertInvalid('last:-1',
427
430
                          spec_in_history, 'last:', tree.branch)
428
431
 
429
432
    def test_not_a_number(self):
 
433
        last_e = None
430
434
        try:
431
435
            int('Y')
432
436
        except ValueError as e:
433
 
            pass
434
 
        self.assertInvalid('last:Y', extra='\n' + str(e))
 
437
            last_e = e
 
438
        self.assertInvalid('last:Y', extra='\n' + str(last_e))
435
439
 
436
440
    def test_as_revision_id(self):
437
 
        self.assertAsRevisionId('r2', 'last:1')
438
 
        self.assertAsRevisionId('r1', 'last:2')
 
441
        self.assertAsRevisionId(b'r2', 'last:1')
 
442
        self.assertAsRevisionId(b'r1', 'last:2')
439
443
 
440
444
 
441
445
class TestRevisionSpec_before(TestRevisionSpec):
442
446
 
443
447
    def test_int(self):
444
 
        self.assertInHistoryIs(1, 'r1', 'before:2')
445
 
        self.assertInHistoryIs(1, 'r1', 'before:-1')
 
448
        self.assertInHistoryIs(1, b'r1', 'before:2')
 
449
        self.assertInHistoryIs(1, b'r1', 'before:-1')
446
450
 
447
451
    def test_before_one(self):
448
 
        self.assertInHistoryIs(0, 'null:', 'before:1')
 
452
        self.assertInHistoryIs(0, b'null:', 'before:1')
449
453
 
450
454
    def test_before_none(self):
451
455
        self.assertInvalid('before:0',
452
456
                           extra='\ncannot go before the null: revision')
453
457
 
454
458
    def test_revid(self):
455
 
        self.assertInHistoryIs(1, 'r1', 'before:revid:r2')
 
459
        self.assertInHistoryIs(1, b'r1', 'before:revid:r2')
456
460
 
457
461
    def test_last(self):
458
 
        self.assertInHistoryIs(1, 'r1', 'before:last:1')
 
462
        self.assertInHistoryIs(1, b'r1', 'before:last:1')
459
463
 
460
464
    def test_alt_revid(self):
461
465
        # This will grab the left-most ancestor for alternate histories
462
 
        self.assertInHistoryIs(1, 'r1', 'before:revid:alt_r2')
 
466
        self.assertInHistoryIs(1, b'r1', 'before:revid:alt_r2')
463
467
 
464
468
    def test_alt_no_parents(self):
465
469
        new_tree = self.make_branch_and_tree('new_tree')
466
 
        new_tree.commit('first', rev_id='new_r1')
467
 
        self.tree.branch.fetch(new_tree.branch, 'new_r1')
468
 
        self.assertInHistoryIs(0, 'null:', 'before:revid:new_r1')
 
470
        new_tree.commit('first', rev_id=b'new_r1')
 
471
        self.tree.branch.fetch(new_tree.branch, b'new_r1')
 
472
        self.assertInHistoryIs(0, b'null:', 'before:revid:new_r1')
469
473
 
470
474
    def test_as_revision_id(self):
471
 
        self.assertAsRevisionId('r1', 'before:revid:r2')
472
 
        self.assertAsRevisionId('r1', 'before:2')
473
 
        self.assertAsRevisionId('r1', 'before:1.1.1')
474
 
        self.assertAsRevisionId('r1', 'before:revid:alt_r2')
 
475
        self.assertAsRevisionId(b'r1', 'before:revid:r2')
 
476
        self.assertAsRevisionId(b'r1', 'before:2')
 
477
        self.assertAsRevisionId(b'r1', 'before:1.1.1')
 
478
        self.assertAsRevisionId(b'r1', 'before:revid:alt_r2')
475
479
 
476
480
 
477
481
class TestRevisionSpec_tag(TestRevisionSpec):
487
491
        self.assertEqual(spec.spec, 'bzr-0.14')
488
492
 
489
493
    def test_lookup_tag(self):
490
 
        self.tree.branch.tags.set_tag('bzr-0.14', 'r1')
491
 
        self.assertInHistoryIs(1, 'r1', 'tag:bzr-0.14')
492
 
        self.tree.branch.tags.set_tag('null_rev', 'null:')
493
 
        self.assertInHistoryIs(0, 'null:', 'tag:null_rev')
 
494
        self.tree.branch.tags.set_tag('bzr-0.14', b'r1')
 
495
        self.assertInHistoryIs(1, b'r1', 'tag:bzr-0.14')
 
496
        self.tree.branch.tags.set_tag('null_rev', b'null:')
 
497
        self.assertInHistoryIs(0, b'null:', 'tag:null_rev')
494
498
 
495
499
    def test_failed_lookup(self):
496
500
        # tags that don't exist give a specific message: arguably we should
497
501
        # just give InvalidRevisionSpec but I think this is more helpful
498
502
        self.assertRaises(errors.NoSuchTag,
499
 
            self.get_in_history,
500
 
            'tag:some-random-tag')
 
503
                          self.get_in_history,
 
504
                          'tag:some-random-tag')
501
505
 
502
506
    def test_as_revision_id(self):
503
 
        self.tree.branch.tags.set_tag('my-tag', 'r2')
504
 
        self.tree.branch.tags.set_tag('null_rev', 'null:')
505
 
        self.assertAsRevisionId('r2', 'tag:my-tag')
506
 
        self.assertAsRevisionId('null:', 'tag:null_rev')
507
 
        self.assertAsRevisionId('r1', 'before:tag:my-tag')
 
507
        self.tree.branch.tags.set_tag('my-tag', b'r2')
 
508
        self.tree.branch.tags.set_tag('null_rev', b'null:')
 
509
        self.assertAsRevisionId(b'r2', 'tag:my-tag')
 
510
        self.assertAsRevisionId(b'null:', 'tag:null_rev')
 
511
        self.assertAsRevisionId(b'r1', 'before:tag:my-tag')
508
512
 
509
513
 
510
514
class TestRevisionSpec_date(TestRevisionSpec):
513
517
        super(TestRevisionSpec, self).setUp()
514
518
 
515
519
        new_tree = self.make_branch_and_tree('new_tree')
516
 
        new_tree.commit('Commit one', rev_id='new_r1',
517
 
                        timestamp=time.time() - 60*60*24)
518
 
        new_tree.commit('Commit two', rev_id='new_r2')
519
 
        new_tree.commit('Commit three', rev_id='new_r3')
 
520
        new_tree.commit('Commit one', rev_id=b'new_r1',
 
521
                        timestamp=time.time() - 60 * 60 * 24)
 
522
        new_tree.commit('Commit two', rev_id=b'new_r2')
 
523
        new_tree.commit('Commit three', rev_id=b'new_r3')
520
524
 
521
525
        self.tree = new_tree
522
526
 
524
528
        self.assertInvalid('date:tomorrow')
525
529
 
526
530
    def test_today(self):
527
 
        self.assertInHistoryIs(2, 'new_r2', 'date:today')
528
 
        self.assertInHistoryIs(1, 'new_r1', 'before:date:today')
 
531
        self.assertInHistoryIs(2, b'new_r2', 'date:today')
 
532
        self.assertInHistoryIs(1, b'new_r1', 'before:date:today')
529
533
 
530
534
    def test_yesterday(self):
531
 
        self.assertInHistoryIs(1, 'new_r1', 'date:yesterday')
 
535
        self.assertInHistoryIs(1, b'new_r1', 'date:yesterday')
532
536
 
533
537
    def test_invalid(self):
534
538
        self.assertInvalid('date:foobar', extra='\ninvalid date')
539
543
 
540
544
    def test_day(self):
541
545
        now = datetime.datetime.now()
542
 
        self.assertInHistoryIs(2, 'new_r2',
543
 
            'date:%04d-%02d-%02d' % (now.year, now.month, now.day))
 
546
        self.assertInHistoryIs(2, b'new_r2',
 
547
                               'date:%04d-%02d-%02d' % (now.year, now.month, now.day))
544
548
 
545
549
    def test_as_revision_id(self):
546
 
        self.assertAsRevisionId('new_r2', 'date:today')
 
550
        self.assertAsRevisionId(b'new_r2', 'date:today')
547
551
 
548
552
 
549
553
class TestRevisionSpec_ancestor(TestRevisionSpec):
556
560
 
557
561
    def test_simple(self):
558
562
        # Common ancestor of trees is 'alt_r2'
559
 
        self.assertInHistoryIs(None, 'alt_r2', 'ancestor:tree2')
 
563
        self.assertInHistoryIs(None, b'alt_r2', 'ancestor:tree2')
560
564
 
561
565
        # Going the other way, we get a valid revno
562
566
        tmp = self.tree
563
567
        self.tree = self.tree2
564
568
        self.tree2 = tmp
565
 
        self.assertInHistoryIs(2, 'alt_r2', 'ancestor:tree')
 
569
        self.assertInHistoryIs(2, b'alt_r2', 'ancestor:tree')
566
570
 
567
571
    def test_self(self):
568
 
        self.assertInHistoryIs(2, 'r2', 'ancestor:tree')
 
572
        self.assertInHistoryIs(2, b'r2', 'ancestor:tree')
569
573
 
570
574
    def test_unrelated(self):
571
575
        new_tree = self.make_branch_and_tree('new_tree')
572
576
 
573
 
        new_tree.commit('Commit one', rev_id='new_r1')
574
 
        new_tree.commit('Commit two', rev_id='new_r2')
575
 
        new_tree.commit('Commit three', rev_id='new_r3')
 
577
        new_tree.commit('Commit one', rev_id=b'new_r1')
 
578
        new_tree.commit('Commit two', rev_id=b'new_r2')
 
579
        new_tree.commit('Commit three', rev_id=b'new_r3')
576
580
 
577
581
        # With no common ancestor, we should raise another user error
578
582
        self.assertRaises(errors.NoCommonAncestor,
589
593
                                           new_tree.branch)
590
594
 
591
595
    def test_as_revision_id(self):
592
 
        self.assertAsRevisionId('alt_r2', 'ancestor:tree2')
 
596
        self.assertAsRevisionId(b'alt_r2', 'ancestor:tree2')
593
597
 
594
598
    def test_default(self):
595
599
        # We don't have a parent to default to
598
602
 
599
603
        # Create a branch with a parent to default to
600
604
        tree3 = self.tree.controldir.sprout('tree3').open_workingtree()
601
 
        tree3.commit('foo', rev_id='r3')
 
605
        tree3.commit('foo', rev_id=b'r3')
602
606
        self.tree = tree3
603
 
        self.assertInHistoryIs(2, 'r2', 'ancestor:')
 
607
        self.assertInHistoryIs(2, b'r2', 'ancestor:')
604
608
 
605
609
 
606
610
class TestRevisionSpec_branch(TestRevisionSpec):
612
616
                          self.get_in_history, 'branch:tree2/a')
613
617
 
614
618
    def test_simple(self):
615
 
        self.assertInHistoryIs(None, 'alt_r2', 'branch:tree2')
 
619
        self.assertInHistoryIs(None, b'alt_r2', 'branch:tree2')
616
620
 
617
621
    def test_self(self):
618
 
        self.assertInHistoryIs(2, 'r2', 'branch:tree')
 
622
        self.assertInHistoryIs(2, b'r2', 'branch:tree')
619
623
 
620
624
    def test_unrelated(self):
621
625
        new_tree = self.make_branch_and_tree('new_tree')
622
626
 
623
 
        new_tree.commit('Commit one', rev_id='new_r1')
624
 
        new_tree.commit('Commit two', rev_id='new_r2')
625
 
        new_tree.commit('Commit three', rev_id='new_r3')
 
627
        new_tree.commit('Commit one', rev_id=b'new_r1')
 
628
        new_tree.commit('Commit two', rev_id=b'new_r2')
 
629
        new_tree.commit('Commit three', rev_id=b'new_r3')
626
630
 
627
 
        self.assertInHistoryIs(None, 'new_r3', 'branch:new_tree')
 
631
        self.assertInHistoryIs(None, b'new_r3', 'branch:new_tree')
628
632
 
629
633
        # XXX: Right now, we use fetch() to make sure the remote revisions
630
634
        # have been pulled into the local branch. We may change that
631
635
        # behavior in the future.
632
 
        self.assertTrue(self.tree.branch.repository.has_revision('new_r3'))
 
636
        self.assertTrue(self.tree.branch.repository.has_revision(b'new_r3'))
633
637
 
634
638
    def test_no_commits(self):
635
 
        new_tree = self.make_branch_and_tree('new_tree')
 
639
        self.make_branch_and_tree('new_tree')
636
640
        self.assertRaises(errors.NoCommits,
637
641
                          self.get_in_history, 'branch:new_tree')
638
642
        self.assertRaises(errors.NoCommits,
639
643
                          self.get_as_tree, 'branch:new_tree')
640
644
 
641
645
    def test_as_revision_id(self):
642
 
        self.assertAsRevisionId('alt_r2', 'branch:tree2')
 
646
        self.assertAsRevisionId(b'alt_r2', 'branch:tree2')
643
647
 
644
648
    def test_as_tree(self):
645
649
        tree = self.get_as_tree('branch:tree', self.tree2)
646
 
        self.assertEqual('r2', tree.get_revision_id())
647
 
        self.assertFalse(self.tree2.branch.repository.has_revision('r2'))
 
650
        self.assertEqual(b'r2', tree.get_revision_id())
 
651
        self.assertFalse(self.tree2.branch.repository.has_revision(b'r2'))
648
652
 
649
653
 
650
654
class TestRevisionSpec_submit(TestRevisionSpec):
654
658
        self.assertRaises(errors.NoSubmitBranch, self.get_in_history,
655
659
                          'submit:')
656
660
        self.tree.branch.set_parent('../tree2')
657
 
        self.assertInHistoryIs(None, 'alt_r2', 'submit:')
 
661
        self.assertInHistoryIs(None, b'alt_r2', 'submit:')
658
662
        self.tree.branch.set_parent('bogus')
659
663
        self.assertRaises(errors.NotBranchError, self.get_in_history,
660
 
            'submit:')
 
664
                          'submit:')
661
665
        # submit branch overrides parent branch
662
666
        self.tree.branch.set_submit_branch('tree2')
663
 
        self.assertInHistoryIs(None, 'alt_r2', 'submit:')
 
667
        self.assertInHistoryIs(None, b'alt_r2', 'submit:')
664
668
 
665
669
    def test_as_revision_id(self):
666
670
        self.tree.branch.set_submit_branch('tree2')
667
 
        self.assertAsRevisionId('alt_r2', 'branch:tree2')
 
671
        self.assertAsRevisionId(b'alt_r2', 'branch:tree2')
668
672
 
669
673
 
670
674
class TestRevisionSpec_mainline(TestRevisionSpec):
671
675
 
672
676
    def test_as_revision_id(self):
673
 
        self.assertAsRevisionId('r1', 'mainline:1')
674
 
        self.assertAsRevisionId('r2', 'mainline:1.1.1')
675
 
        self.assertAsRevisionId('r2', 'mainline:revid:alt_r2')
 
677
        self.assertAsRevisionId(b'r1', 'mainline:1')
 
678
        self.assertAsRevisionId(b'r2', 'mainline:1.1.1')
 
679
        self.assertAsRevisionId(b'r2', 'mainline:revid:alt_r2')
676
680
        spec = RevisionSpec.from_string('mainline:revid:alt_r22')
677
 
        e = self.assertRaises(errors.InvalidRevisionSpec,
678
 
                              spec.as_revision_id, self.tree.branch)
 
681
        e = self.assertRaises(
 
682
            InvalidRevisionSpec, spec.as_revision_id, self.tree.branch)
679
683
        self.assertContainsRe(str(e),
680
 
            "Requested revision: 'mainline:revid:alt_r22' does not exist in"
681
 
            " branch: ")
 
684
                              "Requested revision: 'mainline:revid:alt_r22' does not exist in"
 
685
                              " branch: ")
682
686
 
683
687
    def test_in_history(self):
684
 
        self.assertInHistoryIs(2, 'r2', 'mainline:revid:alt_r2')
 
688
        self.assertInHistoryIs(2, b'r2', 'mainline:revid:alt_r2')
685
689
 
686
690
 
687
691
class TestRevisionSpec_annotate(TestRevisionSpec):
689
693
    def setUp(self):
690
694
        super(TestRevisionSpec_annotate, self).setUp()
691
695
        self.tree = self.make_branch_and_tree('annotate-tree')
692
 
        self.build_tree_contents([('annotate-tree/file1', '1\n')])
 
696
        self.build_tree_contents([('annotate-tree/file1', b'1\n')])
693
697
        self.tree.add('file1')
694
 
        self.tree.commit('r1', rev_id='r1')
695
 
        self.build_tree_contents([('annotate-tree/file1', '2\n1\n')])
696
 
        self.tree.commit('r2', rev_id='r2')
697
 
        self.build_tree_contents([('annotate-tree/file1', '2\n1\n3\n')])
 
698
        self.tree.commit('r1', rev_id=b'r1')
 
699
        self.build_tree_contents([('annotate-tree/file1', b'2\n1\n')])
 
700
        self.tree.commit('r2', rev_id=b'r2')
 
701
        self.build_tree_contents([('annotate-tree/file1', b'2\n1\n3\n')])
698
702
 
699
703
    def test_as_revision_id_r1(self):
700
 
        self.assertAsRevisionId('r1', 'annotate:annotate-tree/file1:2')
 
704
        self.assertAsRevisionId(b'r1', 'annotate:annotate-tree/file1:2')
701
705
 
702
706
    def test_as_revision_id_r2(self):
703
 
        self.assertAsRevisionId('r2', 'annotate:annotate-tree/file1:1')
 
707
        self.assertAsRevisionId(b'r2', 'annotate:annotate-tree/file1:1')
704
708
 
705
709
    def test_as_revision_id_uncommitted(self):
706
710
        spec = RevisionSpec.from_string('annotate:annotate-tree/file1:3')
707
 
        e = self.assertRaises(errors.InvalidRevisionSpec,
708
 
                              spec.as_revision_id, self.tree.branch)
 
711
        e = self.assertRaises(
 
712
            InvalidRevisionSpec, spec.as_revision_id, self.tree.branch)
709
713
        self.assertContainsRe(str(e),
710
 
            r"Requested revision: \'annotate:annotate-tree/file1:3\' does not"
711
 
            " exist in branch: .*\nLine 3 has not been committed.")
 
714
                              r"Requested revision: \'annotate:annotate-tree/file1:3\' does not"
 
715
                              " exist in branch: .*\nLine 3 has not been committed.")
712
716
 
713
717
    def test_non_existent_line(self):
714
718
        spec = RevisionSpec.from_string('annotate:annotate-tree/file1:4')
715
 
        e = self.assertRaises(errors.InvalidRevisionSpec,
 
719
        e = self.assertRaises(InvalidRevisionSpec,
716
720
                              spec.as_revision_id, self.tree.branch)
717
721
        self.assertContainsRe(str(e),
718
 
            r"Requested revision: \'annotate:annotate-tree/file1:4\' does not"
719
 
            " exist in branch: .*\nNo such line: 4")
 
722
                              r"Requested revision: \'annotate:annotate-tree/file1:4\' does not"
 
723
                              " exist in branch: .*\nNo such line: 4")
720
724
 
721
725
    def test_invalid_line(self):
722
726
        spec = RevisionSpec.from_string('annotate:annotate-tree/file1:q')
723
 
        e = self.assertRaises(errors.InvalidRevisionSpec,
 
727
        e = self.assertRaises(InvalidRevisionSpec,
724
728
                              spec.as_revision_id, self.tree.branch)
725
729
        self.assertContainsRe(str(e),
726
 
            r"Requested revision: \'annotate:annotate-tree/file1:q\' does not"
727
 
            " exist in branch: .*\nNo such line: q")
 
730
                              r"Requested revision: \'annotate:annotate-tree/file1:q\' does not"
 
731
                              " exist in branch: .*\nNo such line: q")
728
732
 
729
733
    def test_no_such_file(self):
730
734
        spec = RevisionSpec.from_string('annotate:annotate-tree/file2:1')
731
 
        e = self.assertRaises(errors.InvalidRevisionSpec,
 
735
        e = self.assertRaises(InvalidRevisionSpec,
732
736
                              spec.as_revision_id, self.tree.branch)
733
737
        self.assertContainsRe(str(e),
734
 
            r"Requested revision: \'annotate:annotate-tree/file2:1\' does not"
735
 
            " exist in branch: .*\nFile 'file2' is not versioned")
 
738
                              r"Requested revision: \'annotate:annotate-tree/file2:1\' does not"
 
739
                              " exist in branch: .*\nFile 'file2' is not versioned")
736
740
 
737
741
    def test_no_such_file_with_colon(self):
738
742
        spec = RevisionSpec.from_string('annotate:annotate-tree/fi:le2:1')
739
 
        e = self.assertRaises(errors.InvalidRevisionSpec,
 
743
        e = self.assertRaises(InvalidRevisionSpec,
740
744
                              spec.as_revision_id, self.tree.branch)
741
745
        self.assertContainsRe(str(e),
742
 
            r"Requested revision: \'annotate:annotate-tree/fi:le2:1\' does not"
743
 
            " exist in branch: .*\nFile 'fi:le2' is not versioned")
 
746
                              r"Requested revision: \'annotate:annotate-tree/fi:le2:1\' does not"
 
747
                              " exist in branch: .*\nFile 'fi:le2' is not versioned")