← 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: Martin Pool
  • Date: 2010-01-29 10:36:23 UTC
  • mto: This revision was merged to the branch mainline in revision 4992.
  • Revision ID: mbp@sourcefrog.net-20100129103623-hywka5hymo5z13jw
Change url to canonical.com or wiki, plus some doc improvements in passing

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisionspec.py
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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import datetime
18
18
import os
23
23
    bzrdir,
24
24
    errors,
25
25
    repository,
 
26
    revision as _mod_revision,
26
27
    )
27
 
from bzrlib.builtins import merge
28
28
from bzrlib.tests import TestCase, TestCaseWithTransport
29
29
from bzrlib.revisionspec import (
30
30
    RevisionSpec,
50
50
 
51
51
        self.tree = self.make_branch_and_tree('tree')
52
52
        self.build_tree(['tree/a'])
 
53
        self.tree.lock_write()
 
54
        self.addCleanup(self.tree.unlock)
53
55
        self.tree.add(['a'])
54
56
        self.tree.commit('a', rev_id='r1')
55
57
 
56
58
        self.tree2 = self.tree.bzrdir.sprout('tree2').open_workingtree()
57
59
        self.tree2.commit('alt', rev_id='alt_r2')
58
60
 
59
 
        self.tree.branch.repository.fetch(self.tree2.branch.repository,
60
 
                                          revision_id='alt_r2')
61
 
        self.tree.set_pending_merges(['alt_r2'])
 
61
        self.tree.merge_from_branch(self.tree2.branch)
62
62
        self.tree.commit('second', rev_id='r2')
63
63
 
64
64
    def get_in_history(self, revision_spec):
74
74
                         ' %r != %r'
75
75
                         % (revision_spec, exp_revision_id, rev_info.rev_id))
76
76
 
77
 
    def assertInvalid(self, revision_spec, extra=''):
 
77
    def assertInvalid(self, revision_spec, extra='',
 
78
                      invalid_as_revision_id=True):
78
79
        try:
79
80
            self.get_in_history(revision_spec)
80
81
        except errors.InvalidRevisionSpec, e:
81
82
            self.assertEqual(revision_spec, e.spec)
82
83
            self.assertEqual(extra, e.extra)
83
84
        else:
84
 
            self.fail('Expected InvalidRevisionSpec to be raised for %s'
85
 
                      % (revision_spec,))
 
85
            self.fail('Expected InvalidRevisionSpec to be raised for'
 
86
                      ' %r.in_history' % (revision_spec,))
 
87
        if invalid_as_revision_id:
 
88
            try:
 
89
                spec = RevisionSpec.from_string(revision_spec)
 
90
                spec.as_revision_id(self.tree.branch)
 
91
            except errors.InvalidRevisionSpec, e:
 
92
                self.assertEqual(revision_spec, e.spec)
 
93
                self.assertEqual(extra, e.extra)
 
94
            else:
 
95
                self.fail('Expected InvalidRevisionSpec to be raised for'
 
96
                          ' %r.as_revision_id' % (revision_spec,))
 
97
 
 
98
    def assertAsRevisionId(self, revision_id, revision_spec):
 
99
        """Calling as_revision_id() should return the specified id."""
 
100
        spec = RevisionSpec.from_string(revision_spec)
 
101
        self.assertEqual(revision_id,
 
102
                         spec.as_revision_id(self.tree.branch))
 
103
 
 
104
    def get_as_tree(self, revision_spec, tree=None):
 
105
        if tree is None:
 
106
            tree = self.tree
 
107
        spec = RevisionSpec.from_string(revision_spec)
 
108
        return spec.as_tree(tree.branch)
 
109
 
 
110
 
 
111
class RevisionSpecMatchOnTrap(RevisionSpec):
 
112
 
 
113
    def _match_on(self, branch, revs):
 
114
        self.last_call = (branch, revs)
 
115
        return super(RevisionSpecMatchOnTrap, self)._match_on(branch, revs)
 
116
 
 
117
 
 
118
class TestRevisionSpecBase(TestRevisionSpec):
 
119
 
 
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
    def test_wants_no_revision_history(self):
 
130
        # If wants_revision_history = False, then _match_on should get None for
 
131
        # the branch revision history
 
132
        spec = RevisionSpecMatchOnTrap('foo', _internal=True)
 
133
        spec.wants_revision_history = False
 
134
        spec.in_history(self.tree.branch)
 
135
 
 
136
        self.assertEqual((self.tree.branch, None), spec.last_call)
 
137
 
86
138
 
87
139
 
88
140
class TestOddRevisionSpec(TestRevisionSpec):
89
141
    """Test things that aren't normally thought of as revision specs"""
90
142
 
91
143
    def test_none(self):
92
 
        self.assertInHistoryIs(0, None, None)
 
144
        self.assertInHistoryIs(None, None, None)
93
145
 
94
146
    def test_object(self):
95
147
        self.assertRaises(TypeError, RevisionSpec.from_string, object())
96
148
 
97
 
    def test_unregistered_spec(self):
98
 
        self.assertRaises(errors.NoSuchRevisionSpec,
99
 
                          RevisionSpec.from_string, 'foo')
100
 
        self.assertRaises(errors.NoSuchRevisionSpec,
101
 
                          RevisionSpec.from_string, '123a')
102
 
 
103
 
 
104
 
 
105
 
class TestRevnoFromString(TestCase):
106
 
 
107
 
    def test_from_string_dotted_decimal(self):
108
 
        self.assertRaises(errors.NoSuchRevisionSpec, RevisionSpec.from_string, '-1.1')
109
 
        self.assertRaises(errors.NoSuchRevisionSpec, RevisionSpec.from_string, '.1')
110
 
        self.assertRaises(errors.NoSuchRevisionSpec, RevisionSpec.from_string, '1..1')
111
 
        self.assertRaises(errors.NoSuchRevisionSpec, RevisionSpec.from_string, '1.2..1')
112
 
        self.assertRaises(errors.NoSuchRevisionSpec, RevisionSpec.from_string, '1.')
113
 
        self.assertIsInstance(RevisionSpec.from_string('1.1'), RevisionSpec_revno)
114
 
        self.assertIsInstance(RevisionSpec.from_string('1.1.3'), RevisionSpec_revno)
 
149
 
 
150
class TestRevisionSpec_dwim(TestRevisionSpec):
 
151
 
 
152
    # Don't need to test revno's explicitly since TRS_revno already
 
153
    # covers that well for us
 
154
    def test_dwim_spec_revno(self):
 
155
        self.assertInHistoryIs(2, 'r2', '2')
 
156
        self.assertAsRevisionId('alt_r2', '1.1.1')
 
157
 
 
158
    def test_dwim_spec_revid(self):
 
159
        self.assertInHistoryIs(2, 'r2', 'r2')
 
160
 
 
161
    def test_dwim_spec_tag(self):
 
162
        self.tree.branch.tags.set_tag('footag', 'r1')
 
163
        self.assertAsRevisionId('r1', 'footag')
 
164
        self.tree.branch.tags.delete_tag('footag')
 
165
        self.assertRaises(errors.InvalidRevisionSpec,
 
166
                          self.get_in_history, 'footag')
 
167
 
 
168
    def test_dwim_spec_tag_that_looks_like_revno(self):
 
169
        # Test that we slip past revno with things that look like revnos,
 
170
        # but aren't.  Tags are convenient for testing this since we can
 
171
        # make them look however we want.
 
172
        self.tree.branch.tags.set_tag('3', 'r2')
 
173
        self.assertAsRevisionId('r2', '3')
 
174
        self.build_tree(['tree/b'])
 
175
        self.tree.add(['b'])
 
176
        self.tree.commit('b', rev_id='r3')
 
177
        self.assertAsRevisionId('r3', '3')
 
178
 
 
179
    def test_dwim_spec_date(self):
 
180
        self.assertAsRevisionId('r1', 'today')
 
181
 
 
182
    def test_dwim_spec_branch(self):
 
183
        self.assertInHistoryIs(None, 'alt_r2', 'tree2')
 
184
 
 
185
    def test_dwim_spec_nonexistent(self):
 
186
        self.assertInvalid('somethingrandom', invalid_as_revision_id=False)
 
187
        self.assertInvalid('-1.1', invalid_as_revision_id=False)
 
188
        self.assertInvalid('.1', invalid_as_revision_id=False)
 
189
        self.assertInvalid('1..1', invalid_as_revision_id=False)
 
190
        self.assertInvalid('1.2..1', invalid_as_revision_id=False)
 
191
        self.assertInvalid('1.', invalid_as_revision_id=False)
115
192
 
116
193
 
117
194
class TestRevisionSpec_revno(TestRevisionSpec):
118
195
 
119
196
    def test_positive_int(self):
120
 
        self.assertInHistoryIs(0, None, '0')
 
197
        self.assertInHistoryIs(0, 'null:', '0')
121
198
        self.assertInHistoryIs(1, 'r1', '1')
122
199
        self.assertInHistoryIs(2, 'r2', '2')
123
200
        self.assertInvalid('3')
124
201
 
125
202
    def test_dotted_decimal(self):
126
203
        self.assertInHistoryIs(None, 'alt_r2', '1.1.1')
 
204
        self.assertInvalid('1.1.123')
127
205
 
128
206
    def test_negative_int(self):
129
207
        self.assertInHistoryIs(2, 'r2', '-1')
134
212
        self.assertInHistoryIs(1, 'r1', '-100')
135
213
 
136
214
    def test_positive(self):
137
 
        self.assertInHistoryIs(0, None, 'revno:0')
 
215
        self.assertInHistoryIs(0, 'null:', 'revno:0')
138
216
        self.assertInHistoryIs(1, 'r1', 'revno:1')
139
217
        self.assertInHistoryIs(2, 'r2', 'revno:2')
140
218
 
223
301
        """Old revno:N:path tests"""
224
302
        wta = self.make_branch_and_tree('a')
225
303
        ba = wta.branch
226
 
        
 
304
 
227
305
        wta.commit('Commit one', rev_id='a@r-0-1')
228
306
        wta.commit('Commit two', rev_id='a@r-0-2')
229
307
        wta.commit('Commit three', rev_id='a@r-0-3')
247
325
        self.assertEqual((2, 'b@r-0-2'),
248
326
                         spec_in_history('revno:2:b/', None))
249
327
 
 
328
    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')
 
335
 
 
336
    def test_as_tree(self):
 
337
        tree = self.get_as_tree('0')
 
338
        self.assertEquals(_mod_revision.NULL_REVISION, tree.get_revision_id())
 
339
        tree = self.get_as_tree('1')
 
340
        self.assertEquals('r1', tree.get_revision_id())
 
341
        tree = self.get_as_tree('2')
 
342
        self.assertEquals('r2', tree.get_revision_id())
 
343
        tree = self.get_as_tree('-2')
 
344
        self.assertEquals('r1', tree.get_revision_id())
 
345
        tree = self.get_as_tree('-1')
 
346
        self.assertEquals('r2', tree.get_revision_id())
 
347
        tree = self.get_as_tree('1.1.1')
 
348
        self.assertEquals('alt_r2', tree.get_revision_id())
250
349
 
251
350
 
252
351
class TestRevisionSpec_revid(TestRevisionSpec):
253
 
    
 
352
 
254
353
    def test_in_history(self):
255
354
        # We should be able to access revisions that are directly
256
355
        # in the history.
257
356
        self.assertInHistoryIs(1, 'r1', 'revid:r1')
258
357
        self.assertInHistoryIs(2, 'r2', 'revid:r2')
259
 
        
 
358
 
260
359
    def test_missing(self):
261
 
        self.assertInvalid('revid:r3')
 
360
        self.assertInvalid('revid:r3', invalid_as_revision_id=False)
262
361
 
263
362
    def test_merged(self):
264
363
        """We can reach revisions in the ancestry"""
267
366
    def test_not_here(self):
268
367
        self.tree2.commit('alt third', rev_id='alt_r3')
269
368
        # It exists in tree2, but not in tree
270
 
        self.assertInvalid('revid:alt_r3')
 
369
        self.assertInvalid('revid:alt_r3', invalid_as_revision_id=False)
271
370
 
272
371
    def test_in_repository(self):
273
372
        """We can get any revision id in the repository"""
284
383
        self.assertInHistoryIs(3, revision_id, u'revid:\N{SNOWMAN}')
285
384
        self.assertInHistoryIs(3, revision_id, 'revid:' + revision_id)
286
385
 
 
386
    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')
 
390
 
287
391
 
288
392
class TestRevisionSpec_last(TestRevisionSpec):
289
393
 
290
394
    def test_positive(self):
291
395
        self.assertInHistoryIs(2, 'r2', 'last:1')
292
396
        self.assertInHistoryIs(1, 'r1', 'last:2')
293
 
        self.assertInHistoryIs(0, None, 'last:3')
 
397
        self.assertInHistoryIs(0, 'null:', 'last:3')
294
398
 
295
399
    def test_empty(self):
296
400
        self.assertInHistoryIs(2, 'r2', 'last:')
315
419
            pass
316
420
        self.assertInvalid('last:Y', extra='\n' + str(e))
317
421
 
 
422
    def test_as_revision_id(self):
 
423
        self.assertAsRevisionId('r2', 'last:1')
 
424
        self.assertAsRevisionId('r1', 'last:2')
 
425
 
318
426
 
319
427
class TestRevisionSpec_before(TestRevisionSpec):
320
428
 
323
431
        self.assertInHistoryIs(1, 'r1', 'before:-1')
324
432
 
325
433
    def test_before_one(self):
326
 
        self.assertInHistoryIs(0, None, 'before:1')
 
434
        self.assertInHistoryIs(0, 'null:', 'before:1')
327
435
 
328
436
    def test_before_none(self):
329
437
        self.assertInvalid('before:0',
344
452
        new_tree.commit('first', rev_id='new_r1')
345
453
        self.tree.branch.repository.fetch(new_tree.branch.repository,
346
454
                                          revision_id='new_r1')
347
 
        self.assertInHistoryIs(0, None, 'before:revid:new_r1')
 
455
        self.assertInHistoryIs(0, 'null:', 'before:revid:new_r1')
 
456
 
 
457
    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')
348
462
 
349
463
 
350
464
class TestRevisionSpec_tag(TestRevisionSpec):
351
 
    
 
465
 
352
466
    def make_branch_and_tree(self, relpath):
353
467
        # override format as the default one may not support tags
354
 
        control = bzrdir.BzrDir.create(relpath)
355
 
        control.create_repository()
356
 
        branch.BzrBranchExperimental.initialize(control)
357
 
        return control.create_workingtree()
 
468
        return TestRevisionSpec.make_branch_and_tree(
 
469
            self, relpath, format='dirstate-tags')
358
470
 
359
471
    def test_from_string_tag(self):
360
472
        spec = RevisionSpec.from_string('tag:bzr-0.14')
364
476
    def test_lookup_tag(self):
365
477
        self.tree.branch.tags.set_tag('bzr-0.14', 'r1')
366
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')
367
481
 
368
482
    def test_failed_lookup(self):
369
483
        # tags that don't exist give a specific message: arguably we should
372
486
            self.get_in_history,
373
487
            'tag:some-random-tag')
374
488
 
 
489
    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')
 
495
 
375
496
 
376
497
class TestRevisionSpec_date(TestRevisionSpec):
377
498
 
408
529
        self.assertInHistoryIs(2, 'new_r2',
409
530
            'date:%04d-%02d-%02d' % (now.year, now.month, now.day))
410
531
 
 
532
    def test_as_revision_id(self):
 
533
        self.assertAsRevisionId('new_r2', 'date:today')
 
534
 
411
535
 
412
536
class TestRevisionSpec_ancestor(TestRevisionSpec):
413
 
    
 
537
 
414
538
    def test_non_exact_branch(self):
415
539
        # It seems better to require an exact path to the branch
416
540
        # Branch.open() rather than using Branch.open_containing()
446
570
        self.assertRaises(errors.NoCommits,
447
571
                          spec_in_history, 'ancestor:new_tree',
448
572
                                           self.tree.branch)
449
 
                        
 
573
 
450
574
        self.assertRaises(errors.NoCommits,
451
575
                          spec_in_history, 'ancestor:tree',
452
576
                                           new_tree.branch)
453
577
 
 
578
    def test_as_revision_id(self):
 
579
        self.assertAsRevisionId('alt_r2', 'ancestor:tree2')
 
580
 
 
581
    def test_default(self):
 
582
        # We don't have a parent to default to
 
583
        self.assertRaises(errors.NotBranchError, self.get_in_history,
 
584
                          'ancestor:')
 
585
 
 
586
        # 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')
 
589
        self.tree = tree3
 
590
        self.assertInHistoryIs(2, 'r2', 'ancestor:')
 
591
 
454
592
 
455
593
class TestRevisionSpec_branch(TestRevisionSpec):
456
 
    
 
594
 
457
595
    def test_non_exact_branch(self):
458
596
        # It seems better to require an exact path to the branch
459
597
        # Branch.open() rather than using Branch.open_containing()
484
622
        new_tree = self.make_branch_and_tree('new_tree')
485
623
        self.assertRaises(errors.NoCommits,
486
624
                          self.get_in_history, 'branch:new_tree')
 
625
        self.assertRaises(errors.NoCommits,
 
626
                          self.get_as_tree, 'branch:new_tree')
 
627
 
 
628
    def test_as_revision_id(self):
 
629
        self.assertAsRevisionId('alt_r2', 'branch:tree2')
 
630
 
 
631
    def test_as_tree(self):
 
632
        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'))
487
635
 
488
636
 
489
637
class TestRevisionSpec_submit(TestRevisionSpec):
500
648
        # submit branch overrides parent branch
501
649
        self.tree.branch.set_submit_branch('tree2')
502
650
        self.assertInHistoryIs(None, 'alt_r2', 'submit:')
 
651
 
 
652
    def test_as_revision_id(self):
 
653
        self.tree.branch.set_submit_branch('tree2')
 
654
        self.assertAsRevisionId('alt_r2', 'branch:tree2')