1
# Copyright (C) 2010 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
from StringIO import StringIO
20
from bzrlib.plugins.difftacular import generate_diff
21
from bzrlib import tests
24
class TestMainlineDiff(tests.TestCaseWithTransport):
26
def create_diff_scenario(self):
27
foo = self.make_branch_and_tree('foo')
29
self.addCleanup(foo.unlock)
30
self.build_tree_contents([('foo/baz', 'a\n')])
32
rev1 = foo.commit('initial commit')
33
bar = foo.bzrdir.sprout('bar').open_workingtree()
34
self.build_tree_contents([('bar/baz', 'c\na\n')])
36
foo.merge_from_branch(bar.branch)
37
rev2 = foo.commit('merge')
38
self.build_tree_contents([('foo/baz', 'c\na\nb\n')])
39
rev3 = foo.commit('add b')
40
return foo, rev1, rev2, rev3
42
def test_mainline_diff(self):
43
foo, rev1, rev2, rev3 = self.create_diff_scenario()
45
generate_diff.mainline_diff(foo.branch, rev1, rev3, s)
46
self.assertContainsRe(s.getvalue(), '\+b')
47
self.assertContainsRe(s.getvalue(), ' a')
48
self.assertNotContainsRe(s.getvalue(), '\+c')
50
def test_merges(self):
51
foo, rev1, rev2, rev3 = self.create_diff_scenario()
52
self.assertEqual([(rev1, rev2)], list(
53
generate_diff.merges(foo.branch.repository, rev1, rev3)))