← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_annotate.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-06-09 07:45:19 UTC
  • mfrom: (3484.2.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20080609074519-afx3xh7bd8wqzjy0
(vila) Trivial drive-by cleanups

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_annotate.py
26
26
 
27
27
import os
28
28
 
29
 
from bzrlib.branch import Branch
30
 
from bzrlib.config import extract_email_address
31
29
from bzrlib.tests import TestCaseWithTransport
32
30
 
33
31
 
146
144
                                retcode=3)
147
145
        self.assertEqual('', out)
148
146
        self.assertEqual('bzr: ERROR: bzr annotate --revision takes'
149
 
                         ' exactly one revision identifier\n',
 
147
                         ' exactly 1 argument\n',
150
148
                         err)
151
149
 
152
 
 
153
 
class TestSimpleAnnotate(TestCaseWithTransport):
154
 
    """Annotate tests with no complex setup."""
155
 
 
156
 
    def _setup_edited_file(self):
157
 
        """Create a tree with a locally edited file."""
158
 
        tree = self.make_branch_and_tree('.')
159
 
        self.build_tree_contents([('file', 'foo\ngam\n')])
160
 
        tree.add('file')
161
 
        tree.commit('add file', committer="test@host", rev_id="rev1")
162
 
        self.build_tree_contents([('file', 'foo\nbar\ngam\n')])
163
 
        tree.branch.get_config().set_user_option('email', 'current@host2')
164
 
 
165
 
    def test_annotate_edited_file(self):
166
 
        tree = self._setup_edited_file()
167
 
        out, err = self.run_bzr('annotate file')
168
 
        self.assertEqual(
169
 
            '1   test@ho | foo\n'
170
 
            '2?  current | bar\n'
171
 
            '1   test@ho | gam\n',
172
 
            out)
173
 
 
174
 
    def test_annotate_edited_file_show_ids(self):
175
 
        tree = self._setup_edited_file()
176
 
        out, err = self.run_bzr('annotate file --show-ids')
177
 
        self.assertEqual(
178
 
            '    rev1 | foo\n'
179
 
            'current: | bar\n'
180
 
            '    rev1 | gam\n',
181
 
            out)
182
 
 
183
 
    def _create_merged_file(self):
184
 
        """Create a file with a pending merge and local edit."""
185
 
        tree = self.make_branch_and_tree('.')
186
 
        self.build_tree_contents([('file', 'foo\ngam\n')])
187
 
        tree.add('file')
188
 
        tree.commit('add file', rev_id="rev1", committer="test@host")
189
 
        # right side
190
 
        self.build_tree_contents([('file', 'foo\nbar\ngam\n')])
191
 
        tree.commit("right", rev_id="rev1.1.1", committer="test@host")
192
 
        tree.pull(tree.branch, True, "rev1")
193
 
        # left side
194
 
        self.build_tree_contents([('file', 'foo\nbaz\ngam\n')])
195
 
        tree.commit("left", rev_id="rev2", committer="test@host")
196
 
        # merge
197
 
        tree.merge_from_branch(tree.branch, "rev1.1.1")
198
 
        # edit the file to be 'resolved' and have a further local edit
199
 
        self.build_tree_contents([('file', 'local\nfoo\nbar\nbaz\ngam\n')])
200
 
 
201
 
    def test_annotated_edited_merged_file_revnos(self):
202
 
        self._create_merged_file()
203
 
        out, err = self.run_bzr('annotate file')
204
 
        email = extract_email_address(Branch.open('.').get_config().username())
205
 
        self.assertEqual(
206
 
            '3?    %-7s | local\n'
207
 
            '1     test@ho | foo\n'
208
 
            '1.1.1 test@ho | bar\n'
209
 
            '2     test@ho | baz\n'
210
 
            '1     test@ho | gam\n' % email[:7],
211
 
            out)
212
 
 
213
 
    def test_annotated_edited_merged_file_ids(self):
214
 
        self._create_merged_file()
215
 
        out, err = self.run_bzr('annotate file --show-ids')
216
 
        self.assertEqual(
217
 
            'current: | local\n'
218
 
            '    rev1 | foo\n'
219
 
            'rev1.1.1 | bar\n'
220
 
            '    rev2 | baz\n'
221
 
            '    rev1 | gam\n',
222
 
            out)
223
 
 
224
150
    def test_annotate_empty_file(self):
225
151
        tree = self.make_branch_and_tree('tree')
226
152
        self.build_tree_contents([('tree/empty', '')])