← 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: Ian Clatworthy
  • Date: 2007-12-07 05:31:54 UTC
  • mto: (3092.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3093.
  • Revision ID: ian.clatworthy@internode.on.net-20071207053154-k9tmyczcf8niwonm
fix efficiency of local commit detection as recommended by jameinel's review

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_versioning.py
1
 
# Copyright (C) 2005, 2006, 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2005 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
"""Tests of simple versioning operations"""
22
22
 
23
23
import os
24
24
 
 
25
from bzrlib.tests import TestCaseInTempDir
25
26
from bzrlib.branch import Branch
 
27
from bzrlib.trace import mutter
26
28
from bzrlib.osutils import pathjoin
27
 
from bzrlib.tests import TestCaseInTempDir, TestCaseWithTransport
28
 
from bzrlib.trace import mutter
29
29
from bzrlib.workingtree import WorkingTree
30
30
 
31
31
 
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')
43
 
 
44
 
 
45
32
class TestVersioning(TestCaseInTempDir):
46
33
 
47
34
    def test_mkdir(self):
48
35
        """Basic 'bzr mkdir' operation"""
49
36
 
50
37
        self.run_bzr('init')
51
 
        self.run_bzr(['mkdir', 'foo'])
 
38
        self.run_bzr('mkdir foo')
52
39
        self.assert_(os.path.isdir('foo'))
53
40
 
54
 
        self.run_bzr(['mkdir', 'foo'], retcode=3)
 
41
        self.run_bzr('mkdir foo', retcode=3)
55
42
 
56
43
        wt = WorkingTree.open('.')
57
44
 
61
48
 
62
49
        self.assertEquals(len(delta.added), 1)
63
50
        self.assertEquals(delta.added[0][0], 'foo')
64
 
        self.assertFalse(delta.modified)
 
51
        self.failIf(delta.modified)
65
52
 
66
53
    def test_mkdir_in_subdir(self):
67
54
        """'bzr mkdir' operation in subdirectory"""
68
55
 
69
56
        self.run_bzr('init')
70
 
        self.run_bzr(['mkdir', 'dir'])
 
57
        self.run_bzr('mkdir dir')
71
58
        self.assert_(os.path.isdir('dir'))
72
59
 
73
60
        os.chdir('dir')
74
61
        self.log('Run mkdir in subdir')
75
 
        self.run_bzr(['mkdir', 'subdir'])
 
62
        self.run_bzr('mkdir subdir')
76
63
        self.assert_(os.path.isdir('subdir'))
77
64
        os.chdir('..')
78
65
 
85
72
        self.assertEquals(len(delta.added), 2)
86
73
        self.assertEquals(delta.added[0][0], 'dir')
87
74
        self.assertEquals(delta.added[1][0], pathjoin('dir','subdir'))
88
 
        self.assertFalse(delta.modified)
 
75
        self.failIf(delta.modified)
89
76
 
90
77
    def test_mkdir_w_nested_trees(self):
91
78
        """'bzr mkdir' with nested trees"""
99
86
        self.run_bzr('init')
100
87
        os.chdir('../..')
101
88
 
102
 
        self.run_bzr(['mkdir', 'dir', 'a/dir', 'a/b/dir'])
103
 
        self.assertTrue(os.path.isdir('dir'))
104
 
        self.assertTrue(os.path.isdir('a/dir'))
105
 
        self.assertTrue(os.path.isdir('a/b/dir'))
 
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'))
106
93
 
107
94
        wt = WorkingTree.open('.')
108
95
        wt_a = WorkingTree.open('a')
111
98
        delta = wt.changes_from(wt.basis_tree())
112
99
        self.assertEquals(len(delta.added), 1)
113
100
        self.assertEquals(delta.added[0][0], 'dir')
114
 
        self.assertFalse(delta.modified)
 
101
        self.failIf(delta.modified)
115
102
 
116
103
        delta = wt_a.changes_from(wt_a.basis_tree())
117
104
        self.assertEquals(len(delta.added), 1)
118
105
        self.assertEquals(delta.added[0][0], 'dir')
119
 
        self.assertFalse(delta.modified)
 
106
        self.failIf(delta.modified)
120
107
 
121
108
        delta = wt_b.changes_from(wt_b.basis_tree())
122
109
        self.assertEquals(len(delta.added), 1)
123
110
        self.assertEquals(delta.added[0][0], 'dir')
124
 
        self.assertFalse(delta.modified)
 
111
        self.failIf(delta.modified)
125
112
 
126
113
    def check_branch(self):
127
114
        """After all the above changes, run the check and upgrade commands.
135
122
        check(b, False)
136
123
 
137
124
 
138
 
class SubdirCommit(TestCaseWithTransport):
 
125
class SubdirCommit(TestCaseInTempDir):
139
126
 
140
127
    def test_subdir_commit(self):
141
 
        """Test committing a subdirectory, and committing a directory."""
142
 
        tree = self.make_branch_and_tree('.')
143
 
        b = tree.branch
 
128
        """Test committing a subdirectory, and committing within a directory."""
 
129
        run_bzr = self.run_bzr
 
130
        eq = self.assertEqual
 
131
 
144
132
        self.build_tree(['a/', 'b/'])
145
 
        def set_contents(contents):
146
 
            self.build_tree_contents([
147
 
                ('a/one', contents),
148
 
                ('b/two', contents),
149
 
                ('top', contents),
150
 
                ])
151
 
        set_contents('old contents')
152
 
        tree.smart_add(['.'])
153
 
        tree.commit('first revision')
154
 
        set_contents('new contents')
 
133
 
 
134
        run_bzr('init')
 
135
        b = Branch.open(u'.')
 
136
 
 
137
        for fn in ('a/one', 'b/two', 'top'):
 
138
            file(fn, 'w').write('old contents')
 
139
 
 
140
        run_bzr('add')
 
141
        run_bzr(['commit', '-m', 'first revision'])
 
142
 
 
143
        for fn in ('a/one', 'b/two', 'top'):
 
144
            file(fn, 'w').write('new contents')
155
145
 
156
146
        mutter('start selective subdir commit')
157
 
        self.run_bzr(['commit', 'a', '-m', 'commit a only'])
 
147
        run_bzr(['commit', 'a', '-m', 'commit a only'])
158
148
 
 
149
        old = b.repository.revision_tree(b.get_rev_id(1))
159
150
        new = b.repository.revision_tree(b.get_rev_id(2))
160
151
        new.lock_read()
161
152
 
162
 
        self.assertEqual(new.get_file_by_path('b/two').read(), 'old contents')
163
 
        self.assertEqual(new.get_file_by_path('top').read(), 'old contents')
164
 
        self.assertEqual(new.get_file_by_path('a/one').read(), 'new contents')
 
153
        eq(new.get_file_by_path('b/two').read(), 'old contents')
 
154
        eq(new.get_file_by_path('top').read(), 'old contents')
 
155
        eq(new.get_file_by_path('a/one').read(), 'new contents')
165
156
        new.unlock()
166
157
 
167
158
        os.chdir('a')
168
159
        # commit from here should do nothing
169
 
        self.run_bzr(['commit', '.', '-m', 'commit subdir only', '--unchanged'])
 
160
        run_bzr(['commit', '.', '-m', 'commit subdir only', '--unchanged'])
170
161
        v3 = b.repository.revision_tree(b.get_rev_id(3))
171
162
        v3.lock_read()
172
 
        self.assertEqual(v3.get_file_by_path('b/two').read(), 'old contents')
173
 
        self.assertEqual(v3.get_file_by_path('top').read(), 'old contents')
174
 
        self.assertEqual(v3.get_file_by_path('a/one').read(), 'new contents')
 
163
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
 
164
        eq(v3.get_file_by_path('top').read(), 'old contents')
 
165
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
175
166
        v3.unlock()
176
167
 
177
168
        # commit in subdirectory commits whole tree
178
 
        self.run_bzr(['commit', '-m', 'commit whole tree from subdir'])
 
169
        run_bzr(['commit', '-m', 'commit whole tree from subdir'])
179
170
        v4 = b.repository.revision_tree(b.get_rev_id(4))
180
171
        v4.lock_read()
181
 
        self.assertEqual(v4.get_file_by_path('b/two').read(), 'new contents')
182
 
        self.assertEqual(v4.get_file_by_path('top').read(), 'new contents')
 
172
        eq(v4.get_file_by_path('b/two').read(), 'new contents')
 
173
        eq(v4.get_file_by_path('top').read(), 'new contents')
183
174
        v4.unlock()
184
175
 
185
176
        # TODO: factor out some kind of assert_tree_state() method
 
177
 
 
178
 
 
179
if __name__ == '__main__':
 
180
    import unittest
 
181
    unittest.main()