Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/obsutil.py @ 38589:1c93e0237a24
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.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Fri, 06 Jul 2018 21:49:25 +0900 |
| parents | b62000a28812 |
| children | 83d965803325 |
comparison
equal
deleted
inserted
replaced
| 38588:b62000a28812 | 38589:1c93e0237a24 |
|---|---|
| 9 | 9 |
| 10 import re | 10 import re |
| 11 | 11 |
| 12 from .i18n import _ | 12 from .i18n import _ |
| 13 from . import ( | 13 from . import ( |
| 14 diffutil, | |
| 14 node as nodemod, | 15 node as nodemod, |
| 15 phases, | 16 phases, |
| 16 util, | 17 util, |
| 17 ) | 18 ) |
| 18 from .utils import ( | 19 from .utils import ( |
| 19 dateutil, | 20 dateutil, |
| 20 diffutil, | |
| 21 ) | 21 ) |
| 22 | 22 |
| 23 ### obsolescence marker flag | 23 ### obsolescence marker flag |
| 24 | 24 |
| 25 ## bumpedfix flag | 25 ## bumpedfix flag |