( )⚙ D12367 hgext: use io.BytesIO instead of util.stringio

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12367

hgext: use io.BytesIO instead of util.stringio
AcceptedPublic

Authored by indygreg on Mar 9 2022, 8:07 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Summary

util.stringio is an alias to io.BytesIO. Let's just use io.BytesIO
directly.

I'm doing this because I noticed that in some cases pytype wasn't able
to infer the proper type of util.stringio. Removing the indirection
will enable type checking to work better.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

indygreg created this revision.Mar 9 2022, 8:07 PM
indygreg updated this revision to Diff 32625.Mar 9 2022, 8:16 PM
Alphare accepted this revision.Mar 14 2022, 6:18 AM
This revision is now accepted and ready to land.Mar 14 2022, 6:18 AM

Revision Contents
Changeset List

Diff 32625

hgext/absorb.py

# TODO: # TODO:
# * Rename config items to [commands] namespace # * Rename config items to [commands] namespace
# * Converge getdraftstack() with other code in core # * Converge getdraftstack() with other code in core
# * move many attributes on fixupstate to be private # * move many attributes on fixupstate to be private
import collections import collections
import io
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import ( from mercurial.node import (
hex, hex,
short, short,
) )
from mercurial import ( from mercurial import (
cmdutil, cmdutil,
def _parsechunk(hunk): def _parsechunk(hunk):
"""(crecord.uihunk or patch.recordhunk) -> (path, (a1, a2, [bline]))""" """(crecord.uihunk or patch.recordhunk) -> (path, (a1, a2, [bline]))"""
if type(hunk) not in (crecord.uihunk, patch.recordhunk): if type(hunk) not in (crecord.uihunk, patch.recordhunk):
return None, None return None, None
path = hunk.header.filename() path = hunk.header.filename()
a1 = hunk.fromline + len(hunk.before) - 1 a1 = hunk.fromline + len(hunk.before) - 1
# remove before and after context # remove before and after context
hunk.before = hunk.after = [] hunk.before = hunk.after = []
buf = util.stringio() buf = io.BytesIO()
hunk.write(buf) hunk.write(buf)
patchlines = mdiff.splitnewlines(buf.getvalue()) patchlines = mdiff.splitnewlines(buf.getvalue())
# hunk.prettystr() will update hunk.removed # hunk.prettystr() will update hunk.removed
a2 = a1 + hunk.removed a2 = a1 + hunk.removed
blines = [l[1:] for l in patchlines[1:] if not l.startswith(b'-')] blines = [l[1:] for l in patchlines[1:] if not l.startswith(b'-')]
return path, (a1, a2, blines) return path, (a1, a2, blines)

hgext/convert/cvs.py

# cvs.py: CVS conversion code inspired by hg-cvs-import and git-cvsimport # cvs.py: CVS conversion code inspired by hg-cvs-import and git-cvsimport
# #
# Copyright 2005-2009 Olivia Mackall <olivia@selenic.com> and others # Copyright 2005-2009 Olivia Mackall <olivia@selenic.com> and others
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
import errno import errno
import io
import os import os
import re import re
import socket import socket
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.pycompat import ( from mercurial.pycompat import (
getattr, getattr,
open, open,
) )
from mercurial import ( from mercurial import (
encoding, encoding,
error, error,
util,
) )
from mercurial.utils import ( from mercurial.utils import (
dateutil, dateutil,
procutil, procutil,
) )
from . import ( from . import (
common, common,
cvsps, cvsps,
) )
stringio = util.stringio
checktool = common.checktool checktool = common.checktool
commit = common.commit commit = common.commit
converter_source = common.converter_source converter_source = common.converter_source
makedatetimestamp = common.makedatetimestamp makedatetimestamp = common.makedatetimestamp
NoRepo = common.NoRepo NoRepo = common.NoRepo
class convert_cvs(converter_source): class convert_cvs(converter_source):
self._parse() self._parse()
return self.heads return self.heads
def getfile(self, name, rev): def getfile(self, name, rev):
def chunkedread(fp, count): def chunkedread(fp, count):
# file-objects returned by socket.makefile() do not handle # file-objects returned by socket.makefile() do not handle
# large read() requests very well. # large read() requests very well.
chunksize = 65536 chunksize = 65536
output = stringio() output = io.BytesIO()
while count > 0: while count > 0:
data = fp.read(min(count, chunksize)) data = fp.read(min(count, chunksize))
if not data: if not data:
raise error.Abort( raise error.Abort(
_(b"%d bytes missing from remote file") % count _(b"%d bytes missing from remote file") % count
) )
count -= len(data) count -= len(data)
output.write(data) output.write(data)

hgext/convert/hg.py

# those older versions, then converted, may thus have different # those older versions, then converted, may thus have different
# hashes for changesets that are otherwise identical. # hashes for changesets that are otherwise identical.
# #
# * Using "--config convert.hg.saverev=true" will make the source # * Using "--config convert.hg.saverev=true" will make the source
# identifier to be stored in the converted revision. This will cause # identifier to be stored in the converted revision. This will cause
# the converted revision to have a different identity than the # the converted revision to have a different identity than the
# source. # source.
import io
import os import os
import re import re
import time import time
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.pycompat import open from mercurial.pycompat import open
from mercurial.node import ( from mercurial.node import (
bin, bin,
logcmdutil, logcmdutil,
merge as mergemod, merge as mergemod,
mergestate, mergestate,
phases, phases,
util, util,
) )
from mercurial.utils import dateutil from mercurial.utils import dateutil
stringio = util.stringio
from . import common from . import common
mapfile = common.mapfile mapfile = common.mapfile
NoRepo = common.NoRepo NoRepo = common.NoRepo
sha1re = re.compile(br'\b[0-9a-f]{12,40}\b') sha1re = re.compile(br'\b[0-9a-f]{12,40}\b')
_(b'pulling from %s into %s\n') % (pbranch, branch) _(b'pulling from %s into %s\n') % (pbranch, branch)
) )
exchange.pull( exchange.pull(
self.repo, prepo, heads=[prepo.lookup(h) for h in heads] self.repo, prepo, heads=[prepo.lookup(h) for h in heads]
) )
self.before() self.before()
def _rewritetags(self, source, revmap, data): def _rewritetags(self, source, revmap, data):
fp = stringio() fp = io.BytesIO()
for line in data.splitlines(): for line in data.splitlines():
s = line.split(b' ', 1) s = line.split(b' ', 1)
if len(s) != 2: if len(s) != 2:
self.ui.warn(_(b'invalid tag entry: "%s"\n') % line) self.ui.warn(_(b'invalid tag entry: "%s"\n') % line)
fp.write(b'%s\n' % line) # Bogus, but keep for hash stability fp.write(b'%s\n' % line) # Bogus, but keep for hash stability
continue continue
revid = revmap.get(source.lookuprev(s[0])) revid = revmap.get(source.lookuprev(s[0]))
if not revid: if not revid:
if s[0] == sha1nodeconstants.nullhex: if s[0] == sha1nodeconstants.nullhex:
revid = s[0] revid = s[0]
else: else:
# missing, but keep for hash stability # missing, but keep for hash stability
self.ui.warn(_(b'missing tag entry: "%s"\n') % line) self.ui.warn(_(b'missing tag entry: "%s"\n') % line)
fp.write(b'%s\n' % line) fp.write(b'%s\n' % line)
continue continue
fp.write(b'%s %s\n' % (revid, s[1])) fp.write(b'%s %s\n' % (revid, s[1]))
return fp.getvalue() return fp.getvalue()
def _rewritesubstate(self, source, data): def _rewritesubstate(self, source, data):
fp = stringio() fp = io.BytesIO()
for line in data.splitlines(): for line in data.splitlines():
s = line.split(b' ', 1) s = line.split(b' ', 1)
if len(s) != 2: if len(s) != 2:
continue continue
revid = s[0] revid = s[0]
subpath = s[1] subpath = s[1]
if revid != sha1nodeconstants.nullhex: if revid != sha1nodeconstants.nullhex:

hgext/convert/subversion.py

# Subversion 1.4/1.5 Python API backend # Subversion 1.4/1.5 Python API backend
# #
# Copyright(C) 2007 Daniel Holth et al # Copyright(C) 2007 Daniel Holth et al
import codecs import codecs
import io
import locale import locale
import os import os
import pickle import pickle
import re import re
import xml.dom.minidom import xml.dom.minidom
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.pycompat import open from mercurial.pycompat import open
from mercurial import ( from mercurial import (
encoding, encoding,
error, error,
pycompat, pycompat,
util, util,
vfs as vfsmod, vfs as vfsmod,
) )
from mercurial.utils import ( from mercurial.utils import (
dateutil, dateutil,
procutil, procutil,
stringutil, stringutil,
) )
from . import common from . import common
stringio = util.stringio
propertycache = util.propertycache propertycache = util.propertycache
urlerr = util.urlerr urlerr = util.urlerr
urlreq = util.urlreq urlreq = util.urlreq
commandline = common.commandline commandline = common.commandline
commit = common.commit commit = common.commit
converter_sink = common.converter_sink converter_sink = common.converter_sink
converter_source = common.converter_source converter_source = common.converter_source
# TODO: ra.get_file transmits the whole file instead of diffs. # TODO: ra.get_file transmits the whole file instead of diffs.
if file in self.removed: if file in self.removed:
return None, None return None, None
try: try:
new_module, revnum = revsplit(rev)[1:] new_module, revnum = revsplit(rev)[1:]
if self.module != new_module: if self.module != new_module:
self.module = new_module self.module = new_module
self.reparent(self.module) self.reparent(self.module)
io = stringio() bio = io.BytesIO()
info = svn.ra.get_file(self.ra, file, revnum, io) info = svn.ra.get_file(self.ra, file, revnum, bio)
data = io.getvalue() data = bio.getvalue()
# ra.get_file() seems to keep a reference on the input buffer # ra.get_file() seems to keep a reference on the input buffer
# preventing collection. Release it explicitly. # preventing collection. Release it explicitly.
io.close() bio.close()
if isinstance(info, list): if isinstance(info, list):
info = info[-1] info = info[-1]
mode = (b"svn:executable" in info) and b'x' or b'' mode = (b"svn:executable" in info) and b'x' or b''
mode = (b"svn:special" in info) and b'l' or mode mode = (b"svn:special" in info) and b'l' or mode
except svn.core.SubversionException as e: except svn.core.SubversionException as e:
notfound = ( notfound = (
svn.core.SVN_ERR_FS_NOT_FOUND, svn.core.SVN_ERR_FS_NOT_FOUND,
svn.core.SVN_ERR_RA_DAV_PATH_NOT_FOUND, svn.core.SVN_ERR_RA_DAV_PATH_NOT_FOUND,

hgext/infinitepush/bundleparts.py

# Copyright 2017 Facebook, Inc. # Copyright 2017 Facebook, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
import io
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import hex from mercurial.node import hex
from mercurial import ( from mercurial import (
bundle2, bundle2,
changegroup, changegroup,
error, error,
extensions, extensions,
revsetlang, revsetlang,
util,
) )
from . import common from . import common
isremotebooksenabled = common.isremotebooksenabled isremotebooksenabled = common.isremotebooksenabled
scratchbranchparttype = b'b2x:infinitepush' scratchbranchparttype = b'b2x:infinitepush'
self.type = part.type self.type = part.type
self.id = part.id self.id = part.id
self.mandatory = part.mandatory self.mandatory = part.mandatory
self.mandatoryparams = part.mandatoryparams self.mandatoryparams = part.mandatoryparams
self.advisoryparams = part.advisoryparams self.advisoryparams = part.advisoryparams
self.params = part.params self.params = part.params
self.mandatorykeys = part.mandatorykeys self.mandatorykeys = part.mandatorykeys
# copy the buffer # copy the buffer
self._io = util.stringio(part.read()) self._io = io.BytesIO(part.read())
def consume(self): def consume(self):
return return
def read(self, size=None): def read(self, size=None):
if size is None: if size is None:
return self._io.read() return self._io.read()
else: else:
return self._io.read(size) return self._io.read(size)

hgext/patchbomb.py

``patchbomb.confirm`` to true. ``patchbomb.confirm`` to true.
''' '''
import email.encoders as emailencoders import email.encoders as emailencoders
import email.mime.base as emimebase import email.mime.base as emimebase
import email.mime.multipart as emimemultipart import email.mime.multipart as emimemultipart
import email.utils as eutil import email.utils as eutil
import errno import errno
import io
import os import os
import socket import socket
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.pycompat import open from mercurial.pycompat import open
from mercurial.node import bin from mercurial.node import bin
from mercurial import ( from mercurial import (
cmdutil, cmdutil,
templater, templater,
util, util,
) )
from mercurial.utils import ( from mercurial.utils import (
dateutil, dateutil,
urlutil, urlutil,
) )
stringio = util.stringio
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
configtable = {} configtable = {}
configitem = registrar.configitem(configtable) configitem = registrar.configitem(configtable)
configitem( configitem(
b'patchbomb', b'patchbomb',
return intro return intro
def _formatflags(ui, repo, rev, flags): def _formatflags(ui, repo, rev, flags):
"""build flag string optionally by template""" """build flag string optionally by template"""
tmpl = ui.config(b'patchbomb', b'flagtemplate') tmpl = ui.config(b'patchbomb', b'flagtemplate')
if not tmpl: if not tmpl:
return b' '.join(flags) return b' '.join(flags)
out = util.stringio() out = io.BytesIO()
spec = formatter.literal_templatespec(templater.unquotestring(tmpl)) spec = formatter.literal_templatespec(templater.unquotestring(tmpl))
with formatter.templateformatter(ui, out, b'patchbombflag', {}, spec) as fm: with formatter.templateformatter(ui, out, b'patchbombflag', {}, spec) as fm:
fm.startitem() fm.startitem()
fm.context(ctx=repo[rev]) fm.context(ctx=repo[rev])
fm.write(b'flags', b'%s', fm.formatlist(flags, name=b'flag')) fm.write(b'flags', b'%s', fm.formatlist(flags, name=b'flag'))
return out.getvalue() return out.getvalue()
Each patch in the list is itself a list of lines. Each patch in the list is itself a list of lines.
""" """
ui = repo.ui ui = repo.ui
prev = repo[b'.'].rev() prev = repo[b'.'].rev()
for r in revs: for r in revs:
if r == prev and (repo[None].files() or repo[None].deleted()): if r == prev and (repo[None].files() or repo[None].deleted()):
ui.warn(_(b'warning: working directory has uncommitted changes\n')) ui.warn(_(b'warning: working directory has uncommitted changes\n'))
output = stringio() output = io.BytesIO()
cmdutil.exportfile( cmdutil.exportfile(
repo, [r], output, opts=patch.difffeatureopts(ui, opts, git=True) repo, [r], output, opts=patch.difffeatureopts(ui, opts, git=True)
) )
yield output.getvalue().split(b'\n') yield output.getvalue().split(b'\n')
def _getbundle(repo, dest, **opts): def _getbundle(repo, dest, **opts):
"""return a bundle containing changesets missing in "dest" """return a bundle containing changesets missing in "dest"
else: else:
if not sendmail: if not sendmail:
sendmail = mail.connect(ui, mbox=mbox) sendmail = mail.connect(ui, mbox=mbox)
ui.status(_(b'sending '), subj, b' ...\n') ui.status(_(b'sending '), subj, b' ...\n')
progress.update(i, item=subj) progress.update(i, item=subj)
if not mbox: if not mbox:
# Exim does not remove the Bcc field # Exim does not remove the Bcc field
del m['Bcc'] del m['Bcc']
fp = stringio() fp = io.BytesIO()
generator = mail.Generator(fp, mangle_from_=False) generator = mail.Generator(fp, mangle_from_=False)
generator.flatten(m, False) generator.flatten(m, False)
alldests = to + bcc + cc alldests = to + bcc + cc
sendmail(sender_addr, alldests, fp.getvalue()) sendmail(sender_addr, alldests, fp.getvalue())
progress.complete() progress.complete()

hgext/phabricator.py

result[rev] = int(m.group(1)) result[rev] = int(m.group(1))
break break
return result return result
def getdiff(basectx, ctx, diffopts): def getdiff(basectx, ctx, diffopts):
"""plain-text diff without header (user, commit message, etc)""" """plain-text diff without header (user, commit message, etc)"""
output = util.stringio() output = io.BytesIO()
for chunk, _label in patch.diffui( for chunk, _label in patch.diffui(
ctx.repo(), basectx.p1().node(), ctx.node(), None, opts=diffopts ctx.repo(), basectx.p1().node(), ctx.node(), None, opts=diffopts
): ):
output.write(chunk) output.write(chunk)
return output.getvalue() return output.getvalue()
class DiffChangeType: class DiffChangeType: