/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-04-05 19:11:34 UTC
  • mto: (7490.7.16 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200405191134-0aebh8ikiwygxma5
Populate the .gitignore file.

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