/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_log.py

  • Committer: Vincent Ladeuil
  • Date: 2009-05-06 08:17:44 UTC
  • mto: (4343.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4344.
  • Revision ID: v.ladeuil+lp@free.fr-20090506081744-cddmmug2gl2wm7ex
Clarify LogCatcher purpose.

* bzrlib/tests/test_log.py:
(LogCatcher.__init__): We are catching revisions, not their
formatted logs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_log.py
54
54
 
55
55
    def __init__(self):
56
56
        super(LogCatcher, self).__init__(to_file=None)
57
 
        self.logs = []
 
57
        self.revisions = []
58
58
 
59
59
    def log_revision(self, revision):
60
 
        self.logs.append(revision)
 
60
        self.revisions.append(revision)
61
61
 
62
62
 
63
63
class TestShowLog(tests.TestCaseWithTransport):
104
104
        lf = LogCatcher()
105
105
        log.show_log(wt.branch, lf)
106
106
        # no entries yet
107
 
        self.assertEqual([], lf.logs)
 
107
        self.assertEqual([], lf.revisions)
108
108
 
109
109
    def test_empty_commit(self):
110
110
        wt = self.make_branch_and_tree('.')
112
112
        wt.commit('empty commit')
113
113
        lf = LogCatcher()
114
114
        log.show_log(wt.branch, lf, verbose=True)
115
 
        self.assertEqual(1, len(lf.logs))
116
 
        self.assertEqual('1', lf.logs[0].revno)
117
 
        self.assertEqual('empty commit', lf.logs[0].rev.message)
118
 
        self.checkDelta(lf.logs[0].delta)
 
115
        revs = lf.revisions
 
116
        self.assertEqual(1, len(revs))
 
117
        self.assertEqual('1', revs[0].revno)
 
118
        self.assertEqual('empty commit', revs[0].rev.message)
 
119
        self.checkDelta(revs[0].delta)
119
120
 
120
121
    def test_simple_commit(self):
121
122
        wt = self.make_branch_and_tree('.')
127
128
                            u'<test@example.com>')
128
129
        lf = LogCatcher()
129
130
        log.show_log(wt.branch, lf, verbose=True)
130
 
        self.assertEqual(2, len(lf.logs))
 
131
        self.assertEqual(2, len(lf.revisions))
131
132
        # first one is most recent
132
 
        log_entry = lf.logs[0]
 
133
        log_entry = lf.revisions[0]
133
134
        self.assertEqual('2', log_entry.revno)
134
135
        self.assertEqual('add one file', log_entry.rev.message)
135
136
        self.checkDelta(log_entry.delta, added=['hello'])
141
142
        wt.commit(msg)
142
143
        lf = LogCatcher()
143
144
        log.show_log(wt.branch, lf, verbose=True)
144
 
        committed_msg = lf.logs[0].rev.message
 
145
        committed_msg = lf.revisions[0].rev.message
145
146
        self.assertNotEqual(msg, committed_msg)
146
147
        self.assertTrue(len(committed_msg) > len(msg))
147
148
 
155
156
        wt.commit(msg)
156
157
        lf = LogCatcher()
157
158
        log.show_log(wt.branch, lf, verbose=True)
158
 
        committed_msg = lf.logs[0].rev.message
 
159
        committed_msg = lf.revisions[0].rev.message
159
160
        self.assertEqual(msg, committed_msg)
160
161
 
161
162
    def test_deltas_in_merge_revisions(self):
179
180
        lf.supports_merge_revisions = True
180
181
        log.show_log(b, lf, verbose=True)
181
182
 
182
 
        self.assertEqual(3, len(lf.logs))
 
183
        revs = lf.revisions
 
184
        self.assertEqual(3, len(revs))
183
185
 
184
 
        logentry = lf.logs[0]
 
186
        logentry = revs[0]
185
187
        self.assertEqual('2', logentry.revno)
186
188
        self.assertEqual('merge child branch', logentry.rev.message)
187
189
        self.checkDelta(logentry.delta, removed=['file1'], modified=['file2'])
188
190
 
189
 
        logentry = lf.logs[1]
 
191
        logentry = revs[1]
190
192
        self.assertEqual('1.1.1', logentry.revno)
191
193
        self.assertEqual('remove file1 and modify file2', logentry.rev.message)
192
194
        self.checkDelta(logentry.delta, removed=['file1'], modified=['file2'])
193
195
 
194
 
        logentry = lf.logs[2]
 
196
        logentry = revs[2]
195
197
        self.assertEqual('1', logentry.revno)
196
198
        self.assertEqual('add file1 and file2', logentry.rev.message)
197
199
        self.checkDelta(logentry.delta, added=['file1', 'file2'])