/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

  • Committer: Jelmer Vernooij
  • Date: 2019-03-05 07:32:38 UTC
  • mto: (7290.1.21 work)
  • mto: This revision was merged to the branch mainline in revision 7311.
  • Revision ID: jelmer@jelmer.uk-20190305073238-zlqn981opwnqsmzi
Add appveyor configuration.

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
25
24
lazy_import(globals(), """
26
25
import gzip
27
26
import itertools
28
 
import patiencediff
29
27
 
30
28
from breezy import (
31
29
    bencode,
 
30
    errors,
 
31
    patiencediff,
32
32
    ui,
33
33
    )
34
34
""")
35
 
from . import (
36
 
    errors,
37
 
    )
38
35
from .i18n import gettext
 
36
from .sixish import (
 
37
    BytesIO,
 
38
    range,
 
39
    )
39
40
 
40
41
 
41
42
def topo_iter_keys(vf, keys=None):