← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_log.py

  • Committer: Jelmer Vernooij
  • Date: 2009-04-06 02:54:14 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4255.
  • Revision ID: jelmer@samba.org-20090406025414-65tpjwcmjp5wa5oj
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
495
495
  branch 1
496
496
""")
497
497
 
498
 
    def test_merges_nonsupporting_formatter(self):
499
 
        # This "feature" of log formatters is madness. If a log
500
 
        # formatter cannot display a dotted-revno, it ought to ignore it.
501
 
        # Otherwise, a linear sequence is always expected to be handled now.
502
 
        raise KnownFailure('log formatters must support linear sequences now')
503
 
        self._prepare()
504
 
        err_msg = 'Selected log formatter only supports mainline revisions.'
505
 
        # The single revision case is tested in the core tests
506
 
        # since all standard formatters support single merge revisions.
507
 
        out,err = self.run_bzr('log --short -r1..1.1.2', retcode=3)
508
 
        self.assertContainsRe(err, err_msg)
509
 
        out,err = self.run_bzr('log --short -r1.1.1..1.1.2', retcode=3)
510
 
        self.assertContainsRe(err, err_msg)
511
 
 
512
498
 
513
499
def subst_dates(string):
514
500
    """Replace date strings with constant values."""
621
607
      @@ -0,0 +1,1 @@
622
608
      +contents of parent/file2
623
609
 
 
610
Use --levels 0 (or -n0) to see merged revisions.
624
611
""")
625
612
 
626
613
    def test_log_show_diff_line(self):
658
645
      @@ -0,0 +1,1 @@
659
646
      +contents of parent/file2
660
647
 
 
648
Use --levels 0 (or -n0) to see merged revisions.
661
649
""")
662
650
        out,err = self.run_bzr('log -p --short file1')
663
651
        self.assertEqual('', err)