interfaceutil: move to interfaces/

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

Differential Revision: https://phab.mercurial-scm.org/D6742

hgext/sqlitestore.py

@@ -75,9 +75,9 b' from mercurial import ('
 )
 from mercurial.interfaces import (
     repository,
+    util as interfaceutil,
 )
 from mercurial.utils import (
-    interfaceutil,
     storageutil,
 )
 

mercurial/filelog.py

@@ -18,9 +18,9 b' from . import ('
 )
 from .interfaces import (
     repository,
+    util as interfaceutil,
 )
 from .utils import (
-    interfaceutil,
     storageutil,
 )
 

mercurial/httppeer.py

@@ -16,9 +16,6 b' import struct'
 import weakref
 
 from .i18n import _
-from .interfaces import (
-    repository,
-)
 from . import (
     bundle2,
     error,
@@ -33,9 +30,12 b' from . import ('
     wireprotov2peer,
     wireprotov2server,
 )
+from .interfaces import (
+    repository,
+    util as interfaceutil,
+)
 from .utils import (
     cborutil,
-    interfaceutil,
     stringutil,
 )
 

mercurial/interfaces/repository.py

@@ -11,8 +11,8 b' from ..i18n import _'
 from .. import (
     error,
 )
-from ..utils import (
-    interfaceutil,
+from . import (
+    util as interfaceutil,
 )
 
 # When narrowing is finalized and no longer subject to format changes,

mercurial/interfaces/util.py

@@ -1,4 +1,4 b''
-# interfaceutil.py - Utilities for declaring interfaces.
+# util.py - Utilities for declaring interfaces.
 #
 # Copyright 2018 Gregory Szorc <[e-mail]>
 #

mercurial/localrepo.py

@@ -68,10 +68,10 b' from . import ('
 
 from .interfaces import (
     repository,
+    util as interfaceutil,
 )
 
 from .utils import (
-    interfaceutil,
     procutil,
     stringutil,
 )

mercurial/manifest.py

@@ -29,9 +29,7 b' from . import ('
 )
 from .interfaces import (
     repository,
-)
-from .utils import (
-    interfaceutil,
+    util as interfaceutil,
 )
 
 parsers = policy.importmod(r'parsers')

mercurial/revlog.py

@@ -70,13 +70,13 b' from . import ('
 )
 from .interfaces import (
     repository,
+    util as interfaceutil,
 )
 from .revlogutils import (
     deltas as deltautil,
     flagutil,
 )
 from .utils import (
-    interfaceutil,
     storageutil,
     stringutil,
 )

mercurial/wireprotoserver.py

@@ -21,10 +21,12 b' from . import ('
     wireprotov1server,
     wireprotov2server,
 )
+from .interfaces import (
+    util as interfaceutil,
+)
 from .utils import (
     cborutil,
     compression,
-    interfaceutil,
 )
 
 stringio = util.stringio

mercurial/wireprototypes.py

@@ -17,9 +17,11 b' from . import ('
     error,
     util,
 )
+from .interfaces import (
+    util as interfaceutil,
+)
 from .utils import (
     compression,
-    interfaceutil,
 )
 
 # Names of the SSH protocol implementations.

mercurial/wireprotov1peer.py

@@ -27,9 +27,7 b' from . import ('
 )
 from .interfaces import (
     repository,
-)
-from .utils import (
-    interfaceutil,
+    util as interfaceutil,
 )
 
 urlreq = util.urlreq

mercurial/wireprotov2server.py

@@ -28,9 +28,11 b' from . import ('
     wireprotoframing,
     wireprototypes,
 )
+from .interfaces import (
+    util as interfaceutil,
+)
 from .utils import (
     cborutil,
-    interfaceutil,
     stringutil,
 )
 

tests/simplestorerepo.py

@@ -38,10 +38,10 b' from mercurial import ('
 )
 from mercurial.interfaces import (
     repository,
+    util as interfaceutil,
 )
 from mercurial.utils import (
     cborutil,
-    interfaceutil,
     storageutil,
 )
 from mercurial.revlogutils import (

tests/wireprotosimplecache.py

@@ -17,9 +17,9 b' from mercurial import ('
 )
 from mercurial.interfaces import (
     repository,
+    util as interfaceutil,
 )
 from mercurial.utils import (
-    interfaceutil,
     stringutil,
 )