diffutil: move the module out of utils package

mercurial.utils modules inherit the property of the mercurial.util, which is
no dependency on ui, repo, ctx, etc. As the diffutil module seems to reside
in the scmutil layer, it's probably better to not put it under the utils
package.

contrib/synthrepo.py

@@ -54,6 +54,7 b' from mercurial.node import ('
 )
 from mercurial import (
     context,
+    diffutil,
     error,
     hg,
     patch,
@@ -62,7 +63,6 b' from mercurial import ('
 )
 from mercurial.utils import (
     dateutil,
-    diffutil,
 )
 
 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for

mercurial/diffutil.py

@@ -9,9 +9,9 b''
 
 from __future__ import absolute_import
 
-from ..i18n import _
+from .i18n import _
 
-from .. import (
+from . import (
     mdiff,
     pycompat,
 )

mercurial/hgweb/webutil.py

@@ -25,6 +25,7 b' from .common import ('
 
 from .. import (
     context,
+    diffutil,
     error,
     match,
     mdiff,
@@ -41,7 +42,6 b' from .. import ('
 )
 
 from ..utils import (
-    diffutil,
     stringutil,
 )
 

mercurial/obsutil.py

@@ -11,13 +11,13 b' import re'
 
 from .i18n import _
 from . import (
+    diffutil,
     node as nodemod,
     phases,
     util,
 )
 from .utils import (
     dateutil,
-    diffutil,
 )
 
 ### obsolescence marker flag

mercurial/patch.py

@@ -28,6 +28,7 b' from .node import ('
 from . import (
     copies,
     diffhelper,
+    diffutil,
     encoding,
     error,
     mail,
@@ -41,7 +42,6 b' from . import ('
 )
 from .utils import (
     dateutil,
-    diffutil,
     procutil,
     stringutil,
 )

mercurial/revset.py

@@ -13,6 +13,7 b' from .i18n import _'
 from . import (
     dagop,
     destutil,
+    diffutil,
     encoding,
     error,
     hbisect,
@@ -33,7 +34,6 b' from . import ('
 )
 from .utils import (
     dateutil,
-    diffutil,
     stringutil,
 )
 

mercurial/templatekw.py

@@ -14,6 +14,7 b' from .node import ('
 )
 
 from . import (
+    diffutil,
     encoding,
     error,
     hbisect,
@@ -27,7 +28,6 b' from . import ('
     util,
 )
 from .utils import (
-    diffutil,
     stringutil,
 )
 

tests/test-context.py

@@ -5,12 +5,12 b' import sys'
 from mercurial.node import hex
 from mercurial import (
     context,
+    diffutil,
     encoding,
     hg,
     scmutil,
     ui as uimod,
 )
-from mercurial.utils import diffutil
 
 print_ = print
 def print(*args, **kwargs):