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')
56
58
self.tree2 = self.tree.bzrdir.sprout('tree2').open_workingtree()
57
59
self.tree2.commit('alt', rev_id='alt_r2')
59
self.tree.branch.repository.fetch(self.tree2.branch.repository,
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')
64
64
def get_in_history(self, revision_spec):
75
75
% (revision_spec, exp_revision_id, rev_info.rev_id))
77
def assertInvalid(self, revision_spec, extra=''):
77
def assertInvalid(self, revision_spec, extra='',
78
invalid_as_revision_id=True):
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)
84
self.fail('Expected InvalidRevisionSpec to be raised for %s'
85
self.fail('Expected InvalidRevisionSpec to be raised for'
86
' %r.in_history' % (revision_spec,))
87
if invalid_as_revision_id:
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)
95
self.fail('Expected InvalidRevisionSpec to be raised for'
96
' %r.as_revision_id' % (revision_spec,))
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))
104
def get_as_tree(self, revision_spec, tree=None):
107
spec = RevisionSpec.from_string(revision_spec)
108
return spec.as_tree(tree.branch)
111
class RevisionSpecMatchOnTrap(RevisionSpec):
113
def _match_on(self, branch, revs):
114
self.last_call = (branch, revs)
115
return super(RevisionSpecMatchOnTrap, self)._match_on(branch, revs)
118
class TestRevisionSpecBase(TestRevisionSpec):
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)
126
self.assertEqual((self.tree.branch, ['r1' ,'r2']),
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)
136
self.assertEqual((self.tree.branch, None), spec.last_call)
88
140
class TestOddRevisionSpec(TestRevisionSpec):
89
141
"""Test things that aren't normally thought of as revision specs"""
91
143
def test_none(self):
92
self.assertInHistoryIs(0, None, None)
144
self.assertInHistoryIs(None, None, None)
94
146
def test_object(self):
95
147
self.assertRaises(TypeError, RevisionSpec.from_string, object())
117
169
class TestRevisionSpec_revno(TestRevisionSpec):
119
171
def test_positive_int(self):
120
self.assertInHistoryIs(0, None, '0')
172
self.assertInHistoryIs(0, 'null:', '0')
121
173
self.assertInHistoryIs(1, 'r1', '1')
122
174
self.assertInHistoryIs(2, 'r2', '2')
123
175
self.assertInvalid('3')
125
177
def test_dotted_decimal(self):
126
178
self.assertInHistoryIs(None, 'alt_r2', '1.1.1')
179
self.assertInvalid('1.1.123')
128
181
def test_negative_int(self):
129
182
self.assertInHistoryIs(2, 'r2', '-1')
247
300
self.assertEqual((2, 'b@r-0-2'),
248
301
spec_in_history('revno:2:b/', None))
303
def test_as_revision_id(self):
304
self.assertAsRevisionId('null:', '0')
305
self.assertAsRevisionId('r1', '1')
306
self.assertAsRevisionId('r2', '2')
307
self.assertAsRevisionId('r1', '-2')
308
self.assertAsRevisionId('r2', '-1')
309
self.assertAsRevisionId('alt_r2', '1.1.1')
311
def test_as_tree(self):
312
tree = self.get_as_tree('0')
313
self.assertEquals(_mod_revision.NULL_REVISION, tree.get_revision_id())
314
tree = self.get_as_tree('1')
315
self.assertEquals('r1', tree.get_revision_id())
316
tree = self.get_as_tree('2')
317
self.assertEquals('r2', tree.get_revision_id())
318
tree = self.get_as_tree('-2')
319
self.assertEquals('r1', tree.get_revision_id())
320
tree = self.get_as_tree('-1')
321
self.assertEquals('r2', tree.get_revision_id())
322
tree = self.get_as_tree('1.1.1')
323
self.assertEquals('alt_r2', tree.get_revision_id())
252
326
class TestRevisionSpec_revid(TestRevisionSpec):
254
328
def test_in_history(self):
255
329
# We should be able to access revisions that are directly
256
330
# in the history.
257
331
self.assertInHistoryIs(1, 'r1', 'revid:r1')
258
332
self.assertInHistoryIs(2, 'r2', 'revid:r2')
260
334
def test_missing(self):
261
self.assertInvalid('revid:r3')
335
self.assertInvalid('revid:r3', invalid_as_revision_id=False)
263
337
def test_merged(self):
264
338
"""We can reach revisions in the ancestry"""
284
358
self.assertInHistoryIs(3, revision_id, u'revid:\N{SNOWMAN}')
285
359
self.assertInHistoryIs(3, revision_id, 'revid:' + revision_id)
361
def test_as_revision_id(self):
362
self.assertAsRevisionId('r1', 'revid:r1')
363
self.assertAsRevisionId('r2', 'revid:r2')
364
self.assertAsRevisionId('alt_r2', 'revid:alt_r2')
288
367
class TestRevisionSpec_last(TestRevisionSpec):
290
369
def test_positive(self):
291
370
self.assertInHistoryIs(2, 'r2', 'last:1')
292
371
self.assertInHistoryIs(1, 'r1', 'last:2')
293
self.assertInHistoryIs(0, None, 'last:3')
372
self.assertInHistoryIs(0, 'null:', 'last:3')
295
374
def test_empty(self):
296
375
self.assertInHistoryIs(2, 'r2', 'last:')
344
427
new_tree.commit('first', rev_id='new_r1')
345
428
self.tree.branch.repository.fetch(new_tree.branch.repository,
346
429
revision_id='new_r1')
347
self.assertInHistoryIs(0, None, 'before:revid:new_r1')
430
self.assertInHistoryIs(0, 'null:', 'before:revid:new_r1')
432
def test_as_revision_id(self):
433
self.assertAsRevisionId('r1', 'before:revid:r2')
434
self.assertAsRevisionId('r1', 'before:2')
435
self.assertAsRevisionId('r1', 'before:1.1.1')
436
self.assertAsRevisionId('r1', 'before:revid:alt_r2')
350
439
class TestRevisionSpec_tag(TestRevisionSpec):
352
441
def make_branch_and_tree(self, relpath):
353
442
# 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()
443
return TestRevisionSpec.make_branch_and_tree(
444
self, relpath, format='dirstate-tags')
359
446
def test_from_string_tag(self):
360
447
spec = RevisionSpec.from_string('tag:bzr-0.14')
408
504
self.assertInHistoryIs(2, 'new_r2',
409
505
'date:%04d-%02d-%02d' % (now.year, now.month, now.day))
507
def test_as_revision_id(self):
508
self.assertAsRevisionId('new_r2', 'date:today')
412
511
class TestRevisionSpec_ancestor(TestRevisionSpec):
414
513
def test_non_exact_branch(self):
415
514
# It seems better to require an exact path to the branch
416
515
# Branch.open() rather than using Branch.open_containing()
446
545
self.assertRaises(errors.NoCommits,
447
546
spec_in_history, 'ancestor:new_tree',
448
547
self.tree.branch)
450
549
self.assertRaises(errors.NoCommits,
451
550
spec_in_history, 'ancestor:tree',
553
def test_as_revision_id(self):
554
self.assertAsRevisionId('alt_r2', 'ancestor:tree2')
556
def test_default(self):
557
# We don't have a parent to default to
558
self.assertRaises(errors.NotBranchError, self.get_in_history,
561
# Create a branch with a parent to default to
562
tree3 = self.tree.bzrdir.sprout('tree3').open_workingtree()
563
tree3.commit('foo', rev_id='r3')
565
self.assertInHistoryIs(2, 'r2', 'ancestor:')
455
568
class TestRevisionSpec_branch(TestRevisionSpec):
457
570
def test_non_exact_branch(self):
458
571
# It seems better to require an exact path to the branch
459
572
# Branch.open() rather than using Branch.open_containing()
484
597
new_tree = self.make_branch_and_tree('new_tree')
485
598
self.assertRaises(errors.NoCommits,
486
599
self.get_in_history, 'branch:new_tree')
600
self.assertRaises(errors.NoCommits,
601
self.get_as_tree, 'branch:new_tree')
603
def test_as_revision_id(self):
604
self.assertAsRevisionId('alt_r2', 'branch:tree2')
606
def test_as_tree(self):
607
tree = self.get_as_tree('branch:tree', self.tree2)
608
self.assertEquals('r2', tree.get_revision_id())
609
self.assertFalse(self.tree2.branch.repository.has_revision('r2'))
489
612
class TestRevisionSpec_submit(TestRevisionSpec):