← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_log.py

Improved help for remerge and merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_log.py
18
18
from cStringIO import StringIO
19
19
 
20
20
from bzrlib.tests import BzrTestBase, TestCaseWithTransport
21
 
from bzrlib.log import (LogFormatter, show_log, LongLogFormatter,
22
 
                        ShortLogFormatter, LineLogFormatter)
 
21
from bzrlib.log import LogFormatter, show_log, LongLogFormatter, ShortLogFormatter
23
22
from bzrlib.branch import Branch
24
23
from bzrlib.errors import InvalidRevisionNumber
25
24
 
40
39
    def __init__(self):
41
40
        super(LogCatcher, self).__init__(to_file=None)
42
41
        self.logs = []
43
 
 
 
42
        
 
43
        
44
44
    def show(self, revno, rev, delta):
45
45
        le = _LogEntry()
46
46
        le.revno = revno
276
276
added:
277
277
  a
278
278
''')
279
 
 
280
 
    def test_line_log(self):
281
 
        """Line log should show revno
282
 
        
283
 
        bug #5162
284
 
        """
285
 
        wt = self.make_branch_and_tree('.')
286
 
        b = wt.branch
287
 
        self.build_tree(['a'])
288
 
        wt.add('a')
289
 
        b.nick = 'test-line-log'
290
 
        wt.commit(message='add a', 
291
 
                  timestamp=1132711707, 
292
 
                  timezone=36000,
293
 
                  committer='Line-Log-Formatter Tester <test@line.log>')
294
 
        logfile = file('out.tmp', 'w+')
295
 
        formatter = LineLogFormatter(to_file=logfile)
296
 
        show_log(b, formatter)
297
 
        logfile.flush()
298
 
        logfile.seek(0)
299
 
        log_contents = logfile.read()
300
 
        self.assertEqualDiff(log_contents, '1: Line-Log-Formatte... 2005-11-23 add a\n')