← 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: Marius Kruger
  • Date: 2009-11-01 03:45:20 UTC
  • mto: (4867.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4868.
  • Revision ID: marius.kruger@enerweb.co.za-20091101034520-npr7m7ca1tedqlbm
* fix tests again
  - reverted some changes this branch made
  - adjusted the new test according to my new understanding of how log should work

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
277
277
        # tags don't propagate if we don't merge
278
278
        self.run_bzr('merge ../branch1', working_dir='branch2')
279
279
        branch2_tree.commit(message='merge branch 1')
280
 
        log = self.run_bzr("log -n0 -r-2..-1", working_dir='branch2')[0]
 
280
        log = self.run_bzr("log -n0 -r-1", working_dir='branch2')[0]
281
281
        self.assertContainsRe(log, r'    tags: tag1')
282
282
        log = self.run_bzr("log -n0 -r3.1.1", working_dir='branch2')[0]
283
283
        self.assertContainsRe(log, r'tags: tag1')
500
500
timestamp: Just now
501
501
message:
502
502
  merge branch level2
 
503
    ------------------------------------------------------------
 
504
    revno: 1.2.1
 
505
    committer: Lorem Ipsum <test@example.com>
 
506
    branch nick: level2
 
507
    timestamp: Just now
 
508
    message:
 
509
      in branch level2
503
510
"""
504
511
        self.check_log(expected, ['-n0', '-r1.1.2'])
505
512
 
530
537
        self.check_log(expected, ['-n0', '-r1.1.1..1.1.2'])
531
538
 
532
539
    def test_merges_partial_range_ignore_before_lower_bound(self):
533
 
        """Dont show revisions before the lower bound"""
 
540
        """Dont show revisions before the lower bound's merged revs"""
534
541
        expected = """\
535
542
    2 Lorem Ipsum\t2005-11-22 [merge]
536
543
      merge branch level1
538
545
          1.1.2 Lorem Ipsum\t2005-11-22 [merge]
539
546
                merge branch level2
540
547
 
 
548
              1.2.1 Lorem Ipsum\t2005-11-22
 
549
                    in branch level2
 
550
 
541
551
"""
542
552
        self.check_log(expected, ['--short', '-n0', '-r1.1.2..2'])
543
553
 
881
891
        self.assertNotContainsRe(log, 'revno: 1\n')
882
892
        self.assertNotContainsRe(log, 'revno: 2\n')
883
893
        self.assertNotContainsRe(log, 'revno: 3\n')
884
 
        self.assertNotContainsRe(log, 'revno: 3.1.1\n')
 
894
        self.assertContainsRe(log, 'revno: 3.1.1\n')
885
895
        self.assertContainsRe(log, 'revno: 4 ')
886
896
        log = self.run_bzr('log -n0 -r3.. file2')[0]
887
897
        self.assertNotContainsRe(log, 'revno: 1\n')