/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: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

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