← 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: Canonical.com Patch Queue Manager
  • Date: 2010-05-21 13:36:51 UTC
  • mfrom: (5243.2.1 readdir_cleanup)
  • Revision ID: pqm@pqm.ubuntu.com-20100521133651-p62dndo2giy5ls21
(lifeless) Some cleanups to the readdir pyrex code for a little efficiency
 and to avoid compile warnings. (John A Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
19
19
 
20
20
from itertools import izip
21
21
import os
 
22
import re
22
23
 
23
24
from bzrlib import (
24
25
    branchbuilder,
28
29
    tests,
29
30
    )
30
31
from bzrlib.tests import (
 
32
    script,
31
33
    test_log,
32
34
    )
33
35
 
156
158
        self.make_linear_branch()
157
159
        self.assertLogRevnos(['-c1'], ['1'])
158
160
 
159
 
    def test_branch_revspec(self):
160
 
        foo = self.make_branch_and_tree('foo')
161
 
        bar = self.make_branch_and_tree('bar')
162
 
        self.build_tree(['foo/foo.txt', 'bar/bar.txt'])
163
 
        foo.add('foo.txt')
164
 
        bar.add('bar.txt')
165
 
        foo.commit(message='foo')
166
 
        bar.commit(message='bar')
167
 
        self.run_bzr('log -r branch:../bar', working_dir='foo')
168
 
        self.assertEqual([bar.branch.get_rev_id(1)],
169
 
                         [r.rev.revision_id
170
 
                          for r in self.get_captured_revisions()])
171
 
 
172
 
 
173
 
class TestLogExcludeCommonAncestry(TestLogWithLogCatcher):
174
 
 
175
 
    def test_exclude_common_ancestry_simple_revnos(self):
176
 
        self.make_linear_branch()
177
 
        self.assertLogRevnos(['-r1..3', '--exclude-common-ancestry'],
178
 
                             ['3', '2'])
179
 
 
180
161
 
181
162
class TestLogMergedLinearAncestry(TestLogWithLogCatcher):
182
163
 
186
167
        # stop calling run_bzr, there is no point) --vila 100118.
187
168
        builder = branchbuilder.BranchBuilder(self.get_transport())
188
169
        builder.start_series()
189
 
        # 1
190
 
        # | \
191
 
        # 2  1.1.1
192
 
        # | / |
193
 
        # 3  1.1.2
194
 
        # |   |
195
 
        # |  1.1.3
196
 
        # | / |
197
 
        # 4  1.1.4
198
 
        # | /
199
 
        # 5
200
 
 
201
170
        # mainline
202
171
        builder.build_snapshot('1', None, [
203
172
            ('add', ('', 'root-id', 'directory', ''))])
379
348
 
380
349
    def test_log_bad_message_re(self):
381
350
        """Bad --message argument gives a sensible message
382
 
 
 
351
        
383
352
        See https://bugs.launchpad.net/bzr/+bug/251352
384
353
        """
385
354
        self.make_minimal_branch()
386
355
        out, err = self.run_bzr(['log', '-m', '*'], retcode=3)
387
 
        self.assertContainsRe(err, "ERROR.*Invalid pattern.*nothing to repeat")
388
 
        self.assertNotContainsRe(err, "Unprintable exception")
389
 
        self.assertEqual(out, '')
 
356
        self.assertEqual("bzr: ERROR: Invalid regular expression"
 
357
            " in log message filter"
 
358
            ": '*'"
 
359
            ": nothing to repeat\n", err)
 
360
        self.assertEqual('', out)
390
361
 
391
362
    def test_log_unsupported_timezone(self):
392
363
        self.make_linear_branch()
922
893
        self.prepare_tree()
923
894
        os.chdir("dir1")
924
895
        self.assertLogRevnos(['dir2', 'file5'], ['5', '3'])
925
 
 
926
 
 
927
 
class MainlineGhostTests(TestLogWithLogCatcher):
928
 
 
929
 
    def setUp(self):
930
 
        super(MainlineGhostTests, self).setUp()
931
 
        tree = self.make_branch_and_tree('')
932
 
        tree.set_parent_ids(["spooky"], allow_leftmost_as_ghost=True)
933
 
        tree.add('')
934
 
        tree.commit('msg1', rev_id='rev1')
935
 
        tree.commit('msg2', rev_id='rev2')
936
 
 
937
 
    def test_log_range(self):
938
 
        self.assertLogRevnos(["-r1..2"], ["2", "1"])
939
 
 
940
 
    def test_log_norange(self):
941
 
        self.assertLogRevnos([], ["2", "1"])
942
 
 
943
 
    def test_log_range_open_begin(self):
944
 
        raise tests.KnownFailure("log with ghosts fails. bug #726466")
945
 
        (stdout, stderr) = self.run_bzr(['log', '-r..2'], retcode=3)
946
 
        self.assertEqual(["2", "1"],
947
 
                         [r.revno for r in self.get_captured_revisions()])
948
 
        self.assertEquals("bzr: ERROR: Further revision history missing.", stderr)
949
 
 
950
 
    def test_log_range_open_end(self):
951
 
        self.assertLogRevnos(["-r1.."], ["2", "1"])