← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisiontree.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisiontree.py
1
 
# Copyright (C) 2006, 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2008-2012, 2016 Canonical Ltd
2
2
# Authors:  Robert Collins <robert.collins@canonical.com>
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
21
21
    errors,
22
22
    revision,
23
23
    )
24
 
import bzrlib
25
 
from bzrlib.inventory import ROOT_ID
26
24
from bzrlib.tests import TestCaseWithTransport
27
25
 
28
26
 
60
58
    def test_empty_no_root(self):
61
59
        null_tree = self.t.branch.repository.revision_tree(
62
60
            revision.NULL_REVISION)
63
 
        self.assertIs(None, null_tree.inventory.root)
 
61
        self.assertIs(None, null_tree.get_root_id())
 
62
 
 
63
    def test_get_file_revision_root(self):
 
64
        self.assertEqual(self.rev_id,
 
65
            self.rev_tree.get_file_revision(self.rev_tree.get_root_id()))
 
66
 
 
67
    def test_get_file_revision(self):
 
68
        self.build_tree_contents([('a', 'initial')])
 
69
        self.t.add(['a'])
 
70
        revid1 = self.t.commit('add a')
 
71
        revid2 = self.t.commit('another change', allow_pointless=True)
 
72
        tree = self.t.branch.repository.revision_tree(revid2)
 
73
        self.assertEqual(revid1,
 
74
            tree.get_file_revision(tree.path2id('a')))
64
75
 
65
76
    def test_get_file_mtime_ghost(self):
66
 
        file_id = iter(self.rev_tree).next()
67
 
        self.rev_tree.inventory[file_id].revision = 'ghostrev'
 
77
        file_id = iter(self.rev_tree.all_file_ids()).next()
 
78
        self.rev_tree.root_inventory[file_id].revision = 'ghostrev'
68
79
        self.assertRaises(errors.FileTimestampUnavailable, 
69
80
            self.rev_tree.get_file_mtime, file_id)