← 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-09-19 02:52:24 UTC
  • mto: (1185.1.29)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: aaron.bentley@utoronto.ca-20050919025224-1cc3c70640086e09
TODO re tests

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
20
# TODO: test trying to commit within a directory that is not yet added
22
21
 
23
22
 
45
44
 
46
45
        from bzrlib.diff import compare_trees
47
46
        from bzrlib.branch import Branch
48
 
        b = Branch('.')
 
47
        b = Branch.open('.')
49
48
        
50
49
        delta = compare_trees(b.basis_tree(), b.working_tree())
51
50
 
55
54
        self.assertEquals(delta.added[0][0], 'foo')
56
55
        self.failIf(delta.modified)
57
56
 
58
 
    def test_add_in_unversioned(self):
 
57
    def test_branch_add_in_unversioned(self):
59
58
        """Try to add a file in an unversioned directory.
60
59
 
61
 
        smart_add may eventually add the parent as necessary, but simple
62
 
        branch add doesn't do that.
 
60
        "bzr add" adds the parent as necessary, but simple branch add
 
61
        doesn't do that.
63
62
        """
64
63
        from bzrlib.branch import Branch
65
64
        from bzrlib.errors import NotVersionedError
66
65
 
67
 
        b = Branch('.', init=True)
 
66
        b = Branch.initialize('.')
68
67
 
69
68
        self.build_tree(['foo/',
70
69
                         'foo/hello'])
75
74
        
76
75
        self.check_and_upgrade()
77
76
 
78
 
        
 
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/esp'])
 
121
        run_bzr(['add', 'inertiatic/esp'])
 
122
        eq(list(b.unknowns()), [])
 
123
 
79
124
    def test_subdir_add(self):
80
125
        """Add in subdirectory should add only things from there down"""
81
126
        
86
131
        ass = self.assert_
87
132
        chdir = os.chdir
88
133
        
89
 
        b = Branch('.', init=True)
 
134
        b = Branch.initialize('.')
90
135
        self.build_tree(['src/', 'README'])
91
136
        
92
137
        eq(sorted(b.unknowns()),
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('.')
 
162
        b = Branch.open('.')
118
163
        debug('branch has %d revisions', b.revno())
119
164
        
120
165
        debug('check branch...')
131
176
        
132
177
 
133
178
        
134
 
        
135
179
class SubdirCommit(TestCaseInTempDir):
136
180
 
137
181
    def test_subdir_commit(self):
142
186
        self.build_tree(['a/', 'b/'])
143
187
        
144
188
        run_bzr('init')
145
 
        b = Branch('.')
 
189
        b = Branch.open('.')
146
190
        
147
191
        for fn in ('a/one', 'b/two', 'top'):
148
192
            file(fn, 'w').write('old contents')
155
199
            
156
200
        run_bzr('commit', 'a', '-m', 'commit a only')
157
201
        
158
 
        old = b.revision_tree(b.lookup_revision(1))
159
 
        new = b.revision_tree(b.lookup_revision(2))
 
202
        old = b.revision_tree(b.get_rev_id(1))
 
203
        new = b.revision_tree(b.get_rev_id(2))
160
204
        
161
205
        eq(new.get_file_by_path('b/two').read(), 'old contents')
162
206
        eq(new.get_file_by_path('top').read(), 'old contents')
165
209
        os.chdir('a')
166
210
        # commit from here should do nothing
167
211
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
168
 
        v3 = b.revision_tree(b.lookup_revision(3))
 
212
        v3 = b.revision_tree(b.get_rev_id(3))
169
213
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
170
214
        eq(v3.get_file_by_path('top').read(), 'old contents')
171
215
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
172
216
                
173
217
        # commit in subdirectory commits whole tree
174
218
        run_bzr('commit', '-m', 'commit whole tree from subdir')
175
 
        v4 = b.revision_tree(b.lookup_revision(4))
 
219
        v4 = b.revision_tree(b.get_rev_id(4))
176
220
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
177
221
        eq(v4.get_file_by_path('top').read(), 'new contents')
178
222