← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testlog.py

- merge improved merge base selection from aaron
aaron.bentley@utoronto.ca-20050912025534-43d7275dd948e4ad

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testlog.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
 
18
from cStringIO import StringIO
18
19
 
19
 
from bzrlib.selftest import BzrTestBase
 
20
from bzrlib.selftest import BzrTestBase, TestCaseInTempDir
20
21
from bzrlib.log import LogFormatter, show_log, LongLogFormatter
21
22
from bzrlib.branch import Branch
 
23
from bzrlib.errors import InvalidRevisionNumber
22
24
 
23
25
class _LogEntry(object):
24
26
    # should probably move into bzrlib.log?
47
49
        self.logs.append(le)
48
50
 
49
51
 
50
 
class SimpleLogTest(BzrTestBase):
 
52
class SimpleLogTest(TestCaseInTempDir):
51
53
 
52
54
    def checkDelta(self, delta, **kw):
53
55
        """Check the filenames touched by a delta are as expected."""
62
64
            got = [x[0] for x in getattr(delta, n)]
63
65
            self.assertEquals(expected, got)
64
66
 
 
67
    def test_cur_revno(self):
 
68
        b = Branch('.', init=True)
 
69
 
 
70
        lf = LogCatcher()
 
71
        b.commit('empty commit')
 
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
 
65
86
    def test_simple_log(self):
66
87
        eq = self.assertEquals
67
 
        ass = self.assert_
68
88
        
69
89
        b = Branch('.', init=True)
70
90
 
88
108
        self.build_tree(['hello'])
89
109
        b.add('hello')
90
110
        b.commit('add one file')
 
111
 
 
112
        lf = StringIO()
91
113
        # log using regular thing
92
 
        show_log(b, LongLogFormatter(self.TEST_LOG))
 
114
        show_log(b, LongLogFormatter(lf))
 
115
        lf.seek(0)
 
116
        for l in lf.readlines():
 
117
            self.log(l)
93
118
 
94
119
        # get log as data structure
95
120
        lf = LogCatcher()