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

  • Committer: Jelmer Vernooij
  • Date: 2017-08-29 21:29:35 UTC
  • mfrom: (6754.8.21 lock-context-2)
  • mto: This revision was merged to the branch mainline in revision 6784.
  • Revision ID: jelmer@jelmer.uk-20170829212935-lakl2jhq9sqckejp
Merge lock-context-2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/diff.py
460
460
        context = DEFAULT_CONTEXT_AMOUNT
461
461
    if format_cls is None:
462
462
        format_cls = DiffTree
463
 
    old_tree.lock_read()
464
 
    try:
 
463
    with old_tree.lock_read():
465
464
        if extra_trees is not None:
466
465
            for tree in extra_trees:
467
466
                tree.lock_read()
478
477
            if extra_trees is not None:
479
478
                for tree in extra_trees:
480
479
                    tree.unlock()
481
 
    finally:
482
 
        old_tree.unlock()
483
480
 
484
481
 
485
482
def _patch_header_date(tree, file_id, path):