/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: Breezy landing bot
  • Author(s): Colin Watson
  • Date: 2020-11-16 21:47:08 UTC
  • mfrom: (7521.1.1 remove-lp-workaround)
  • Revision ID: breezy.the.bot@gmail.com-20201116214708-jos209mgxi41oy15
Remove breezy.git workaround for bazaar.launchpad.net.

Merged from https://code.launchpad.net/~cjwatson/brz/remove-lp-workaround/+merge/393710

Show diffs side-by-side

added added

removed removed

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