Mercurial > hg
comparison hgext/convert/hg.py @ 28861:86db5cb55d46
pycompat: switch to util.stringio for py3 compat
author | timeless <timeless@mozdev.org> |
---|---|
date | Sun, 10 Apr 2016 20:55:37 +0000 |
parents | c1878afb063a |
children | b65966f50058 |
comparison
equal
deleted
inserted
replaced
28860:50d11dd8ac02 | 28861:86db5cb55d46 |
---|---|
16 # identifier to be stored in the converted revision. This will cause | 16 # identifier to be stored in the converted revision. This will cause |
17 # the converted revision to have a different identity than the | 17 # the converted revision to have a different identity than the |
18 # source. | 18 # source. |
19 from __future__ import absolute_import | 19 from __future__ import absolute_import |
20 | 20 |
21 import cStringIO | |
22 import os | 21 import os |
23 import re | 22 import re |
24 import time | 23 import time |
25 | 24 |
26 from mercurial import ( | 25 from mercurial import ( |
34 node as nodemod, | 33 node as nodemod, |
35 phases, | 34 phases, |
36 scmutil, | 35 scmutil, |
37 util, | 36 util, |
38 ) | 37 ) |
38 stringio = util.stringio | |
39 | |
39 from mercurial.i18n import _ | 40 from mercurial.i18n import _ |
40 from . import common | 41 from . import common |
41 mapfile = common.mapfile | 42 mapfile = common.mapfile |
42 NoRepo = common.NoRepo | 43 NoRepo = common.NoRepo |
43 | 44 |
135 exchange.pull(self.repo, prepo, | 136 exchange.pull(self.repo, prepo, |
136 [prepo.lookup(h) for h in heads]) | 137 [prepo.lookup(h) for h in heads]) |
137 self.before() | 138 self.before() |
138 | 139 |
139 def _rewritetags(self, source, revmap, data): | 140 def _rewritetags(self, source, revmap, data): |
140 fp = cStringIO.StringIO() | 141 fp = stringio() |
141 for line in data.splitlines(): | 142 for line in data.splitlines(): |
142 s = line.split(' ', 1) | 143 s = line.split(' ', 1) |
143 if len(s) != 2: | 144 if len(s) != 2: |
144 continue | 145 continue |
145 revid = revmap.get(source.lookuprev(s[0])) | 146 revid = revmap.get(source.lookuprev(s[0])) |
150 continue | 151 continue |
151 fp.write('%s %s\n' % (revid, s[1])) | 152 fp.write('%s %s\n' % (revid, s[1])) |
152 return fp.getvalue() | 153 return fp.getvalue() |
153 | 154 |
154 def _rewritesubstate(self, source, data): | 155 def _rewritesubstate(self, source, data): |
155 fp = cStringIO.StringIO() | 156 fp = stringio() |
156 for line in data.splitlines(): | 157 for line in data.splitlines(): |
157 s = line.split(' ', 1) | 158 s = line.split(' ', 1) |
158 if len(s) != 2: | 159 if len(s) != 2: |
159 continue | 160 continue |
160 | 161 |