/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/missing.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/missing.py
63
63
    """
64
64
    if include_merged is None:
65
65
        include_merged = False
66
 
    with local_branch.lock_read(), remote_branch.lock_read():
67
 
        return _find_unmerged(
68
 
            local_branch, remote_branch, restrict=restrict,
69
 
            include_merged=include_merged, backward=backward,
70
 
            local_revid_range=local_revid_range,
71
 
            remote_revid_range=remote_revid_range)
 
66
    local_branch.lock_read()
 
67
    try:
 
68
        remote_branch.lock_read()
 
69
        try:
 
70
            return _find_unmerged(
 
71
                local_branch, remote_branch, restrict=restrict,
 
72
                include_merged=include_merged, backward=backward,
 
73
                local_revid_range=local_revid_range,
 
74
                remote_revid_range=remote_revid_range)
 
75
        finally:
 
76
            remote_branch.unlock()
 
77
    finally:
 
78
        local_branch.unlock()
72
79
 
73
80
 
74
81
def _enumerate_mainline(ancestry, graph, tip_revno, tip, backward=True):