/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/blackbox/test_log.py

  • Committer: Robert Collins
  • Date: 2008-02-13 03:30:01 UTC
  • mfrom: (3221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3224.
  • Revision ID: robertc@robertcollins.net-20080213033001-rw70ul0zb02ph856
Merge to fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
80
80
        self.run_bzr_error('bzr: ERROR: Logging revision 0 is invalid.',
81
81
                           ['log', '-r-2..0'])
82
82
 
 
83
    def test_log_unsupported_timezone(self):
 
84
        self._prepare()
 
85
        self.run_bzr_error('bzr: ERROR: Unsupported timezone format "foo", '
 
86
                           'options are "utc", "original", "local".',
 
87
                           ['log', '--timezone', 'foo'])
 
88
 
83
89
    def test_log_negative_begin_revspec_full_log(self):
84
90
        self._prepare()
85
91
        log = self.run_bzr("log -r -3..")[0]
168
174
    def test_log_limit(self):
169
175
        self._prepare()
170
176
        log = self.run_bzr("log --limit 2")[0]
171
 
        self.assertTrue('revno: 1\n' not in log)
172
 
        self.assertTrue('revno: 2\n' in log)
173
 
        self.assertTrue('revno: 3\n' in log)
 
177
        self.assertNotContainsRe(log, r'revno: 1\n')
 
178
        self.assertContainsRe(log, r'revno: 2\n')
 
179
        self.assertContainsRe(log, r'revno: 3\n')
 
180
 
 
181
    def test_log_limit_short(self):
 
182
        self._prepare()
 
183
        log = self.run_bzr("log -l 2")[0]
 
184
        self.assertNotContainsRe(log, r'revno: 1\n')
 
185
        self.assertContainsRe(log, r'revno: 2\n')
 
186
        self.assertContainsRe(log, r'revno: 3\n')
174
187
 
175
188
class TestLogMerges(ExternalBase):
176
189
 
209
222
    message:
210
223
      merge branch 2
211
224
        ------------------------------------------------------------
212
 
        revno: 1.1.1.1.1
 
225
        revno: 1.2.1
213
226
        committer: Lorem Ipsum <test@example.com>
214
227
        branch nick: smallerchild
215
228
        timestamp: Just now
245
258
message:
246
259
  merge branch 2
247
260
    ------------------------------------------------------------
248
 
    revno: 1.1.1.1.1
 
261
    revno: 1.2.1
249
262
    committer: Lorem Ipsum <test@example.com>
250
263
    branch nick: smallerchild
251
264
    timestamp: Just now
267
280
message:
268
281
  merge branch 2
269
282
    ------------------------------------------------------------
270
 
    revno: 1.1.1.1.1
 
283
    revno: 1.2.1
271
284
    committer: Lorem Ipsum <test@example.com>
272
285
    branch nick: smallerchild
273
286
    timestamp: Just now
285
298
    def test_merges_nonsupporting_formatter(self):
286
299
        self._prepare()
287
300
        err_msg = 'Selected log formatter only supports mainline revisions.'
288
 
        out,err = self.run_bzr('log --short -r1.1.2', retcode=3)
289
 
        self.assertContainsRe(err, err_msg)
 
301
        # The single revision case is tested in the core tests
 
302
        # since all standard formatters support single merge revisions.
290
303
        out,err = self.run_bzr('log --short -r1..1.1.2', retcode=3)
291
304
        self.assertContainsRe(err, err_msg)
292
305
        out,err = self.run_bzr('log --short -r1.1.1..1.1.2', retcode=3)