← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisionspec.py

https://launchpad.net/bugs/524184
NEWS section template into a separate file

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
28
from bzrlib.tests import TestCase, TestCaseWithTransport
28
29
from bzrlib.revisionspec import (
100
101
        self.assertEqual(revision_id,
101
102
                         spec.as_revision_id(self.tree.branch))
102
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
 
103
110
 
104
111
class RevisionSpecMatchOnTrap(RevisionSpec):
105
112
 
169
176
 
170
177
    def test_dotted_decimal(self):
171
178
        self.assertInHistoryIs(None, 'alt_r2', '1.1.1')
 
179
        self.assertInvalid('1.1.123')
172
180
 
173
181
    def test_negative_int(self):
174
182
        self.assertInHistoryIs(2, 'r2', '-1')
268
276
        """Old revno:N:path tests"""
269
277
        wta = self.make_branch_and_tree('a')
270
278
        ba = wta.branch
271
 
        
 
279
 
272
280
        wta.commit('Commit one', rev_id='a@r-0-1')
273
281
        wta.commit('Commit two', rev_id='a@r-0-2')
274
282
        wta.commit('Commit three', rev_id='a@r-0-3')
300
308
        self.assertAsRevisionId('r2', '-1')
301
309
        self.assertAsRevisionId('alt_r2', '1.1.1')
302
310
 
 
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())
 
324
 
303
325
 
304
326
class TestRevisionSpec_revid(TestRevisionSpec):
305
 
    
 
327
 
306
328
    def test_in_history(self):
307
329
        # We should be able to access revisions that are directly
308
330
        # in the history.
309
331
        self.assertInHistoryIs(1, 'r1', 'revid:r1')
310
332
        self.assertInHistoryIs(2, 'r2', 'revid:r2')
311
 
        
 
333
 
312
334
    def test_missing(self):
313
335
        self.assertInvalid('revid:r3', invalid_as_revision_id=False)
314
336
 
415
437
 
416
438
 
417
439
class TestRevisionSpec_tag(TestRevisionSpec):
418
 
    
 
440
 
419
441
    def make_branch_and_tree(self, relpath):
420
442
        # override format as the default one may not support tags
421
443
        return TestRevisionSpec.make_branch_and_tree(
487
509
 
488
510
 
489
511
class TestRevisionSpec_ancestor(TestRevisionSpec):
490
 
    
 
512
 
491
513
    def test_non_exact_branch(self):
492
514
        # It seems better to require an exact path to the branch
493
515
        # Branch.open() rather than using Branch.open_containing()
523
545
        self.assertRaises(errors.NoCommits,
524
546
                          spec_in_history, 'ancestor:new_tree',
525
547
                                           self.tree.branch)
526
 
                        
 
548
 
527
549
        self.assertRaises(errors.NoCommits,
528
550
                          spec_in_history, 'ancestor:tree',
529
551
                                           new_tree.branch)
531
553
    def test_as_revision_id(self):
532
554
        self.assertAsRevisionId('alt_r2', 'ancestor:tree2')
533
555
 
 
556
    def test_default(self):
 
557
        # We don't have a parent to default to
 
558
        self.assertRaises(errors.NotBranchError, self.get_in_history,
 
559
                          'ancestor:')
 
560
 
 
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')
 
564
        self.tree = tree3
 
565
        self.assertInHistoryIs(2, 'r2', 'ancestor:')
 
566
 
534
567
 
535
568
class TestRevisionSpec_branch(TestRevisionSpec):
536
 
    
 
569
 
537
570
    def test_non_exact_branch(self):
538
571
        # It seems better to require an exact path to the branch
539
572
        # Branch.open() rather than using Branch.open_containing()
564
597
        new_tree = self.make_branch_and_tree('new_tree')
565
598
        self.assertRaises(errors.NoCommits,
566
599
                          self.get_in_history, 'branch:new_tree')
 
600
        self.assertRaises(errors.NoCommits,
 
601
                          self.get_as_tree, 'branch:new_tree')
567
602
 
568
603
    def test_as_revision_id(self):
569
604
        self.assertAsRevisionId('alt_r2', 'branch:tree2')
570
605
 
 
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'))
 
610
 
571
611
 
572
612
class TestRevisionSpec_submit(TestRevisionSpec):
573
613