/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-09-02 11:51:19 UTC
  • mto: (7490.40.109 work)
  • mto: This revision was merged to the branch mainline in revision 7526.
  • Revision ID: jelmer@jelmer.uk-20200902115119-otuspc349t9rmhua
add test for git file merge.

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