1
1
# -*- coding: utf-8 -*-
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
37
37
a_wt.commit('modified A/foo',rev_id='A2')
38
38
merge(['B',-1],['B',1],this_dir='A')
39
39
a_wt.commit('merged B into A',rev_id='A3')
41
def _check_ancestry(self, location='', result=None):
42
out = self.capture('ancestry ' + location)
44
result = "A1\nB1\nA2\nA3\n"
45
self.assertEqualDiff(out, result)
47
def test_ancestry(self):
48
"""Tests 'ancestry' command"""
49
self._build_branches()
51
self._check_ancestry()
53
def test_ancestry_with_location(self):
54
"""Tests 'ancestry' command with a specified location."""
55
self._build_branches()
56
self._check_ancestry('A')
58
def test_ancestry_with_repo_branch(self):
59
"""Tests 'ancestry' command with a location that is a
61
self._build_branches()
62
self.run_bzr('init-repo', 'repo')
63
self.run_bzr('branch', 'A', 'repo/A')
64
self._check_ancestry('repo/A')
66
def test_ancestry_with_checkout(self):
67
"""Tests 'ancestry' command with a location that is a
68
checkout of a repository branch."""
69
self._build_branches()
70
self.run_bzr('init-repo', 'repo')
71
self.run_bzr('branch', 'A', 'repo/A')
72
self.run_bzr('checkout', 'repo/A', 'A-checkout')
73
self._check_ancestry('A-checkout')
75
def test_ancestry_with_lightweight_checkout(self):
76
"""Tests 'ancestry' command with a location that is a
77
lightweight checkout of a repository branch."""
78
self._build_branches()
79
self.run_bzr('init-repo', 'repo')
80
self.run_bzr('branch', 'A', 'repo/A')
81
self.run_bzr('checkout', '--lightweight', 'repo/A', 'A-checkout')
82
self._check_ancestry('A-checkout')
84
def test_ancestry_with_truncated_checkout(self):
85
"""Tests 'ancestry' command with a location that is a
86
checkout of a repository branch with a shortened revision history."""
87
self._build_branches()
88
self.run_bzr('init-repo', 'repo')
89
self.run_bzr('branch', 'A', 'repo/A')
90
self.run_bzr('checkout', '-r', '2', 'repo/A', 'A-checkout')
91
self._check_ancestry('A-checkout', "A1\nA2\n")
93
def test_ancestry_with_truncated_lightweight_checkout(self):
94
"""Tests 'ancestry' command with a location that is a lightweight
95
checkout of a repository branch with a shortened revision history."""
96
self._build_branches()
97
self.run_bzr('init-repo', 'repo')
98
self.run_bzr('branch', 'A', 'repo/A')
99
self.run_bzr('checkout', '-r', '2', '--lightweight',
100
'repo/A', 'A-checkout')
101
self._check_ancestry('A-checkout', "A1\nA2\n")
41
out, err = self.run_bzr('ancestry')
42
self.assertEquals(err, '')
43
self.assertEqualDiff(out,
added
removed
bzrlib/tests/blackbox/test_ancestry.py
