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

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
398
398
    """
399
399
    old_tree.lock_read()
400
400
    try:
 
401
        if extra_trees is not None:
 
402
            for tree in extra_trees:
 
403
                tree.lock_read()
401
404
        new_tree.lock_read()
402
405
        try:
403
406
            return _show_diff_trees(old_tree, new_tree, to_file,
406
409
                                    extra_trees=extra_trees)
407
410
        finally:
408
411
            new_tree.unlock()
 
412
            if extra_trees is not None:
 
413
                for tree in extra_trees:
 
414
                    tree.unlock()
409
415
    finally:
410
416
        old_tree.unlock()
411
417