/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_annotate.py

  • Committer: John Arbash Meinel
  • Date: 2006-12-13 22:23:08 UTC
  • mto: This revision was merged to the branch mainline in revision 2186.
  • Revision ID: john@arbash-meinel.com-20061213222308-e1cf1r9zhde76l8e
Add tests for annotate with dotted revnos.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_annotate.py
 
1
# Copyright (C) 2006 Canonical Ltd
 
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
"""Whitebox tests for annotate functionality."""
 
18
 
 
19
from cStringIO import StringIO
 
20
 
 
21
from bzrlib import (
 
22
    annotate,
 
23
    conflicts,
 
24
    errors,
 
25
    tests,
 
26
    trace,
 
27
    )
 
28
 
 
29
 
 
30
class TestAnnotate(tests.TestCaseWithTransport):
 
31
 
 
32
    def create_merged_trees(self):
 
33
        tree1 = self.make_branch_and_tree('tree1')
 
34
        self.build_tree_contents([('tree1/a', 'first\n')])
 
35
        tree1.add(['a'], ['a-id'])
 
36
        tree1.commit('a', rev_id='rev-1',
 
37
                     committer="joe@foo.com", timestamp=1166046000.00)
 
38
 
 
39
        tree2 = tree1.bzrdir.clone('tree2').open_workingtree()
 
40
 
 
41
        self.build_tree_contents([('tree1/a', 'first\nsecond\n')])
 
42
        tree1.commit('b', rev_id='rev-2',
 
43
                     committer='joe@foo.com', timestamp=1166046001.00)
 
44
 
 
45
        self.build_tree_contents([('tree2/a', 'first\nthird\n')])
 
46
        tree2.commit('c', rev_id='rev-1_1_1',
 
47
                     committer="barry@foo.com", timestamp=1166046002.00)
 
48
 
 
49
        num_conflicts = tree1.merge_from_branch(tree2.branch)
 
50
        self.assertEqual(1, num_conflicts)
 
51
 
 
52
        self.build_tree_contents([('tree1/a',
 
53
                                 'first\nsecond\nthird\n')])
 
54
        tree1.set_conflicts(conflicts.ConflictList())
 
55
        tree1.commit('merge 2', rev_id='rev-3',
 
56
                     committer='sal@foo.com', timestamp=1166046003.00)
 
57
        return tree1, tree2
 
58
 
 
59
    def create_deeply_merged_trees(self):
 
60
        tree1, tree2 = self.create_merged_trees()
 
61
 
 
62
        tree3 = tree2.bzrdir.clone('tree3').open_workingtree()
 
63
 
 
64
        tree2.commit('noop', rev_id='rev-1.1.2')
 
65
        self.assertEqual(0, tree1.merge_from_branch(tree2.branch))
 
66
        tree1.commit('noop merge', rev_id='rev-4')
 
67
 
 
68
        self.build_tree_contents([('tree3/a', 'first\nthird\nfourth\n')])
 
69
        tree3.commit('four', rev_id='rev-1.1.1.1.1',
 
70
                     committer='jerry@foo.com', timestamp=1166046003.00)
 
71
 
 
72
        tree4 = tree3.bzrdir.clone('tree4').open_workingtree()
 
73
 
 
74
        tree3.commit('noop', rev_id='rev-1.1.1.1.2',
 
75
                     committer='jerry@foo.com', timestamp=1166046004.00)
 
76
        self.assertEqual(0, tree1.merge_from_branch(tree3.branch))
 
77
        tree1.commit('merge four', rev_id='rev-5')
 
78
 
 
79
        self.build_tree_contents([('tree4/a', 'first\nthird\nfourth\nfifth\n')])
 
80
        tree4.commit('five', rev_id='rev-1.1.1.1.1.1.1',
 
81
                     committer='george@foo.com', timestamp=1166046005.00)
 
82
        self.assertEqual(0, tree1.merge_from_branch(tree4.branch))
 
83
        tree1.commit('merge five', rev_id='rev-6')
 
84
        return tree1
 
85
 
 
86
    def test_annotate_shows_dotted_revnos(self):
 
87
        tree1, tree2 = self.create_merged_trees()
 
88
 
 
89
        sio = StringIO()
 
90
        annotate.annotate_file(tree1.branch, 'rev-3', 'a-id',
 
91
                               to_file=sio)
 
92
        self.assertEqualDiff('1     joe@foo | first\n'
 
93
                             '2     joe@foo | second\n'
 
94
                             '1.1.1 barry@f | third\n',
 
95
                             sio.getvalue())
 
96
 
 
97
    def test_annotate_limits_dotted_revnos(self):
 
98
        """Annotate should limit dotted revnos to a depth of 12"""
 
99
        tree1 = self.create_deeply_merged_trees()
 
100
 
 
101
        sio = StringIO()
 
102
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
 
103
                               to_file=sio)
 
104
        self.assertEqualDiff('1            joe@foo | first\n'
 
105
                             '2            joe@foo | second\n'
 
106
                             '1.1.1        barry@f | third\n'
 
107
                             '1.1.1.1.1    jerry@f | fourth\n'
 
108
                             '1.1.1.1.1.1> george@ | fifth\n',
 
109
                             sio.getvalue())
 
110
 
 
111
        # verbose=True shows everything, the full revno, user id, and date
 
112
        sio = StringIO()
 
113
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
 
114
                               to_file=sio, verbose=True)
 
115
        self.assertEqualDiff('1             joe@foo.com    20061213 | first\n'
 
116
                             '2             joe@foo.com    20061213 | second\n'
 
117
                             '1.1.1         barry@foo.com  20061213 | third\n'
 
118
                             '1.1.1.1.1     jerry@foo.com  20061213 | fourth\n'
 
119
                             '1.1.1.1.1.1.1 george@foo.com 20061213 | fifth\n',
 
120
                             sio.getvalue())