1
# Copyright (C) 2005 Canonical Ltd
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.
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.
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
20
from bzrlib.missing import (
24
from bzrlib.tests import TestCaseWithTransport
25
from bzrlib.workingtree import WorkingTree
28
class TestMissing(TestCaseWithTransport):
30
def test_find_unmerged(self):
31
original_tree = self.make_branch_and_tree('original')
32
original = original_tree.branch
33
puller_tree = self.make_branch_and_tree('puller')
34
puller = puller_tree.branch
35
merger_tree = self.make_branch_and_tree('merger')
36
merger = merger_tree.branch
37
self.assertEqual(find_unmerged(original, puller), ([], []))
38
original_tree.commit('a', rev_id='a')
39
self.assertEqual(find_unmerged(original, puller), ([(1, u'a')], []))
40
puller_tree.pull(original)
41
self.assertEqual(find_unmerged(original, puller), ([], []))
42
merger_tree.pull(original)
43
original_tree.commit('b', rev_id='b')
44
original_tree.commit('c', rev_id='c')
45
self.assertEqual(find_unmerged(original, puller), ([(2, u'b'),
48
puller_tree.pull(original)
49
self.assertEqual(find_unmerged(original, puller), ([], []))
50
self.assertEqual(find_unmerged(original, merger), ([(2, u'b'),
52
merger_tree.merge_from_branch(original)
53
self.assertEqual(find_unmerged(original, merger), ([(2, u'b'),
55
merger_tree.commit('d', rev_id='d')
56
self.assertEqual(find_unmerged(original, merger), ([], [(2, 'd')]))
58
def test_iter_log_revisions(self):
59
base_tree = self.make_branch_and_tree('base')
60
self.build_tree(['base/a'])
61
base_tree.add(['a'], ['a-id'])
62
base_tree.commit('add a', rev_id='b-1')
64
child_tree = base_tree.bzrdir.sprout('child').open_workingtree()
66
self.build_tree(['child/b'])
67
child_tree.add(['b'], ['b-id'])
68
child_tree.commit('adding b', rev_id='c-2')
70
child_tree.remove(['a'])
71
child_tree.commit('removing a', rev_id='c-3')
73
self.build_tree_contents([('child/b', 'new contents for b\n')])
74
child_tree.commit('modifying b', rev_id='c-4')
76
child_tree.rename_one('b', 'c')
77
child_tree.commit('rename b=>c', rev_id='c-5')
79
base_extra, child_extra = find_unmerged(base_tree.branch,
81
results = list(iter_log_revisions(base_extra,
82
base_tree.branch.repository,
84
self.assertEqual([], results)
86
results = list(iter_log_revisions(child_extra,
87
child_tree.branch.repository,
89
self.assertEqual(4, len(results))
93
self.assertEqual((2, 'c-2'), (r0.revno, r0.rev.revision_id))
94
self.assertEqual((3, 'c-3'), (r1.revno, r1.rev.revision_id))
95
self.assertEqual((4, 'c-4'), (r2.revno, r2.rev.revision_id))
96
self.assertEqual((5, 'c-5'), (r3.revno, r3.rev.revision_id))
99
self.assertNotEqual(None, delta0)
100
self.assertEqual([('b', 'b-id', 'file')], delta0.added)
101
self.assertEqual([], delta0.removed)
102
self.assertEqual([], delta0.renamed)
103
self.assertEqual([], delta0.modified)
106
self.assertNotEqual(None, delta1)
107
self.assertEqual([], delta1.added)
108
self.assertEqual([('a', 'a-id', 'file')], delta1.removed)
109
self.assertEqual([], delta1.renamed)
110
self.assertEqual([], delta1.modified)
113
self.assertNotEqual(None, delta2)
114
self.assertEqual([], delta2.added)
115
self.assertEqual([], delta2.removed)
116
self.assertEqual([], delta2.renamed)
117
self.assertEqual([('b', 'b-id', 'file', True, False)], delta2.modified)
120
self.assertNotEqual(None, delta3)
121
self.assertEqual([], delta3.added)
122
self.assertEqual([], delta3.removed)
123
self.assertEqual([('b', 'c', 'b-id', 'file', False, False)],
125
self.assertEqual([], delta3.modified)