2052.3.2
by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical |
1 |
# Copyright (C) 2006 Canonical Ltd
|
1740.3.1
by Jelmer Vernooij
Introduce and use CommitBuilder objects. |
2 |
#
|
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.
|
|
7 |
#
|
|
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.
|
|
12 |
#
|
|
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
17 |
"""Tests for repository commit builder."""
|
|
18 |
||
1910.2.6
by Aaron Bentley
Update for merge review, handle deprecations |
19 |
from bzrlib import inventory |
2150.2.2
by Robert Collins
Change the commit builder selected-revision-id test to use a unicode revision id where possible, leading to stricter testing of the hypothetical unicode revision id support in bzr. |
20 |
from bzrlib.errors import NonAsciiRevisionId, CannotSetRevisionId |
1740.3.1
by Jelmer Vernooij
Introduce and use CommitBuilder objects. |
21 |
from bzrlib.repository import CommitBuilder |
1910.2.22
by Aaron Bentley
Make commits preserve root entry data |
22 |
from bzrlib import tests |
1740.3.1
by Jelmer Vernooij
Introduce and use CommitBuilder objects. |
23 |
from bzrlib.tests.repository_implementations.test_repository import TestCaseWithRepository |
24 |
||
25 |
||
26 |
class TestCommitBuilder(TestCaseWithRepository): |
|
1740.3.3
by Jelmer Vernooij
Move storing directories and links to commit builder. |
27 |
|
1740.3.10
by Jelmer Vernooij
Fix some minor issues pointed out by j-a-m. |
28 |
def test_get_commit_builder(self): |
1740.3.7
by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder. |
29 |
tree = self.make_branch_and_tree(".") |
30 |
builder = tree.branch.get_commit_builder([]) |
|
1740.3.1
by Jelmer Vernooij
Introduce and use CommitBuilder objects. |
31 |
self.assertIsInstance(builder, CommitBuilder) |
1740.3.3
by Jelmer Vernooij
Move storing directories and links to commit builder. |
32 |
|
1910.2.6
by Aaron Bentley
Update for merge review, handle deprecations |
33 |
def record_root(self, builder, tree): |
34 |
if builder.record_root_entry is True: |
|
2255.7.8
by John Arbash Meinel
Lock the tree when using a commit builder. |
35 |
tree.lock_read() |
36 |
try: |
|
37 |
ie = tree.inventory.root |
|
38 |
finally: |
|
39 |
tree.unlock() |
|
1910.2.6
by Aaron Bentley
Update for merge review, handle deprecations |
40 |
parent_tree = tree.branch.repository.revision_tree(None) |
1910.2.22
by Aaron Bentley
Make commits preserve root entry data |
41 |
parent_invs = [] |
1910.2.6
by Aaron Bentley
Update for merge review, handle deprecations |
42 |
builder.record_entry_contents(ie, parent_invs, '', tree) |
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
43 |
|
1740.3.10
by Jelmer Vernooij
Fix some minor issues pointed out by j-a-m. |
44 |
def test_finish_inventory(self): |
1740.3.7
by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder. |
45 |
tree = self.make_branch_and_tree(".") |
46 |
builder = tree.branch.get_commit_builder([]) |
|
1910.2.6
by Aaron Bentley
Update for merge review, handle deprecations |
47 |
self.record_root(builder, tree) |
1740.3.8
by Jelmer Vernooij
Move make_revision() to commit builder. |
48 |
builder.finish_inventory() |
1740.3.3
by Jelmer Vernooij
Move storing directories and links to commit builder. |
49 |
|
1740.3.10
by Jelmer Vernooij
Fix some minor issues pointed out by j-a-m. |
50 |
def test_commit_message(self): |
1740.3.7
by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder. |
51 |
tree = self.make_branch_and_tree(".") |
1740.3.9
by Jelmer Vernooij
Make the commit message the first argument of CommitBuilder.commit(). |
52 |
builder = tree.branch.get_commit_builder([]) |
1910.2.6
by Aaron Bentley
Update for merge review, handle deprecations |
53 |
self.record_root(builder, tree) |
1740.3.9
by Jelmer Vernooij
Make the commit message the first argument of CommitBuilder.commit(). |
54 |
builder.finish_inventory() |
55 |
rev_id = builder.commit('foo bar blah') |
|
56 |
rev = tree.branch.repository.get_revision(rev_id) |
|
57 |
self.assertEqual('foo bar blah', rev.message) |
|
58 |
||
1740.3.10
by Jelmer Vernooij
Fix some minor issues pointed out by j-a-m. |
59 |
def test_commit_with_revision_id(self): |
1740.3.9
by Jelmer Vernooij
Make the commit message the first argument of CommitBuilder.commit(). |
60 |
tree = self.make_branch_and_tree(".") |
2150.2.2
by Robert Collins
Change the commit builder selected-revision-id test to use a unicode revision id where possible, leading to stricter testing of the hypothetical unicode revision id support in bzr. |
61 |
# use a unicode revision id to test more corner cases.
|
62 |
# The repository layer is meant to handle this.
|
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
63 |
revision_id = u'\xc8abc'.encode('utf8') |
1740.3.9
by Jelmer Vernooij
Make the commit message the first argument of CommitBuilder.commit(). |
64 |
try: |
2150.2.2
by Robert Collins
Change the commit builder selected-revision-id test to use a unicode revision id where possible, leading to stricter testing of the hypothetical unicode revision id support in bzr. |
65 |
try: |
66 |
builder = tree.branch.get_commit_builder([], |
|
67 |
revision_id=revision_id) |
|
68 |
except NonAsciiRevisionId: |
|
69 |
revision_id = 'abc' |
|
70 |
builder = tree.branch.get_commit_builder([], |
|
71 |
revision_id=revision_id) |
|
72 |
except CannotSetRevisionId: |
|
1740.3.9
by Jelmer Vernooij
Make the commit message the first argument of CommitBuilder.commit(). |
73 |
# This format doesn't support supplied revision ids
|
74 |
return
|
|
1910.2.6
by Aaron Bentley
Update for merge review, handle deprecations |
75 |
self.record_root(builder, tree) |
1740.3.9
by Jelmer Vernooij
Make the commit message the first argument of CommitBuilder.commit(). |
76 |
builder.finish_inventory() |
2150.2.2
by Robert Collins
Change the commit builder selected-revision-id test to use a unicode revision id where possible, leading to stricter testing of the hypothetical unicode revision id support in bzr. |
77 |
self.assertEqual(revision_id, builder.commit('foo bar')) |
78 |
self.assertTrue(tree.branch.repository.has_revision(revision_id)) |
|
79 |
# the revision id must be set on the inventory when saving it. This
|
|
80 |
# does not precisely test that - a repository that wants to can add it
|
|
81 |
# on deserialisation, but thats all the current contract guarantees
|
|
82 |
# anyway.
|
|
83 |
self.assertEqual(revision_id, |
|
84 |
tree.branch.repository.get_inventory(revision_id).revision_id) |
|
1740.3.8
by Jelmer Vernooij
Move make_revision() to commit builder. |
85 |
|
1910.2.8
by Aaron Bentley
Fix commit_builder when root not passed to record_entry_contents |
86 |
def test_commit_without_root(self): |
87 |
"""This should cause a deprecation warning, not an assertion failure"""
|
|
88 |
tree = self.make_branch_and_tree(".") |
|
2305.2.1
by Andrew Bennetts
Use repo.supports_rich_root() everywhere rather than |
89 |
if tree.branch.repository.supports_rich_root(): |
1910.2.22
by Aaron Bentley
Make commits preserve root entry data |
90 |
raise tests.TestSkipped('Format requires root') |
2381.1.3
by Robert Collins
Review feedback. |
91 |
self.build_tree(['foo']) |
1910.2.8
by Aaron Bentley
Fix commit_builder when root not passed to record_entry_contents |
92 |
tree.add('foo', 'foo-id') |
2255.7.8
by John Arbash Meinel
Lock the tree when using a commit builder. |
93 |
tree.lock_write() |
94 |
try: |
|
95 |
entry = tree.inventory['foo-id'] |
|
96 |
builder = tree.branch.get_commit_builder([]) |
|
97 |
self.callDeprecated(['Root entry should be supplied to' |
|
98 |
' record_entry_contents, as of bzr 0.10.'], |
|
99 |
builder.record_entry_contents, entry, [], 'foo', tree) |
|
100 |
builder.finish_inventory() |
|
101 |
rev_id = builder.commit('foo bar') |
|
102 |
finally: |
|
103 |
tree.unlock() |
|
1910.2.8
by Aaron Bentley
Fix commit_builder when root not passed to record_entry_contents |
104 |
|
1740.3.10
by Jelmer Vernooij
Fix some minor issues pointed out by j-a-m. |
105 |
def test_commit(self): |
1740.3.8
by Jelmer Vernooij
Move make_revision() to commit builder. |
106 |
tree = self.make_branch_and_tree(".") |
1740.3.9
by Jelmer Vernooij
Make the commit message the first argument of CommitBuilder.commit(). |
107 |
builder = tree.branch.get_commit_builder([]) |
1910.2.6
by Aaron Bentley
Update for merge review, handle deprecations |
108 |
self.record_root(builder, tree) |
1740.3.8
by Jelmer Vernooij
Move make_revision() to commit builder. |
109 |
builder.finish_inventory() |
1740.3.9
by Jelmer Vernooij
Make the commit message the first argument of CommitBuilder.commit(). |
110 |
rev_id = builder.commit('foo bar') |
111 |
self.assertNotEqual(None, rev_id) |
|
112 |
self.assertTrue(tree.branch.repository.has_revision(rev_id)) |
|
1757.1.2
by Robert Collins
Bugfix CommitBuilders recording of the inventory revision id. |
113 |
# the revision id must be set on the inventory when saving it. This does not
|
114 |
# precisely test that - a repository that wants to can add it on deserialisation,
|
|
115 |
# but thats all the current contract guarantees anyway.
|
|
116 |
self.assertEqual(rev_id, tree.branch.repository.get_inventory(rev_id).revision_id) |
|
2041.1.1
by John Arbash Meinel
Add a 'get_tree()' call that returns a RevisionTree for the newly committed tree |
117 |
|
2041.1.5
by John Arbash Meinel
CommitBuilder.get_tree => CommitBuilder.revision_tree |
118 |
def test_revision_tree(self): |
2041.1.1
by John Arbash Meinel
Add a 'get_tree()' call that returns a RevisionTree for the newly committed tree |
119 |
tree = self.make_branch_and_tree(".") |
120 |
builder = tree.branch.get_commit_builder([]) |
|
121 |
self.record_root(builder, tree) |
|
122 |
builder.finish_inventory() |
|
123 |
rev_id = builder.commit('foo bar') |
|
2041.1.5
by John Arbash Meinel
CommitBuilder.get_tree => CommitBuilder.revision_tree |
124 |
rev_tree = builder.revision_tree() |
2041.1.1
by John Arbash Meinel
Add a 'get_tree()' call that returns a RevisionTree for the newly committed tree |
125 |
# Just a couple simple tests to ensure that it actually follows
|
126 |
# the RevisionTree api.
|
|
127 |
self.assertEqual(rev_id, rev_tree.get_revision_id()) |
|
128 |
self.assertEqual([], rev_tree.get_parent_ids()) |
|
2255.7.65
by Robert Collins
Split test_root_revision_entry into tree and repository portions. |
129 |
|
130 |
def test_root_entry_has_revision(self): |
|
131 |
# test the root revision created and put in the basis
|
|
132 |
# has the right rev id.
|
|
133 |
tree = self.make_branch_and_tree('.') |
|
134 |
rev_id = tree.commit('message') |
|
135 |
basis_tree = tree.basis_tree() |
|
136 |
basis_tree.lock_read() |
|
137 |
self.addCleanup(basis_tree.unlock) |
|
138 |
self.assertEqual(rev_id, basis_tree.inventory.root.revision) |
|
139 |