##// END OF EJS Templates
bundle2: use absolute_import
Gregory Szorc -
r25919:8221fefa default
parent child Browse files
Show More
@@ -145,19 +145,25 b' future, dropping the stream may become a'
145 preserve.
145 preserve.
146 """
146 """
147
147
148 from __future__ import absolute_import
149
148 import errno
150 import errno
149 import sys
151 import re
150 import util
151 import struct
152 import urllib
153 import string
152 import string
154 import obsolete
153 import struct
155 import pushkey
154 import sys
156 import url
155 import urllib
157 import re
158
156
159 import changegroup, error, tags
157 from .i18n import _
160 from i18n import _
158 from . import (
159 changegroup,
160 error,
161 obsolete,
162 pushkey,
163 tags,
164 url,
165 util,
166 )
161
167
162 _pack = struct.pack
168 _pack = struct.pack
163 _unpack = struct.unpack
169 _unpack = struct.unpack
@@ -1233,7 +1239,7 b' def handleremotechangegroup(op, inpart):'
1233 # we need to make sure we trigger the creation of a transaction object used
1239 # we need to make sure we trigger the creation of a transaction object used
1234 # for the whole processing scope.
1240 # for the whole processing scope.
1235 op.gettransaction()
1241 op.gettransaction()
1236 import exchange
1242 from . import exchange
1237 cg = exchange.readbundle(op.repo.ui, real_part, raw_url)
1243 cg = exchange.readbundle(op.repo.ui, real_part, raw_url)
1238 if not isinstance(cg, changegroup.cg1unpacker):
1244 if not isinstance(cg, changegroup.cg1unpacker):
1239 raise util.Abort(_('%s: not a bundle version 1.0') %
1245 raise util.Abort(_('%s: not a bundle version 1.0') %
General Comments 0
You need to be logged in to leave comments. Login now