Show More
@@ -145,19 +145,25 b' future, dropping the stream may become a' | |||
|
145 | 145 | preserve. |
|
146 | 146 | """ |
|
147 | 147 | |
|
148 | from __future__ import absolute_import | |
|
149 | ||
|
148 | 150 | import errno |
|
149 |
import |
|
|
150 | import util | |
|
151 | import struct | |
|
152 | import urllib | |
|
151 | import re | |
|
153 | 152 | import string |
|
154 |
import |
|
|
155 |
import |
|
|
156 | import url | |
|
157 | import re | |
|
153 | import struct | |
|
154 | import sys | |
|
155 | import urllib | |
|
158 | 156 | |
|
159 | import changegroup, error, tags | |
|
160 |
from |
|
|
157 | from .i18n import _ | |
|
158 | from . import ( | |
|
159 | changegroup, | |
|
160 | error, | |
|
161 | obsolete, | |
|
162 | pushkey, | |
|
163 | tags, | |
|
164 | url, | |
|
165 | util, | |
|
166 | ) | |
|
161 | 167 | |
|
162 | 168 | _pack = struct.pack |
|
163 | 169 | _unpack = struct.unpack |
@@ -1233,7 +1239,7 b' def handleremotechangegroup(op, inpart):' | |||
|
1233 | 1239 | # we need to make sure we trigger the creation of a transaction object used |
|
1234 | 1240 | # for the whole processing scope. |
|
1235 | 1241 | op.gettransaction() |
|
1236 | import exchange | |
|
1242 | from . import exchange | |
|
1237 | 1243 | cg = exchange.readbundle(op.repo.ui, real_part, raw_url) |
|
1238 | 1244 | if not isinstance(cg, changegroup.cg1unpacker): |
|
1239 | 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