/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/per_controldir/test_controldir.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/per_controldir/test_controldir.py
24
24
    errors,
25
25
    gpg,
26
26
    osutils,
 
27
    repository as _mod_repository,
27
28
    revision as _mod_revision,
28
29
    transport,
29
30
    ui,
319
320
        tree_repo = tree.branch.repository
320
321
        if not tree_repo._format.supports_revision_signatures:
321
322
            self.skipTest('repository format does not support signing')
322
 
        tree_repo.lock_write()
323
 
        tree_repo.start_write_group()
324
 
        tree_repo.sign_revision(rev1, gpg.LoopbackGPGStrategy(None))
325
 
        tree_repo.commit_write_group()
326
 
        tree_repo.unlock()
 
323
        with tree_repo.lock_write(), _mod_repository.WriteGroup(tree_repo):
 
324
            tree_repo.sign_revision(rev1, gpg.LoopbackGPGStrategy(None))
327
325
        target = self.make_branch('target')
328
326
        tree.branch.repository.copy_content_into(target.repository)
329
327
        tree.branch.copy_content_into(target)