← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/versioning.py

  • Committer: Martin Pool
  • Date: 2005-10-04 11:13:33 UTC
  • mto: (1185.13.3)
  • mto: This revision was merged to the branch mainline in revision 1403.
  • Revision ID: mbp@sourcefrog.net-20051004111332-f7b8a6bd41b9fe22
- tweak capture_tree formatting

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/versioning.py
1
1
# Copyright (C) 2005 by 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
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
#
 
7
 
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
22
22
 
23
23
import os
24
24
 
25
 
from bzrlib.tests import BzrTestBase, TestCaseInTempDir
 
25
from bzrlib.selftest import BzrTestBase, TestCaseInTempDir
26
26
from bzrlib.branch import Branch
27
 
from bzrlib.trace import mutter
28
 
from bzrlib.osutils import pathjoin
29
 
from bzrlib.workingtree import WorkingTree
 
27
 
 
28
import logging
 
29
logger = logging.getLogger('bzr.test.versioning')
 
30
debug = logger.debug
30
31
 
31
32
 
32
33
class TestVersioning(TestCaseInTempDir):
33
34
    
34
35
    def test_mkdir(self): 
35
36
        """Basic 'bzr mkdir' operation"""
 
37
        from bzrlib.commands import run_bzr
36
38
 
37
 
        self.run_bzr('init')
38
 
        self.run_bzr('mkdir', 'foo')
 
39
        run_bzr(['init'])
 
40
        run_bzr(['mkdir', 'foo'])
39
41
        self.assert_(os.path.isdir('foo'))
40
42
 
41
 
        self.run_bzr('mkdir', 'foo', retcode=3)
 
43
        self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
42
44
 
43
 
        wt = WorkingTree.open('.')
 
45
        from bzrlib.diff import compare_trees
 
46
        from bzrlib.branch import Branch
 
47
        b = Branch.open('.')
44
48
        
45
 
        delta = wt.changes_from(wt.basis_tree())
 
49
        delta = compare_trees(b.basis_tree(), b.working_tree())
46
50
 
47
51
        self.log('delta.added = %r' % delta.added)
48
52
 
50
54
        self.assertEquals(delta.added[0][0], 'foo')
51
55
        self.failIf(delta.modified)
52
56
 
53
 
    def test_mkdir_in_subdir(self):
54
 
        """'bzr mkdir' operation in subdirectory"""
55
 
 
56
 
        self.run_bzr('init')
57
 
        self.run_bzr('mkdir', 'dir')
58
 
        self.assert_(os.path.isdir('dir'))
59
 
 
60
 
        os.chdir('dir')
61
 
        self.log('Run mkdir in subdir')
62
 
        self.run_bzr('mkdir', 'subdir')
63
 
        self.assert_(os.path.isdir('subdir'))
64
 
        os.chdir('..')
65
 
 
66
 
        wt = WorkingTree.open('.')
67
 
        
68
 
        delta = wt.changes_from(wt.basis_tree())
69
 
 
70
 
        self.log('delta.added = %r' % delta.added)
71
 
 
72
 
        self.assertEquals(len(delta.added), 2)
73
 
        self.assertEquals(delta.added[0][0], 'dir')
74
 
        self.assertEquals(delta.added[1][0], pathjoin('dir','subdir'))
75
 
        self.failIf(delta.modified)
76
 
 
77
 
    def test_mkdir_w_nested_trees(self):
78
 
        """'bzr mkdir' with nested trees"""
79
 
 
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('../..')
88
 
 
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'))
93
 
 
94
 
        wt = WorkingTree.open('.')
95
 
        wt_a = WorkingTree.open('a')
96
 
        wt_b = WorkingTree.open('a/b')
97
 
        
98
 
        delta = wt.changes_from(wt.basis_tree())
99
 
        self.assertEquals(len(delta.added), 1)
100
 
        self.assertEquals(delta.added[0][0], 'dir')
101
 
        self.failIf(delta.modified)
102
 
 
103
 
        delta = wt_a.changes_from(wt_a.basis_tree())
104
 
        self.assertEquals(len(delta.added), 1)
105
 
        self.assertEquals(delta.added[0][0], 'dir')
106
 
        self.failIf(delta.modified)
107
 
 
108
 
        delta = wt_b.changes_from(wt_b.basis_tree())
109
 
        self.assertEquals(len(delta.added), 1)
110
 
        self.assertEquals(delta.added[0][0], 'dir')
111
 
        self.failIf(delta.modified)
 
57
    def test_branch_add_in_unversioned(self):
 
58
        """Try to add a file in an unversioned directory.
 
59
 
 
60
        "bzr add" adds the parent as necessary, but simple branch add
 
61
        doesn't do that.
 
62
        """
 
63
        from bzrlib.branch import Branch
 
64
        from bzrlib.errors import NotVersionedError
 
65
 
 
66
        b = Branch.initialize('.')
 
67
 
 
68
        self.build_tree(['foo/',
 
69
                         'foo/hello'])
 
70
 
 
71
        self.assertRaises(NotVersionedError,
 
72
                          b.add,
 
73
                          'foo/hello')
 
74
        
 
75
        self.check_branch()
 
76
 
 
77
 
 
78
    def test_add_in_unversioned(self):
 
79
        """Try to add a file in an unversioned directory.
 
80
 
 
81
        "bzr add" should add the parent(s) as necessary.
 
82
        """
 
83
        from bzrlib.branch import Branch
 
84
        from bzrlib.commands import run_bzr
 
85
        eq = self.assertEqual
 
86
 
 
87
        b = Branch.initialize('.')
 
88
 
 
89
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
 
90
        eq(list(b.unknowns()), ['inertiatic'])
 
91
        run_bzr(['add', 'inertiatic/esp'])
 
92
        eq(list(b.unknowns()), [])
 
93
 
 
94
        # Multiple unversioned parents
 
95
        self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
 
96
        eq(list(b.unknowns()), ['veil'])
 
97
        run_bzr(['add', 'veil/cerpin/taxt'])
 
98
        eq(list(b.unknowns()), [])
 
99
 
 
100
        # Check whacky paths work
 
101
        self.build_tree(['cicatriz/', 'cicatriz/esp'])
 
102
        eq(list(b.unknowns()), ['cicatriz'])
 
103
        run_bzr(['add', 'inertiatic/../cicatriz/esp'])
 
104
        eq(list(b.unknowns()), [])
 
105
 
 
106
    def test_add_in_versioned(self):
 
107
        """Try to add a file in a versioned directory.
 
108
 
 
109
        "bzr add" should do this happily.
 
110
        """
 
111
        from bzrlib.branch import Branch
 
112
        from bzrlib.commands import run_bzr
 
113
        eq = self.assertEqual
 
114
 
 
115
        b = Branch.initialize('.')
 
116
 
 
117
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
 
118
        eq(list(b.unknowns()), ['inertiatic'])
 
119
        run_bzr(['add', '--no-recurse', 'inertiatic'])
 
120
        eq(list(b.unknowns()), ['inertiatic'+os.sep+'esp'])
 
121
        run_bzr(['add', 'inertiatic/esp'])
 
122
        eq(list(b.unknowns()), [])
 
123
 
 
124
    def test_subdir_add(self):
 
125
        """Add in subdirectory should add only things from there down"""
 
126
        
 
127
        from bzrlib.branch import Branch
 
128
        from bzrlib.commands import run_bzr
 
129
        
 
130
        eq = self.assertEqual
 
131
        ass = self.assert_
 
132
        chdir = os.chdir
 
133
        
 
134
        b = Branch.initialize('.')
 
135
        self.build_tree(['src/', 'README'])
 
136
        
 
137
        eq(sorted(b.unknowns()),
 
138
           ['README', 'src'])
 
139
        
 
140
        eq(run_bzr(['add', 'src']), 0)
 
141
        
 
142
        self.build_tree(['src/foo.c'])
 
143
        
 
144
        chdir('src')
 
145
        eq(run_bzr(['add']), 0)
 
146
        
 
147
        eq(sorted(b.unknowns()), 
 
148
           ['README'])
 
149
        eq(len(b.inventory), 3)
 
150
                
 
151
        chdir('..')
 
152
        eq(run_bzr(['add']), 0)
 
153
        eq(list(b.unknowns()), [])
 
154
 
 
155
        self.check_branch()
 
156
 
112
157
 
113
158
    def check_branch(self):
114
159
        """After all the above changes, run the check and upgrade commands.
115
160
 
116
161
        The upgrade should be a no-op."""
117
 
        b = Branch.open(u'.')
118
 
        mutter('branch has %d revisions', b.revno())
 
162
        b = Branch.open('.')
 
163
        debug('branch has %d revisions', b.revno())
119
164
        
120
 
        mutter('check branch...')
 
165
        debug('check branch...')
121
166
        from bzrlib.check import check
122
 
        check(b, False)
123
 
 
124
 
 
 
167
        check(b)
 
168
        
 
169
 
 
170
        
125
171
class SubdirCommit(TestCaseInTempDir):
126
172
 
127
173
    def test_subdir_commit(self):
132
178
        self.build_tree(['a/', 'b/'])
133
179
        
134
180
        run_bzr('init')
135
 
        b = Branch.open(u'.')
 
181
        b = Branch.open('.')
136
182
        
137
183
        for fn in ('a/one', 'b/two', 'top'):
138
184
            file(fn, 'w').write('old contents')
143
189
        for fn in ('a/one', 'b/two', 'top'):
144
190
            file(fn, 'w').write('new contents')
145
191
            
146
 
        mutter('start selective subdir commit')
 
192
        debug('start selective subdir commit')
147
193
        run_bzr('commit', 'a', '-m', 'commit a only')
148
194
        
149
 
        old = b.repository.revision_tree(b.get_rev_id(1))
150
 
        new = b.repository.revision_tree(b.get_rev_id(2))
 
195
        old = b.revision_tree(b.get_rev_id(1))
 
196
        new = b.revision_tree(b.get_rev_id(2))
151
197
        
152
198
        eq(new.get_file_by_path('b/two').read(), 'old contents')
153
199
        eq(new.get_file_by_path('top').read(), 'old contents')
156
202
        os.chdir('a')
157
203
        # commit from here should do nothing
158
204
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
159
 
        v3 = b.repository.revision_tree(b.get_rev_id(3))
 
205
        v3 = b.revision_tree(b.get_rev_id(3))
160
206
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
161
207
        eq(v3.get_file_by_path('top').read(), 'old contents')
162
208
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
163
209
                
164
210
        # commit in subdirectory commits whole tree
165
211
        run_bzr('commit', '-m', 'commit whole tree from subdir')
166
 
        v4 = b.repository.revision_tree(b.get_rev_id(4))
 
212
        v4 = b.revision_tree(b.get_rev_id(4))
167
213
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
168
214
        eq(v4.get_file_by_path('top').read(), 'new contents')
169
215