Mercurial > public > mercurial-scm > hg-stable
diff mercurial/filemerge.py @ 37087:f0b6fbea00cf
stringutil: bulk-replace call sites to point to new module
This might conflict with other patches floating around, sorry.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Thu, 22 Mar 2018 21:56:20 +0900 |
| parents | 1e30a26a65d0 |
| children | a8a902d7176e |
line wrap: on
line diff
--- a/mercurial/filemerge.py Thu Mar 22 21:19:31 2018 +0900 +++ b/mercurial/filemerge.py Thu Mar 22 21:56:20 2018 +0900 @@ -31,6 +31,10 @@ util, ) +from .utils import ( + stringutil, +) + def _toolstr(ui, tool, part, *args): return ui.config("merge-tools", tool + "." + part, *args) @@ -573,7 +577,7 @@ mark = mark.splitlines()[0] # split for safety # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ') - return util.ellipsis(mark, 80 - 8) + return stringutil.ellipsis(mark, 80 - 8) _defaultconflictlabels = ['local', 'other']