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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-05-06 03:06:18 UTC
  • mfrom: (7500.1.2 trunk-merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200506030618-131sjbc876q7on66
Merge the 3.1 branch.

Merged from https://code.launchpad.net/~jelmer/brz/trunk-merge-3.1/+merge/383481

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/fetch_ghosts.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from __future__ import absolute_import
 
17
import contextlib
18
18
 
19
 
from . import cleanup
20
19
from .branch import Branch
21
20
from .trace import note
22
21
from .errors import NoSuchRevision, BzrCommandError
43
42
 
44
43
    def run(self):
45
44
        lock_other = self.this_branch.base != self.other_branch.base
46
 
        with cleanup.ExitStack() as exit_stack:
 
45
        with contextlib.ExitStack() as exit_stack:
47
46
            exit_stack.enter_context(self.this_branch.lock_write())
48
47
            if lock_other:
49
48
                exit_stack.enter_context(self.other_branch.lock_read())