← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/versioning.py

  • Committer: Lalo Martins
  • Date: 2005-09-09 11:37:44 UTC
  • mto: (1185.1.22)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: lalo@exoweb.net-20050909113744-22f870db25a9e5f5
getting rid of everything that calls the Branch constructor directly

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