/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_memorytree.py

  • Committer: Jelmer Vernooij
  • Date: 2017-11-19 18:35:20 UTC
  • mfrom: (6809.4.27 swap-arguments)
  • Revision ID: jelmer@jelmer.uk-20171119183520-fmw89uw30e0tbhwz
Merge lp:~jelmer/brz/swap-arguments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_memorytree.py
49
49
        tree.lock_read()
50
50
        self.assertEqual([rev_id], tree.get_parent_ids())
51
51
        self.assertEqual('contents of foo\n',
52
 
            tree.get_file(tree.path2id('foo')).read())
 
52
            tree.get_file('foo').read())
53
53
        tree.unlock()
54
54
 
55
55
    def test_get_root_id(self):
110
110
        tree.lock_write()
111
111
        tree.add(['', 'foo'], ids=['root-id', 'foo-id'],
112
112
                  kinds=['directory', 'file'])
113
 
        tree.put_file_bytes_non_atomic('foo-id', 'barshoom')
114
 
        self.assertEqual('barshoom', tree.get_file('foo-id').read())
 
113
        tree.put_file_bytes_non_atomic('foo', 'barshoom')
 
114
        self.assertEqual('barshoom', tree.get_file('foo').read())
115
115
        tree.unlock()
116
116
 
117
117
    def test_put_existing_file(self):
120
120
        tree.lock_write()
121
121
        tree.add(['', 'foo'], ids=['root-id', 'foo-id'],
122
122
                 kinds=['directory', 'file'])
123
 
        tree.put_file_bytes_non_atomic('foo-id', 'first-content')
124
 
        tree.put_file_bytes_non_atomic('foo-id', 'barshoom')
125
 
        self.assertEqual('barshoom', tree.get_file('foo-id').read())
 
123
        tree.put_file_bytes_non_atomic('foo', 'first-content')
 
124
        tree.put_file_bytes_non_atomic('foo', 'barshoom')
 
125
        self.assertEqual('barshoom', tree.get_file('foo').read())
126
126
        tree.unlock()
127
127
 
128
128
    def test_add_in_subdir(self):
139
139
        tree.add(['adir/afile'], ['file-id'], ['file'])
140
140
        self.assertEqual('adir/afile', tree.id2path('file-id'))
141
141
        self.assertEqual('adir', tree.id2path('dir-id'))
142
 
        tree.put_file_bytes_non_atomic('file-id', 'barshoom')
 
142
        tree.put_file_bytes_non_atomic('adir/afile', 'barshoom')
143
143
 
144
144
    def test_commit_trivial(self):
145
145
        """Smoke test for commit on a MemoryTree.
152
152
        tree.lock_write()
153
153
        tree.add(['', 'foo'], ids=['root-id', 'foo-id'],
154
154
                 kinds=['directory', 'file'])
155
 
        tree.put_file_bytes_non_atomic('foo-id', 'barshoom')
 
155
        tree.put_file_bytes_non_atomic('foo', 'barshoom')
156
156
        revision_id = tree.commit('message baby')
157
157
        # the parents list for the tree should have changed.
158
158
        self.assertEqual([revision_id], tree.get_parent_ids())
161
161
        revtree = tree.branch.repository.revision_tree(revision_id)
162
162
        revtree.lock_read()
163
163
        self.addCleanup(revtree.unlock)
164
 
        self.assertEqual('barshoom', revtree.get_file('foo-id').read())
 
164
        self.assertEqual('barshoom', revtree.get_file('foo').read())
165
165
 
166
166
    def test_unversion(self):
167
167
        """Some test for unversion of a memory tree."""
170
170
        tree.lock_write()
171
171
        tree.add(['', 'foo'], ids=['root-id', 'foo-id'],
172
172
                 kinds=['directory', 'file'])
173
 
        tree.unversion(['foo-id'])
 
173
        tree.unversion(['foo'])
174
174
        self.assertFalse(tree.has_id('foo-id'))
175
175
        tree.unlock()
176
176
 
188
188
        tree.lock_write()
189
189
        self.addCleanup(tree.unlock)
190
190
        tree.add(['', 'foo'], ['root-id', 'foo-id'], ['directory', 'file'])
191
 
        tree.put_file_bytes_non_atomic('foo-id', 'content\n')
 
191
        tree.put_file_bytes_non_atomic('foo', 'content\n')
192
192
        tree.commit('one', rev_id='rev-one')
193
193
        tree.rename_one('foo', 'bar')
194
194
        self.assertEqual('bar', tree.id2path('foo-id'))
202
202
 
203
203
        rev_tree2 = tree.branch.repository.revision_tree('rev-two')
204
204
        self.assertEqual('bar', rev_tree2.id2path('foo-id'))
205
 
        self.assertEqual('content\n', rev_tree2.get_file_text('foo-id'))
 
205
        self.assertEqual('content\n', rev_tree2.get_file_text('bar'))
206
206
 
207
207
    def test_rename_file_to_subdir(self):
208
208
        tree = self.make_branch_and_memory_tree('branch')
211
211
        tree.add('')
212
212
        tree.mkdir('subdir', 'subdir-id')
213
213
        tree.add('foo', 'foo-id', 'file')
214
 
        tree.put_file_bytes_non_atomic('foo-id', 'content\n')
 
214
        tree.put_file_bytes_non_atomic('foo', 'content\n')
215
215
        tree.commit('one', rev_id='rev-one')
216
216
 
217
217
        tree.rename_one('foo', 'subdir/bar')