← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/versioning.py

  • Committer: Aaron Bentley
  • Date: 2005-07-29 17:19:16 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1020.
  • Revision ID: abentley@panoramicfeedback.com-20050729171916-322fd81b451d2e3e
Added merge-type parameter to merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/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
 
# TODO: test trying to commit within a directory that is not yet added
22
 
 
23
 
 
24
 
import os
25
 
from bzrlib.selftest import InTempDir, BzrTestBase
26
 
from bzrlib.branch import Branch
27
 
 
 
20
 
 
21
from bzrlib.selftest import InTempDir
28
22
 
29
23
class Mkdir(InTempDir):
30
24
    def runTest(self): 
31
25
        """Basic 'bzr mkdir' operation"""
32
26
        from bzrlib.commands import run_bzr
 
27
        import os
33
28
 
34
29
        run_bzr(['init'])
35
30
        run_bzr(['mkdir', 'foo'])
37
32
 
38
33
        self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
39
34
 
40
 
        from bzrlib.diff import compare_trees
 
35
        from bzrlib.diff import compare_trees, TreeDelta
41
36
        from bzrlib.branch import Branch
42
37
        b = Branch('.')
43
38
        
44
39
        delta = compare_trees(b.basis_tree(), b.working_tree())
45
40
 
46
 
        self.log('delta.added = %r' % delta.added)
47
 
 
48
41
        self.assertEquals(len(delta.added), 1)
49
42
        self.assertEquals(delta.added[0][0], 'foo')
50
43
        self.failIf(delta.modified)
59
52
        branch add doesn't do that.
60
53
        """
61
54
        from bzrlib.branch import Branch
 
55
        import os
62
56
        from bzrlib.errors import NotVersionedError
63
57
 
64
58
        b = Branch('.', init=True)
71
65
                          'foo/hello')
72
66
        
73
67
        
74
 
class SubdirCommit(BzrTestBase):
75
 
    def runTest(self):
76
 
        """Test committing a subdirectory, and committing within a directory."""
77
 
        run_bzr = self.run_bzr
78
 
        eq = self.assertEqual
79
 
 
80
 
        self.build_tree(['a/', 'b/'])
81
 
        
82
 
        run_bzr('init')
83
 
        b = Branch('.')
84
 
        
85
 
        for fn in ('a/one', 'b/two', 'top'):
86
 
            file(fn, 'w').write('old contents')
87
 
            
88
 
        run_bzr('add')
89
 
        run_bzr('commit', '-m', 'first revision')
90
 
        
91
 
        for fn in ('a/one', 'b/two', 'top'):
92
 
            file(fn, 'w').write('new contents')
93
 
            
94
 
        run_bzr('commit', 'a', '-m', 'commit a only')
95
 
        
96
 
        old = b.revision_tree(b.lookup_revision(1))
97
 
        new = b.revision_tree(b.lookup_revision(2))
98
 
        
99
 
        eq(new.get_file_by_path('b/two').read(), 'old contents')
100
 
        eq(new.get_file_by_path('top').read(), 'old contents')
101
 
        eq(new.get_file_by_path('a/one').read(), 'new contents')
102
 
        
103
 
        os.chdir('a')
104
 
        # commit from here should do nothing
105
 
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
106
 
        v3 = b.revision_tree(b.lookup_revision(3))
107
 
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
108
 
        eq(v3.get_file_by_path('top').read(), 'old contents')
109
 
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
110
 
                
111
 
        # commit in subdirectory commits whole tree
112
 
        run_bzr('commit', '-m', 'commit whole tree from subdir')
113
 
        v4 = b.revision_tree(b.lookup_revision(4))
114
 
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
115
 
        eq(v4.get_file_by_path('top').read(), 'new contents')
116
 
        
117
 
        # TODO: factor out some kind of assert_tree_state() method
118
 
        
119
 
        
120
 
        
121
 
class SubdirAdd(InTempDir):
122
 
    def runTest(self):
123
 
        """Add in subdirectory should add only things from there down"""
 
68
class SubdirCommit(InTempDir):
 
69
    def runTest(self):
 
70
        """Various commits from a subdirectory"""
124
71
        
125
72
        from bzrlib.branch import Branch
126
73
        from bzrlib.commands import run_bzr
127
 
        
128
 
        eq = self.assertEqual
129
 
        ass = self.assert_
130
 
        chdir = os.chdir
 
74
        import os
131
75
        
132
76
        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
 
        
 
77
        self.build_tree(['src/', 'src/foo.c', 'README'])
 
78
        
 
79
        self.assertEqual(sorted(b.unknowns()),
 
80
                         ['README', 'src'])
 
81
        
 
82
        self.assertEqual(run_bzr(['version']), 0)
 
83
        
 
84
        self.assertEqual(run_bzr(['add']), 0)
 
85
        
 
86
        
 
87
 
 
88
 
 
89
TEST_CLASSES = [
 
90
    Mkdir,
 
91
    AddInUnversioned,
 
92
    ]