~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisiontree.py

  • Committer: Vincent Ladeuil
  • Date: 2017-01-30 14:30:10 UTC
  • mfrom: (6615.3.7 merges)
  • mto: This revision was merged to the branch mainline in revision 6621.
  • Revision ID: v.ladeuil+lp@free.fr-20170130143010-p31t1ranfeqbaeki
Merge  2.7 into trunk including fix for bug #1657238

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006 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
18
18
"""Tests for the RevisionTree class."""
19
19
 
20
20
from bzrlib import (
 
21
    errors,
21
22
    revision,
22
23
    )
23
 
import bzrlib
24
24
from bzrlib.tests import TestCaseWithTransport
25
25
 
26
26
 
58
58
    def test_empty_no_root(self):
59
59
        null_tree = self.t.branch.repository.revision_tree(
60
60
            revision.NULL_REVISION)
61
 
        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')))
 
75
 
 
76
    def test_get_file_mtime_ghost(self):
 
77
        file_id = iter(self.rev_tree.all_file_ids()).next()
 
78
        self.rev_tree.root_inventory[file_id].revision = 'ghostrev'
 
79
        self.assertRaises(errors.FileTimestampUnavailable, 
 
80
            self.rev_tree.get_file_mtime, file_id)