Mercurial > public > mercurial-scm > hg
comparison hgext/extdiff.py @ 37084: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 | ffa3026d4196 |
| children | a8a902d7176e |
comparison
equal
deleted
inserted
replaced
| 37083:f99d64e8a4e4 | 37084:f0b6fbea00cf |
|---|---|
| 79 filemerge, | 79 filemerge, |
| 80 pycompat, | 80 pycompat, |
| 81 registrar, | 81 registrar, |
| 82 scmutil, | 82 scmutil, |
| 83 util, | 83 util, |
| 84 ) | |
| 85 from mercurial.utils import ( | |
| 86 stringutil, | |
| 84 ) | 87 ) |
| 85 | 88 |
| 86 cmdtable = {} | 89 cmdtable = {} |
| 87 command = registrar.command(cmdtable) | 90 command = registrar.command(cmdtable) |
| 88 | 91 |
| 365 """ | 368 """ |
| 366 | 369 |
| 367 def __init__(self, path, cmdline): | 370 def __init__(self, path, cmdline): |
| 368 # We can't pass non-ASCII through docstrings (and path is | 371 # We can't pass non-ASCII through docstrings (and path is |
| 369 # in an unknown encoding anyway) | 372 # in an unknown encoding anyway) |
| 370 docpath = util.escapestr(path) | 373 docpath = stringutil.escapestr(path) |
| 371 self.__doc__ %= {r'path': pycompat.sysstr(util.uirepr(docpath))} | 374 self.__doc__ %= {r'path': pycompat.sysstr(stringutil.uirepr(docpath))} |
| 372 self._cmdline = cmdline | 375 self._cmdline = cmdline |
| 373 | 376 |
| 374 def __call__(self, ui, repo, *pats, **opts): | 377 def __call__(self, ui, repo, *pats, **opts): |
| 375 opts = pycompat.byteskwargs(opts) | 378 opts = pycompat.byteskwargs(opts) |
| 376 options = ' '.join(map(util.shellquote, opts['option'])) | 379 options = ' '.join(map(util.shellquote, opts['option'])) |