← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisionspec.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-09-11 06:10:59 UTC
  • mfrom: (3702.1.1 trivial)
  • Revision ID: pqm@pqm.ubuntu.com-20080911061059-svzqfejar17ui4zw
(mbp) KnitVersionedFiles repr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisionspec.py
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2004, 2005, 2006, 2007 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import datetime
 
18
import os
18
19
import time
19
20
 
20
21
from bzrlib import (
 
22
    branch,
 
23
    bzrdir,
21
24
    errors,
22
 
    revision as _mod_revision,
 
25
    repository,
23
26
    )
24
 
from bzrlib.tests import TestCaseWithTransport
 
27
from bzrlib.tests import TestCase, TestCaseWithTransport
25
28
from bzrlib.revisionspec import (
26
 
    RevisionInfo,
27
29
    RevisionSpec,
28
 
    RevisionSpec_dwim,
 
30
    RevisionSpec_revno,
29
31
    RevisionSpec_tag,
30
32
    )
31
33
 
98
100
        self.assertEqual(revision_id,
99
101
                         spec.as_revision_id(self.tree.branch))
100
102
 
101
 
    def get_as_tree(self, revision_spec, tree=None):
102
 
        if tree is None:
103
 
            tree = self.tree
104
 
        spec = RevisionSpec.from_string(revision_spec)
105
 
        return spec.as_tree(tree.branch)
106
 
 
107
103
 
108
104
class RevisionSpecMatchOnTrap(RevisionSpec):
109
105
 
143
139
    def test_object(self):
144
140
        self.assertRaises(TypeError, RevisionSpec.from_string, object())
145
141
 
146
 
 
147
 
class RevisionSpec_bork(RevisionSpec):
148
 
 
149
 
    prefix = 'irrelevant:'
150
 
 
151
 
    def _match_on(self, branch, revs):
152
 
        if self.spec == "bork":
153
 
            return RevisionInfo.from_revision_id(branch, "r1", revs)
154
 
        else:
155
 
            raise errors.InvalidRevisionSpec(self.spec, branch)
156
 
 
157
 
 
158
 
class TestRevisionSpec_dwim(TestRevisionSpec):
159
 
 
160
 
    # Don't need to test revno's explicitly since TRS_revno already
161
 
    # covers that well for us
162
 
    def test_dwim_spec_revno(self):
163
 
        self.assertInHistoryIs(2, 'r2', '2')
164
 
        self.assertAsRevisionId('alt_r2', '1.1.1')
165
 
 
166
 
    def test_dwim_spec_revid(self):
167
 
        self.assertInHistoryIs(2, 'r2', 'r2')
168
 
 
169
 
    def test_dwim_spec_tag(self):
170
 
        self.tree.branch.tags.set_tag('footag', 'r1')
171
 
        self.assertAsRevisionId('r1', 'footag')
172
 
        self.tree.branch.tags.delete_tag('footag')
173
 
        self.assertRaises(errors.InvalidRevisionSpec,
174
 
                          self.get_in_history, 'footag')
175
 
 
176
 
    def test_dwim_spec_tag_that_looks_like_revno(self):
177
 
        # Test that we slip past revno with things that look like revnos,
178
 
        # but aren't.  Tags are convenient for testing this since we can
179
 
        # make them look however we want.
180
 
        self.tree.branch.tags.set_tag('3', 'r2')
181
 
        self.assertAsRevisionId('r2', '3')
182
 
        self.build_tree(['tree/b'])
183
 
        self.tree.add(['b'])
184
 
        self.tree.commit('b', rev_id='r3')
185
 
        self.assertAsRevisionId('r3', '3')
186
 
 
187
 
    def test_dwim_spec_date(self):
188
 
        self.assertAsRevisionId('r1', 'today')
189
 
 
190
 
    def test_dwim_spec_branch(self):
191
 
        self.assertInHistoryIs(None, 'alt_r2', 'tree2')
192
 
 
193
 
    def test_dwim_spec_nonexistent(self):
194
 
        self.assertInvalid('somethingrandom', invalid_as_revision_id=False)
195
 
        self.assertInvalid('-1.1', invalid_as_revision_id=False)
196
 
        self.assertInvalid('.1', invalid_as_revision_id=False)
197
 
        self.assertInvalid('1..1', invalid_as_revision_id=False)
198
 
        self.assertInvalid('1.2..1', invalid_as_revision_id=False)
199
 
        self.assertInvalid('1.', invalid_as_revision_id=False)
200
 
 
201
 
    def test_append_dwim_revspec(self):
202
 
        original_dwim_revspecs = list(RevisionSpec_dwim._possible_revspecs)
203
 
        def reset_dwim_revspecs():
204
 
            RevisionSpec_dwim._possible_revspecs = original_dwim_revspecs
205
 
        self.addCleanup(reset_dwim_revspecs)
206
 
        RevisionSpec_dwim.append_possible_revspec(RevisionSpec_bork)
207
 
        self.assertAsRevisionId('r1', 'bork')
208
 
 
209
 
    def test_append_lazy_dwim_revspec(self):
210
 
        original_dwim_revspecs = list(RevisionSpec_dwim._possible_revspecs)
211
 
        def reset_dwim_revspecs():
212
 
            RevisionSpec_dwim._possible_revspecs = original_dwim_revspecs
213
 
        self.addCleanup(reset_dwim_revspecs)
214
 
        RevisionSpec_dwim.append_possible_lazy_revspec(
215
 
            "bzrlib.tests.test_revisionspec", "RevisionSpec_bork")
216
 
        self.assertAsRevisionId('r1', 'bork')
 
142
    def test_unregistered_spec(self):
 
143
        self.assertRaises(errors.NoSuchRevisionSpec,
 
144
                          RevisionSpec.from_string, 'foo')
 
145
        self.assertRaises(errors.NoSuchRevisionSpec,
 
146
                          RevisionSpec.from_string, '123a')
 
147
 
 
148
 
 
149
 
 
150
class TestRevnoFromString(TestCase):
 
151
 
 
152
    def test_from_string_dotted_decimal(self):
 
153
        self.assertRaises(errors.NoSuchRevisionSpec, RevisionSpec.from_string, '-1.1')
 
154
        self.assertRaises(errors.NoSuchRevisionSpec, RevisionSpec.from_string, '.1')
 
155
        self.assertRaises(errors.NoSuchRevisionSpec, RevisionSpec.from_string, '1..1')
 
156
        self.assertRaises(errors.NoSuchRevisionSpec, RevisionSpec.from_string, '1.2..1')
 
157
        self.assertRaises(errors.NoSuchRevisionSpec, RevisionSpec.from_string, '1.')
 
158
        self.assertIsInstance(RevisionSpec.from_string('1.1'), RevisionSpec_revno)
 
159
        self.assertIsInstance(RevisionSpec.from_string('1.1.3'), RevisionSpec_revno)
217
160
 
218
161
 
219
162
class TestRevisionSpec_revno(TestRevisionSpec):
226
169
 
227
170
    def test_dotted_decimal(self):
228
171
        self.assertInHistoryIs(None, 'alt_r2', '1.1.1')
229
 
        self.assertInvalid('1.1.123')
230
172
 
231
173
    def test_negative_int(self):
232
174
        self.assertInHistoryIs(2, 'r2', '-1')
326
268
        """Old revno:N:path tests"""
327
269
        wta = self.make_branch_and_tree('a')
328
270
        ba = wta.branch
329
 
 
 
271
        
330
272
        wta.commit('Commit one', rev_id='a@r-0-1')
331
273
        wta.commit('Commit two', rev_id='a@r-0-2')
332
274
        wta.commit('Commit three', rev_id='a@r-0-3')
358
300
        self.assertAsRevisionId('r2', '-1')
359
301
        self.assertAsRevisionId('alt_r2', '1.1.1')
360
302
 
361
 
    def test_as_tree(self):
362
 
        tree = self.get_as_tree('0')
363
 
        self.assertEquals(_mod_revision.NULL_REVISION, tree.get_revision_id())
364
 
        tree = self.get_as_tree('1')
365
 
        self.assertEquals('r1', tree.get_revision_id())
366
 
        tree = self.get_as_tree('2')
367
 
        self.assertEquals('r2', tree.get_revision_id())
368
 
        tree = self.get_as_tree('-2')
369
 
        self.assertEquals('r1', tree.get_revision_id())
370
 
        tree = self.get_as_tree('-1')
371
 
        self.assertEquals('r2', tree.get_revision_id())
372
 
        tree = self.get_as_tree('1.1.1')
373
 
        self.assertEquals('alt_r2', tree.get_revision_id())
374
 
 
375
303
 
376
304
class TestRevisionSpec_revid(TestRevisionSpec):
377
 
 
 
305
    
378
306
    def test_in_history(self):
379
307
        # We should be able to access revisions that are directly
380
308
        # in the history.
381
309
        self.assertInHistoryIs(1, 'r1', 'revid:r1')
382
310
        self.assertInHistoryIs(2, 'r2', 'revid:r2')
383
 
 
 
311
        
384
312
    def test_missing(self):
385
313
        self.assertInvalid('revid:r3', invalid_as_revision_id=False)
386
314
 
397
325
        """We can get any revision id in the repository"""
398
326
        # XXX: This may change in the future, but for now, it is true
399
327
        self.tree2.commit('alt third', rev_id='alt_r3')
400
 
        self.tree.branch.fetch(self.tree2.branch, 'alt_r3')
 
328
        self.tree.branch.repository.fetch(self.tree2.branch.repository,
 
329
                                          revision_id='alt_r3')
401
330
        self.assertInHistoryIs(None, 'alt_r3', 'revid:alt_r3')
402
331
 
403
332
    def test_unicode(self):
474
403
    def test_alt_no_parents(self):
475
404
        new_tree = self.make_branch_and_tree('new_tree')
476
405
        new_tree.commit('first', rev_id='new_r1')
477
 
        self.tree.branch.fetch(new_tree.branch, 'new_r1')
 
406
        self.tree.branch.repository.fetch(new_tree.branch.repository,
 
407
                                          revision_id='new_r1')
478
408
        self.assertInHistoryIs(0, 'null:', 'before:revid:new_r1')
479
409
 
480
410
    def test_as_revision_id(self):
485
415
 
486
416
 
487
417
class TestRevisionSpec_tag(TestRevisionSpec):
488
 
 
 
418
    
489
419
    def make_branch_and_tree(self, relpath):
490
420
        # override format as the default one may not support tags
491
421
        return TestRevisionSpec.make_branch_and_tree(
557
487
 
558
488
 
559
489
class TestRevisionSpec_ancestor(TestRevisionSpec):
560
 
 
 
490
    
561
491
    def test_non_exact_branch(self):
562
492
        # It seems better to require an exact path to the branch
563
493
        # Branch.open() rather than using Branch.open_containing()
593
523
        self.assertRaises(errors.NoCommits,
594
524
                          spec_in_history, 'ancestor:new_tree',
595
525
                                           self.tree.branch)
596
 
 
 
526
                        
597
527
        self.assertRaises(errors.NoCommits,
598
528
                          spec_in_history, 'ancestor:tree',
599
529
                                           new_tree.branch)
601
531
    def test_as_revision_id(self):
602
532
        self.assertAsRevisionId('alt_r2', 'ancestor:tree2')
603
533
 
604
 
    def test_default(self):
605
 
        # We don't have a parent to default to
606
 
        self.assertRaises(errors.NotBranchError, self.get_in_history,
607
 
                          'ancestor:')
608
 
 
609
 
        # Create a branch with a parent to default to
610
 
        tree3 = self.tree.bzrdir.sprout('tree3').open_workingtree()
611
 
        tree3.commit('foo', rev_id='r3')
612
 
        self.tree = tree3
613
 
        self.assertInHistoryIs(2, 'r2', 'ancestor:')
614
 
 
615
534
 
616
535
class TestRevisionSpec_branch(TestRevisionSpec):
617
 
 
 
536
    
618
537
    def test_non_exact_branch(self):
619
538
        # It seems better to require an exact path to the branch
620
539
        # Branch.open() rather than using Branch.open_containing()
639
558
        # XXX: Right now, we use fetch() to make sure the remote revisions
640
559
        # have been pulled into the local branch. We may change that
641
560
        # behavior in the future.
642
 
        self.assertTrue(self.tree.branch.repository.has_revision('new_r3'))
 
561
        self.failUnless(self.tree.branch.repository.has_revision('new_r3'))
643
562
 
644
563
    def test_no_commits(self):
645
564
        new_tree = self.make_branch_and_tree('new_tree')
646
565
        self.assertRaises(errors.NoCommits,
647
566
                          self.get_in_history, 'branch:new_tree')
648
 
        self.assertRaises(errors.NoCommits,
649
 
                          self.get_as_tree, 'branch:new_tree')
650
567
 
651
568
    def test_as_revision_id(self):
652
569
        self.assertAsRevisionId('alt_r2', 'branch:tree2')
653
570
 
654
 
    def test_as_tree(self):
655
 
        tree = self.get_as_tree('branch:tree', self.tree2)
656
 
        self.assertEquals('r2', tree.get_revision_id())
657
 
        self.assertFalse(self.tree2.branch.repository.has_revision('r2'))
658
 
 
659
571
 
660
572
class TestRevisionSpec_submit(TestRevisionSpec):
661
573
 
675
587
    def test_as_revision_id(self):
676
588
        self.tree.branch.set_submit_branch('tree2')
677
589
        self.assertAsRevisionId('alt_r2', 'branch:tree2')
678
 
 
679
 
 
680
 
class TestRevisionSpec_mainline(TestRevisionSpec):
681
 
 
682
 
    def test_as_revision_id(self):
683
 
        self.assertAsRevisionId('r1', 'mainline:1')
684
 
        self.assertAsRevisionId('r2', 'mainline:1.1.1')
685
 
        self.assertAsRevisionId('r2', 'mainline:revid:alt_r2')
686
 
        spec = RevisionSpec.from_string('mainline:revid:alt_r22')
687
 
        e = self.assertRaises(errors.InvalidRevisionSpec,
688
 
                              spec.as_revision_id, self.tree.branch)
689
 
        self.assertContainsRe(str(e),
690
 
            "Requested revision: 'mainline:revid:alt_r22' does not exist in"
691
 
            " branch: ")
692
 
 
693
 
    def test_in_history(self):
694
 
        self.assertInHistoryIs(2, 'r2', 'mainline:revid:alt_r2')
695
 
 
696
 
 
697
 
class TestRevisionSpec_annotate(TestRevisionSpec):
698
 
 
699
 
    def setUp(self):
700
 
        TestRevisionSpec.setUp(self)
701
 
        self.tree = self.make_branch_and_tree('annotate-tree')
702
 
        self.build_tree_contents([('annotate-tree/file1', '1\n')])
703
 
        self.tree.add('file1')
704
 
        self.tree.commit('r1', rev_id='r1')
705
 
        self.build_tree_contents([('annotate-tree/file1', '2\n1\n')])
706
 
        self.tree.commit('r2', rev_id='r2')
707
 
        self.build_tree_contents([('annotate-tree/file1', '2\n1\n3\n')])
708
 
 
709
 
    def test_as_revision_id_r1(self):
710
 
        self.assertAsRevisionId('r1', 'annotate:annotate-tree/file1:2')
711
 
 
712
 
    def test_as_revision_id_r2(self):
713
 
        self.assertAsRevisionId('r2', 'annotate:annotate-tree/file1:1')
714
 
 
715
 
    def test_as_revision_id_uncommitted(self):
716
 
        spec = RevisionSpec.from_string('annotate:annotate-tree/file1:3')
717
 
        e = self.assertRaises(errors.InvalidRevisionSpec,
718
 
                              spec.as_revision_id, self.tree.branch)
719
 
        self.assertContainsRe(str(e),
720
 
            r"Requested revision: \'annotate:annotate-tree/file1:3\' does not"
721
 
            " exist in branch: .*\nLine 3 has not been committed.")
722
 
 
723
 
    def test_non_existent_line(self):
724
 
        spec = RevisionSpec.from_string('annotate:annotate-tree/file1:4')
725
 
        e = self.assertRaises(errors.InvalidRevisionSpec,
726
 
                              spec.as_revision_id, self.tree.branch)
727
 
        self.assertContainsRe(str(e),
728
 
            r"Requested revision: \'annotate:annotate-tree/file1:4\' does not"
729
 
            " exist in branch: .*\nNo such line: 4")
730
 
 
731
 
    def test_invalid_line(self):
732
 
        spec = RevisionSpec.from_string('annotate:annotate-tree/file1:q')
733
 
        e = self.assertRaises(errors.InvalidRevisionSpec,
734
 
                              spec.as_revision_id, self.tree.branch)
735
 
        self.assertContainsRe(str(e),
736
 
            r"Requested revision: \'annotate:annotate-tree/file1:q\' does not"
737
 
            " exist in branch: .*\nNo such line: q")
738
 
 
739
 
    def test_no_such_file(self):
740
 
        spec = RevisionSpec.from_string('annotate:annotate-tree/file2:1')
741
 
        e = self.assertRaises(errors.InvalidRevisionSpec,
742
 
                              spec.as_revision_id, self.tree.branch)
743
 
        self.assertContainsRe(str(e),
744
 
            r"Requested revision: \'annotate:annotate-tree/file2:1\' does not"
745
 
            " exist in branch: .*\nFile 'file2' is not versioned")
746
 
 
747
 
    def test_no_such_file_with_colon(self):
748
 
        spec = RevisionSpec.from_string('annotate:annotate-tree/fi:le2:1')
749
 
        e = self.assertRaises(errors.InvalidRevisionSpec,
750
 
                              spec.as_revision_id, self.tree.branch)
751
 
        self.assertContainsRe(str(e),
752
 
            r"Requested revision: \'annotate:annotate-tree/fi:le2:1\' does not"
753
 
            " exist in branch: .*\nFile 'fi:le2' is not versioned")