/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-09-12 18:20:02 UTC
  • mto: This revision was merged to the branch mainline in revision 7107.
  • Revision ID: jelmer@jelmer.uk-20180912182002-5z6dvag2frdvr9y2
Fix remaining deprecation warning test.

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, b"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
 
        self.assertInHistoryIs(2, 'r2', '2')
156
 
        self.assertAsRevisionId('alt_r2', '1.1.1')
 
153
        self.assertInHistoryIs(2, b'r2', '2')
 
154
        self.assertAsRevisionId(b'alt_r2', '1.1.1')
157
155
 
158
156
    def test_dwim_spec_revid(self):
159
 
        self.assertInHistoryIs(2, 'r2', 'r2')
 
157
        self.assertInHistoryIs(2, b'r2', 'r2')
160
158
 
161
159
    def test_dwim_spec_tag(self):
162
 
        self.tree.branch.tags.set_tag('footag', 'r1')
163
 
        self.assertAsRevisionId('r1', 'footag')
 
160
        self.tree.branch.tags.set_tag('footag', b'r1')
 
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')
169
167
        # Test that we slip past revno with things that look like revnos,
170
168
        # but aren't.  Tags are convenient for testing this since we can
171
169
        # make them look however we want.
172
 
        self.tree.branch.tags.set_tag('3', 'r2')
173
 
        self.assertAsRevisionId('r2', '3')
 
170
        self.tree.branch.tags.set_tag('3', b'r2')
 
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
 
        self.assertInHistoryIs(None, 'alt_r2', 'tree2')
 
181
        self.assertInHistoryIs(None, b'alt_r2', 'tree2')
184
182
 
185
183
    def test_dwim_spec_nonexistent(self):
186
184
        self.assertInvalid('somethingrandom', invalid_as_revision_id=False)
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:
233
 
            pass
234
 
        self.assertInvalid('revno:X', extra='\n' + str(e))
 
247
        except ValueError as e:
 
248
            self.assertInvalid('revno:X', extra='\n' + str(e))
 
249
        else:
 
250
            self.fail()
235
251
 
236
252
    def test_missing_number_and_branch(self):
237
253
        self.assertInvalid('revno::',
240
256
    def test_invalid_number_with_branch(self):
241
257
        try:
242
258
            int('X')
243
 
        except ValueError, e:
244
 
            pass
245
 
        self.assertInvalid('revno:X:tree2', extra='\n' + str(e))
 
259
        except ValueError as e:
 
260
            self.assertInvalid('revno:X:tree2', extra='\n' + str(e))
 
261
        else:
 
262
            self.fail()
246
263
 
247
264
    def test_non_exact_branch(self):
248
265
        # It seems better to require an exact path to the branch
257
274
        self.assertNotEqual(self.tree.branch.base, revinfo.branch.base)
258
275
        self.assertEqual(self.tree2.branch.base, revinfo.branch.base)
259
276
        self.assertEqual(2, revinfo.revno)
260
 
        self.assertEqual('alt_r2', revinfo.rev_id)
 
277
        self.assertEqual(b'alt_r2', revinfo.rev_id)
261
278
 
262
279
    def test_int_with_branch(self):
263
280
        revinfo = self.get_in_history('2:tree2')
264
281
        self.assertNotEqual(self.tree.branch.base, revinfo.branch.base)
265
282
        self.assertEqual(self.tree2.branch.base, revinfo.branch.base)
266
283
        self.assertEqual(2, revinfo.revno)
267
 
        self.assertEqual('alt_r2', revinfo.rev_id)
 
284
        self.assertEqual(b'alt_r2', revinfo.rev_id)
268
285
 
269
286
    def test_with_url(self):
270
287
        url = self.get_url() + '/tree2'
272
289
        self.assertNotEqual(self.tree.branch.base, revinfo.branch.base)
273
290
        self.assertEqual(self.tree2.branch.base, revinfo.branch.base)
274
291
        self.assertEqual(2, revinfo.revno)
275
 
        self.assertEqual('alt_r2', revinfo.rev_id)
 
292
        self.assertEqual(b'alt_r2', revinfo.rev_id)
276
293
 
277
294
    def test_negative_with_url(self):
278
295
        url = self.get_url() + '/tree2'
280
297
        self.assertNotEqual(self.tree.branch.base, revinfo.branch.base)
281
298
        self.assertEqual(self.tree2.branch.base, revinfo.branch.base)
282
299
        self.assertEqual(2, revinfo.revno)
283
 
        self.assertEqual('alt_r2', revinfo.rev_id)
 
300
        self.assertEqual(b'alt_r2', revinfo.rev_id)
284
301
 
285
302
    def test_different_history_lengths(self):
286
303
        # Make sure we use the revisions and offsets in the supplied branch
287
304
        # not the ones in the original branch.
288
 
        self.tree2.commit('three', rev_id='r3')
289
 
        self.assertInHistoryIs(3, 'r3', 'revno:3:tree2')
290
 
        self.assertInHistoryIs(3, 'r3', 'revno:-1:tree2')
 
305
        self.tree2.commit('three', rev_id=b'r3')
 
306
        self.assertInHistoryIs(3, b'r3', 'revno:3:tree2')
 
307
        self.assertInHistoryIs(3, b'r3', 'revno:-1:tree2')
291
308
 
292
309
    def test_invalid_branch(self):
293
310
        self.assertRaises(errors.NotBranchError,
294
311
                          self.get_in_history, 'revno:-1:tree3')
295
312
 
296
313
    def test_invalid_revno_in_branch(self):
297
 
        self.tree.commit('three', rev_id='r3')
 
314
        self.tree.commit('three', rev_id=b'r3')
298
315
        self.assertInvalid('revno:3:tree2')
299
316
 
300
317
    def test_revno_n_path(self):
302
319
        wta = self.make_branch_and_tree('a')
303
320
        ba = wta.branch
304
321
 
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')
 
322
        wta.commit('Commit one', rev_id=b'a@r-0-1')
 
323
        wta.commit('Commit two', rev_id=b'a@r-0-2')
 
324
        wta.commit('Commit three', rev_id=b'a@r-0-3')
308
325
 
309
326
        wtb = self.make_branch_and_tree('b')
310
327
        bb = wtb.branch
311
328
 
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')
315
 
 
316
 
 
317
 
        self.assertEqual((1, 'a@r-0-1'),
 
329
        wtb.commit('Commit one', rev_id=b'b@r-0-1')
 
330
        wtb.commit('Commit two', rev_id=b'b@r-0-2')
 
331
        wtb.commit('Commit three', rev_id=b'b@r-0-3')
 
332
 
 
333
 
 
334
        self.assertEqual((1, b'a@r-0-1'),
318
335
                         spec_in_history('revno:1:a/', ba))
319
336
        # The argument of in_history should be ignored since it is
320
337
        # redundant with the path in the spec.
321
 
        self.assertEqual((1, 'a@r-0-1'),
 
338
        self.assertEqual((1, b'a@r-0-1'),
322
339
                         spec_in_history('revno:1:a/', None))
323
 
        self.assertEqual((1, 'a@r-0-1'),
 
340
        self.assertEqual((1, b'a@r-0-1'),
324
341
                         spec_in_history('revno:1:a/', bb))
325
 
        self.assertEqual((2, 'b@r-0-2'),
 
342
        self.assertEqual((2, b'b@r-0-2'),
326
343
                         spec_in_history('revno:2:b/', None))
327
344
 
328
345
    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')
 
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')
335
352
 
336
353
    def test_as_tree(self):
337
354
        tree = self.get_as_tree('0')
338
 
        self.assertEquals(_mod_revision.NULL_REVISION, tree.get_revision_id())
 
355
        self.assertEqual(_mod_revision.NULL_REVISION, tree.get_revision_id())
339
356
        tree = self.get_as_tree('1')
340
 
        self.assertEquals('r1', tree.get_revision_id())
 
357
        self.assertEqual(b'r1', tree.get_revision_id())
341
358
        tree = self.get_as_tree('2')
342
 
        self.assertEquals('r2', tree.get_revision_id())
 
359
        self.assertEqual(b'r2', tree.get_revision_id())
343
360
        tree = self.get_as_tree('-2')
344
 
        self.assertEquals('r1', tree.get_revision_id())
 
361
        self.assertEqual(b'r1', tree.get_revision_id())
345
362
        tree = self.get_as_tree('-1')
346
 
        self.assertEquals('r2', tree.get_revision_id())
 
363
        self.assertEqual(b'r2', tree.get_revision_id())
347
364
        tree = self.get_as_tree('1.1.1')
348
 
        self.assertEquals('alt_r2', tree.get_revision_id())
 
365
        self.assertEqual(b'alt_r2', tree.get_revision_id())
349
366
 
350
367
 
351
368
class TestRevisionSpec_revid(TestRevisionSpec):
353
370
    def test_in_history(self):
354
371
        # We should be able to access revisions that are directly
355
372
        # in the history.
356
 
        self.assertInHistoryIs(1, 'r1', 'revid:r1')
357
 
        self.assertInHistoryIs(2, 'r2', 'revid:r2')
 
373
        self.assertInHistoryIs(1, b'r1', 'revid:r1')
 
374
        self.assertInHistoryIs(2, b'r2', 'revid:r2')
358
375
 
359
376
    def test_missing(self):
360
377
        self.assertInvalid('revid:r3', invalid_as_revision_id=False)
361
378
 
362
379
    def test_merged(self):
363
380
        """We can reach revisions in the ancestry"""
364
 
        self.assertInHistoryIs(None, 'alt_r2', 'revid:alt_r2')
 
381
        self.assertInHistoryIs(None, b'alt_r2', 'revid:alt_r2')
365
382
 
366
383
    def test_not_here(self):
367
 
        self.tree2.commit('alt third', rev_id='alt_r3')
 
384
        self.tree2.commit('alt third', rev_id=b'alt_r3')
368
385
        # It exists in tree2, but not in tree
369
386
        self.assertInvalid('revid:alt_r3', invalid_as_revision_id=False)
370
387
 
371
388
    def test_in_repository(self):
372
389
        """We can get any revision id in the repository"""
373
390
        # 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')
 
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')
378
394
 
379
395
    def test_unicode(self):
380
396
        """We correctly convert a unicode ui string to an encoded revid."""
381
397
        revision_id = u'\N{SNOWMAN}'.encode('utf-8')
382
398
        self.tree.commit('unicode', rev_id=revision_id)
383
399
        self.assertInHistoryIs(3, revision_id, u'revid:\N{SNOWMAN}')
384
 
        self.assertInHistoryIs(3, revision_id, 'revid:' + revision_id)
 
400
        self.assertInHistoryIs(3, revision_id, 'revid:' + revision_id.decode('utf-8'))
385
401
 
386
402
    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')
 
403
        self.assertAsRevisionId(b'r1', 'revid:r1')
 
404
        self.assertAsRevisionId(b'r2', 'revid:r2')
 
405
        self.assertAsRevisionId(b'alt_r2', 'revid:alt_r2')
390
406
 
391
407
 
392
408
class TestRevisionSpec_last(TestRevisionSpec):
393
409
 
394
410
    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')
 
411
        self.assertInHistoryIs(2, b'r2', 'last:1')
 
412
        self.assertInHistoryIs(1, b'r1', 'last:2')
 
413
        self.assertInHistoryIs(0, b'null:', 'last:3')
398
414
 
399
415
    def test_empty(self):
400
 
        self.assertInHistoryIs(2, 'r2', 'last:')
 
416
        self.assertInHistoryIs(2, b'r2', 'last:')
401
417
 
402
418
    def test_negative(self):
403
419
        self.assertInvalid('last:-1',
413
429
                          spec_in_history, 'last:', tree.branch)
414
430
 
415
431
    def test_not_a_number(self):
 
432
        last_e = None
416
433
        try:
417
434
            int('Y')
418
 
        except ValueError, e:
419
 
            pass
420
 
        self.assertInvalid('last:Y', extra='\n' + str(e))
 
435
        except ValueError as e:
 
436
            last_e = e
 
437
        self.assertInvalid('last:Y', extra='\n' + str(last_e))
421
438
 
422
439
    def test_as_revision_id(self):
423
 
        self.assertAsRevisionId('r2', 'last:1')
424
 
        self.assertAsRevisionId('r1', 'last:2')
 
440
        self.assertAsRevisionId(b'r2', 'last:1')
 
441
        self.assertAsRevisionId(b'r1', 'last:2')
425
442
 
426
443
 
427
444
class TestRevisionSpec_before(TestRevisionSpec):
428
445
 
429
446
    def test_int(self):
430
 
        self.assertInHistoryIs(1, 'r1', 'before:2')
431
 
        self.assertInHistoryIs(1, 'r1', 'before:-1')
 
447
        self.assertInHistoryIs(1, b'r1', 'before:2')
 
448
        self.assertInHistoryIs(1, b'r1', 'before:-1')
432
449
 
433
450
    def test_before_one(self):
434
 
        self.assertInHistoryIs(0, 'null:', 'before:1')
 
451
        self.assertInHistoryIs(0, b'null:', 'before:1')
435
452
 
436
453
    def test_before_none(self):
437
454
        self.assertInvalid('before:0',
438
455
                           extra='\ncannot go before the null: revision')
439
456
 
440
457
    def test_revid(self):
441
 
        self.assertInHistoryIs(1, 'r1', 'before:revid:r2')
 
458
        self.assertInHistoryIs(1, b'r1', 'before:revid:r2')
442
459
 
443
460
    def test_last(self):
444
 
        self.assertInHistoryIs(1, 'r1', 'before:last:1')
 
461
        self.assertInHistoryIs(1, b'r1', 'before:last:1')
445
462
 
446
463
    def test_alt_revid(self):
447
464
        # This will grab the left-most ancestor for alternate histories
448
 
        self.assertInHistoryIs(1, 'r1', 'before:revid:alt_r2')
 
465
        self.assertInHistoryIs(1, b'r1', 'before:revid:alt_r2')
449
466
 
450
467
    def test_alt_no_parents(self):
451
468
        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')
 
469
        new_tree.commit('first', rev_id=b'new_r1')
 
470
        self.tree.branch.fetch(new_tree.branch, b'new_r1')
 
471
        self.assertInHistoryIs(0, b'null:', 'before:revid:new_r1')
456
472
 
457
473
    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')
 
474
        self.assertAsRevisionId(b'r1', 'before:revid:r2')
 
475
        self.assertAsRevisionId(b'r1', 'before:2')
 
476
        self.assertAsRevisionId(b'r1', 'before:1.1.1')
 
477
        self.assertAsRevisionId(b'r1', 'before:revid:alt_r2')
462
478
 
463
479
 
464
480
class TestRevisionSpec_tag(TestRevisionSpec):
474
490
        self.assertEqual(spec.spec, 'bzr-0.14')
475
491
 
476
492
    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')
 
493
        self.tree.branch.tags.set_tag('bzr-0.14', b'r1')
 
494
        self.assertInHistoryIs(1, b'r1', 'tag:bzr-0.14')
 
495
        self.tree.branch.tags.set_tag('null_rev', b'null:')
 
496
        self.assertInHistoryIs(0, b'null:', 'tag:null_rev')
481
497
 
482
498
    def test_failed_lookup(self):
483
499
        # tags that don't exist give a specific message: arguably we should
487
503
            'tag:some-random-tag')
488
504
 
489
505
    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')
 
506
        self.tree.branch.tags.set_tag('my-tag', b'r2')
 
507
        self.tree.branch.tags.set_tag('null_rev', b'null:')
 
508
        self.assertAsRevisionId(b'r2', 'tag:my-tag')
 
509
        self.assertAsRevisionId(b'null:', 'tag:null_rev')
 
510
        self.assertAsRevisionId(b'r1', 'before:tag:my-tag')
495
511
 
496
512
 
497
513
class TestRevisionSpec_date(TestRevisionSpec):
500
516
        super(TestRevisionSpec, self).setUp()
501
517
 
502
518
        new_tree = self.make_branch_and_tree('new_tree')
503
 
        new_tree.commit('Commit one', rev_id='new_r1',
 
519
        new_tree.commit('Commit one', rev_id=b'new_r1',
504
520
                        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')
 
521
        new_tree.commit('Commit two', rev_id=b'new_r2')
 
522
        new_tree.commit('Commit three', rev_id=b'new_r3')
507
523
 
508
524
        self.tree = new_tree
509
525
 
511
527
        self.assertInvalid('date:tomorrow')
512
528
 
513
529
    def test_today(self):
514
 
        self.assertInHistoryIs(2, 'new_r2', 'date:today')
515
 
        self.assertInHistoryIs(1, 'new_r1', 'before:date:today')
 
530
        self.assertInHistoryIs(2, b'new_r2', 'date:today')
 
531
        self.assertInHistoryIs(1, b'new_r1', 'before:date:today')
516
532
 
517
533
    def test_yesterday(self):
518
 
        self.assertInHistoryIs(1, 'new_r1', 'date:yesterday')
 
534
        self.assertInHistoryIs(1, b'new_r1', 'date:yesterday')
519
535
 
520
536
    def test_invalid(self):
521
537
        self.assertInvalid('date:foobar', extra='\ninvalid date')
526
542
 
527
543
    def test_day(self):
528
544
        now = datetime.datetime.now()
529
 
        self.assertInHistoryIs(2, 'new_r2',
 
545
        self.assertInHistoryIs(2, b'new_r2',
530
546
            'date:%04d-%02d-%02d' % (now.year, now.month, now.day))
531
547
 
532
548
    def test_as_revision_id(self):
533
 
        self.assertAsRevisionId('new_r2', 'date:today')
 
549
        self.assertAsRevisionId(b'new_r2', 'date:today')
534
550
 
535
551
 
536
552
class TestRevisionSpec_ancestor(TestRevisionSpec):
543
559
 
544
560
    def test_simple(self):
545
561
        # Common ancestor of trees is 'alt_r2'
546
 
        self.assertInHistoryIs(None, 'alt_r2', 'ancestor:tree2')
 
562
        self.assertInHistoryIs(None, b'alt_r2', 'ancestor:tree2')
547
563
 
548
564
        # Going the other way, we get a valid revno
549
565
        tmp = self.tree
550
566
        self.tree = self.tree2
551
567
        self.tree2 = tmp
552
 
        self.assertInHistoryIs(2, 'alt_r2', 'ancestor:tree')
 
568
        self.assertInHistoryIs(2, b'alt_r2', 'ancestor:tree')
553
569
 
554
570
    def test_self(self):
555
 
        self.assertInHistoryIs(2, 'r2', 'ancestor:tree')
 
571
        self.assertInHistoryIs(2, b'r2', 'ancestor:tree')
556
572
 
557
573
    def test_unrelated(self):
558
574
        new_tree = self.make_branch_and_tree('new_tree')
559
575
 
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')
 
576
        new_tree.commit('Commit one', rev_id=b'new_r1')
 
577
        new_tree.commit('Commit two', rev_id=b'new_r2')
 
578
        new_tree.commit('Commit three', rev_id=b'new_r3')
563
579
 
564
580
        # With no common ancestor, we should raise another user error
565
581
        self.assertRaises(errors.NoCommonAncestor,
576
592
                                           new_tree.branch)
577
593
 
578
594
    def test_as_revision_id(self):
579
 
        self.assertAsRevisionId('alt_r2', 'ancestor:tree2')
 
595
        self.assertAsRevisionId(b'alt_r2', 'ancestor:tree2')
580
596
 
581
597
    def test_default(self):
582
598
        # We don't have a parent to default to
584
600
                          'ancestor:')
585
601
 
586
602
        # 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')
 
603
        tree3 = self.tree.controldir.sprout('tree3').open_workingtree()
 
604
        tree3.commit('foo', rev_id=b'r3')
589
605
        self.tree = tree3
590
 
        self.assertInHistoryIs(2, 'r2', 'ancestor:')
 
606
        self.assertInHistoryIs(2, b'r2', 'ancestor:')
591
607
 
592
608
 
593
609
class TestRevisionSpec_branch(TestRevisionSpec):
599
615
                          self.get_in_history, 'branch:tree2/a')
600
616
 
601
617
    def test_simple(self):
602
 
        self.assertInHistoryIs(None, 'alt_r2', 'branch:tree2')
 
618
        self.assertInHistoryIs(None, b'alt_r2', 'branch:tree2')
603
619
 
604
620
    def test_self(self):
605
 
        self.assertInHistoryIs(2, 'r2', 'branch:tree')
 
621
        self.assertInHistoryIs(2, b'r2', 'branch:tree')
606
622
 
607
623
    def test_unrelated(self):
608
624
        new_tree = self.make_branch_and_tree('new_tree')
609
625
 
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')
 
626
        new_tree.commit('Commit one', rev_id=b'new_r1')
 
627
        new_tree.commit('Commit two', rev_id=b'new_r2')
 
628
        new_tree.commit('Commit three', rev_id=b'new_r3')
613
629
 
614
 
        self.assertInHistoryIs(None, 'new_r3', 'branch:new_tree')
 
630
        self.assertInHistoryIs(None, b'new_r3', 'branch:new_tree')
615
631
 
616
632
        # XXX: Right now, we use fetch() to make sure the remote revisions
617
633
        # have been pulled into the local branch. We may change that
618
634
        # behavior in the future.
619
 
        self.failUnless(self.tree.branch.repository.has_revision('new_r3'))
 
635
        self.assertTrue(self.tree.branch.repository.has_revision(b'new_r3'))
620
636
 
621
637
    def test_no_commits(self):
622
638
        new_tree = self.make_branch_and_tree('new_tree')
626
642
                          self.get_as_tree, 'branch:new_tree')
627
643
 
628
644
    def test_as_revision_id(self):
629
 
        self.assertAsRevisionId('alt_r2', 'branch:tree2')
 
645
        self.assertAsRevisionId(b'alt_r2', 'branch:tree2')
630
646
 
631
647
    def test_as_tree(self):
632
648
        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'))
 
649
        self.assertEqual(b'r2', tree.get_revision_id())
 
650
        self.assertFalse(self.tree2.branch.repository.has_revision(b'r2'))
635
651
 
636
652
 
637
653
class TestRevisionSpec_submit(TestRevisionSpec):
641
657
        self.assertRaises(errors.NoSubmitBranch, self.get_in_history,
642
658
                          'submit:')
643
659
        self.tree.branch.set_parent('../tree2')
644
 
        self.assertInHistoryIs(None, 'alt_r2', 'submit:')
 
660
        self.assertInHistoryIs(None, b'alt_r2', 'submit:')
645
661
        self.tree.branch.set_parent('bogus')
646
662
        self.assertRaises(errors.NotBranchError, self.get_in_history,
647
663
            'submit:')
648
664
        # submit branch overrides parent branch
649
665
        self.tree.branch.set_submit_branch('tree2')
650
 
        self.assertInHistoryIs(None, 'alt_r2', 'submit:')
 
666
        self.assertInHistoryIs(None, b'alt_r2', 'submit:')
651
667
 
652
668
    def test_as_revision_id(self):
653
669
        self.tree.branch.set_submit_branch('tree2')
654
 
        self.assertAsRevisionId('alt_r2', 'branch:tree2')
 
670
        self.assertAsRevisionId(b'alt_r2', 'branch:tree2')
 
671
 
 
672
 
 
673
class TestRevisionSpec_mainline(TestRevisionSpec):
 
674
 
 
675
    def test_as_revision_id(self):
 
676
        self.assertAsRevisionId(b'r1', 'mainline:1')
 
677
        self.assertAsRevisionId(b'r2', 'mainline:1.1.1')
 
678
        self.assertAsRevisionId(b'r2', 'mainline:revid:alt_r2')
 
679
        spec = RevisionSpec.from_string('mainline:revid:alt_r22')
 
680
        e = self.assertRaises(errors.InvalidRevisionSpec,
 
681
                              spec.as_revision_id, self.tree.branch)
 
682
        self.assertContainsRe(str(e),
 
683
            "Requested revision: 'mainline:revid:alt_r22' does not exist in"
 
684
            " branch: ")
 
685
 
 
686
    def test_in_history(self):
 
687
        self.assertInHistoryIs(2, b'r2', 'mainline:revid:alt_r2')
 
688
 
 
689
 
 
690
class TestRevisionSpec_annotate(TestRevisionSpec):
 
691
 
 
692
    def setUp(self):
 
693
        super(TestRevisionSpec_annotate, self).setUp()
 
694
        self.tree = self.make_branch_and_tree('annotate-tree')
 
695
        self.build_tree_contents([('annotate-tree/file1', b'1\n')])
 
696
        self.tree.add('file1')
 
697
        self.tree.commit('r1', rev_id=b'r1')
 
698
        self.build_tree_contents([('annotate-tree/file1', b'2\n1\n')])
 
699
        self.tree.commit('r2', rev_id=b'r2')
 
700
        self.build_tree_contents([('annotate-tree/file1', b'2\n1\n3\n')])
 
701
 
 
702
    def test_as_revision_id_r1(self):
 
703
        self.assertAsRevisionId(b'r1', 'annotate:annotate-tree/file1:2')
 
704
 
 
705
    def test_as_revision_id_r2(self):
 
706
        self.assertAsRevisionId(b'r2', 'annotate:annotate-tree/file1:1')
 
707
 
 
708
    def test_as_revision_id_uncommitted(self):
 
709
        spec = RevisionSpec.from_string('annotate:annotate-tree/file1:3')
 
710
        e = self.assertRaises(errors.InvalidRevisionSpec,
 
711
                              spec.as_revision_id, self.tree.branch)
 
712
        self.assertContainsRe(str(e),
 
713
            r"Requested revision: \'annotate:annotate-tree/file1:3\' does not"
 
714
            " exist in branch: .*\nLine 3 has not been committed.")
 
715
 
 
716
    def test_non_existent_line(self):
 
717
        spec = RevisionSpec.from_string('annotate:annotate-tree/file1:4')
 
718
        e = self.assertRaises(errors.InvalidRevisionSpec,
 
719
                              spec.as_revision_id, self.tree.branch)
 
720
        self.assertContainsRe(str(e),
 
721
            r"Requested revision: \'annotate:annotate-tree/file1:4\' does not"
 
722
            " exist in branch: .*\nNo such line: 4")
 
723
 
 
724
    def test_invalid_line(self):
 
725
        spec = RevisionSpec.from_string('annotate:annotate-tree/file1:q')
 
726
        e = self.assertRaises(errors.InvalidRevisionSpec,
 
727
                              spec.as_revision_id, self.tree.branch)
 
728
        self.assertContainsRe(str(e),
 
729
            r"Requested revision: \'annotate:annotate-tree/file1:q\' does not"
 
730
            " exist in branch: .*\nNo such line: q")
 
731
 
 
732
    def test_no_such_file(self):
 
733
        spec = RevisionSpec.from_string('annotate:annotate-tree/file2:1')
 
734
        e = self.assertRaises(errors.InvalidRevisionSpec,
 
735
                              spec.as_revision_id, self.tree.branch)
 
736
        self.assertContainsRe(str(e),
 
737
            r"Requested revision: \'annotate:annotate-tree/file2:1\' does not"
 
738
            " exist in branch: .*\nFile 'file2' is not versioned")
 
739
 
 
740
    def test_no_such_file_with_colon(self):
 
741
        spec = RevisionSpec.from_string('annotate:annotate-tree/fi:le2:1')
 
742
        e = self.assertRaises(errors.InvalidRevisionSpec,
 
743
                              spec.as_revision_id, self.tree.branch)
 
744
        self.assertContainsRe(str(e),
 
745
            r"Requested revision: \'annotate:annotate-tree/fi:le2:1\' does not"
 
746
            " exist in branch: .*\nFile 'fi:le2' is not versioned")