Mercurial > public > mercurial-scm > hg
comparison mercurial/scmutil.py @ 33798:2cd5aba5e1d2
scmutil: use util.shellquote instead of %r
Changes some output, but also resolves differences with Python 3.
Differential Revision: https://phab.mercurial-scm.org/D301
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Wed, 26 Jul 2017 23:47:54 -0400 |
| parents | 377e8ddaebef |
| children | 5e83a8fe6bc4 |
comparison
equal
deleted
inserted
replaced
| 33797:4abf34f47526 | 33798:2cd5aba5e1d2 |
|---|---|
| 271 checkfilename(f) | 271 checkfilename(f) |
| 272 abort, warn = checkportabilityalert(ui) | 272 abort, warn = checkportabilityalert(ui) |
| 273 if abort or warn: | 273 if abort or warn: |
| 274 msg = util.checkwinfilename(f) | 274 msg = util.checkwinfilename(f) |
| 275 if msg: | 275 if msg: |
| 276 msg = "%s: %r" % (msg, f) | 276 msg = "%s: %s" % (msg, util.shellquote(f)) |
| 277 if abort: | 277 if abort: |
| 278 raise error.Abort(msg) | 278 raise error.Abort(msg) |
| 279 ui.warn(_("warning: %s\n") % msg) | 279 ui.warn(_("warning: %s\n") % msg) |
| 280 | 280 |
| 281 def checkportabilityalert(ui): | 281 def checkportabilityalert(ui): |