bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
1551.10.18
by Aaron Bentley
 Log works in local treeless branches (#84247)  | 
1  | 
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
 | 
| 
1540.2.6
by Robey Pointer
 make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'  | 
2  | 
# -*- coding: utf-8 -*-
 | 
| 
1887.1.1
by Adeodato Simó
 Do not separate paragraphs in the copyright statement with blank lines,  | 
3  | 
#
 | 
| 
1540.2.6
by Robey Pointer
 make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'  | 
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  | 
#
 | 
| 
1540.2.6
by Robey Pointer
 make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'  | 
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  | 
#
 | 
| 
1540.2.6
by Robey Pointer
 make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'  | 
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  | 
||
| 
1624.1.3
by Robert Collins
 Convert log to use the new tsort.merge_sort routine.  | 
19  | 
"""Black-box tests for bzr log."""
 | 
| 
1540.2.6
by Robey Pointer
 make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'  | 
20  | 
|
| 
1624.1.3
by Robert Collins
 Convert log to use the new tsort.merge_sort routine.  | 
21  | 
import os  | 
| 
1540.2.6
by Robey Pointer
 make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'  | 
22  | 
|
| 
1685.1.5
by John Arbash Meinel
 Merged test_log.py.moved into test_log.py  | 
23  | 
import bzrlib  | 
| 
1540.2.6
by Robey Pointer
 make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'  | 
24  | 
from bzrlib.tests.blackbox import ExternalBase  | 
| 
1551.10.18
by Aaron Bentley
 Log works in local treeless branches (#84247)  | 
25  | 
from bzrlib.tests import TestCaseInTempDir, TestCaseWithTransport  | 
| 
2978.6.1
by Kent Gibson
 Use normalize_log to more accurately test blackbox log output.  | 
26  | 
from bzrlib.tests.test_log import (  | 
27  | 
normalize_log,  | 
|
28  | 
    )
 | 
|
| 
3144.7.9
by Guillermo Gonzalez
 * bzrlib.log.show_roperties don't hide handler errors  | 
29  | 
from bzrlib.tests import test_log  | 
30  | 
||
31  | 
||
32  | 
class TestCaseWithoutPropsHandler(ExternalBase, test_log.TestCaseWithoutPropsHandler):  | 
|
33  | 
    pass
 | 
|
| 
1540.2.6
by Robey Pointer
 make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'  | 
34  | 
|
35  | 
||
36  | 
class TestLog(ExternalBase):  | 
|
37  | 
||
| 
2664.14.1
by Daniel Watkins
 Fixed tests.blackbox.test_log to use internals where appropriate.  | 
38  | 
def _prepare(self, path='.', format=None):  | 
| 
2809.1.2
by Daniel Watkins
 Removed unnecessary check as per abentley's on-list comments.  | 
39  | 
tree = self.make_branch_and_tree(path, format=format)  | 
| 
2664.14.1
by Daniel Watkins
 Fixed tests.blackbox.test_log to use internals where appropriate.  | 
40  | 
self.build_tree(  | 
41  | 
[path + '/hello.txt', path + '/goodbye.txt', path + '/meep.txt'])  | 
|
42  | 
tree.add('hello.txt')  | 
|
43  | 
tree.commit(message='message1')  | 
|
44  | 
tree.add('goodbye.txt')  | 
|
45  | 
tree.commit(message='message2')  | 
|
46  | 
tree.add('meep.txt')  | 
|
47  | 
tree.commit(message='message3')  | 
|
48  | 
self.full_log = self.run_bzr(["log", path])[0]  | 
|
49  | 
return tree  | 
|
| 
1553.4.2
by Michael Ellerman
 Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure  | 
50  | 
|
51  | 
def test_log_null_end_revspec(self):  | 
|
52  | 
self._prepare()  | 
|
53  | 
self.assertTrue('revno: 1\n' in self.full_log)  | 
|
54  | 
self.assertTrue('revno: 2\n' in self.full_log)  | 
|
55  | 
self.assertTrue('revno: 3\n' in self.full_log)  | 
|
56  | 
self.assertTrue('message:\n message1\n' in self.full_log)  | 
|
57  | 
self.assertTrue('message:\n message2\n' in self.full_log)  | 
|
58  | 
self.assertTrue('message:\n message3\n' in self.full_log)  | 
|
59  | 
||
| 
2530.3.1
by Martin Pool
 Cleanup old variations on run_bzr in the test suite  | 
60  | 
log = self.run_bzr("log -r 1..")[0]  | 
| 
2466.11.2
by Kent Gibson
 Add tests for deltas in merge revisions  | 
61  | 
self.assertEqualDiff(log, self.full_log)  | 
| 
1553.4.2
by Michael Ellerman
 Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure  | 
62  | 
|
63  | 
def test_log_null_begin_revspec(self):  | 
|
64  | 
self._prepare()  | 
|
| 
2530.3.1
by Martin Pool
 Cleanup old variations on run_bzr in the test suite  | 
65  | 
log = self.run_bzr("log -r ..3")[0]  | 
| 
2466.11.2
by Kent Gibson
 Add tests for deltas in merge revisions  | 
66  | 
self.assertEqualDiff(self.full_log, log)  | 
| 
1553.4.2
by Michael Ellerman
 Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure  | 
67  | 
|
68  | 
def test_log_null_both_revspecs(self):  | 
|
69  | 
self._prepare()  | 
|
| 
2530.3.1
by Martin Pool
 Cleanup old variations on run_bzr in the test suite  | 
70  | 
log = self.run_bzr("log -r ..")[0]  | 
| 
2466.11.2
by Kent Gibson
 Add tests for deltas in merge revisions  | 
71  | 
self.assertEqualDiff(self.full_log, log)  | 
| 
1553.4.2
by Michael Ellerman
 Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure  | 
72  | 
|
| 
2978.4.1
by Kent Gibson
 Logging revision 0 returns error.  | 
73  | 
def test_log_zero_revspec(self):  | 
74  | 
self._prepare()  | 
|
75  | 
self.run_bzr_error('bzr: ERROR: Logging revision 0 is invalid.',  | 
|
76  | 
['log', '-r0'])  | 
|
77  | 
||
78  | 
def test_log_zero_begin_revspec(self):  | 
|
79  | 
self._prepare()  | 
|
80  | 
self.run_bzr_error('bzr: ERROR: Logging revision 0 is invalid.',  | 
|
81  | 
['log', '-r0..2'])  | 
|
82  | 
||
83  | 
def test_log_zero_end_revspec(self):  | 
|
84  | 
self._prepare()  | 
|
85  | 
self.run_bzr_error('bzr: ERROR: Logging revision 0 is invalid.',  | 
|
86  | 
['log', '-r-2..0'])  | 
|
87  | 
||
| 
3144.1.1
by Lukáš Lalinský
 Fixed error reporting of unsupported timezone format.  | 
88  | 
def test_log_unsupported_timezone(self):  | 
89  | 
self._prepare()  | 
|
90  | 
self.run_bzr_error('bzr: ERROR: Unsupported timezone format "foo", '  | 
|
91  | 
'options are "utc", "original", "local".',  | 
|
92  | 
['log', '--timezone', 'foo'])  | 
|
93  | 
||
| 
1553.4.2
by Michael Ellerman
 Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure  | 
94  | 
def test_log_negative_begin_revspec_full_log(self):  | 
95  | 
self._prepare()  | 
|
| 
2530.3.1
by Martin Pool
 Cleanup old variations on run_bzr in the test suite  | 
96  | 
log = self.run_bzr("log -r -3..")[0]  | 
| 
2466.11.2
by Kent Gibson
 Add tests for deltas in merge revisions  | 
97  | 
self.assertEqualDiff(self.full_log, log)  | 
| 
1553.4.2
by Michael Ellerman
 Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure  | 
98  | 
|
99  | 
def test_log_negative_both_revspec_full_log(self):  | 
|
100  | 
self._prepare()  | 
|
| 
2530.3.1
by Martin Pool
 Cleanup old variations on run_bzr in the test suite  | 
101  | 
log = self.run_bzr("log -r -3..-1")[0]  | 
| 
2466.11.2
by Kent Gibson
 Add tests for deltas in merge revisions  | 
102  | 
self.assertEqualDiff(self.full_log, log)  | 
| 
1553.4.2
by Michael Ellerman
 Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure  | 
103  | 
|
104  | 
def test_log_negative_both_revspec_partial(self):  | 
|
105  | 
self._prepare()  | 
|
| 
2530.3.1
by Martin Pool
 Cleanup old variations on run_bzr in the test suite  | 
106  | 
log = self.run_bzr("log -r -3..-2")[0]  | 
| 
1553.4.2
by Michael Ellerman
 Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure  | 
107  | 
self.assertTrue('revno: 1\n' in log)  | 
108  | 
self.assertTrue('revno: 2\n' in log)  | 
|
109  | 
self.assertTrue('revno: 3\n' not in log)  | 
|
110  | 
||
111  | 
def test_log_negative_begin_revspec(self):  | 
|
112  | 
self._prepare()  | 
|
| 
2530.3.1
by Martin Pool
 Cleanup old variations on run_bzr in the test suite  | 
113  | 
log = self.run_bzr("log -r -2..")[0]  | 
| 
1553.4.2
by Michael Ellerman
 Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure  | 
114  | 
self.assertTrue('revno: 1\n' not in log)  | 
115  | 
self.assertTrue('revno: 2\n' in log)  | 
|
116  | 
self.assertTrue('revno: 3\n' in log)  | 
|
117  | 
||
| 
2978.4.1
by Kent Gibson
 Logging revision 0 returns error.  | 
118  | 
def test_log_positive_revspecs(self):  | 
| 
1553.4.2
by Michael Ellerman
 Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure  | 
119  | 
self._prepare()  | 
| 
2530.3.1
by Martin Pool
 Cleanup old variations on run_bzr in the test suite  | 
120  | 
log = self.run_bzr("log -r 1..3")[0]  | 
| 
2466.11.2
by Kent Gibson
 Add tests for deltas in merge revisions  | 
121  | 
self.assertEqualDiff(self.full_log, log)  | 
| 
1624.1.3
by Robert Collins
 Convert log to use the new tsort.merge_sort routine.  | 
122  | 
|
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
123  | 
def test_log_reversed_revspecs(self):  | 
124  | 
self._prepare()  | 
|
125  | 
self.run_bzr_error(('bzr: ERROR: Start revision must be older than '  | 
|
126  | 
'the end revision.\n',),  | 
|
| 
2581.1.6
by Martin Pool
 fix up more run_bzr callers  | 
127  | 
['log', '-r3..1'])  | 
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
128  | 
|
| 
1907.4.2
by Matthieu Moy
 Make log work nicely with revno:N:path too.  | 
129  | 
def test_log_revno_n_path(self):  | 
| 
2664.14.1
by Daniel Watkins
 Fixed tests.blackbox.test_log to use internals where appropriate.  | 
130  | 
self._prepare(path='branch1')  | 
131  | 
self._prepare(path='branch2')  | 
|
| 
2530.3.1
by Martin Pool
 Cleanup old variations on run_bzr in the test suite  | 
132  | 
log = self.run_bzr("log -r revno:2:branch1..revno:3:branch2",  | 
| 
1907.4.2
by Matthieu Moy
 Make log work nicely with revno:N:path too.  | 
133  | 
retcode=3)[0]  | 
| 
2530.3.1
by Martin Pool
 Cleanup old variations on run_bzr in the test suite  | 
134  | 
log = self.run_bzr("log -r revno:1:branch2..revno:3:branch2")[0]  | 
| 
2466.11.2
by Kent Gibson
 Add tests for deltas in merge revisions  | 
135  | 
self.assertEqualDiff(self.full_log, log)  | 
| 
2530.3.1
by Martin Pool
 Cleanup old variations on run_bzr in the test suite  | 
136  | 
log = self.run_bzr("log -r revno:1:branch2")[0]  | 
| 
1907.4.2
by Matthieu Moy
 Make log work nicely with revno:N:path too.  | 
137  | 
self.assertTrue('revno: 1\n' in log)  | 
138  | 
self.assertTrue('revno: 2\n' not in log)  | 
|
139  | 
self.assertTrue('branch nick: branch2\n' in log)  | 
|
140  | 
self.assertTrue('branch nick: branch1\n' not in log)  | 
|
141  | 
||
| 
2100.1.1
by wang
 Running ``bzr log`` on nonexistent file gives an error instead of the  | 
142  | 
def test_log_nonexistent_file(self):  | 
143  | 
        # files that don't exist in either the basis tree or working tree
 | 
|
144  | 
        # should give an error
 | 
|
145  | 
wt = self.make_branch_and_tree('.')  | 
|
| 
2552.2.3
by Vincent Ladeuil
 Deprecate the varargs syntax and fix the tests.  | 
146  | 
out, err = self.run_bzr('log does-not-exist', retcode=3)  | 
| 
2100.1.1
by wang
 Running ``bzr log`` on nonexistent file gives an error instead of the  | 
147  | 
self.assertContainsRe(  | 
148  | 
err, 'Path does not have any revision history: does-not-exist')  | 
|
| 
2388.1.11
by Alexander Belchenko
 changes after John's review  | 
149  | 
|
| 
2388.1.3
by Erik Bagfors
 tests for tags in log output  | 
150  | 
def test_log_with_tags(self):  | 
| 
2664.14.1
by Daniel Watkins
 Fixed tests.blackbox.test_log to use internals where appropriate.  | 
151  | 
tree = self._prepare(format='dirstate-tags')  | 
152  | 
branch = tree.branch  | 
|
153  | 
branch.tags.set_tag('tag1', branch.get_rev_id(1))  | 
|
154  | 
branch.tags.set_tag('tag1.1', branch.get_rev_id(1))  | 
|
155  | 
branch.tags.set_tag('tag3', branch.last_revision())  | 
|
| 
2388.1.3
by Erik Bagfors
 tests for tags in log output  | 
156  | 
|
| 
2530.3.1
by Martin Pool
 Cleanup old variations on run_bzr in the test suite  | 
157  | 
log = self.run_bzr("log -r-1")[0]  | 
| 
2388.1.3
by Erik Bagfors
 tests for tags in log output  | 
158  | 
self.assertTrue('tags: tag3' in log)  | 
159  | 
||
| 
2530.3.1
by Martin Pool
 Cleanup old variations on run_bzr in the test suite  | 
160  | 
log = self.run_bzr("log -r1")[0]  | 
| 
2388.1.3
by Erik Bagfors
 tests for tags in log output  | 
161  | 
        # I guess that we can't know the order of tags in the output
 | 
162  | 
        # since dicts are unordered, need to check both possibilities
 | 
|
| 
2388.1.11
by Alexander Belchenko
 changes after John's review  | 
163  | 
self.assertContainsRe(log, r'tags: (tag1, tag1\.1|tag1\.1, tag1)')  | 
164  | 
||
| 
2388.1.9
by Erik Bagfors
 test for merges with tags in log  | 
165  | 
def test_merged_log_with_tags(self):  | 
| 
2664.14.1
by Daniel Watkins
 Fixed tests.blackbox.test_log to use internals where appropriate.  | 
166  | 
branch1_tree = self._prepare(path='branch1', format='dirstate-tags')  | 
167  | 
branch1 = branch1_tree.branch  | 
|
168  | 
branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()  | 
|
169  | 
branch1_tree.commit(message='foobar', allow_pointless=True)  | 
|
170  | 
branch1.tags.set_tag('tag1', branch1.last_revision())  | 
|
171  | 
os.chdir('branch2')  | 
|
172  | 
self.run_bzr('merge ../branch1') # tags don't propagate otherwise  | 
|
173  | 
branch2_tree.commit(message='merge branch 1')  | 
|
| 
2530.3.1
by Martin Pool
 Cleanup old variations on run_bzr in the test suite  | 
174  | 
log = self.run_bzr("log -r-1")[0]  | 
| 
2388.1.11
by Alexander Belchenko
 changes after John's review  | 
175  | 
self.assertContainsRe(log, r' tags: tag1')  | 
| 
2578.2.1
by Andrew Bennetts
 Merge Kent Gibson's fix for bug #4663, resolving conflicts.  | 
176  | 
log = self.run_bzr("log -r3.1.1")[0]  | 
| 
2466.12.2
by Kent Gibson
 shift log output with only merge revisions to the left margin  | 
177  | 
self.assertContainsRe(log, r'tags: tag1')  | 
| 
2388.1.3
by Erik Bagfors
 tests for tags in log output  | 
178  | 
|
| 
2466.9.1
by Kent Gibson
 add bzr log --limit  | 
179  | 
def test_log_limit(self):  | 
| 
3660.1.1
by Robert Collins
 Fix log --limit (broken by log filtering patch).  | 
180  | 
tree = self.make_branch_and_tree('.')  | 
181  | 
        # We want more commits than our batch size starts at
 | 
|
182  | 
for pos in range(10):  | 
|
183  | 
tree.commit("%s" % pos)  | 
|
| 
2530.3.1
by Martin Pool
 Cleanup old variations on run_bzr in the test suite  | 
184  | 
log = self.run_bzr("log --limit 2")[0]  | 
| 
3108.1.3
by Matt Nordhoff
 Use assertContainsRe/assertNotContainsRe in tests.  | 
185  | 
self.assertNotContainsRe(log, r'revno: 1\n')  | 
| 
3660.1.1
by Robert Collins
 Fix log --limit (broken by log filtering patch).  | 
186  | 
self.assertNotContainsRe(log, r'revno: 2\n')  | 
187  | 
self.assertNotContainsRe(log, r'revno: 3\n')  | 
|
188  | 
self.assertNotContainsRe(log, r'revno: 4\n')  | 
|
189  | 
self.assertNotContainsRe(log, r'revno: 5\n')  | 
|
190  | 
self.assertNotContainsRe(log, r'revno: 6\n')  | 
|
191  | 
self.assertNotContainsRe(log, r'revno: 7\n')  | 
|
192  | 
self.assertNotContainsRe(log, r'revno: 8\n')  | 
|
193  | 
self.assertContainsRe(log, r'revno: 9\n')  | 
|
194  | 
self.assertContainsRe(log, r'revno: 10\n')  | 
|
| 
2466.9.1
by Kent Gibson
 add bzr log --limit  | 
195  | 
|
| 
3108.1.2
by Matt Nordhoff
 Simple copied unit test.  | 
196  | 
def test_log_limit_short(self):  | 
197  | 
self._prepare()  | 
|
198  | 
log = self.run_bzr("log -l 2")[0]  | 
|
| 
3108.1.3
by Matt Nordhoff
 Use assertContainsRe/assertNotContainsRe in tests.  | 
199  | 
self.assertNotContainsRe(log, r'revno: 1\n')  | 
200  | 
self.assertContainsRe(log, r'revno: 2\n')  | 
|
201  | 
self.assertContainsRe(log, r'revno: 3\n')  | 
|
| 
3144.7.9
by Guillermo Gonzalez
 * bzrlib.log.show_roperties don't hide handler errors  | 
202  | 
|
203  | 
||
204  | 
class TestLogMerges(TestCaseWithoutPropsHandler):  | 
|
| 
1624.1.3
by Robert Collins
 Convert log to use the new tsort.merge_sort routine.  | 
205  | 
|
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
206  | 
def _prepare(self):  | 
| 
2664.14.1
by Daniel Watkins
 Fixed tests.blackbox.test_log to use internals where appropriate.  | 
207  | 
parent_tree = self.make_branch_and_tree('parent')  | 
208  | 
parent_tree.commit(message='first post', allow_pointless=True)  | 
|
209  | 
child_tree = parent_tree.bzrdir.sprout('child').open_workingtree()  | 
|
210  | 
child_tree.commit(message='branch 1', allow_pointless=True)  | 
|
211  | 
smaller_tree = \  | 
|
212  | 
child_tree.bzrdir.sprout('smallerchild').open_workingtree()  | 
|
213  | 
smaller_tree.commit(message='branch 2', allow_pointless=True)  | 
|
214  | 
child_tree.merge_from_branch(smaller_tree.branch)  | 
|
215  | 
child_tree.commit(message='merge branch 2')  | 
|
216  | 
parent_tree.merge_from_branch(child_tree.branch)  | 
|
217  | 
parent_tree.commit(message='merge branch 1')  | 
|
218  | 
os.chdir('parent')  | 
|
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
219  | 
|
220  | 
def test_merges_are_indented_by_level(self):  | 
|
221  | 
self._prepare()  | 
|
| 
1624.1.3
by Robert Collins
 Convert log to use the new tsort.merge_sort routine.  | 
222  | 
out,err = self.run_bzr('log')  | 
223  | 
self.assertEqual('', err)  | 
|
| 
2978.6.1
by Kent Gibson
 Use normalize_log to more accurately test blackbox log output.  | 
224  | 
log = normalize_log(out)  | 
225  | 
self.assertEqualDiff(log, """\  | 
|
226  | 
------------------------------------------------------------
 | 
|
227  | 
revno: 2
 | 
|
228  | 
committer: Lorem Ipsum <test@example.com>
 | 
|
229  | 
branch nick: parent
 | 
|
230  | 
timestamp: Just now
 | 
|
231  | 
message:
 | 
|
232  | 
  merge branch 1
 | 
|
233  | 
    ------------------------------------------------------------
 | 
|
234  | 
    revno: 1.1.2
 | 
|
235  | 
    committer: Lorem Ipsum <test@example.com>
 | 
|
236  | 
    branch nick: child
 | 
|
237  | 
    timestamp: Just now
 | 
|
238  | 
    message:
 | 
|
239  | 
      merge branch 2
 | 
|
240  | 
        ------------------------------------------------------------
 | 
|
| 
3170.3.4
by John Arbash Meinel
 Update the tests for the new revision numbering.  | 
241  | 
        revno: 1.2.1
 | 
| 
2978.6.1
by Kent Gibson
 Use normalize_log to more accurately test blackbox log output.  | 
242  | 
        committer: Lorem Ipsum <test@example.com>
 | 
243  | 
        branch nick: smallerchild
 | 
|
244  | 
        timestamp: Just now
 | 
|
245  | 
        message:
 | 
|
246  | 
          branch 2
 | 
|
247  | 
    ------------------------------------------------------------
 | 
|
248  | 
    revno: 1.1.1
 | 
|
249  | 
    committer: Lorem Ipsum <test@example.com>
 | 
|
250  | 
    branch nick: child
 | 
|
251  | 
    timestamp: Just now
 | 
|
252  | 
    message:
 | 
|
253  | 
      branch 1
 | 
|
254  | 
------------------------------------------------------------
 | 
|
255  | 
revno: 1
 | 
|
256  | 
committer: Lorem Ipsum <test@example.com>
 | 
|
257  | 
branch nick: parent
 | 
|
258  | 
timestamp: Just now
 | 
|
259  | 
message:
 | 
|
260  | 
  first post
 | 
|
261  | 
""")  | 
|
| 
1685.1.5
by John Arbash Meinel
 Merged test_log.py.moved into test_log.py  | 
262  | 
|
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
263  | 
def test_merges_single_merge_rev(self):  | 
264  | 
self._prepare()  | 
|
| 
2581.1.6
by Martin Pool
 fix up more run_bzr callers  | 
265  | 
out,err = self.run_bzr('log -r1.1.2')  | 
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
266  | 
self.assertEqual('', err)  | 
| 
2978.6.1
by Kent Gibson
 Use normalize_log to more accurately test blackbox log output.  | 
267  | 
log = normalize_log(out)  | 
268  | 
self.assertEqualDiff(log, """\  | 
|
269  | 
------------------------------------------------------------
 | 
|
270  | 
revno: 1.1.2
 | 
|
271  | 
committer: Lorem Ipsum <test@example.com>
 | 
|
272  | 
branch nick: child
 | 
|
273  | 
timestamp: Just now
 | 
|
274  | 
message:
 | 
|
275  | 
  merge branch 2
 | 
|
276  | 
    ------------------------------------------------------------
 | 
|
| 
3170.3.4
by John Arbash Meinel
 Update the tests for the new revision numbering.  | 
277  | 
    revno: 1.2.1
 | 
| 
2978.6.1
by Kent Gibson
 Use normalize_log to more accurately test blackbox log output.  | 
278  | 
    committer: Lorem Ipsum <test@example.com>
 | 
279  | 
    branch nick: smallerchild
 | 
|
280  | 
    timestamp: Just now
 | 
|
281  | 
    message:
 | 
|
282  | 
      branch 2
 | 
|
283  | 
""")  | 
|
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
284  | 
|
285  | 
def test_merges_partial_range(self):  | 
|
286  | 
self._prepare()  | 
|
| 
2581.1.6
by Martin Pool
 fix up more run_bzr callers  | 
287  | 
out,err = self.run_bzr('log -r1.1.1..1.1.2')  | 
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
288  | 
self.assertEqual('', err)  | 
| 
2978.6.1
by Kent Gibson
 Use normalize_log to more accurately test blackbox log output.  | 
289  | 
log = normalize_log(out)  | 
290  | 
self.assertEqualDiff(log, """\  | 
|
291  | 
------------------------------------------------------------
 | 
|
292  | 
revno: 1.1.2
 | 
|
293  | 
committer: Lorem Ipsum <test@example.com>
 | 
|
294  | 
branch nick: child
 | 
|
295  | 
timestamp: Just now
 | 
|
296  | 
message:
 | 
|
297  | 
  merge branch 2
 | 
|
298  | 
    ------------------------------------------------------------
 | 
|
| 
3170.3.4
by John Arbash Meinel
 Update the tests for the new revision numbering.  | 
299  | 
    revno: 1.2.1
 | 
| 
2978.6.1
by Kent Gibson
 Use normalize_log to more accurately test blackbox log output.  | 
300  | 
    committer: Lorem Ipsum <test@example.com>
 | 
301  | 
    branch nick: smallerchild
 | 
|
302  | 
    timestamp: Just now
 | 
|
303  | 
    message:
 | 
|
304  | 
      branch 2
 | 
|
305  | 
------------------------------------------------------------
 | 
|
306  | 
revno: 1.1.1
 | 
|
307  | 
committer: Lorem Ipsum <test@example.com>
 | 
|
308  | 
branch nick: child
 | 
|
309  | 
timestamp: Just now
 | 
|
310  | 
message:
 | 
|
311  | 
  branch 1
 | 
|
312  | 
""")  | 
|
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
313  | 
|
| 
2978.3.1
by Kent Gibson
 Return an error if the revisionspec contains merge revisions, but the log formatter doesn't support them.  | 
314  | 
def test_merges_nonsupporting_formatter(self):  | 
315  | 
self._prepare()  | 
|
316  | 
err_msg = 'Selected log formatter only supports mainline revisions.'  | 
|
| 
2997.1.1
by Kent Gibson
 Support logging single merge revisions with short and line log formatters.  | 
317  | 
        # The single revision case is tested in the core tests
 | 
318  | 
        # since all standard formatters support single merge revisions.
 | 
|
| 
2978.3.1
by Kent Gibson
 Return an error if the revisionspec contains merge revisions, but the log formatter doesn't support them.  | 
319  | 
out,err = self.run_bzr('log --short -r1..1.1.2', retcode=3)  | 
320  | 
self.assertContainsRe(err, err_msg)  | 
|
321  | 
out,err = self.run_bzr('log --short -r1.1.1..1.1.2', retcode=3)  | 
|
322  | 
self.assertContainsRe(err, err_msg)  | 
|
323  | 
||
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
324  | 
|
| 
1685.1.5
by John Arbash Meinel
 Merged test_log.py.moved into test_log.py  | 
325  | 
class TestLogEncodings(TestCaseInTempDir):  | 
326  | 
||
327  | 
_mu = u'\xb5'  | 
|
328  | 
_message = u'Message with \xb5'  | 
|
329  | 
||
330  | 
    # Encodings which can encode mu
 | 
|
331  | 
good_encodings = [  | 
|
332  | 
'utf-8',  | 
|
333  | 
'latin-1',  | 
|
334  | 
'iso-8859-1',  | 
|
335  | 
'cp437', # Common windows encoding  | 
|
336  | 
'cp1251', # Alexander Belchenko's windows encoding  | 
|
337  | 
'cp1258', # Common windows encoding  | 
|
338  | 
    ]
 | 
|
339  | 
    # Encodings which cannot encode mu
 | 
|
340  | 
bad_encodings = [  | 
|
341  | 
'ascii',  | 
|
342  | 
'iso-8859-2',  | 
|
343  | 
'koi8_r',  | 
|
344  | 
    ]
 | 
|
345  | 
||
346  | 
def setUp(self):  | 
|
347  | 
TestCaseInTempDir.setUp(self)  | 
|
348  | 
self.user_encoding = bzrlib.user_encoding  | 
|
349  | 
||
350  | 
def tearDown(self):  | 
|
351  | 
bzrlib.user_encoding = self.user_encoding  | 
|
352  | 
TestCaseInTempDir.tearDown(self)  | 
|
353  | 
||
354  | 
def create_branch(self):  | 
|
355  | 
bzr = self.run_bzr  | 
|
356  | 
bzr('init')  | 
|
357  | 
open('a', 'wb').write('some stuff\n')  | 
|
| 
2552.2.3
by Vincent Ladeuil
 Deprecate the varargs syntax and fix the tests.  | 
358  | 
bzr('add a')  | 
359  | 
bzr(['commit', '-m', self._message])  | 
|
| 
1685.1.5
by John Arbash Meinel
 Merged test_log.py.moved into test_log.py  | 
360  | 
|
361  | 
def try_encoding(self, encoding, fail=False):  | 
|
362  | 
bzr = self.run_bzr  | 
|
363  | 
if fail:  | 
|
364  | 
self.assertRaises(UnicodeEncodeError,  | 
|
365  | 
self._mu.encode, encoding)  | 
|
366  | 
encoded_msg = self._message.encode(encoding, 'replace')  | 
|
367  | 
else:  | 
|
368  | 
encoded_msg = self._message.encode(encoding)  | 
|
369  | 
||
370  | 
old_encoding = bzrlib.user_encoding  | 
|
371  | 
        # This test requires that 'run_bzr' uses the current
 | 
|
372  | 
        # bzrlib, because we override user_encoding, and expect
 | 
|
373  | 
        # it to be used
 | 
|
374  | 
try:  | 
|
375  | 
bzrlib.user_encoding = 'ascii'  | 
|
376  | 
            # We should be able to handle any encoding
 | 
|
377  | 
out, err = bzr('log', encoding=encoding)  | 
|
378  | 
if not fail:  | 
|
379  | 
                # Make sure we wrote mu as we expected it to exist
 | 
|
380  | 
self.assertNotEqual(-1, out.find(encoded_msg))  | 
|
381  | 
out_unicode = out.decode(encoding)  | 
|
382  | 
self.assertNotEqual(-1, out_unicode.find(self._message))  | 
|
383  | 
else:  | 
|
384  | 
self.assertNotEqual(-1, out.find('Message with ?'))  | 
|
385  | 
finally:  | 
|
386  | 
bzrlib.user_encoding = old_encoding  | 
|
387  | 
||
388  | 
def test_log_handles_encoding(self):  | 
|
389  | 
self.create_branch()  | 
|
390  | 
||
391  | 
for encoding in self.good_encodings:  | 
|
392  | 
self.try_encoding(encoding)  | 
|
393  | 
||
394  | 
def test_log_handles_bad_encoding(self):  | 
|
395  | 
self.create_branch()  | 
|
396  | 
||
397  | 
for encoding in self.bad_encodings:  | 
|
398  | 
self.try_encoding(encoding, fail=True)  | 
|
399  | 
||
400  | 
def test_stdout_encoding(self):  | 
|
401  | 
bzr = self.run_bzr  | 
|
402  | 
bzrlib.user_encoding = "cp1251"  | 
|
403  | 
||
404  | 
bzr('init')  | 
|
405  | 
self.build_tree(['a'])  | 
|
| 
2552.2.3
by Vincent Ladeuil
 Deprecate the varargs syntax and fix the tests.  | 
406  | 
bzr('add a')  | 
407  | 
bzr(['commit', '-m', u'\u0422\u0435\u0441\u0442'])  | 
|
| 
1685.1.5
by John Arbash Meinel
 Merged test_log.py.moved into test_log.py  | 
408  | 
stdout, stderr = self.run_bzr('log', encoding='cp866')  | 
409  | 
||
410  | 
message = stdout.splitlines()[-1]  | 
|
411  | 
||
412  | 
        # explanation of the check:
 | 
|
413  | 
        # u'\u0422\u0435\u0441\u0442' is word 'Test' in russian
 | 
|
414  | 
        # in cp866  encoding this is string '\x92\xa5\xe1\xe2'
 | 
|
415  | 
        # in cp1251 encoding this is string '\xd2\xe5\xf1\xf2'
 | 
|
416  | 
        # This test should check that output of log command
 | 
|
417  | 
        # encoded to sys.stdout.encoding
 | 
|
418  | 
test_in_cp866 = '\x92\xa5\xe1\xe2'  | 
|
419  | 
test_in_cp1251 = '\xd2\xe5\xf1\xf2'  | 
|
420  | 
        # Make sure the log string is encoded in cp866
 | 
|
421  | 
self.assertEquals(test_in_cp866, message[2:])  | 
|
422  | 
        # Make sure the cp1251 string is not found anywhere
 | 
|
423  | 
self.assertEquals(-1, stdout.find(test_in_cp1251))  | 
|
424  | 
||
| 
1551.10.18
by Aaron Bentley
 Log works in local treeless branches (#84247)  | 
425  | 
|
426  | 
class TestLogFile(TestCaseWithTransport):  | 
|
427  | 
||
428  | 
def test_log_local_branch_file(self):  | 
|
429  | 
"""We should be able to log files in local treeless branches"""  | 
|
430  | 
tree = self.make_branch_and_tree('tree')  | 
|
431  | 
self.build_tree(['tree/file'])  | 
|
432  | 
tree.add('file')  | 
|
433  | 
tree.commit('revision 1')  | 
|
434  | 
tree.bzrdir.destroy_workingtree()  | 
|
| 
2552.2.3
by Vincent Ladeuil
 Deprecate the varargs syntax and fix the tests.  | 
435  | 
self.run_bzr('log tree/file')  | 
| 
2359.1.1
by Kent Gibson
 Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.  | 
436  | 
|
437  | 
def test_log_file(self):  | 
|
438  | 
"""The log for a particular file should only list revs for that file"""  | 
|
439  | 
tree = self.make_branch_and_tree('parent')  | 
|
440  | 
self.build_tree(['parent/file1', 'parent/file2', 'parent/file3'])  | 
|
441  | 
tree.add('file1')  | 
|
442  | 
tree.commit('add file1')  | 
|
443  | 
tree.add('file2')  | 
|
444  | 
tree.commit('add file2')  | 
|
445  | 
tree.add('file3')  | 
|
446  | 
tree.commit('add file3')  | 
|
| 
2664.14.1
by Daniel Watkins
 Fixed tests.blackbox.test_log to use internals where appropriate.  | 
447  | 
child_tree = tree.bzrdir.sprout('child').open_workingtree()  | 
448  | 
self.build_tree_contents([('child/file2', 'hello')])  | 
|
449  | 
child_tree.commit(message='branch 1')  | 
|
450  | 
tree.merge_from_branch(child_tree.branch)  | 
|
451  | 
tree.commit(message='merge child branch')  | 
|
| 
2359.1.1
by Kent Gibson
 Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.  | 
452  | 
os.chdir('parent')  | 
| 
2581.1.6
by Martin Pool
 fix up more run_bzr callers  | 
453  | 
log = self.run_bzr('log file1')[0]  | 
| 
2359.1.1
by Kent Gibson
 Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.  | 
454  | 
self.assertContainsRe(log, 'revno: 1\n')  | 
455  | 
self.assertNotContainsRe(log, 'revno: 2\n')  | 
|
456  | 
self.assertNotContainsRe(log, 'revno: 3\n')  | 
|
457  | 
self.assertNotContainsRe(log, 'revno: 3.1.1\n')  | 
|
458  | 
self.assertNotContainsRe(log, 'revno: 4\n')  | 
|
| 
2581.1.6
by Martin Pool
 fix up more run_bzr callers  | 
459  | 
log = self.run_bzr('log file2')[0]  | 
| 
2359.1.1
by Kent Gibson
 Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.  | 
460  | 
self.assertNotContainsRe(log, 'revno: 1\n')  | 
461  | 
self.assertContainsRe(log, 'revno: 2\n')  | 
|
462  | 
self.assertNotContainsRe(log, 'revno: 3\n')  | 
|
463  | 
self.assertContainsRe(log, 'revno: 3.1.1\n')  | 
|
| 
2359.1.2
by Kent Gibson
 add logging of merge revisions  | 
464  | 
self.assertContainsRe(log, 'revno: 4\n')  | 
| 
2581.1.6
by Martin Pool
 fix up more run_bzr callers  | 
465  | 
log = self.run_bzr('log file3')[0]  | 
| 
2359.1.1
by Kent Gibson
 Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.  | 
466  | 
self.assertNotContainsRe(log, 'revno: 1\n')  | 
467  | 
self.assertNotContainsRe(log, 'revno: 2\n')  | 
|
468  | 
self.assertContainsRe(log, 'revno: 3\n')  | 
|
469  | 
self.assertNotContainsRe(log, 'revno: 3.1.1\n')  | 
|
470  | 
self.assertNotContainsRe(log, 'revno: 4\n')  | 
|
| 
2581.1.6
by Martin Pool
 fix up more run_bzr callers  | 
471  | 
log = self.run_bzr('log -r3.1.1 file2')[0]  | 
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
472  | 
self.assertNotContainsRe(log, 'revno: 1\n')  | 
473  | 
self.assertNotContainsRe(log, 'revno: 2\n')  | 
|
474  | 
self.assertNotContainsRe(log, 'revno: 3\n')  | 
|
475  | 
self.assertContainsRe(log, 'revno: 3.1.1\n')  | 
|
476  | 
self.assertNotContainsRe(log, 'revno: 4\n')  | 
|
| 
2581.1.6
by Martin Pool
 fix up more run_bzr callers  | 
477  | 
log = self.run_bzr('log -r4 file2')[0]  | 
478  | 
self.assertNotContainsRe(log, 'revno: 1\n')  | 
|
479  | 
self.assertNotContainsRe(log, 'revno: 2\n')  | 
|
480  | 
self.assertNotContainsRe(log, 'revno: 3\n')  | 
|
481  | 
self.assertContainsRe(log, 'revno: 3.1.1\n')  | 
|
482  | 
self.assertContainsRe(log, 'revno: 4\n')  | 
|
483  | 
log = self.run_bzr('log -r3.. file2')[0]  | 
|
484  | 
self.assertNotContainsRe(log, 'revno: 1\n')  | 
|
485  | 
self.assertNotContainsRe(log, 'revno: 2\n')  | 
|
486  | 
self.assertNotContainsRe(log, 'revno: 3\n')  | 
|
487  | 
self.assertContainsRe(log, 'revno: 3.1.1\n')  | 
|
488  | 
self.assertContainsRe(log, 'revno: 4\n')  | 
|
489  | 
log = self.run_bzr('log -r..3 file2')[0]  | 
|
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
490  | 
self.assertNotContainsRe(log, 'revno: 1\n')  | 
491  | 
self.assertContainsRe(log, 'revno: 2\n')  | 
|
492  | 
self.assertNotContainsRe(log, 'revno: 3\n')  | 
|
493  | 
self.assertNotContainsRe(log, 'revno: 3.1.1\n')  | 
|
494  | 
self.assertNotContainsRe(log, 'revno: 4\n')  |