bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
2052.3.2
by John Arbash Meinel
 Change Copyright .. by Canonical to Copyright ... Canonical  | 
1  | 
# Copyright (C) 2005 Canonical Ltd
 | 
| 
1185.16.32
by Martin Pool
 - add a basic annotate built-in command  | 
2  | 
# -*- coding: utf-8 -*-
 | 
| 
1887.1.1
by Adeodato Simó
 Do not separate paragraphs in the copyright statement with blank lines,  | 
3  | 
#
 | 
| 
1185.16.32
by Martin Pool
 - add a basic annotate built-in command  | 
4  | 
# This program is free software; you can redistribute it and/or modify
 | 
5  | 
# it under the terms of the GNU General Public License as published by
 | 
|
6  | 
# the Free Software Foundation; either version 2 of the License, or
 | 
|
7  | 
# (at your option) any later version.
 | 
|
| 
1887.1.1
by Adeodato Simó
 Do not separate paragraphs in the copyright statement with blank lines,  | 
8  | 
#
 | 
| 
1185.16.32
by Martin Pool
 - add a basic annotate built-in command  | 
9  | 
# This program is distributed in the hope that it will be useful,
 | 
10  | 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
|
11  | 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
|
12  | 
# GNU General Public License for more details.
 | 
|
| 
1887.1.1
by Adeodato Simó
 Do not separate paragraphs in the copyright statement with blank lines,  | 
13  | 
#
 | 
| 
1185.16.32
by Martin Pool
 - add a basic annotate built-in command  | 
14  | 
# You should have received a copy of the GNU General Public License
 | 
15  | 
# along with this program; if not, write to the Free Software
 | 
|
16  | 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | 
|
17  | 
||
18  | 
||
19  | 
"""Black-box tests for bzr.
 | 
|
20  | 
||
21  | 
These check that it behaves properly when it's invoked through the regular
 | 
|
22  | 
command-line interface. This doesn't actually run a new interpreter but 
 | 
|
23  | 
rather starts again from the run_bzr function.
 | 
|
24  | 
"""
 | 
|
25  | 
||
26  | 
||
27  | 
from cStringIO import StringIO  | 
|
28  | 
import os  | 
|
29  | 
import shutil  | 
|
30  | 
import sys  | 
|
31  | 
||
32  | 
from bzrlib.branch import Branch  | 
|
33  | 
from bzrlib.errors import BzrCommandError  | 
|
34  | 
from bzrlib.osutils import has_symlinks  | 
|
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
35  | 
from bzrlib.tests import TestCaseWithTransport  | 
| 
1185.16.32
by Martin Pool
 - add a basic annotate built-in command  | 
36  | 
from bzrlib.annotate import annotate_file  | 
37  | 
||
38  | 
||
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
39  | 
class TestAnnotate(TestCaseWithTransport):  | 
40  | 
||
| 
1185.16.53
by Martin Pool
 - annotate improvements from Goffreddo, with extra bug fixes and tests  | 
41  | 
def setUp(self):  | 
42  | 
super(TestAnnotate, self).setUp()  | 
|
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
43  | 
wt = self.make_branch_and_tree('.')  | 
44  | 
b = wt.branch  | 
|
| 
1185.33.31
by Martin Pool
 Make annotate cope better with revisions committed without a valid  | 
45  | 
self.build_tree_contents([('hello.txt', 'my helicopter\n'),  | 
46  | 
('nomail.txt', 'nomail\n')])  | 
|
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
47  | 
wt.add(['hello.txt'])  | 
| 
1558.14.6
by Aaron Bentley
 Added annotate test  | 
48  | 
wt.commit('add hello', committer='test@user')  | 
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
49  | 
wt.add(['nomail.txt'])  | 
50  | 
wt.commit('add nomail', committer='no mail')  | 
|
| 
1558.14.6
by Aaron Bentley
 Added annotate test  | 
51  | 
file('hello.txt', 'ab').write('your helicopter')  | 
52  | 
wt.commit('mod hello', committer='user@test')  | 
|
| 
1185.16.53
by Martin Pool
 - annotate improvements from Goffreddo, with extra bug fixes and tests  | 
53  | 
|
| 
1185.16.32
by Martin Pool
 - add a basic annotate built-in command  | 
54  | 
def test_help_annotate(self):  | 
55  | 
"""Annotate command exists"""  | 
|
56  | 
out, err = self.run_bzr_captured(['--no-plugins', 'annotate', '--help'])  | 
|
| 
1185.16.53
by Martin Pool
 - annotate improvements from Goffreddo, with extra bug fixes and tests  | 
57  | 
|
58  | 
def test_annotate_cmd(self):  | 
|
59  | 
out, err = self.run_bzr_captured(['annotate', 'hello.txt'])  | 
|
60  | 
self.assertEquals(err, '')  | 
|
61  | 
self.assertEqualDiff(out, '''\  | 
|
62  | 
    1 test@us | my helicopter
 | 
|
| 
1558.14.6
by Aaron Bentley
 Added annotate test  | 
63  | 
    3 user@te | your helicopter
 | 
| 
1185.16.53
by Martin Pool
 - annotate improvements from Goffreddo, with extra bug fixes and tests  | 
64  | 
''')  | 
| 
1185.33.31
by Martin Pool
 Make annotate cope better with revisions committed without a valid  | 
65  | 
|
66  | 
def test_no_mail(self):  | 
|
67  | 
out, err = self.run_bzr_captured(['annotate', 'nomail.txt'])  | 
|
68  | 
self.assertEquals(err, '')  | 
|
69  | 
self.assertEqualDiff(out, '''\  | 
|
70  | 
    2 no mail | nomail
 | 
|
71  | 
''')  | 
|
| 
1694.2.6
by Martin Pool
 [merge] bzr.dev  | 
72  | 
|
73  | 
def test_annotate_cmd_revision(self):  | 
|
| 
1948.4.31
by John Arbash Meinel
 fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'  | 
74  | 
out, err = self.run_bzr_captured(['annotate', 'hello.txt', '-r1'])  | 
| 
1694.2.6
by Martin Pool
 [merge] bzr.dev  | 
75  | 
self.assertEquals(err, '')  | 
76  | 
self.assertEqualDiff(out, '''\  | 
|
77  | 
    1 test@us | my helicopter
 | 
|
78  | 
''')  | 
|
79  | 
||
| 
1558.14.6
by Aaron Bentley
 Added annotate test  | 
80  | 
def test_annotate_cmd_revision3(self):  | 
| 
1948.4.31
by John Arbash Meinel
 fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'  | 
81  | 
out, err = self.run_bzr_captured(['annotate', 'hello.txt', '-r3'])  | 
| 
1558.14.6
by Aaron Bentley
 Added annotate test  | 
82  | 
self.assertEquals(err, '')  | 
83  | 
self.assertEqualDiff(out, '''\  | 
|
84  | 
    1 test@us | my helicopter
 | 
|
85  | 
    3 user@te | your helicopter
 | 
|
86  | 
''')  | 
|
87  | 
||
| 
1694.2.6
by Martin Pool
 [merge] bzr.dev  | 
88  | 
def test_annotate_cmd_unknown_revision(self):  | 
| 
1948.4.31
by John Arbash Meinel
 fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'  | 
89  | 
out, err = self.run_bzr_captured(['annotate', 'hello.txt', '-r', '10'],  | 
| 
1694.2.6
by Martin Pool
 [merge] bzr.dev  | 
90  | 
retcode=3)  | 
91  | 
self.assertEquals(out, '')  | 
|
| 
1948.4.15
by John Arbash Meinel
 Change the InvalidRevisionSpec formatting to be more readable  | 
92  | 
self.assertContainsRe(err, 'Requested revision: \'10\' does not exist')  | 
| 
1694.2.6
by Martin Pool
 [merge] bzr.dev  | 
93  | 
|
94  | 
def test_annotate_cmd_two_revisions(self):  | 
|
| 
1948.4.31
by John Arbash Meinel
 fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'  | 
95  | 
out, err = self.run_bzr_captured(['annotate', 'hello.txt', '-r1..2'],  | 
| 
1694.2.6
by Martin Pool
 [merge] bzr.dev  | 
96  | 
retcode=3)  | 
97  | 
self.assertEquals(out, '')  | 
|
98  | 
self.assertEquals(err, 'bzr: ERROR: bzr annotate --revision takes'  | 
|
99  | 
' exactly 1 argument\n')  | 
|
| 
2027.3.1
by John Arbash Meinel
 'bzr annotate' shouldn't fail on an empty file: fix bug #56814  | 
100  | 
|
101  | 
def test_annotate_empty_file(self):  | 
|
102  | 
tree = self.make_branch_and_tree('tree')  | 
|
103  | 
self.build_tree_contents([('tree/empty', '')])  | 
|
104  | 
tree.add('empty')  | 
|
105  | 
tree.commit('add empty file')  | 
|
106  | 
||
107  | 
os.chdir('tree')  | 
|
108  | 
out, err = self.run_bzr('annotate', 'empty')  | 
|
109  | 
self.assertEqual('', out)  |