/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_inv.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-03 23:48:08 UTC
  • mfrom: (7316 work)
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190603234808-15yk5c7054tj8e2b
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_inv.py
141
141
 
142
142
 
143
143
def _create_repo_revisions(repo, basis, delta, invalid_delta):
144
 
    repo.start_write_group()
145
 
    try:
 
144
    with repository.WriteGroup(repo):
146
145
        rev = revision.Revision(b'basis', timestamp=0, timezone=None,
147
146
                                message="", committer="foo@example.com")
148
147
        basis.revision_id = b'basis'
161
160
        rev = revision.Revision(b'result', timestamp=0, timezone=None,
162
161
                                message="", committer="foo@example.com")
163
162
        repo.add_revision(b'result', rev, result_inv)
164
 
        repo.commit_write_group()
165
 
    except:
166
 
        repo.abort_write_group()
167
 
        raise
168
163
    return target_entries
169
164
 
170
165
 
171
166
def _get_basis_entries(tree):
172
167
    basis_tree = tree.basis_tree()
173
 
    basis_tree.lock_read()
174
 
    basis_tree_entries = list(basis_tree.inventory.iter_entries_by_dir())
175
 
    basis_tree.unlock()
176
 
    return basis_tree_entries
 
168
    with basis_tree.lock_read():
 
169
        return list(basis_tree.inventory.iter_entries_by_dir())
177
170
 
178
171
 
179
172
def _populate_different_tree(tree, basis, delta):
253
246
    format = self.format()
254
247
    control = self.make_controldir('tree', format=format._matchingcontroldir)
255
248
    repo = format.initialize(control)
256
 
    with repo.lock_write():
257
 
        repo.start_write_group()
258
 
        try:
259
 
            rev = revision.Revision(b'basis', timestamp=0, timezone=None,
260
 
                                    message="", committer="foo@example.com")
261
 
            basis.revision_id = b'basis'
262
 
            create_texts_for_inv(repo, basis)
263
 
            repo.add_revision(b'basis', rev, basis)
264
 
            repo.commit_write_group()
265
 
        except:
266
 
            repo.abort_write_group()
267
 
            raise
268
 
    with repo.lock_write():
269
 
        repo.start_write_group()
270
 
        try:
271
 
            inv_sha1 = repo.add_inventory_by_delta(b'basis', delta,
272
 
                                                   b'result', [b'basis'])
273
 
        except:
274
 
            repo.abort_write_group()
275
 
            raise
276
 
        else:
277
 
            repo.commit_write_group()
 
249
    with repo.lock_write(), repository.WriteGroup(repo):
 
250
        rev = revision.Revision(
 
251
            b'basis', timestamp=0, timezone=None, message="",
 
252
            committer="foo@example.com")
 
253
        basis.revision_id = b'basis'
 
254
        create_texts_for_inv(repo, basis)
 
255
        repo.add_revision(b'basis', rev, basis)
 
256
    with repo.lock_write(), repository.WriteGroup(repo):
 
257
        inv_sha1 = repo.add_inventory_by_delta(
 
258
            b'basis', delta, b'result', [b'basis'])
278
259
    # Fresh lock, reads disk again.
279
260
    repo = repo.controldir.open_repository()
280
261
    repo.lock_read()