/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: Ian Clatworthy
  • Date: 2009-01-29 07:53:46 UTC
  • mto: (3972.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3973.
  • Revision ID: ian.clatworthy@canonical.com-20090129075346-4zyjjh9a0yw07t42
review feedback from vila

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
585
585
        self.assertNotContainsRe(log, 'revno: 3.1.1\n')
586
586
        self.assertNotContainsRe(log, 'revno: 4\n')
587
587
 
588
 
    def test_log_file_historical(self):
589
 
        """File matched against revision range, not current tree."""
590
 
        self.prepare_tree(complex=True)
591
 
 
 
588
    def test_log_file_historical_missing(self):
592
589
        # Check logging a deleted file gives an error if the
593
590
        # file isn't found at the end or start of the revision range
 
591
        self.prepare_tree(complex=True)
594
592
        err_msg = "Path unknown at end or start of revision range: file2"
595
593
        err = self.run_bzr('log file2', retcode=3)[1]
596
594
        self.assertContainsRe(err, err_msg)
597
595
 
 
596
    def test_log_file_historical_end(self):
598
597
        # Check logging a deleted file is ok if the file existed
599
598
        # at the end the revision range
 
599
        self.prepare_tree(complex=True)
600
600
        log, err = self.run_bzr('log -r..4 file2')
601
601
        self.assertEquals('', err)
602
602
        self.assertNotContainsRe(log, 'revno: 1\n')
605
605
        self.assertContainsRe(log, 'revno: 3.1.1\n')
606
606
        self.assertContainsRe(log, 'revno: 4\n')
607
607
 
 
608
    def test_log_file_historical_start(self):
608
609
        # Check logging a deleted file is ok if the file existed
609
610
        # at the start of the revision range
 
611
        self.prepare_tree(complex=True)
610
612
        log, err = self.run_bzr('log file1')
611
613
        self.assertEquals('', err)
612
614
        self.assertContainsRe(log, 'revno: 1\n')