/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/msgeditor.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/msgeditor.py
16
16
 
17
17
"""Commit message editor support."""
18
18
 
19
 
from __future__ import absolute_import
20
 
 
21
19
import codecs
 
20
from io import (
 
21
    BytesIO,
 
22
    StringIO,
 
23
    )
22
24
import os
23
25
from subprocess import call
24
26
import sys
34
36
    )
35
37
from .errors import BzrError
36
38
from .hooks import Hooks
37
 
from .sixish import (
38
 
    BytesIO,
39
 
    StringIO,
40
 
    )
41
39
 
42
40
 
43
41
class BadCommitMessageEncoding(BzrError):