@@ -17,9 +17,9 @@
)
from mercurial.interfaces import (
repository,
+ util as interfaceutil,
)
from mercurial.utils import (
- interfaceutil,
stringutil,
)
@@ -38,10 +38,10 @@
)
from mercurial.interfaces import (
repository,
+ util as interfaceutil,
)
from mercurial.utils import (
cborutil,
- interfaceutil,
storageutil,
)
from mercurial.revlogutils import (
@@ -28,9 +28,11 @@
wireprotoframing,
wireprototypes,
)
+from .interfaces import (
+ util as interfaceutil,
+)
from .utils import (
cborutil,
- interfaceutil,
stringutil,
)
@@ -27,9 +27,7 @@
)
from .interfaces import (
repository,
-)
-from .utils import (
- interfaceutil,
+ util as interfaceutil,
)
urlreq = util.urlreq
@@ -17,9 +17,11 @@
error,
util,
)
+from .interfaces import (
+ util as interfaceutil,
+)
from .utils import (
compression,
- interfaceutil,
)
# Names of the SSH protocol implementations.
@@ -21,10 +21,12 @@
wireprotov1server,
wireprotov2server,
)
+from .interfaces import (
+ util as interfaceutil,
+)
from .utils import (
cborutil,
compression,
- interfaceutil,
)
stringio = util.stringio
@@ -70,13 +70,13 @@
)
from .interfaces import (
repository,
+ util as interfaceutil,
)
from .revlogutils import (
deltas as deltautil,
flagutil,
)
from .utils import (
- interfaceutil,
storageutil,
stringutil,
)
@@ -29,9 +29,7 @@
)
from .interfaces import (
repository,
-)
-from .utils import (
- interfaceutil,
+ util as interfaceutil,
)
parsers = policy.importmod(r'parsers')
@@ -68,10 +68,10 @@
from .interfaces import (
repository,
+ util as interfaceutil,
)
from .utils import (
- interfaceutil,
procutil,
stringutil,
)
rename from mercurial/utils/interfaceutil.py
rename to mercurial/interfaces/util.py
@@ -1,4 +1,4 @@
-# interfaceutil.py - Utilities for declaring interfaces.
+# util.py - Utilities for declaring interfaces.
#
# Copyright 2018 Gregory Szorc <gregory.szorc@gmail.com>
#
@@ -11,8 +11,8 @@
from .. import (
error,
)
-from ..utils import (
- interfaceutil,
+from . import (
+ util as interfaceutil,
)
# When narrowing is finalized and no longer subject to format changes,
@@ -16,9 +16,6 @@
import weakref
from .i18n import _
-from .interfaces import (
- repository,
-)
from . import (
bundle2,
error,
@@ -33,9 +30,12 @@
wireprotov2peer,
wireprotov2server,
)
+from .interfaces import (
+ repository,
+ util as interfaceutil,
+)
from .utils import (
cborutil,
- interfaceutil,
stringutil,
)
@@ -18,9 +18,9 @@
)
from .interfaces import (
repository,
+ util as interfaceutil,
)
from .utils import (
- interfaceutil,
storageutil,
)
@@ -75,9 +75,9 @@
)
from mercurial.interfaces import (
repository,
+ util as interfaceutil,
)
from mercurial.utils import (
- interfaceutil,
storageutil,
)