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

  • Committer: Jelmer Vernooij
  • Date: 2020-08-10 15:00:17 UTC
  • mfrom: (7490.40.99 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200810150017-vs7xnrd1vat4iktg
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/merge_directive.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
18
 
 
19
17
import base64
 
18
import contextlib
 
19
from io import BytesIO
20
20
import re
21
21
 
22
22
from . import lazy_import
23
23
lazy_import.lazy_import(globals(), """
24
24
from breezy import (
25
25
    branch as _mod_branch,
26
 
    cleanup,
27
26
    diff,
28
27
    email_message,
29
28
    gpg,
44
43
from . import (
45
44
    errors,
46
45
    )
47
 
from .sixish import (
48
 
    BytesIO,
49
 
    )
50
46
 
51
47
 
52
48
class IllegalMergeDirectivePayload(errors.BzrError):
609
605
        If the message is not supplied, the message from revision_id will be
610
606
        used for the commit.
611
607
        """
612
 
        with cleanup.ExitStack() as exit_stack:
 
608
        with contextlib.ExitStack() as exit_stack:
613
609
            exit_stack.enter_context(repository.lock_write())
614
610
            t_revision_id = revision_id
615
611
            if revision_id == b'null:':