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

Support user.signingkey configuration variable in .git/config.

Merged from https://code.launchpad.net/~jelmer/brz/local-git-key/+merge/381000

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/multiparent.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
 
17
19
import errno
18
 
from io import (
19
 
    BytesIO,
20
 
    )
21
20
import os
22
21
 
23
22
from .lazy_import import lazy_import
36
35
    errors,
37
36
    )
38
37
from .i18n import gettext
 
38
from .sixish import (
 
39
    BytesIO,
 
40
    range,
 
41
    )
39
42
 
40
43
 
41
44
def topo_iter_keys(vf, keys=None):