← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/versioning.py

  • Committer: Robert Collins
  • Date: 2005-10-17 11:56:54 UTC
  • mfrom: (1185.16.59)
  • Revision ID: robertc@robertcollins.net-20051017115654-662239e1587524a8
merge from martin.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/versioning.py
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
 
27
 
 
28
import logging
 
29
logger = logging.getLogger('bzr.test.versioning')
 
30
debug = logger.debug
28
31
 
29
32
 
30
33
class TestVersioning(TestCaseInTempDir):
31
34
    
32
35
    def test_mkdir(self): 
33
36
        """Basic 'bzr mkdir' operation"""
 
37
        from bzrlib.commands import run_bzr
34
38
 
35
 
        self.run_bzr('init')
36
 
        self.run_bzr('mkdir', 'foo')
 
39
        run_bzr(['init'])
 
40
        run_bzr(['mkdir', 'foo'])
37
41
        self.assert_(os.path.isdir('foo'))
38
42
 
39
 
        self.run_bzr('mkdir', 'foo', retcode=3)
 
43
        self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
40
44
 
41
45
        from bzrlib.diff import compare_trees
42
46
        from bzrlib.branch import Branch
43
 
        b = Branch.open(u'.')
 
47
        b = Branch.open('.')
44
48
        
45
49
        delta = compare_trees(b.basis_tree(), b.working_tree())
46
50
 
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
 
        from bzrlib.diff import compare_trees
67
 
        from bzrlib.branch import Branch
68
 
        b = Branch.open(u'.')
69
 
        
70
 
        delta = compare_trees(b.basis_tree(), b.working_tree())
71
 
 
72
 
        self.log('delta.added = %r' % delta.added)
73
 
 
74
 
        self.assertEquals(len(delta.added), 2)
75
 
        self.assertEquals(delta.added[0][0], 'dir')
76
 
        self.assertEquals(delta.added[1][0], os.path.join('dir','subdir'))
77
 
        self.failIf(delta.modified)
78
 
 
79
 
    def test_mkdir_w_nested_trees(self):
80
 
        """'bzr mkdir' with nested trees"""
81
 
 
82
 
        self.run_bzr('init')
83
 
        os.mkdir('a')
84
 
        os.chdir('a')
85
 
        self.run_bzr('init')
86
 
        os.mkdir('b')
87
 
        os.chdir('b')
88
 
        self.run_bzr('init')
89
 
        os.chdir('../..')
90
 
 
91
 
        self.run_bzr('mkdir', 'dir', 'a/dir', 'a/b/dir')
92
 
        self.failUnless(os.path.isdir('dir'))
93
 
        self.failUnless(os.path.isdir('a/dir'))
94
 
        self.failUnless(os.path.isdir('a/b/dir'))
95
 
 
96
 
        from bzrlib.diff import compare_trees
97
 
        b = Branch.open(u'.')
98
 
        b_a = Branch.open('a')
99
 
        b_b = Branch.open('a/b')
100
 
        
101
 
        delta = compare_trees(b.basis_tree(), b.working_tree())
102
 
        self.assertEquals(len(delta.added), 1)
103
 
        self.assertEquals(delta.added[0][0], 'dir')
104
 
        self.failIf(delta.modified)
105
 
 
106
 
        delta = compare_trees(b_a.basis_tree(), b_a.working_tree())
107
 
        self.assertEquals(len(delta.added), 1)
108
 
        self.assertEquals(delta.added[0][0], 'dir')
109
 
        self.failIf(delta.modified)
110
 
 
111
 
        delta = compare_trees(b_b.basis_tree(), b_b.working_tree())
112
 
        self.assertEquals(len(delta.added), 1)
113
 
        self.assertEquals(delta.added[0][0], 'dir')
114
 
        self.failIf(delta.modified)
115
 
 
116
 
    def test_working_tree_add_in_unversioned(self):
 
57
    def test_branch_add_in_unversioned(self):
117
58
        """Try to add a file in an unversioned directory.
118
59
 
119
 
        "bzr add" adds the parent as necessary, but simple working tree add
 
60
        "bzr add" adds the parent as necessary, but simple branch add
120
61
        doesn't do that.
121
62
        """
122
63
        from bzrlib.branch import Branch
123
64
        from bzrlib.errors import NotVersionedError
124
 
        from bzrlib.workingtree import WorkingTree
125
65
 
126
 
        b = Branch.initialize(u'.')
 
66
        b = Branch.initialize('.')
127
67
 
128
68
        self.build_tree(['foo/',
129
69
                         'foo/hello'])
130
70
 
131
71
        self.assertRaises(NotVersionedError,
132
 
                          WorkingTree(b.base, b).add,
 
72
                          b.add,
133
73
                          'foo/hello')
134
74
        
135
75
        self.check_branch()
136
76
 
 
77
    def test_add_in_unversioned(self):
 
78
        """Try to add a file in an unversioned directory.
 
79
 
 
80
        "bzr add" should add the parent(s) as necessary.
 
81
        """
 
82
        from bzrlib.branch import Branch
 
83
        from bzrlib.commands import run_bzr
 
84
        eq = self.assertEqual
 
85
 
 
86
        b = Branch.initialize('.')
 
87
 
 
88
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
 
89
        eq(list(b.unknowns()), ['inertiatic'])
 
90
        run_bzr(['add', 'inertiatic/esp'])
 
91
        eq(list(b.unknowns()), [])
 
92
 
 
93
        # Multiple unversioned parents
 
94
        self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
 
95
        eq(list(b.unknowns()), ['veil'])
 
96
        run_bzr(['add', 'veil/cerpin/taxt'])
 
97
        eq(list(b.unknowns()), [])
 
98
 
 
99
        # Check whacky paths work
 
100
        self.build_tree(['cicatriz/', 'cicatriz/esp'])
 
101
        eq(list(b.unknowns()), ['cicatriz'])
 
102
        run_bzr(['add', 'inertiatic/../cicatriz/esp'])
 
103
        eq(list(b.unknowns()), [])
 
104
 
 
105
    def test_add_in_versioned(self):
 
106
        """Try to add a file in a versioned directory.
 
107
 
 
108
        "bzr add" should do this happily.
 
109
        """
 
110
        from bzrlib.branch import Branch
 
111
        from bzrlib.commands import run_bzr
 
112
        eq = self.assertEqual
 
113
 
 
114
        b = Branch.initialize('.')
 
115
 
 
116
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
 
117
        eq(list(b.unknowns()), ['inertiatic'])
 
118
        run_bzr(['add', '--no-recurse', 'inertiatic'])
 
119
        eq(list(b.unknowns()), ['inertiatic'+os.sep+'esp'])
 
120
        run_bzr(['add', 'inertiatic/esp'])
 
121
        eq(list(b.unknowns()), [])
 
122
 
 
123
    def test_subdir_add(self):
 
124
        """Add in subdirectory should add only things from there down"""
 
125
        
 
126
        from bzrlib.branch import Branch
 
127
        from bzrlib.commands import run_bzr
 
128
        
 
129
        eq = self.assertEqual
 
130
        ass = self.assert_
 
131
        chdir = os.chdir
 
132
        
 
133
        b = Branch.initialize('.')
 
134
        self.build_tree(['src/', 'README'])
 
135
        
 
136
        eq(sorted(b.unknowns()),
 
137
           ['README', 'src'])
 
138
        
 
139
        eq(run_bzr(['add', 'src']), 0)
 
140
        
 
141
        self.build_tree(['src/foo.c'])
 
142
        
 
143
        chdir('src')
 
144
        eq(run_bzr(['add']), 0)
 
145
        
 
146
        eq(sorted(b.unknowns()), 
 
147
           ['README'])
 
148
        eq(len(b.inventory), 3)
 
149
                
 
150
        chdir('..')
 
151
        eq(run_bzr(['add']), 0)
 
152
        eq(list(b.unknowns()), [])
 
153
 
 
154
        self.check_branch()
 
155
 
137
156
    def check_branch(self):
138
157
        """After all the above changes, run the check and upgrade commands.
139
158
 
140
159
        The upgrade should be a no-op."""
141
 
        b = Branch.open(u'.')
142
 
        mutter('branch has %d revisions', b.revno())
 
160
        b = Branch.open('.')
 
161
        debug('branch has %d revisions', b.revno())
143
162
        
144
 
        mutter('check branch...')
 
163
        debug('check branch...')
145
164
        from bzrlib.check import check
146
165
        check(b, False)
147
 
 
148
 
 
 
166
        
 
167
 
 
168
        
149
169
class SubdirCommit(TestCaseInTempDir):
150
170
 
151
171
    def test_subdir_commit(self):
156
176
        self.build_tree(['a/', 'b/'])
157
177
        
158
178
        run_bzr('init')
159
 
        b = Branch.open(u'.')
 
179
        b = Branch.open('.')
160
180
        
161
181
        for fn in ('a/one', 'b/two', 'top'):
162
182
            file(fn, 'w').write('old contents')
167
187
        for fn in ('a/one', 'b/two', 'top'):
168
188
            file(fn, 'w').write('new contents')
169
189
            
170
 
        mutter('start selective subdir commit')
 
190
        debug('start selective subdir commit')
171
191
        run_bzr('commit', 'a', '-m', 'commit a only')
172
192
        
173
193
        old = b.revision_tree(b.get_rev_id(1))