/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 bzrlib/tests/test_revisionspec.py

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisionspec.py
1
 
# Copyright (C) 2005-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2005-2011 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 breezy import (
 
20
from bzrlib import (
21
21
    errors,
22
22
    revision as _mod_revision,
 
23
    symbol_versioning,
23
24
    )
24
 
from breezy.tests import TestCaseWithTransport
25
 
from breezy.revisionspec import (
 
25
from bzrlib.tests import TestCaseWithTransport
 
26
from bzrlib.revisionspec import (
26
27
    RevisionInfo,
27
28
    RevisionSpec,
28
29
    RevisionSpec_dwim,
50
51
        self.tree.lock_write()
51
52
        self.addCleanup(self.tree.unlock)
52
53
        self.tree.add(['a'])
53
 
        self.tree.commit('a', rev_id=b'r1')
 
54
        self.tree.commit('a', rev_id='r1')
54
55
 
55
 
        self.tree2 = self.tree.controldir.sprout('tree2').open_workingtree()
56
 
        self.tree2.commit('alt', rev_id=b'alt_r2')
 
56
        self.tree2 = self.tree.bzrdir.sprout('tree2').open_workingtree()
 
57
        self.tree2.commit('alt', rev_id='alt_r2')
57
58
 
58
59
        self.tree.merge_from_branch(self.tree2.branch)
59
 
        self.tree.commit('second', rev_id=b'r2')
 
60
        self.tree.commit('second', rev_id='r2')
60
61
 
61
62
    def get_in_history(self, revision_spec):
62
63
        return spec_in_history(revision_spec, self.tree.branch)
75
76
                      invalid_as_revision_id=True):
76
77
        try:
77
78
            self.get_in_history(revision_spec)
78
 
        except errors.InvalidRevisionSpec as e:
 
79
        except errors.InvalidRevisionSpec, e:
79
80
            self.assertEqual(revision_spec, e.spec)
80
81
            self.assertEqual(extra, e.extra)
81
82
        else:
85
86
            try:
86
87
                spec = RevisionSpec.from_string(revision_spec)
87
88
                spec.as_revision_id(self.tree.branch)
88
 
            except errors.InvalidRevisionSpec as e:
 
89
            except errors.InvalidRevisionSpec, e:
89
90
                self.assertEqual(revision_spec, e.spec)
90
91
                self.assertEqual(extra, e.extra)
91
92
            else:
114
115
 
115
116
class TestRevisionSpecBase(TestRevisionSpec):
116
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
 
117
130
    def test_wants_no_revision_history(self):
118
131
        # If wants_revision_history = False, then _match_on should get None for
119
132
        # the branch revision history
171
184
        self.assertAsRevisionId('r2', '3')
172
185
        self.build_tree(['tree/b'])
173
186
        self.tree.add(['b'])
174
 
        self.tree.commit('b', rev_id=b'r3')
 
187
        self.tree.commit('b', rev_id='r3')
175
188
        self.assertAsRevisionId('r3', '3')
176
189
 
177
190
    def test_dwim_spec_date(self):
202
215
            RevisionSpec_dwim._possible_revspecs = original_dwim_revspecs
203
216
        self.addCleanup(reset_dwim_revspecs)
204
217
        RevisionSpec_dwim.append_possible_lazy_revspec(
205
 
            "breezy.tests.test_revisionspec", "RevisionSpec_bork")
 
218
            "bzrlib.tests.test_revisionspec", "RevisionSpec_bork")
206
219
        self.assertAsRevisionId('r1', 'bork')
207
220
 
208
221
 
244
257
        # Get the right exception text
245
258
        try:
246
259
            int('X')
247
 
        except ValueError as e:
 
260
        except ValueError, e:
248
261
            pass
249
262
        self.assertInvalid('revno:X', extra='\n' + str(e))
250
263
 
255
268
    def test_invalid_number_with_branch(self):
256
269
        try:
257
270
            int('X')
258
 
        except ValueError as e:
 
271
        except ValueError, e:
259
272
            pass
260
273
        self.assertInvalid('revno:X:tree2', extra='\n' + str(e))
261
274
 
300
313
    def test_different_history_lengths(self):
301
314
        # Make sure we use the revisions and offsets in the supplied branch
302
315
        # not the ones in the original branch.
303
 
        self.tree2.commit('three', rev_id=b'r3')
 
316
        self.tree2.commit('three', rev_id='r3')
304
317
        self.assertInHistoryIs(3, 'r3', 'revno:3:tree2')
305
318
        self.assertInHistoryIs(3, 'r3', 'revno:-1:tree2')
306
319
 
309
322
                          self.get_in_history, 'revno:-1:tree3')
310
323
 
311
324
    def test_invalid_revno_in_branch(self):
312
 
        self.tree.commit('three', rev_id=b'r3')
 
325
        self.tree.commit('three', rev_id='r3')
313
326
        self.assertInvalid('revno:3:tree2')
314
327
 
315
328
    def test_revno_n_path(self):
317
330
        wta = self.make_branch_and_tree('a')
318
331
        ba = wta.branch
319
332
 
320
 
        wta.commit('Commit one', rev_id=b'a@r-0-1')
321
 
        wta.commit('Commit two', rev_id=b'a@r-0-2')
322
 
        wta.commit('Commit three', rev_id=b'a@r-0-3')
 
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
336
 
324
337
        wtb = self.make_branch_and_tree('b')
325
338
        bb = wtb.branch
326
339
 
327
 
        wtb.commit('Commit one', rev_id=b'b@r-0-1')
328
 
        wtb.commit('Commit two', rev_id=b'b@r-0-2')
329
 
        wtb.commit('Commit three', rev_id=b'b@r-0-3')
 
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')
330
343
 
331
344
 
332
345
        self.assertEqual((1, 'a@r-0-1'),
350
363
 
351
364
    def test_as_tree(self):
352
365
        tree = self.get_as_tree('0')
353
 
        self.assertEqual(_mod_revision.NULL_REVISION, tree.get_revision_id())
 
366
        self.assertEquals(_mod_revision.NULL_REVISION, tree.get_revision_id())
354
367
        tree = self.get_as_tree('1')
355
 
        self.assertEqual('r1', tree.get_revision_id())
 
368
        self.assertEquals('r1', tree.get_revision_id())
356
369
        tree = self.get_as_tree('2')
357
 
        self.assertEqual('r2', tree.get_revision_id())
 
370
        self.assertEquals('r2', tree.get_revision_id())
358
371
        tree = self.get_as_tree('-2')
359
 
        self.assertEqual('r1', tree.get_revision_id())
 
372
        self.assertEquals('r1', tree.get_revision_id())
360
373
        tree = self.get_as_tree('-1')
361
 
        self.assertEqual('r2', tree.get_revision_id())
 
374
        self.assertEquals('r2', tree.get_revision_id())
362
375
        tree = self.get_as_tree('1.1.1')
363
 
        self.assertEqual('alt_r2', tree.get_revision_id())
 
376
        self.assertEquals('alt_r2', tree.get_revision_id())
364
377
 
365
378
 
366
379
class TestRevisionSpec_revid(TestRevisionSpec):
379
392
        self.assertInHistoryIs(None, 'alt_r2', 'revid:alt_r2')
380
393
 
381
394
    def test_not_here(self):
382
 
        self.tree2.commit('alt third', rev_id=b'alt_r3')
 
395
        self.tree2.commit('alt third', rev_id='alt_r3')
383
396
        # It exists in tree2, but not in tree
384
397
        self.assertInvalid('revid:alt_r3', invalid_as_revision_id=False)
385
398
 
386
399
    def test_in_repository(self):
387
400
        """We can get any revision id in the repository"""
388
401
        # XXX: This may change in the future, but for now, it is true
389
 
        self.tree2.commit('alt third', rev_id=b'alt_r3')
 
402
        self.tree2.commit('alt third', rev_id='alt_r3')
390
403
        self.tree.branch.fetch(self.tree2.branch, 'alt_r3')
391
404
        self.assertInHistoryIs(None, 'alt_r3', 'revid:alt_r3')
392
405
 
429
442
    def test_not_a_number(self):
430
443
        try:
431
444
            int('Y')
432
 
        except ValueError as e:
 
445
        except ValueError, e:
433
446
            pass
434
447
        self.assertInvalid('last:Y', extra='\n' + str(e))
435
448
 
463
476
 
464
477
    def test_alt_no_parents(self):
465
478
        new_tree = self.make_branch_and_tree('new_tree')
466
 
        new_tree.commit('first', rev_id=b'new_r1')
 
479
        new_tree.commit('first', rev_id='new_r1')
467
480
        self.tree.branch.fetch(new_tree.branch, 'new_r1')
468
481
        self.assertInHistoryIs(0, 'null:', 'before:revid:new_r1')
469
482
 
513
526
        super(TestRevisionSpec, self).setUp()
514
527
 
515
528
        new_tree = self.make_branch_and_tree('new_tree')
516
 
        new_tree.commit('Commit one', rev_id=b'new_r1',
 
529
        new_tree.commit('Commit one', rev_id='new_r1',
517
530
                        timestamp=time.time() - 60*60*24)
518
 
        new_tree.commit('Commit two', rev_id=b'new_r2')
519
 
        new_tree.commit('Commit three', rev_id=b'new_r3')
 
531
        new_tree.commit('Commit two', rev_id='new_r2')
 
532
        new_tree.commit('Commit three', rev_id='new_r3')
520
533
 
521
534
        self.tree = new_tree
522
535
 
570
583
    def test_unrelated(self):
571
584
        new_tree = self.make_branch_and_tree('new_tree')
572
585
 
573
 
        new_tree.commit('Commit one', rev_id=b'new_r1')
574
 
        new_tree.commit('Commit two', rev_id=b'new_r2')
575
 
        new_tree.commit('Commit three', rev_id=b'new_r3')
 
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')
576
589
 
577
590
        # With no common ancestor, we should raise another user error
578
591
        self.assertRaises(errors.NoCommonAncestor,
597
610
                          'ancestor:')
598
611
 
599
612
        # Create a branch with a parent to default to
600
 
        tree3 = self.tree.controldir.sprout('tree3').open_workingtree()
601
 
        tree3.commit('foo', rev_id=b'r3')
 
613
        tree3 = self.tree.bzrdir.sprout('tree3').open_workingtree()
 
614
        tree3.commit('foo', rev_id='r3')
602
615
        self.tree = tree3
603
616
        self.assertInHistoryIs(2, 'r2', 'ancestor:')
604
617
 
620
633
    def test_unrelated(self):
621
634
        new_tree = self.make_branch_and_tree('new_tree')
622
635
 
623
 
        new_tree.commit('Commit one', rev_id=b'new_r1')
624
 
        new_tree.commit('Commit two', rev_id=b'new_r2')
625
 
        new_tree.commit('Commit three', rev_id=b'new_r3')
 
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')
626
639
 
627
640
        self.assertInHistoryIs(None, 'new_r3', 'branch:new_tree')
628
641
 
643
656
 
644
657
    def test_as_tree(self):
645
658
        tree = self.get_as_tree('branch:tree', self.tree2)
646
 
        self.assertEqual('r2', tree.get_revision_id())
 
659
        self.assertEquals('r2', tree.get_revision_id())
647
660
        self.assertFalse(self.tree2.branch.repository.has_revision('r2'))
648
661
 
649
662
 
689
702
    def setUp(self):
690
703
        super(TestRevisionSpec_annotate, self).setUp()
691
704
        self.tree = self.make_branch_and_tree('annotate-tree')
692
 
        self.build_tree_contents([('annotate-tree/file1', b'1\n')])
 
705
        self.build_tree_contents([('annotate-tree/file1', '1\n')])
693
706
        self.tree.add('file1')
694
 
        self.tree.commit('r1', rev_id=b'r1')
695
 
        self.build_tree_contents([('annotate-tree/file1', b'2\n1\n')])
696
 
        self.tree.commit('r2', rev_id=b'r2')
697
 
        self.build_tree_contents([('annotate-tree/file1', b'2\n1\n3\n')])
 
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
711
 
699
712
    def test_as_revision_id_r1(self):
700
713
        self.assertAsRevisionId('r1', 'annotate:annotate-tree/file1:2')