/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: John Arbash Meinel
  • Date: 2007-11-14 15:03:18 UTC
  • mfrom: (2991 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2992.
  • Revision ID: john@arbash-meinel.com-20071114150318-j0yvbz7et36s005e
merge bzr.dev 2991

Show diffs side-by-side

added added

removed removed

Lines of Context:
60
60
    def test_log_null_both_revspecs(self):
61
61
        self._prepare()
62
62
        log = self.run_bzr("log -r ..")[0]
63
 
        self.assertEquals(self.full_log, log)
64
63
        self.assertEqualDiff(self.full_log, log)
65
64
 
 
65
    def test_log_zero_revspec(self):
 
66
        self._prepare()
 
67
        self.run_bzr_error('bzr: ERROR: Logging revision 0 is invalid.',
 
68
                           ['log', '-r0'])
 
69
 
 
70
    def test_log_zero_begin_revspec(self):
 
71
        self._prepare()
 
72
        self.run_bzr_error('bzr: ERROR: Logging revision 0 is invalid.',
 
73
                           ['log', '-r0..2'])
 
74
 
 
75
    def test_log_zero_end_revspec(self):
 
76
        self._prepare()
 
77
        self.run_bzr_error('bzr: ERROR: Logging revision 0 is invalid.',
 
78
                           ['log', '-r-2..0'])
 
79
 
66
80
    def test_log_negative_begin_revspec_full_log(self):
67
81
        self._prepare()
68
82
        log = self.run_bzr("log -r -3..")[0]
87
101
        self.assertTrue('revno: 2\n' in log)
88
102
        self.assertTrue('revno: 3\n' in log)
89
103
 
90
 
    def test_log_postive_revspecs(self):
 
104
    def test_log_positive_revspecs(self):
91
105
        self._prepare()
92
106
        log = self.run_bzr("log -r 1..3")[0]
93
107
        self.assertEqualDiff(self.full_log, log)
304
318
        self.assertTrue('  first post' not in out)
305
319
        self.assertEqual('', err)
306
320
 
 
321
    def test_merges_nonsupporting_formatter(self):
 
322
        self._prepare()
 
323
        err_msg = 'Selected log formatter only supports mainline revisions.'
 
324
        out,err = self.run_bzr('log --short -r1.1.2', retcode=3)
 
325
        self.assertContainsRe(err, err_msg)
 
326
        out,err = self.run_bzr('log --short -r1..1.1.2', retcode=3)
 
327
        self.assertContainsRe(err, err_msg)
 
328
        out,err = self.run_bzr('log --short -r1.1.1..1.1.2', retcode=3)
 
329
        self.assertContainsRe(err, err_msg)
 
330
 
307
331
 
308
332
class TestLogEncodings(TestCaseInTempDir):
309
333