1
# Copyright (C) 2005-2012, 2016 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
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
22
revision as _mod_revision,
24
from breezy.tests import TestCaseWithTransport
25
from breezy.revisionspec import (
33
def spec_in_history(spec, branch):
34
"""A simple helper to change a revision spec into a branch search"""
35
return RevisionSpec.from_string(spec).in_history(branch)
38
# Basic class, which just creates a really basic set of revisions
39
class TestRevisionSpec(TestCaseWithTransport):
42
super(TestRevisionSpec, self).setUp()
43
# this sets up a revision graph:
48
self.tree = self.make_branch_and_tree('tree')
49
self.build_tree(['tree/a'])
50
self.tree.lock_write()
51
self.addCleanup(self.tree.unlock)
53
self.tree.commit('a', rev_id='r1')
55
self.tree2 = self.tree.bzrdir.sprout('tree2').open_workingtree()
56
self.tree2.commit('alt', rev_id='alt_r2')
58
self.tree.merge_from_branch(self.tree2.branch)
59
self.tree.commit('second', rev_id='r2')
61
def get_in_history(self, revision_spec):
62
return spec_in_history(revision_spec, self.tree.branch)
64
def assertInHistoryIs(self, exp_revno, exp_revision_id, revision_spec):
65
rev_info = self.get_in_history(revision_spec)
66
self.assertEqual(exp_revno, rev_info.revno,
67
'Revision spec: %r returned wrong revno: %r != %r'
68
% (revision_spec, exp_revno, rev_info.revno))
69
self.assertEqual(exp_revision_id, rev_info.rev_id,
70
'Revision spec: %r returned wrong revision id:'
72
% (revision_spec, exp_revision_id, rev_info.rev_id))
74
def assertInvalid(self, revision_spec, extra='',
75
invalid_as_revision_id=True):
77
self.get_in_history(revision_spec)
78
except errors.InvalidRevisionSpec as e:
79
self.assertEqual(revision_spec, e.spec)
80
self.assertEqual(extra, e.extra)
82
self.fail('Expected InvalidRevisionSpec to be raised for'
83
' %r.in_history' % (revision_spec,))
84
if invalid_as_revision_id:
86
spec = RevisionSpec.from_string(revision_spec)
87
spec.as_revision_id(self.tree.branch)
88
except errors.InvalidRevisionSpec as e:
89
self.assertEqual(revision_spec, e.spec)
90
self.assertEqual(extra, e.extra)
92
self.fail('Expected InvalidRevisionSpec to be raised for'
93
' %r.as_revision_id' % (revision_spec,))
95
def assertAsRevisionId(self, revision_id, revision_spec):
96
"""Calling as_revision_id() should return the specified id."""
97
spec = RevisionSpec.from_string(revision_spec)
98
self.assertEqual(revision_id,
99
spec.as_revision_id(self.tree.branch))
101
def get_as_tree(self, revision_spec, tree=None):
104
spec = RevisionSpec.from_string(revision_spec)
105
return spec.as_tree(tree.branch)
108
class RevisionSpecMatchOnTrap(RevisionSpec):
110
def _match_on(self, branch, revs):
111
self.last_call = (branch, revs)
112
return super(RevisionSpecMatchOnTrap, self)._match_on(branch, revs)
115
class TestRevisionSpecBase(TestRevisionSpec):
117
def test_wants_no_revision_history(self):
118
# If wants_revision_history = False, then _match_on should get None for
119
# the branch revision history
120
spec = RevisionSpecMatchOnTrap('foo', _internal=True)
121
spec.in_history(self.tree.branch)
123
self.assertEqual((self.tree.branch, None), spec.last_call)
127
class TestOddRevisionSpec(TestRevisionSpec):
128
"""Test things that aren't normally thought of as revision specs"""
131
self.assertInHistoryIs(None, None, None)
133
def test_object(self):
134
self.assertRaises(TypeError, RevisionSpec.from_string, object())
137
class RevisionSpec_bork(RevisionSpec):
139
prefix = 'irrelevant:'
141
def _match_on(self, branch, revs):
142
if self.spec == "bork":
143
return RevisionInfo.from_revision_id(branch, "r1")
145
raise errors.InvalidRevisionSpec(self.spec, branch)
148
class TestRevisionSpec_dwim(TestRevisionSpec):
150
# Don't need to test revno's explicitly since TRS_revno already
151
# covers that well for us
152
def test_dwim_spec_revno(self):
153
self.assertInHistoryIs(2, 'r2', '2')
154
self.assertAsRevisionId('alt_r2', '1.1.1')
156
def test_dwim_spec_revid(self):
157
self.assertInHistoryIs(2, 'r2', 'r2')
159
def test_dwim_spec_tag(self):
160
self.tree.branch.tags.set_tag('footag', 'r1')
161
self.assertAsRevisionId('r1', 'footag')
162
self.tree.branch.tags.delete_tag('footag')
163
self.assertRaises(errors.InvalidRevisionSpec,
164
self.get_in_history, 'footag')
166
def test_dwim_spec_tag_that_looks_like_revno(self):
167
# Test that we slip past revno with things that look like revnos,
168
# but aren't. Tags are convenient for testing this since we can
169
# make them look however we want.
170
self.tree.branch.tags.set_tag('3', 'r2')
171
self.assertAsRevisionId('r2', '3')
172
self.build_tree(['tree/b'])
174
self.tree.commit('b', rev_id='r3')
175
self.assertAsRevisionId('r3', '3')
177
def test_dwim_spec_date(self):
178
self.assertAsRevisionId('r1', 'today')
180
def test_dwim_spec_branch(self):
181
self.assertInHistoryIs(None, 'alt_r2', 'tree2')
183
def test_dwim_spec_nonexistent(self):
184
self.assertInvalid('somethingrandom', invalid_as_revision_id=False)
185
self.assertInvalid('-1.1', invalid_as_revision_id=False)
186
self.assertInvalid('.1', invalid_as_revision_id=False)
187
self.assertInvalid('1..1', invalid_as_revision_id=False)
188
self.assertInvalid('1.2..1', invalid_as_revision_id=False)
189
self.assertInvalid('1.', invalid_as_revision_id=False)
191
def test_append_dwim_revspec(self):
192
original_dwim_revspecs = list(RevisionSpec_dwim._possible_revspecs)
193
def reset_dwim_revspecs():
194
RevisionSpec_dwim._possible_revspecs = original_dwim_revspecs
195
self.addCleanup(reset_dwim_revspecs)
196
RevisionSpec_dwim.append_possible_revspec(RevisionSpec_bork)
197
self.assertAsRevisionId('r1', 'bork')
199
def test_append_lazy_dwim_revspec(self):
200
original_dwim_revspecs = list(RevisionSpec_dwim._possible_revspecs)
201
def reset_dwim_revspecs():
202
RevisionSpec_dwim._possible_revspecs = original_dwim_revspecs
203
self.addCleanup(reset_dwim_revspecs)
204
RevisionSpec_dwim.append_possible_lazy_revspec(
205
"breezy.tests.test_revisionspec", "RevisionSpec_bork")
206
self.assertAsRevisionId('r1', 'bork')
209
class TestRevisionSpec_revno(TestRevisionSpec):
211
def test_positive_int(self):
212
self.assertInHistoryIs(0, 'null:', '0')
213
self.assertInHistoryIs(1, 'r1', '1')
214
self.assertInHistoryIs(2, 'r2', '2')
215
self.assertInvalid('3')
217
def test_dotted_decimal(self):
218
self.assertInHistoryIs(None, 'alt_r2', '1.1.1')
219
self.assertInvalid('1.1.123')
221
def test_negative_int(self):
222
self.assertInHistoryIs(2, 'r2', '-1')
223
self.assertInHistoryIs(1, 'r1', '-2')
225
self.assertInHistoryIs(1, 'r1', '-3')
226
self.assertInHistoryIs(1, 'r1', '-4')
227
self.assertInHistoryIs(1, 'r1', '-100')
229
def test_positive(self):
230
self.assertInHistoryIs(0, 'null:', 'revno:0')
231
self.assertInHistoryIs(1, 'r1', 'revno:1')
232
self.assertInHistoryIs(2, 'r2', 'revno:2')
234
self.assertInvalid('revno:3')
236
def test_negative(self):
237
self.assertInHistoryIs(2, 'r2', 'revno:-1')
238
self.assertInHistoryIs(1, 'r1', 'revno:-2')
240
self.assertInHistoryIs(1, 'r1', 'revno:-3')
241
self.assertInHistoryIs(1, 'r1', 'revno:-4')
243
def test_invalid_number(self):
244
# Get the right exception text
247
except ValueError as e:
249
self.assertInvalid('revno:X', extra='\n' + str(e))
251
def test_missing_number_and_branch(self):
252
self.assertInvalid('revno::',
253
extra='\ncannot have an empty revno and no branch')
255
def test_invalid_number_with_branch(self):
258
except ValueError as e:
260
self.assertInvalid('revno:X:tree2', extra='\n' + str(e))
262
def test_non_exact_branch(self):
263
# It seems better to require an exact path to the branch
264
# Branch.open() rather than using Branch.open_containing()
265
spec = RevisionSpec.from_string('revno:2:tree2/a')
266
self.assertRaises(errors.NotBranchError,
267
spec.in_history, self.tree.branch)
269
def test_with_branch(self):
270
# Passing a URL overrides the supplied branch path
271
revinfo = self.get_in_history('revno:2:tree2')
272
self.assertNotEqual(self.tree.branch.base, revinfo.branch.base)
273
self.assertEqual(self.tree2.branch.base, revinfo.branch.base)
274
self.assertEqual(2, revinfo.revno)
275
self.assertEqual('alt_r2', revinfo.rev_id)
277
def test_int_with_branch(self):
278
revinfo = self.get_in_history('2:tree2')
279
self.assertNotEqual(self.tree.branch.base, revinfo.branch.base)
280
self.assertEqual(self.tree2.branch.base, revinfo.branch.base)
281
self.assertEqual(2, revinfo.revno)
282
self.assertEqual('alt_r2', revinfo.rev_id)
284
def test_with_url(self):
285
url = self.get_url() + '/tree2'
286
revinfo = self.get_in_history('revno:2:%s' % (url,))
287
self.assertNotEqual(self.tree.branch.base, revinfo.branch.base)
288
self.assertEqual(self.tree2.branch.base, revinfo.branch.base)
289
self.assertEqual(2, revinfo.revno)
290
self.assertEqual('alt_r2', revinfo.rev_id)
292
def test_negative_with_url(self):
293
url = self.get_url() + '/tree2'
294
revinfo = self.get_in_history('revno:-1:%s' % (url,))
295
self.assertNotEqual(self.tree.branch.base, revinfo.branch.base)
296
self.assertEqual(self.tree2.branch.base, revinfo.branch.base)
297
self.assertEqual(2, revinfo.revno)
298
self.assertEqual('alt_r2', revinfo.rev_id)
300
def test_different_history_lengths(self):
301
# Make sure we use the revisions and offsets in the supplied branch
302
# not the ones in the original branch.
303
self.tree2.commit('three', rev_id='r3')
304
self.assertInHistoryIs(3, 'r3', 'revno:3:tree2')
305
self.assertInHistoryIs(3, 'r3', 'revno:-1:tree2')
307
def test_invalid_branch(self):
308
self.assertRaises(errors.NotBranchError,
309
self.get_in_history, 'revno:-1:tree3')
311
def test_invalid_revno_in_branch(self):
312
self.tree.commit('three', rev_id='r3')
313
self.assertInvalid('revno:3:tree2')
315
def test_revno_n_path(self):
316
"""Old revno:N:path tests"""
317
wta = self.make_branch_and_tree('a')
320
wta.commit('Commit one', rev_id='a@r-0-1')
321
wta.commit('Commit two', rev_id='a@r-0-2')
322
wta.commit('Commit three', rev_id='a@r-0-3')
324
wtb = self.make_branch_and_tree('b')
327
wtb.commit('Commit one', rev_id='b@r-0-1')
328
wtb.commit('Commit two', rev_id='b@r-0-2')
329
wtb.commit('Commit three', rev_id='b@r-0-3')
332
self.assertEqual((1, 'a@r-0-1'),
333
spec_in_history('revno:1:a/', ba))
334
# The argument of in_history should be ignored since it is
335
# redundant with the path in the spec.
336
self.assertEqual((1, 'a@r-0-1'),
337
spec_in_history('revno:1:a/', None))
338
self.assertEqual((1, 'a@r-0-1'),
339
spec_in_history('revno:1:a/', bb))
340
self.assertEqual((2, 'b@r-0-2'),
341
spec_in_history('revno:2:b/', None))
343
def test_as_revision_id(self):
344
self.assertAsRevisionId('null:', '0')
345
self.assertAsRevisionId('r1', '1')
346
self.assertAsRevisionId('r2', '2')
347
self.assertAsRevisionId('r1', '-2')
348
self.assertAsRevisionId('r2', '-1')
349
self.assertAsRevisionId('alt_r2', '1.1.1')
351
def test_as_tree(self):
352
tree = self.get_as_tree('0')
353
self.assertEqual(_mod_revision.NULL_REVISION, tree.get_revision_id())
354
tree = self.get_as_tree('1')
355
self.assertEqual('r1', tree.get_revision_id())
356
tree = self.get_as_tree('2')
357
self.assertEqual('r2', tree.get_revision_id())
358
tree = self.get_as_tree('-2')
359
self.assertEqual('r1', tree.get_revision_id())
360
tree = self.get_as_tree('-1')
361
self.assertEqual('r2', tree.get_revision_id())
362
tree = self.get_as_tree('1.1.1')
363
self.assertEqual('alt_r2', tree.get_revision_id())
366
class TestRevisionSpec_revid(TestRevisionSpec):
368
def test_in_history(self):
369
# We should be able to access revisions that are directly
371
self.assertInHistoryIs(1, 'r1', 'revid:r1')
372
self.assertInHistoryIs(2, 'r2', 'revid:r2')
374
def test_missing(self):
375
self.assertInvalid('revid:r3', invalid_as_revision_id=False)
377
def test_merged(self):
378
"""We can reach revisions in the ancestry"""
379
self.assertInHistoryIs(None, 'alt_r2', 'revid:alt_r2')
381
def test_not_here(self):
382
self.tree2.commit('alt third', rev_id='alt_r3')
383
# It exists in tree2, but not in tree
384
self.assertInvalid('revid:alt_r3', invalid_as_revision_id=False)
386
def test_in_repository(self):
387
"""We can get any revision id in the repository"""
388
# XXX: This may change in the future, but for now, it is true
389
self.tree2.commit('alt third', rev_id='alt_r3')
390
self.tree.branch.fetch(self.tree2.branch, 'alt_r3')
391
self.assertInHistoryIs(None, 'alt_r3', 'revid:alt_r3')
393
def test_unicode(self):
394
"""We correctly convert a unicode ui string to an encoded revid."""
395
revision_id = u'\N{SNOWMAN}'.encode('utf-8')
396
self.tree.commit('unicode', rev_id=revision_id)
397
self.assertInHistoryIs(3, revision_id, u'revid:\N{SNOWMAN}')
398
self.assertInHistoryIs(3, revision_id, 'revid:' + revision_id)
400
def test_as_revision_id(self):
401
self.assertAsRevisionId('r1', 'revid:r1')
402
self.assertAsRevisionId('r2', 'revid:r2')
403
self.assertAsRevisionId('alt_r2', 'revid:alt_r2')
406
class TestRevisionSpec_last(TestRevisionSpec):
408
def test_positive(self):
409
self.assertInHistoryIs(2, 'r2', 'last:1')
410
self.assertInHistoryIs(1, 'r1', 'last:2')
411
self.assertInHistoryIs(0, 'null:', 'last:3')
413
def test_empty(self):
414
self.assertInHistoryIs(2, 'r2', 'last:')
416
def test_negative(self):
417
self.assertInvalid('last:-1',
418
extra='\nyou must supply a positive value')
420
def test_missing(self):
421
self.assertInvalid('last:4')
423
def test_no_history(self):
424
tree = self.make_branch_and_tree('tree3')
426
self.assertRaises(errors.NoCommits,
427
spec_in_history, 'last:', tree.branch)
429
def test_not_a_number(self):
432
except ValueError as e:
434
self.assertInvalid('last:Y', extra='\n' + str(e))
436
def test_as_revision_id(self):
437
self.assertAsRevisionId('r2', 'last:1')
438
self.assertAsRevisionId('r1', 'last:2')
441
class TestRevisionSpec_before(TestRevisionSpec):
444
self.assertInHistoryIs(1, 'r1', 'before:2')
445
self.assertInHistoryIs(1, 'r1', 'before:-1')
447
def test_before_one(self):
448
self.assertInHistoryIs(0, 'null:', 'before:1')
450
def test_before_none(self):
451
self.assertInvalid('before:0',
452
extra='\ncannot go before the null: revision')
454
def test_revid(self):
455
self.assertInHistoryIs(1, 'r1', 'before:revid:r2')
458
self.assertInHistoryIs(1, 'r1', 'before:last:1')
460
def test_alt_revid(self):
461
# This will grab the left-most ancestor for alternate histories
462
self.assertInHistoryIs(1, 'r1', 'before:revid:alt_r2')
464
def test_alt_no_parents(self):
465
new_tree = self.make_branch_and_tree('new_tree')
466
new_tree.commit('first', rev_id='new_r1')
467
self.tree.branch.fetch(new_tree.branch, 'new_r1')
468
self.assertInHistoryIs(0, 'null:', 'before:revid:new_r1')
470
def test_as_revision_id(self):
471
self.assertAsRevisionId('r1', 'before:revid:r2')
472
self.assertAsRevisionId('r1', 'before:2')
473
self.assertAsRevisionId('r1', 'before:1.1.1')
474
self.assertAsRevisionId('r1', 'before:revid:alt_r2')
477
class TestRevisionSpec_tag(TestRevisionSpec):
479
def make_branch_and_tree(self, relpath):
480
# override format as the default one may not support tags
481
return TestRevisionSpec.make_branch_and_tree(
482
self, relpath, format='dirstate-tags')
484
def test_from_string_tag(self):
485
spec = RevisionSpec.from_string('tag:bzr-0.14')
486
self.assertIsInstance(spec, RevisionSpec_tag)
487
self.assertEqual(spec.spec, 'bzr-0.14')
489
def test_lookup_tag(self):
490
self.tree.branch.tags.set_tag('bzr-0.14', 'r1')
491
self.assertInHistoryIs(1, 'r1', 'tag:bzr-0.14')
492
self.tree.branch.tags.set_tag('null_rev', 'null:')
493
self.assertInHistoryIs(0, 'null:', 'tag:null_rev')
495
def test_failed_lookup(self):
496
# tags that don't exist give a specific message: arguably we should
497
# just give InvalidRevisionSpec but I think this is more helpful
498
self.assertRaises(errors.NoSuchTag,
500
'tag:some-random-tag')
502
def test_as_revision_id(self):
503
self.tree.branch.tags.set_tag('my-tag', 'r2')
504
self.tree.branch.tags.set_tag('null_rev', 'null:')
505
self.assertAsRevisionId('r2', 'tag:my-tag')
506
self.assertAsRevisionId('null:', 'tag:null_rev')
507
self.assertAsRevisionId('r1', 'before:tag:my-tag')
510
class TestRevisionSpec_date(TestRevisionSpec):
513
super(TestRevisionSpec, self).setUp()
515
new_tree = self.make_branch_and_tree('new_tree')
516
new_tree.commit('Commit one', rev_id='new_r1',
517
timestamp=time.time() - 60*60*24)
518
new_tree.commit('Commit two', rev_id='new_r2')
519
new_tree.commit('Commit three', rev_id='new_r3')
523
def test_tomorrow(self):
524
self.assertInvalid('date:tomorrow')
526
def test_today(self):
527
self.assertInHistoryIs(2, 'new_r2', 'date:today')
528
self.assertInHistoryIs(1, 'new_r1', 'before:date:today')
530
def test_yesterday(self):
531
self.assertInHistoryIs(1, 'new_r1', 'date:yesterday')
533
def test_invalid(self):
534
self.assertInvalid('date:foobar', extra='\ninvalid date')
535
# You must have '-' between year/month/day
536
self.assertInvalid('date:20040404', extra='\ninvalid date')
537
# Need 2 digits for each date piece
538
self.assertInvalid('date:2004-4-4', extra='\ninvalid date')
541
now = datetime.datetime.now()
542
self.assertInHistoryIs(2, 'new_r2',
543
'date:%04d-%02d-%02d' % (now.year, now.month, now.day))
545
def test_as_revision_id(self):
546
self.assertAsRevisionId('new_r2', 'date:today')
549
class TestRevisionSpec_ancestor(TestRevisionSpec):
551
def test_non_exact_branch(self):
552
# It seems better to require an exact path to the branch
553
# Branch.open() rather than using Branch.open_containing()
554
self.assertRaises(errors.NotBranchError,
555
self.get_in_history, 'ancestor:tree2/a')
557
def test_simple(self):
558
# Common ancestor of trees is 'alt_r2'
559
self.assertInHistoryIs(None, 'alt_r2', 'ancestor:tree2')
561
# Going the other way, we get a valid revno
563
self.tree = self.tree2
565
self.assertInHistoryIs(2, 'alt_r2', 'ancestor:tree')
568
self.assertInHistoryIs(2, 'r2', 'ancestor:tree')
570
def test_unrelated(self):
571
new_tree = self.make_branch_and_tree('new_tree')
573
new_tree.commit('Commit one', rev_id='new_r1')
574
new_tree.commit('Commit two', rev_id='new_r2')
575
new_tree.commit('Commit three', rev_id='new_r3')
577
# With no common ancestor, we should raise another user error
578
self.assertRaises(errors.NoCommonAncestor,
579
self.get_in_history, 'ancestor:new_tree')
581
def test_no_commits(self):
582
new_tree = self.make_branch_and_tree('new_tree')
583
self.assertRaises(errors.NoCommits,
584
spec_in_history, 'ancestor:new_tree',
587
self.assertRaises(errors.NoCommits,
588
spec_in_history, 'ancestor:tree',
591
def test_as_revision_id(self):
592
self.assertAsRevisionId('alt_r2', 'ancestor:tree2')
594
def test_default(self):
595
# We don't have a parent to default to
596
self.assertRaises(errors.NotBranchError, self.get_in_history,
599
# Create a branch with a parent to default to
600
tree3 = self.tree.bzrdir.sprout('tree3').open_workingtree()
601
tree3.commit('foo', rev_id='r3')
603
self.assertInHistoryIs(2, 'r2', 'ancestor:')
606
class TestRevisionSpec_branch(TestRevisionSpec):
608
def test_non_exact_branch(self):
609
# It seems better to require an exact path to the branch
610
# Branch.open() rather than using Branch.open_containing()
611
self.assertRaises(errors.NotBranchError,
612
self.get_in_history, 'branch:tree2/a')
614
def test_simple(self):
615
self.assertInHistoryIs(None, 'alt_r2', 'branch:tree2')
618
self.assertInHistoryIs(2, 'r2', 'branch:tree')
620
def test_unrelated(self):
621
new_tree = self.make_branch_and_tree('new_tree')
623
new_tree.commit('Commit one', rev_id='new_r1')
624
new_tree.commit('Commit two', rev_id='new_r2')
625
new_tree.commit('Commit three', rev_id='new_r3')
627
self.assertInHistoryIs(None, 'new_r3', 'branch:new_tree')
629
# XXX: Right now, we use fetch() to make sure the remote revisions
630
# have been pulled into the local branch. We may change that
631
# behavior in the future.
632
self.assertTrue(self.tree.branch.repository.has_revision('new_r3'))
634
def test_no_commits(self):
635
new_tree = self.make_branch_and_tree('new_tree')
636
self.assertRaises(errors.NoCommits,
637
self.get_in_history, 'branch:new_tree')
638
self.assertRaises(errors.NoCommits,
639
self.get_as_tree, 'branch:new_tree')
641
def test_as_revision_id(self):
642
self.assertAsRevisionId('alt_r2', 'branch:tree2')
644
def test_as_tree(self):
645
tree = self.get_as_tree('branch:tree', self.tree2)
646
self.assertEqual('r2', tree.get_revision_id())
647
self.assertFalse(self.tree2.branch.repository.has_revision('r2'))
650
class TestRevisionSpec_submit(TestRevisionSpec):
652
def test_submit_branch(self):
653
# Common ancestor of trees is 'alt_r2'
654
self.assertRaises(errors.NoSubmitBranch, self.get_in_history,
656
self.tree.branch.set_parent('../tree2')
657
self.assertInHistoryIs(None, 'alt_r2', 'submit:')
658
self.tree.branch.set_parent('bogus')
659
self.assertRaises(errors.NotBranchError, self.get_in_history,
661
# submit branch overrides parent branch
662
self.tree.branch.set_submit_branch('tree2')
663
self.assertInHistoryIs(None, 'alt_r2', 'submit:')
665
def test_as_revision_id(self):
666
self.tree.branch.set_submit_branch('tree2')
667
self.assertAsRevisionId('alt_r2', 'branch:tree2')
670
class TestRevisionSpec_mainline(TestRevisionSpec):
672
def test_as_revision_id(self):
673
self.assertAsRevisionId('r1', 'mainline:1')
674
self.assertAsRevisionId('r2', 'mainline:1.1.1')
675
self.assertAsRevisionId('r2', 'mainline:revid:alt_r2')
676
spec = RevisionSpec.from_string('mainline:revid:alt_r22')
677
e = self.assertRaises(errors.InvalidRevisionSpec,
678
spec.as_revision_id, self.tree.branch)
679
self.assertContainsRe(str(e),
680
"Requested revision: 'mainline:revid:alt_r22' does not exist in"
683
def test_in_history(self):
684
self.assertInHistoryIs(2, 'r2', 'mainline:revid:alt_r2')
687
class TestRevisionSpec_annotate(TestRevisionSpec):
690
super(TestRevisionSpec_annotate, self).setUp()
691
self.tree = self.make_branch_and_tree('annotate-tree')
692
self.build_tree_contents([('annotate-tree/file1', '1\n')])
693
self.tree.add('file1')
694
self.tree.commit('r1', rev_id='r1')
695
self.build_tree_contents([('annotate-tree/file1', '2\n1\n')])
696
self.tree.commit('r2', rev_id='r2')
697
self.build_tree_contents([('annotate-tree/file1', '2\n1\n3\n')])
699
def test_as_revision_id_r1(self):
700
self.assertAsRevisionId('r1', 'annotate:annotate-tree/file1:2')
702
def test_as_revision_id_r2(self):
703
self.assertAsRevisionId('r2', 'annotate:annotate-tree/file1:1')
705
def test_as_revision_id_uncommitted(self):
706
spec = RevisionSpec.from_string('annotate:annotate-tree/file1:3')
707
e = self.assertRaises(errors.InvalidRevisionSpec,
708
spec.as_revision_id, self.tree.branch)
709
self.assertContainsRe(str(e),
710
r"Requested revision: \'annotate:annotate-tree/file1:3\' does not"
711
" exist in branch: .*\nLine 3 has not been committed.")
713
def test_non_existent_line(self):
714
spec = RevisionSpec.from_string('annotate:annotate-tree/file1:4')
715
e = self.assertRaises(errors.InvalidRevisionSpec,
716
spec.as_revision_id, self.tree.branch)
717
self.assertContainsRe(str(e),
718
r"Requested revision: \'annotate:annotate-tree/file1:4\' does not"
719
" exist in branch: .*\nNo such line: 4")
721
def test_invalid_line(self):
722
spec = RevisionSpec.from_string('annotate:annotate-tree/file1:q')
723
e = self.assertRaises(errors.InvalidRevisionSpec,
724
spec.as_revision_id, self.tree.branch)
725
self.assertContainsRe(str(e),
726
r"Requested revision: \'annotate:annotate-tree/file1:q\' does not"
727
" exist in branch: .*\nNo such line: q")
729
def test_no_such_file(self):
730
spec = RevisionSpec.from_string('annotate:annotate-tree/file2:1')
731
e = self.assertRaises(errors.InvalidRevisionSpec,
732
spec.as_revision_id, self.tree.branch)
733
self.assertContainsRe(str(e),
734
r"Requested revision: \'annotate:annotate-tree/file2:1\' does not"
735
" exist in branch: .*\nFile 'file2' is not versioned")
737
def test_no_such_file_with_colon(self):
738
spec = RevisionSpec.from_string('annotate:annotate-tree/fi:le2:1')
739
e = self.assertRaises(errors.InvalidRevisionSpec,
740
spec.as_revision_id, self.tree.branch)
741
self.assertContainsRe(str(e),
742
r"Requested revision: \'annotate:annotate-tree/fi:le2:1\' does not"
743
" exist in branch: .*\nFile 'fi:le2' is not versioned")
added
removed
breezy/tests/test_revisionspec.py
