← 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: Robert Collins
  • Date: 2006-03-02 03:12:34 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060302031234-cf6b75961f27c5df
InterVersionedFile implemented.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_versioning.py
17
17
 
18
18
"""Tests of simple versioning operations"""
19
19
 
20
 
# TODO: test adding a file whose directory is not versioned
21
20
# TODO: test trying to commit within a directory that is not yet added
22
21
 
23
22
 
24
23
import os
25
 
from bzrlib.selftest import InTempDir, BzrTestBase
 
24
 
 
25
from bzrlib.tests import BzrTestBase, TestCaseInTempDir
26
26
from bzrlib.branch import Branch
27
 
 
28
 
 
29
 
class Mkdir(InTempDir):
30
 
    def runTest(self): 
 
27
from bzrlib.trace import mutter
 
28
from bzrlib.osutils import pathjoin
 
29
from bzrlib.workingtree import WorkingTree
 
30
 
 
31
 
 
32
class TestVersioning(TestCaseInTempDir):
 
33
    
 
34
    def test_mkdir(self): 
31
35
        """Basic 'bzr mkdir' operation"""
32
 
        from bzrlib.commands import run_bzr
33
36
 
34
 
        run_bzr(['init'])
35
 
        run_bzr(['mkdir', 'foo'])
 
37
        self.run_bzr('init')
 
38
        self.run_bzr('mkdir', 'foo')
36
39
        self.assert_(os.path.isdir('foo'))
37
40
 
38
 
        self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
 
41
        self.run_bzr('mkdir', 'foo', retcode=3)
39
42
 
40
43
        from bzrlib.diff import compare_trees
41
 
        from bzrlib.branch import Branch
42
 
        b = Branch('.')
 
44
        wt = WorkingTree.open('.')
43
45
        
44
 
        delta = compare_trees(b.basis_tree(), b.working_tree())
 
46
        delta = compare_trees(wt.basis_tree(), wt)
45
47
 
46
48
        self.log('delta.added = %r' % delta.added)
47
49
 
49
51
        self.assertEquals(delta.added[0][0], 'foo')
50
52
        self.failIf(delta.modified)
51
53
 
52
 
 
53
 
 
54
 
class AddInUnversioned(InTempDir):
55
 
    def runTest(self):
56
 
        """Try to add a file in an unversioned directory.
57
 
 
58
 
        smart_add may eventually add the parent as necessary, but simple
59
 
        branch add doesn't do that.
60
 
        """
61
 
        from bzrlib.branch import Branch
62
 
        from bzrlib.errors import NotVersionedError
63
 
 
64
 
        b = Branch('.', init=True)
65
 
 
66
 
        self.build_tree(['foo/',
67
 
                         'foo/hello'])
68
 
 
69
 
        self.assertRaises(NotVersionedError,
70
 
                          b.add,
71
 
                          'foo/hello')
72
 
        
73
 
        
74
 
class SubdirCommit(BzrTestBase):
75
 
    def runTest(self):
 
54
    def test_mkdir_in_subdir(self):
 
55
        """'bzr mkdir' operation in subdirectory"""
 
56
 
 
57
        self.run_bzr('init')
 
58
        self.run_bzr('mkdir', 'dir')
 
59
        self.assert_(os.path.isdir('dir'))
 
60
 
 
61
        os.chdir('dir')
 
62
        self.log('Run mkdir in subdir')
 
63
        self.run_bzr('mkdir', 'subdir')
 
64
        self.assert_(os.path.isdir('subdir'))
 
65
        os.chdir('..')
 
66
 
 
67
        from bzrlib.diff import compare_trees
 
68
        wt = WorkingTree.open('.')
 
69
        
 
70
        delta = compare_trees(wt.basis_tree(), wt)
 
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], pathjoin('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
        wt = WorkingTree.open('.')
 
98
        wt_a = WorkingTree.open('a')
 
99
        wt_b = WorkingTree.open('a/b')
 
100
        
 
101
        delta = compare_trees(wt.basis_tree(), wt)
 
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(wt_a.basis_tree(), wt_a)
 
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(wt_b.basis_tree(), wt_b)
 
112
        self.assertEquals(len(delta.added), 1)
 
113
        self.assertEquals(delta.added[0][0], 'dir')
 
114
        self.failIf(delta.modified)
 
115
 
 
116
    def check_branch(self):
 
117
        """After all the above changes, run the check and upgrade commands.
 
118
 
 
119
        The upgrade should be a no-op."""
 
120
        b = Branch.open(u'.')
 
121
        mutter('branch has %d revisions', b.revno())
 
122
        
 
123
        mutter('check branch...')
 
124
        from bzrlib.check import check
 
125
        check(b, False)
 
126
 
 
127
 
 
128
class SubdirCommit(TestCaseInTempDir):
 
129
 
 
130
    def test_subdir_commit(self):
76
131
        """Test committing a subdirectory, and committing within a directory."""
77
132
        run_bzr = self.run_bzr
78
133
        eq = self.assertEqual
80
135
        self.build_tree(['a/', 'b/'])
81
136
        
82
137
        run_bzr('init')
83
 
        b = Branch('.')
 
138
        b = Branch.open(u'.')
84
139
        
85
140
        for fn in ('a/one', 'b/two', 'top'):
86
141
            file(fn, 'w').write('old contents')
91
146
        for fn in ('a/one', 'b/two', 'top'):
92
147
            file(fn, 'w').write('new contents')
93
148
            
 
149
        mutter('start selective subdir commit')
94
150
        run_bzr('commit', 'a', '-m', 'commit a only')
95
151
        
96
 
        old = b.revision_tree(b.lookup_revision(1))
97
 
        new = b.revision_tree(b.lookup_revision(2))
 
152
        old = b.repository.revision_tree(b.get_rev_id(1))
 
153
        new = b.repository.revision_tree(b.get_rev_id(2))
98
154
        
99
155
        eq(new.get_file_by_path('b/two').read(), 'old contents')
100
156
        eq(new.get_file_by_path('top').read(), 'old contents')
103
159
        os.chdir('a')
104
160
        # commit from here should do nothing
105
161
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
106
 
        v3 = b.revision_tree(b.lookup_revision(3))
 
162
        v3 = b.repository.revision_tree(b.get_rev_id(3))
107
163
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
108
164
        eq(v3.get_file_by_path('top').read(), 'old contents')
109
165
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
110
166
                
111
167
        # commit in subdirectory commits whole tree
112
168
        run_bzr('commit', '-m', 'commit whole tree from subdir')
113
 
        v4 = b.revision_tree(b.lookup_revision(4))
 
169
        v4 = b.repository.revision_tree(b.get_rev_id(4))
114
170
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
115
171
        eq(v4.get_file_by_path('top').read(), 'new contents')
116
172
        
117
173
        # TODO: factor out some kind of assert_tree_state() method
118
174
        
119
 
        
120
 
        
121
 
class SubdirAdd(InTempDir):
122
 
    def runTest(self):
123
 
        """Add in subdirectory should add only things from there down"""
124
 
        
125
 
        from bzrlib.branch import Branch
126
 
        from bzrlib.commands import run_bzr
127
 
        
128
 
        eq = self.assertEqual
129
 
        ass = self.assert_
130
 
        chdir = os.chdir
131
 
        
132
 
        b = Branch('.', init=True)
133
 
        self.build_tree(['src/', 'README'])
134
 
        
135
 
        eq(sorted(b.unknowns()),
136
 
           ['README', 'src'])
137
 
        
138
 
        eq(run_bzr(['add', 'src']), 0)
139
 
        
140
 
        self.build_tree(['src/foo.c'])
141
 
        
142
 
        chdir('src')
143
 
        eq(run_bzr(['add']), 0)
144
 
        
145
 
        eq(sorted(b.unknowns()), 
146
 
           ['README'])
147
 
        eq(len(b.inventory), 3)
148
 
                
149
 
        chdir('..')
150
 
        eq(run_bzr(['add']), 0)
151
 
        eq(list(b.unknowns()), [])
152
 
        
 
175
 
 
176
if __name__ == '__main__':
 
177
    import unittest
 
178
    unittest.main()
 
179