~bzr-pqm/bzr/bzr.dev

974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1
# Copyright (C) 2005 by 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
import os
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
18
from cStringIO import StringIO
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
19
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
20
from bzrlib.tests import BzrTestBase, TestCaseInTempDir
1185.31.21 by John Arbash Meinel
Added test for log formatting, found bug when redirecting short logs to a file instead of stdout.
21
from bzrlib.log import LogFormatter, show_log, LongLogFormatter, ShortLogFormatter
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
22
from bzrlib.branch import Branch
974.1.54 by aaron.bentley at utoronto
Fixed the revno bug in log
23
from bzrlib.errors import InvalidRevisionNumber
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
24
25
class _LogEntry(object):
26
    # should probably move into bzrlib.log?
27
    pass
28
29
30
class LogCatcher(LogFormatter):
31
    """Pull log messages into list rather than displaying them.
32
33
    For ease of testing we save log messages here rather than actually
34
    formatting them, so that we can precisely check the result without
35
    being too dependent on the exact formatting.
36
37
    We should also test the LogFormatter.
38
    """
39
    def __init__(self):
40
        super(LogCatcher, self).__init__(to_file=None)
41
        self.logs = []
42
        
43
        
44
    def show(self, revno, rev, delta):
45
        le = _LogEntry()
46
        le.revno = revno
47
        le.rev = rev
48
        le.delta = delta
49
        self.logs.append(le)
50
51
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
52
class SimpleLogTest(TestCaseInTempDir):
1102 by Martin Pool
- merge test refactoring from robertc
53
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
54
    def checkDelta(self, delta, **kw):
55
        """Check the filenames touched by a delta are as expected."""
56
        for n in 'added', 'removed', 'renamed', 'modified', 'unchanged':
57
            expected = kw.get(n, [])
58
59
            # tests are written with unix paths; fix them up for windows
60
            if os.sep != '/':
61
                expected = [x.replace('/', os.sep) for x in expected]
62
63
            # strip out only the path components
64
            got = [x[0] for x in getattr(delta, n)]
65
            self.assertEquals(expected, got)
66
974.1.54 by aaron.bentley at utoronto
Fixed the revno bug in log
67
    def test_cur_revno(self):
1092.3.4 by Robert Collins
update symlink branch to integration
68
        b = Branch('.', init=True)
69
70
        lf = LogCatcher()
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
71
        b.working_tree().commit('empty commit')
1092.3.4 by Robert Collins
update symlink branch to integration
72
        show_log(b, lf, verbose=True, start_revision=1, end_revision=1)
73
        self.assertRaises(InvalidRevisionNumber, show_log, b, lf,
74
                          start_revision=2, end_revision=1) 
75
        self.assertRaises(InvalidRevisionNumber, show_log, b, lf,
76
                          start_revision=1, end_revision=2) 
77
        self.assertRaises(InvalidRevisionNumber, show_log, b, lf,
78
                          start_revision=0, end_revision=2) 
79
        self.assertRaises(InvalidRevisionNumber, show_log, b, lf,
80
                          start_revision=1, end_revision=0) 
81
        self.assertRaises(InvalidRevisionNumber, show_log, b, lf,
82
                          start_revision=-1, end_revision=1) 
83
        self.assertRaises(InvalidRevisionNumber, show_log, b, lf,
84
                          start_revision=1, end_revision=-1) 
85
86
    def test_cur_revno(self):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
87
        b = Branch.initialize('.')
88
89
        lf = LogCatcher()
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
90
        b.working_tree().commit('empty commit')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
91
        show_log(b, lf, verbose=True, start_revision=1, end_revision=1)
92
        self.assertRaises(InvalidRevisionNumber, show_log, b, lf,
93
                          start_revision=2, end_revision=1) 
94
        self.assertRaises(InvalidRevisionNumber, show_log, b, lf,
95
                          start_revision=1, end_revision=2) 
96
        self.assertRaises(InvalidRevisionNumber, show_log, b, lf,
97
                          start_revision=0, end_revision=2) 
98
        self.assertRaises(InvalidRevisionNumber, show_log, b, lf,
99
                          start_revision=1, end_revision=0) 
100
        self.assertRaises(InvalidRevisionNumber, show_log, b, lf,
101
                          start_revision=-1, end_revision=1) 
102
        self.assertRaises(InvalidRevisionNumber, show_log, b, lf,
103
                          start_revision=1, end_revision=-1) 
104
1102 by Martin Pool
- merge test refactoring from robertc
105
    def test_simple_log(self):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
106
        eq = self.assertEquals
107
        
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
108
        b = Branch.initialize('.')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
109
110
        lf = LogCatcher()
111
        show_log(b, lf)
112
        # no entries yet
113
        eq(lf.logs, [])
114
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
115
        b.working_tree().commit('empty commit')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
116
        lf = LogCatcher()
117
        show_log(b, lf, verbose=True)
118
        eq(len(lf.logs), 1)
119
        eq(lf.logs[0].revno, 1)
120
        eq(lf.logs[0].rev.message, 'empty commit')
121
        d = lf.logs[0].delta
122
        self.log('log delta: %r' % d)
123
        self.checkDelta(d)
124
125
        self.build_tree(['hello'])
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
126
        b.working_tree().add('hello')
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
127
        b.working_tree().commit('add one file')
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
128
129
        lf = StringIO()
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
130
        # log using regular thing
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
131
        show_log(b, LongLogFormatter(lf))
132
        lf.seek(0)
133
        for l in lf.readlines():
134
            self.log(l)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
135
136
        # get log as data structure
137
        lf = LogCatcher()
138
        show_log(b, lf, verbose=True)
139
        eq(len(lf.logs), 2)
140
        self.log('log entries:')
141
        for logentry in lf.logs:
142
            self.log('%4d %s' % (logentry.revno, logentry.rev.message))
143
        
144
        # first one is most recent
145
        logentry = lf.logs[0]
146
        eq(logentry.revno, 2)
147
        eq(logentry.rev.message, 'add one file')
148
        d = logentry.delta
149
        self.log('log 2 delta: %r' % d)
150
        # self.checkDelta(d, added=['hello'])
151
        
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
152
        # commit a log message with control characters
153
        msg = "All 8-bit chars: " +  ''.join([unichr(x) for x in range(256)])
1393.4.2 by Harald Meland
Cleanup + better test of commit-msg control character escape code.
154
        self.log("original commit message: %r", msg)
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
155
        b.working_tree().commit(msg)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
156
        lf = LogCatcher()
157
        show_log(b, lf, verbose=True)
158
        committed_msg = lf.logs[0].rev.message
159
        self.log("escaped commit message: %r", committed_msg)
160
        self.assert_(msg != committed_msg)
161
        self.assert_(len(committed_msg) > len(msg))
1393.4.2 by Harald Meland
Cleanup + better test of commit-msg control character escape code.
162
163
        # Check that log message with only XML-valid characters isn't
164
        # escaped.  As ElementTree apparently does some kind of
165
        # newline conversion, neither LF (\x0A) nor CR (\x0D) are
166
        # included in the test commit message, even though they are
167
        # valid XML 1.0 characters.
168
        msg = "\x09" + ''.join([unichr(x) for x in range(0x20, 256)])
169
        self.log("original commit message: %r", msg)
1185.33.32 by Martin Pool
[merge] fix \t in commit messages
170
        b.working_tree().commit(msg)
1393.4.2 by Harald Meland
Cleanup + better test of commit-msg control character escape code.
171
        lf = LogCatcher()
172
        show_log(b, lf, verbose=True)
173
        committed_msg = lf.logs[0].rev.message
174
        self.log("escaped commit message: %r", committed_msg)
175
        self.assert_(msg == committed_msg)
1185.31.22 by John Arbash Meinel
[merge] bzr.dev
176
1185.31.21 by John Arbash Meinel
Added test for log formatting, found bug when redirecting short logs to a file instead of stdout.
177
    def test_trailing_newlines(self):
178
        b = Branch.initialize('.')
179
        b.nick='test'
180
        wt = b.working_tree()
181
        open('a', 'wb').write('hello moto\n')
1185.33.54 by Martin Pool
[merge] test renames and other fixes (John)
182
        wt.add('a')
1185.31.21 by John Arbash Meinel
Added test for log formatting, found bug when redirecting short logs to a file instead of stdout.
183
        wt.commit('simple log message', rev_id='a1'
184
                , timestamp=1132586655.459960938, timezone=-6*3600
185
                , committer='Joe Foo <joe@foo.com>')
186
        open('b', 'wb').write('goodbye\n')
1185.33.54 by Martin Pool
[merge] test renames and other fixes (John)
187
        wt.add('b')
1185.31.21 by John Arbash Meinel
Added test for log formatting, found bug when redirecting short logs to a file instead of stdout.
188
        wt.commit('multiline\nlog\nmessage\n', rev_id='a2'
189
                , timestamp=1132586842.411175966, timezone=-6*3600
190
                , committer='Joe Foo <joe@foo.com>')
191
192
        open('c', 'wb').write('just another manic monday\n')
1185.33.54 by Martin Pool
[merge] test renames and other fixes (John)
193
        wt.add('c')
1185.31.21 by John Arbash Meinel
Added test for log formatting, found bug when redirecting short logs to a file instead of stdout.
194
        wt.commit('single line with trailing newline\n', rev_id='a3'
195
                , timestamp=1132587176.835228920, timezone=-6*3600
196
                , committer = 'Joe Foo <joe@foo.com>')
197
198
        sio = StringIO()
199
        lf = ShortLogFormatter(to_file=sio)
200
        show_log(b, lf)
201
        self.assertEquals(sio.getvalue(), """\
202
    3 Joe Foo\t2005-11-21
203
      single line with trailing newline
204
205
    2 Joe Foo\t2005-11-21
206
      multiline
207
      log
208
      message
209
210
    1 Joe Foo\t2005-11-21
211
      simple log message
212
213
""")
214
215
        sio = StringIO()
216
        lf = LongLogFormatter(to_file=sio)
217
        show_log(b, lf)
218
        self.assertEquals(sio.getvalue(), """\
219
------------------------------------------------------------
220
revno: 3
221
committer: Joe Foo <joe@foo.com>
222
branch nick: test
223
timestamp: Mon 2005-11-21 09:32:56 -0600
224
message:
225
  single line with trailing newline
226
------------------------------------------------------------
227
revno: 2
228
committer: Joe Foo <joe@foo.com>
229
branch nick: test
230
timestamp: Mon 2005-11-21 09:27:22 -0600
231
message:
232
  multiline
233
  log
234
  message
235
------------------------------------------------------------
236
revno: 1
237
committer: Joe Foo <joe@foo.com>
238
branch nick: test
239
timestamp: Mon 2005-11-21 09:24:15 -0600
240
message:
241
  simple log message
242
""")
243
        
1185.33.41 by Martin Pool
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
244
    def test_verbose_log(self):
245
        """Verbose log includes changed files
246
        
247
        bug #4676
248
        """
249
        b = Branch.initialize('.')
250
        self.build_tree(['a'])
251
        wt = b.working_tree()
1185.33.45 by Martin Pool
[merge] refactoring of branch vs working tree, etc (robertc)
252
        wt.add('a')
1185.33.41 by Martin Pool
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
253
        # XXX: why does a longer nick show up?
254
        b.nick = 'test_verbose_log'
255
        wt.commit(message='add a', 
256
                  timestamp=1132711707, 
257
                  timezone=36000,
258
                  committer='Lorem Ipsum <test@example.com>')
259
        logfile = file('out.tmp', 'w+')
260
        formatter = LongLogFormatter(to_file=logfile)
261
        show_log(b, formatter, verbose=True)
262
        logfile.flush()
263
        logfile.seek(0)
264
        log_contents = logfile.read()
265
        self.assertEqualDiff(log_contents, '''\
266
------------------------------------------------------------
267
revno: 1
268
committer: Lorem Ipsum <test@example.com>
269
branch nick: test_verbose_log
270
timestamp: Wed 2005-11-23 12:08:27 +1000
271
message:
272
  add a
273
added:
274
  a
275
''')