/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: Canonical.com Patch Queue Manager
  • Date: 2009-01-20 21:03:00 UTC
  • mfrom: (3943.4.5 1.12-fix-short-log)
  • Revision ID: pqm@pqm.ubuntu.com-20090120210300-641tutf1rkdn8a3n
(jam) Include the tests for log --short

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_log.py
319
319
""",
320
320
                             logfile.getvalue())
321
321
 
 
322
    def test_short_log_with_merges_and_range(self):
 
323
        wt = self.make_branch_and_memory_tree('.')
 
324
        wt.lock_write()
 
325
        self.addCleanup(wt.unlock)
 
326
        wt.add('')
 
327
        wt.commit('rev-1', rev_id='rev-1',
 
328
                  timestamp=1132586655, timezone=36000,
 
329
                  committer='Joe Foo <joe@foo.com>')
 
330
        wt.commit('rev-merged', rev_id='rev-2a',
 
331
                  timestamp=1132586700, timezone=36000,
 
332
                  committer='Joe Foo <joe@foo.com>')
 
333
        wt.branch.set_last_revision_info(1, 'rev-1')
 
334
        wt.set_parent_ids(['rev-1', 'rev-2a'])
 
335
        wt.commit('rev-2b', rev_id='rev-2b',
 
336
                  timestamp=1132586800, timezone=36000,
 
337
                  committer='Joe Foo <joe@foo.com>')
 
338
        wt.commit('rev-3a', rev_id='rev-3a',
 
339
                  timestamp=1132586800, timezone=36000,
 
340
                  committer='Joe Foo <joe@foo.com>')
 
341
        wt.branch.set_last_revision_info(2, 'rev-2b')
 
342
        wt.set_parent_ids(['rev-2b', 'rev-3a'])
 
343
        wt.commit('rev-3b', rev_id='rev-3b',
 
344
                  timestamp=1132586800, timezone=36000,
 
345
                  committer='Joe Foo <joe@foo.com>')
 
346
        logfile = self.make_utf8_encoded_stringio()
 
347
        formatter = log.ShortLogFormatter(to_file=logfile)
 
348
        log.show_log(wt.branch, formatter,
 
349
            start_revision=2, end_revision=3)
 
350
        self.assertEqualDiff("""\
 
351
    3 Joe Foo\t2005-11-22 [merge]
 
352
      rev-3b
 
353
 
 
354
    2 Joe Foo\t2005-11-22 [merge]
 
355
      rev-2b
 
356
 
 
357
""",
 
358
                             logfile.getvalue())
 
359
 
322
360
    def test_short_log_single_merge_revision(self):
323
361
        wt = self.make_branch_and_memory_tree('.')
324
362
        wt.lock_write()