← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2011-12-14 12:15:44 UTC
  • mto: This revision was merged to the branch mainline in revision 6365.
  • Revision ID: jelmer@samba.org-20111214121544-v07cbvmi30re6q7w
s/NoVfsCalls/ContainsNoVfsCalls/.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_versioning.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
29
29
from bzrlib.workingtree import WorkingTree
30
30
 
31
31
 
32
 
class TestVersioning(TestCaseInTempDir):
 
32
class TestMkdir(TestCaseWithTransport):
 
33
 
 
34
    def test_mkdir_fails_cleanly(self):
 
35
        """'mkdir' fails cleanly when no working tree is available.
 
36
        https://bugs.launchpad.net/bzr/+bug/138600
 
37
        """
 
38
        # Since there is a safety working tree above us, we create a bare repo
 
39
        # here locally.
 
40
        shared_repo = self.make_repository('.')
 
41
        self.run_bzr(['mkdir', 'abc'], retcode=3)
 
42
        self.assertPathDoesNotExist('abc')
33
43
 
34
44
    def test_mkdir(self):
35
45
        """Basic 'bzr mkdir' operation"""
36
46
 
37
 
        self.run_bzr('init')
38
 
        self.run_bzr('mkdir foo')
 
47
        self.make_branch_and_tree('.')
 
48
        self.run_bzr(['mkdir', 'foo'])
39
49
        self.assert_(os.path.isdir('foo'))
40
50
 
41
 
        self.run_bzr('mkdir foo', retcode=3)
 
51
        self.run_bzr(['mkdir', 'foo'], retcode=3)
42
52
 
43
53
        wt = WorkingTree.open('.')
44
54
 
48
58
 
49
59
        self.assertEquals(len(delta.added), 1)
50
60
        self.assertEquals(delta.added[0][0], 'foo')
51
 
        self.failIf(delta.modified)
 
61
        self.assertFalse(delta.modified)
52
62
 
53
63
    def test_mkdir_in_subdir(self):
54
64
        """'bzr mkdir' operation in subdirectory"""
55
65
 
56
 
        self.run_bzr('init')
57
 
        self.run_bzr('mkdir dir')
 
66
        self.make_branch_and_tree('.')
 
67
        self.run_bzr(['mkdir', 'dir'])
58
68
        self.assert_(os.path.isdir('dir'))
59
69
 
60
70
        os.chdir('dir')
61
71
        self.log('Run mkdir in subdir')
62
 
        self.run_bzr('mkdir subdir')
 
72
        self.run_bzr(['mkdir', 'subdir'])
63
73
        self.assert_(os.path.isdir('subdir'))
64
74
        os.chdir('..')
65
75
 
72
82
        self.assertEquals(len(delta.added), 2)
73
83
        self.assertEquals(delta.added[0][0], 'dir')
74
84
        self.assertEquals(delta.added[1][0], pathjoin('dir','subdir'))
75
 
        self.failIf(delta.modified)
 
85
        self.assertFalse(delta.modified)
76
86
 
77
87
    def test_mkdir_w_nested_trees(self):
78
88
        """'bzr mkdir' with nested trees"""
79
89
 
80
 
        self.run_bzr('init')
81
 
        os.mkdir('a')
82
 
        os.chdir('a')
83
 
        self.run_bzr('init')
84
 
        os.mkdir('b')
85
 
        os.chdir('b')
86
 
        self.run_bzr('init')
87
 
        os.chdir('../..')
 
90
        self.make_branch_and_tree('.')
 
91
        self.make_branch_and_tree('a')
 
92
        self.make_branch_and_tree('a/b')
88
93
 
89
 
        self.run_bzr('mkdir dir a/dir a/b/dir')
90
 
        self.failUnless(os.path.isdir('dir'))
91
 
        self.failUnless(os.path.isdir('a/dir'))
92
 
        self.failUnless(os.path.isdir('a/b/dir'))
 
94
        self.run_bzr(['mkdir', 'dir', 'a/dir', 'a/b/dir'])
 
95
        self.assertTrue(os.path.isdir('dir'))
 
96
        self.assertTrue(os.path.isdir('a/dir'))
 
97
        self.assertTrue(os.path.isdir('a/b/dir'))
93
98
 
94
99
        wt = WorkingTree.open('.')
95
100
        wt_a = WorkingTree.open('a')
98
103
        delta = wt.changes_from(wt.basis_tree())
99
104
        self.assertEquals(len(delta.added), 1)
100
105
        self.assertEquals(delta.added[0][0], 'dir')
101
 
        self.failIf(delta.modified)
 
106
        self.assertFalse(delta.modified)
102
107
 
103
108
        delta = wt_a.changes_from(wt_a.basis_tree())
104
109
        self.assertEquals(len(delta.added), 1)
105
110
        self.assertEquals(delta.added[0][0], 'dir')
106
 
        self.failIf(delta.modified)
 
111
        self.assertFalse(delta.modified)
107
112
 
108
113
        delta = wt_b.changes_from(wt_b.basis_tree())
109
114
        self.assertEquals(len(delta.added), 1)
110
115
        self.assertEquals(delta.added[0][0], 'dir')
111
 
        self.failIf(delta.modified)
112
 
 
113
 
    def check_branch(self):
114
 
        """After all the above changes, run the check and upgrade commands.
115
 
 
116
 
        The upgrade should be a no-op."""
117
 
        b = Branch.open(u'.')
118
 
        mutter('branch has %d revisions', b.revno())
119
 
 
120
 
        mutter('check branch...')
121
 
        from bzrlib.check import check
122
 
        check(b, False)
 
116
        self.assertFalse(delta.modified)
 
117
 
 
118
    def test_mkdir_quiet(self):
 
119
        """'bzr mkdir --quiet' should not print a status message"""
 
120
 
 
121
        self.make_branch_and_tree('.')
 
122
        out, err = self.run_bzr(['mkdir', '--quiet', 'foo'])
 
123
        self.assertEquals('', err)
 
124
        self.assertEquals('', out)
123
125
 
124
126
 
125
127
class SubdirCommit(TestCaseWithTransport):
146
148
        new = b.repository.revision_tree(b.get_rev_id(2))
147
149
        new.lock_read()
148
150
 
149
 
        self.assertEqual(new.get_file_by_path('b/two').read(), 'old contents')
150
 
        self.assertEqual(new.get_file_by_path('top').read(), 'old contents')
151
 
        self.assertEqual(new.get_file_by_path('a/one').read(), 'new contents')
 
151
        def get_text_by_path(tree, path):
 
152
            return tree.get_file_text(tree.path2id(path), path)
 
153
 
 
154
        self.assertEqual(get_text_by_path(new, 'b/two'), 'old contents')
 
155
        self.assertEqual(get_text_by_path(new, 'top'), 'old contents')
 
156
        self.assertEqual(get_text_by_path(new, 'a/one'), 'new contents')
152
157
        new.unlock()
153
158
 
154
159
        os.chdir('a')
156
161
        self.run_bzr(['commit', '.', '-m', 'commit subdir only', '--unchanged'])
157
162
        v3 = b.repository.revision_tree(b.get_rev_id(3))
158
163
        v3.lock_read()
159
 
        self.assertEqual(v3.get_file_by_path('b/two').read(), 'old contents')
160
 
        self.assertEqual(v3.get_file_by_path('top').read(), 'old contents')
161
 
        self.assertEqual(v3.get_file_by_path('a/one').read(), 'new contents')
 
164
        self.assertEqual(get_text_by_path(v3, 'b/two'), 'old contents')
 
165
        self.assertEqual(get_text_by_path(v3, 'top'), 'old contents')
 
166
        self.assertEqual(get_text_by_path(v3, 'a/one'), 'new contents')
162
167
        v3.unlock()
163
168
 
164
169
        # commit in subdirectory commits whole tree
165
170
        self.run_bzr(['commit', '-m', 'commit whole tree from subdir'])
166
171
        v4 = b.repository.revision_tree(b.get_rev_id(4))
167
172
        v4.lock_read()
168
 
        self.assertEqual(v4.get_file_by_path('b/two').read(), 'new contents')
169
 
        self.assertEqual(v4.get_file_by_path('top').read(), 'new contents')
 
173
        self.assertEqual(get_text_by_path(v4, 'b/two'), 'new contents')
 
174
        self.assertEqual(get_text_by_path(v4, 'top'), 'new contents')
170
175
        v4.unlock()
171
176
 
172
177
        # TODO: factor out some kind of assert_tree_state() method