This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6742

interfaceutil: move to interfaces/
ClosedPublic

Authored by pulkit on Aug 17 2019, 7:42 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG2c4f656c8e9f: interfaceutil: move to interfaces/
Summary

Now that we have a dedicated folder for interfaces, let's move interfaceutil
there.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Aug 17 2019, 7:42 PM
indygreg accepted this revision.Aug 25 2019, 12:07 PM
This revision is now accepted and ready to land.Aug 25 2019, 12:07 PM
pulkit added a commit: rHG2c4f656c8e9f: interfaceutil: move to interfaces/.Aug 25 2019, 12:09 PM
Closed by commit rHG2c4f656c8e9f: interfaceutil: move to interfaces/ (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 16311

hgext/sqlitestore.py

mdiff, mdiff,
pycompat, pycompat,
registrar, registrar,
util, util,
verify, verify,
) )
from mercurial.interfaces import ( from mercurial.interfaces import (
repository, repository,
util as interfaceutil,
) )
from mercurial.utils import ( from mercurial.utils import (
interfaceutil,
storageutil, storageutil,
) )
try: try:
from mercurial import zstd from mercurial import zstd
zstd.__version__ zstd.__version__
except ImportError: except ImportError:
zstd = None zstd = None

mercurial/filelog.py

nullrev, nullrev,
) )
from . import ( from . import (
error, error,
revlog, revlog,
) )
from .interfaces import ( from .interfaces import (
repository, repository,
util as interfaceutil,
) )
from .utils import ( from .utils import (
interfaceutil,
storageutil, storageutil,
) )
@interfaceutil.implementer(repository.ifilestorage) @interfaceutil.implementer(repository.ifilestorage)
class filelog(object): class filelog(object):
def __init__(self, opener, path): def __init__(self, opener, path):
self._revlog = revlog.revlog(opener, self._revlog = revlog.revlog(opener,
'/'.join(('data', path + '.i')), '/'.join(('data', path + '.i')),

mercurial/httppeer.py

import errno import errno
import io import io
import os import os
import socket import socket
import struct import struct
import weakref import weakref
from .i18n import _ from .i18n import _
from .interfaces import (
repository,
)
from . import ( from . import (
bundle2, bundle2,
error, error,
httpconnection, httpconnection,
pycompat, pycompat,
statichttprepo, statichttprepo,
url as urlmod, url as urlmod,
util, util,
wireprotoframing, wireprotoframing,
wireprototypes, wireprototypes,
wireprotov1peer, wireprotov1peer,
wireprotov2peer, wireprotov2peer,
wireprotov2server, wireprotov2server,
) )
from .interfaces import (
repository,
util as interfaceutil,
)
from .utils import ( from .utils import (
cborutil, cborutil,
interfaceutil,
stringutil, stringutil,
) )
httplib = util.httplib httplib = util.httplib
urlerr = util.urlerr urlerr = util.urlerr
urlreq = util.urlreq urlreq = util.urlreq
def encodevalueinheaders(value, header, limit): def encodevalueinheaders(value, header, limit):

mercurial/interfaces/repository.py

# repository.py - Interfaces and base classes for repositories and peers. # repository.py - Interfaces and base classes for repositories and peers.
# #
# Copyright 2017 Gregory Szorc <gregory.szorc@gmail.com> # Copyright 2017 Gregory Szorc <gregory.szorc@gmail.com>
# #
# 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.
from __future__ import absolute_import from __future__ import absolute_import
from ..i18n import _ from ..i18n import _
from .. import ( from .. import (
error, error,
) )
from ..utils import ( from . import (
interfaceutil, util as interfaceutil,
) )
# When narrowing is finalized and no longer subject to format changes, # When narrowing is finalized and no longer subject to format changes,
# we should move this to just "narrow" or similar. # we should move this to just "narrow" or similar.
NARROW_REQUIREMENT = 'narrowhg-experimental' NARROW_REQUIREMENT = 'narrowhg-experimental'
# Local repository feature string. # Local repository feature string.

mercurial/interfaces/util.py

  • This file was moved from mercurial/utils/interfaceutil.py.
# interfaceutil.py - Utilities for declaring interfaces. # util.py - Utilities for declaring interfaces.
# #
# Copyright 2018 Gregory Szorc <gregory.szorc@gmail.com> # Copyright 2018 Gregory Szorc <gregory.szorc@gmail.com>
# #
# 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.
# zope.interface imposes a run-time cost due to module import overhead and # zope.interface imposes a run-time cost due to module import overhead and
# bookkeeping for declaring interfaces. So, we use stubs for various # bookkeeping for declaring interfaces. So, we use stubs for various

mercurial/localrepo.py

transaction, transaction,
txnutil, txnutil,
util, util,
vfs as vfsmod, vfs as vfsmod,
) )
from .interfaces import ( from .interfaces import (
repository, repository,
util as interfaceutil,
) )
from .utils import ( from .utils import (
interfaceutil,
procutil, procutil,
stringutil, stringutil,
) )
from .revlogutils import ( from .revlogutils import (
constants as revlogconst, constants as revlogconst,
) )

mercurial/manifest.py

mdiff, mdiff,
policy, policy,
pycompat, pycompat,
revlog, revlog,
util, util,
) )
from .interfaces import ( from .interfaces import (
repository, repository,
) util as interfaceutil,
from .utils import (
interfaceutil,
) )
parsers = policy.importmod(r'parsers') parsers = policy.importmod(r'parsers')
propertycache = util.propertycache propertycache = util.propertycache
# Allow tests to more easily test the alternate path in manifestdict.fastdelta() # Allow tests to more easily test the alternate path in manifestdict.fastdelta()
FASTDELTA_TEXTDIFF_THRESHOLD = 1000 FASTDELTA_TEXTDIFF_THRESHOLD = 1000

mercurial/revlog.py

mdiff, mdiff,
policy, policy,
pycompat, pycompat,
templatefilters, templatefilters,
util, util,
) )
from .interfaces import ( from .interfaces import (
repository, repository,
util as interfaceutil,
) )
from .revlogutils import ( from .revlogutils import (
deltas as deltautil, deltas as deltautil,
flagutil, flagutil,
) )
from .utils import ( from .utils import (
interfaceutil,
storageutil, storageutil,
stringutil, stringutil,
) )
# blanked usage of all the name to prevent pyflakes constraints # blanked usage of all the name to prevent pyflakes constraints
# We need these name available in the module for extensions. # We need these name available in the module for extensions.
REVLOGV0 REVLOGV0
REVLOGV1 REVLOGV1

mercurial/utils/interfaceutil.py

  • This file was moved to mercurial/interfaces/util.py.

mercurial/wireprotoserver.py

encoding, encoding,
error, error,
pycompat, pycompat,
util, util,
wireprototypes, wireprototypes,
wireprotov1server, wireprotov1server,
wireprotov2server, wireprotov2server,
) )
from .interfaces import (
util as interfaceutil,
)
from .utils import ( from .utils import (
cborutil, cborutil,
compression, compression,
interfaceutil,
) )
stringio = util.stringio stringio = util.stringio
urlerr = util.urlerr urlerr = util.urlerr
urlreq = util.urlreq urlreq = util.urlreq
HTTP_OK = 200 HTTP_OK = 200

mercurial/wireprototypes.py

from .i18n import _ from .i18n import _
from .thirdparty import ( from .thirdparty import (
attr, attr,
) )
from . import ( from . import (
error, error,
util, util,
) )
from .interfaces import (
util as interfaceutil,
)
from .utils import ( from .utils import (
compression, compression,
interfaceutil,
) )
# Names of the SSH protocol implementations. # Names of the SSH protocol implementations.
SSHV1 = 'ssh-v1' SSHV1 = 'ssh-v1'
# These are advertised over the wire. Increment the counters at the end # These are advertised over the wire. Increment the counters at the end
# to reflect BC breakages. # to reflect BC breakages.
SSHV2 = 'exp-ssh-v2-0003' SSHV2 = 'exp-ssh-v2-0003'
HTTP_WIREPROTO_V2 = 'exp-http-v2-0003' HTTP_WIREPROTO_V2 = 'exp-http-v2-0003'

mercurial/wireprotov1peer.py

error, error,
pushkey as pushkeymod, pushkey as pushkeymod,
pycompat, pycompat,
util, util,
wireprototypes, wireprototypes,
) )
from .interfaces import ( from .interfaces import (
repository, repository,
) util as interfaceutil,
from .utils import (
interfaceutil,
) )
urlreq = util.urlreq urlreq = util.urlreq
def batchable(f): def batchable(f):
'''annotation for batchable methods '''annotation for batchable methods
Such methods must implement a coroutine as follows: Such methods must implement a coroutine as follows:

mercurial/wireprotov2server.py

narrowspec, narrowspec,
pycompat, pycompat,
streamclone, streamclone,
templatefilters, templatefilters,
util, util,
wireprotoframing, wireprotoframing,
wireprototypes, wireprototypes,
) )
from .interfaces import (
util as interfaceutil,
)
from .utils import ( from .utils import (
cborutil, cborutil,
interfaceutil,
stringutil, stringutil,
) )
FRAMINGTYPE = b'application/mercurial-exp-framing-0006' FRAMINGTYPE = b'application/mercurial-exp-framing-0006'
HTTP_WIREPROTO_V2 = wireprototypes.HTTP_WIREPROTO_V2 HTTP_WIREPROTO_V2 = wireprototypes.HTTP_WIREPROTO_V2
COMMANDS = wireprototypes.commanddict() COMMANDS = wireprototypes.commanddict()

tests/simplestorerepo.py

mdiff, mdiff,
pycompat, pycompat,
revlog, revlog,
store, store,
verify, verify,
) )
from mercurial.interfaces import ( from mercurial.interfaces import (
repository, repository,
util as interfaceutil,
) )
from mercurial.utils import ( from mercurial.utils import (
cborutil, cborutil,
interfaceutil,
storageutil, storageutil,
) )
from mercurial.revlogutils import ( from mercurial.revlogutils import (
flagutil, flagutil,
) )
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should

tests/wireprotosimplecache.py

registrar, registrar,
util, util,
wireprotoserver, wireprotoserver,
wireprototypes, wireprototypes,
wireprotov2server, wireprotov2server,
) )
from mercurial.interfaces import ( from mercurial.interfaces import (
repository, repository,
util as interfaceutil,
) )
from mercurial.utils import ( from mercurial.utils import (
interfaceutil,
stringutil, stringutil,
) )
CACHE = None CACHE = None
configtable = {} configtable = {}
configitem = registrar.configitem(configtable) configitem = registrar.configitem(configtable)