1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
|
# Copyright (C) 2007 John Arbash Meinel <john@arbash-meinel.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Test the Commit functionality."""
from bzrlib import (
tests,
revision,
)
from bzrlib.plugins.gtk import commit
# TODO: All we need is basic ancestry code to test this, we shouldn't need a
# TestCaseWithTransport, just a TestCaseWithMemoryTransport or somesuch.
class TestPendingRevisions(tests.TestCaseWithTransport):
def test_pending_revisions_none(self):
tree = self.make_branch_and_tree('.')
tree.commit('one')
self.assertIs(None, commit.pending_revisions(tree))
def test_pending_revisions_simple(self):
tree = self.make_branch_and_tree('tree')
rev_id1 = tree.commit('one')
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
rev_id2 = tree2.commit('two')
tree.merge_from_branch(tree2.branch)
self.assertEqual([rev_id1, rev_id2], tree.get_parent_ids())
pending_revisions = commit.pending_revisions(tree)
# One primary merge
self.assertEqual(1, len(pending_revisions))
# Revision == rev_id2
self.assertEqual(rev_id2, pending_revisions[0][0].revision_id)
# No children of this revision.
self.assertEqual([], pending_revisions[0][1])
def test_pending_revisions_with_children(self):
tree = self.make_branch_and_tree('tree')
rev_id1 = tree.commit('one')
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
rev_id2 = tree2.commit('two')
rev_id3 = tree2.commit('three')
rev_id4 = tree2.commit('four')
tree.merge_from_branch(tree2.branch)
self.assertEqual([rev_id1, rev_id4], tree.get_parent_ids())
pending_revisions = commit.pending_revisions(tree)
# One primary merge
self.assertEqual(1, len(pending_revisions))
# Revision == rev_id2
self.assertEqual(rev_id4, pending_revisions[0][0].revision_id)
# Two children for this revision
self.assertEqual(2, len(pending_revisions[0][1]))
self.assertEqual(rev_id3, pending_revisions[0][1][0].revision_id)
self.assertEqual(rev_id2, pending_revisions[0][1][1].revision_id)
def test_pending_revisions_multi_merge(self):
tree = self.make_branch_and_tree('tree')
rev_id1 = tree.commit('one')
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
rev_id2 = tree2.commit('two')
rev_id3 = tree2.commit('three')
tree3 = tree2.bzrdir.sprout('tree3').open_workingtree()
rev_id4 = tree3.commit('four')
rev_id5 = tree3.commit('five')
tree.merge_from_branch(tree2.branch)
tree.merge_from_branch(tree3.branch)
self.assertEqual([rev_id1, rev_id3, rev_id5], tree.get_parent_ids())
pending_revisions = commit.pending_revisions(tree)
# Two primary merges
self.assertEqual(2, len(pending_revisions))
# Revision == rev_id2
self.assertEqual(rev_id3, pending_revisions[0][0].revision_id)
self.assertEqual(rev_id5, pending_revisions[1][0].revision_id)
# One child for the first merge
self.assertEqual(1, len(pending_revisions[0][1]))
self.assertEqual(rev_id2, pending_revisions[0][1][0].revision_id)
# One child for the second merge
self.assertEqual(1, len(pending_revisions[1][1]))
self.assertEqual(rev_id4, pending_revisions[1][1][0].revision_id)
class Test_RevToPendingInfo(tests.TestCaseWithTransport):
def test_basic_info(self):
tree = self.make_branch_and_tree('tree')
rev_id = tree.commit('Multiline\ncommit\nmessage',
committer='Joe Foo <joe@foo.com>',
timestamp=1191012408.674,
timezone=-18000
)
rev = tree.branch.repository.get_revision(rev_id)
rev_dict = commit.CommitDialog._rev_to_pending_info(rev)
self.assertEqual({'committer':'Joe Foo',
'summary':'Multiline',
'date':'2007-09-28',
'revision_id':rev_id,
}, rev_dict)
class CommitDialogNoWidgets(commit.CommitDialog):
def construct(self):
pass # Don't create any widgets here
class TestCommitDialog(tests.TestCaseWithTransport):
def test_setup_parameters_no_pending(self):
tree = self.make_branch_and_tree('tree')
rev_id = tree.commit('first')
dlg = CommitDialogNoWidgets(tree)
self.assertEqual(rev_id, dlg._basis_tree.get_revision_id())
self.assertIs(None, dlg._pending)
self.assertFalse(dlg._is_checkout)
def test_setup_parameters_checkout(self):
tree = self.make_branch_and_tree('tree')
rev_id = tree.commit('first')
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
tree2.branch.bind(tree.branch)
dlg = CommitDialogNoWidgets(tree2)
self.assertEqual(rev_id, dlg._basis_tree.get_revision_id())
self.assertIs(None, dlg._pending)
self.assertTrue(dlg._is_checkout)
def test_setup_parameters_pending(self):
tree = self.make_branch_and_tree('tree')
rev_id1 = tree.commit('one')
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
rev_id2 = tree2.commit('two')
tree.merge_from_branch(tree2.branch)
dlg = CommitDialogNoWidgets(tree)
self.assertEqual(rev_id1, dlg._basis_tree.get_revision_id())
self.assertIsNot(None, dlg._pending)
self.assertEqual(1, len(dlg._pending))
self.assertEqual(rev_id2, dlg._pending[0][0].revision_id)
def test_setup_parameters_delta(self):
tree = self.make_branch_and_tree('tree')
self.build_tree(['tree/a'])
tree.add(['a'], ['a-id'])
dlg = CommitDialogNoWidgets(tree)
delta = dlg._delta
self.assertEqual([], delta.modified)
self.assertEqual([], delta.renamed)
self.assertEqual([], delta.removed)
self.assertEqual([(u'a', 'a-id', 'file')], delta.added)
|