This is an archive of the discontinued Mercurial Phabricator instance.

Differential D301

scmutil: use util.shellquote instead of %r
ClosedPublic

Authored by durin42 on Aug 9 2017, 10:25 AM.

Details

Reviewers
quark
indygreg
Group Reviewers
hg-reviewers
Commits
rHG2cd5aba5e1d2: scmutil: use util.shellquote instead of %r
Summary

Changes some output, but also resolves differences with Python 3.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Aug 9 2017, 10:25 AM
quark accepted this revision.Aug 9 2017, 6:05 PM
indygreg accepted this revision.Aug 9 2017, 11:21 PM
This revision is now accepted and ready to land.Aug 9 2017, 11:21 PM
Closed by commit rHG2cd5aba5e1d2: scmutil: use util.shellquote instead of %r (authored by durin42). · Explain WhyAug 15 2017, 3:42 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (2 lines)
Mtests/test-add.t (4 lines)
Mtests/test-copy.t (2 lines)
Mtests/test-rename.t (2 lines)

Diff 684

mercurial/scmutil.py

def checkportable(ui, f): def checkportable(ui, f):
'''Check if filename f is portable and warn or abort depending on config''' '''Check if filename f is portable and warn or abort depending on config'''
checkfilename(f) checkfilename(f)
abort, warn = checkportabilityalert(ui) abort, warn = checkportabilityalert(ui)
if abort or warn: if abort or warn:
msg = util.checkwinfilename(f) msg = util.checkwinfilename(f)
if msg: if msg:
msg = "%s: %r" % (msg, f) msg = "%s: %s" % (msg, util.shellquote(f))
if abort: if abort:
raise error.Abort(msg) raise error.Abort(msg)
ui.warn(_("warning: %s\n") % msg) ui.warn(_("warning: %s\n") % msg)
def checkportabilityalert(ui): def checkportabilityalert(ui):
'''check if the user's config requests nothing, a warning, or abort for '''check if the user's config requests nothing, a warning, or abort for
non-portable filenames''' non-portable filenames'''
val = ui.config('ui', 'portablefilenames') val = ui.config('ui', 'portablefilenames')

tests/test-add.t

A b A b
#if no-windows #if no-windows
$ echo foo > con.xml $ echo foo > con.xml
$ hg --config ui.portablefilenames=jump add con.xml $ hg --config ui.portablefilenames=jump add con.xml
abort: ui.portablefilenames value is invalid ('jump') abort: ui.portablefilenames value is invalid ('jump')
[255] [255]
$ hg --config ui.portablefilenames=abort add con.xml $ hg --config ui.portablefilenames=abort add con.xml
abort: filename contains 'con', which is reserved on Windows: 'con.xml' abort: filename contains 'con', which is reserved on Windows: con.xml
[255] [255]
$ hg st $ hg st
A a A a
A b A b
? con.xml ? con.xml
$ hg add con.xml $ hg add con.xml
warning: filename contains 'con', which is reserved on Windows: 'con.xml' warning: filename contains 'con', which is reserved on Windows: con.xml
$ hg st $ hg st
A a A a
A b A b
A con.xml A con.xml
$ hg forget con.xml $ hg forget con.xml
$ rm con.xml $ rm con.xml
#endif #endif

tests/test-copy.t

$ hg init $ hg init
$ echo a > a $ echo a > a
$ hg add a $ hg add a
$ hg commit -m "1" $ hg commit -m "1"
$ hg status $ hg status
$ hg copy a b $ hg copy a b
$ hg --config ui.portablefilenames=abort copy a con.xml $ hg --config ui.portablefilenames=abort copy a con.xml
abort: filename contains 'con', which is reserved on Windows: 'con.xml' abort: filename contains 'con', which is reserved on Windows: con.xml
[255] [255]
$ hg status $ hg status
A b A b
$ hg sum $ hg sum
parent: 0:c19d34741b0a tip parent: 0:c19d34741b0a tip
1 1
branch: default branch: default
commit: 1 copied commit: 1 copied

tests/test-rename.t

$ hg init $ hg init
$ mkdir d1 d1/d11 d2 $ mkdir d1 d1/d11 d2
$ echo d1/a > d1/a $ echo d1/a > d1/a
$ echo d1/ba > d1/ba $ echo d1/ba > d1/ba
$ echo d1/a1 > d1/d11/a1 $ echo d1/a1 > d1/d11/a1
$ echo d1/b > d1/b $ echo d1/b > d1/b
$ echo d2/b > d2/b $ echo d2/b > d2/b
$ hg add d1/a d1/b d1/ba d1/d11/a1 d2/b $ hg add d1/a d1/b d1/ba d1/d11/a1 d2/b
$ hg commit -m "1" $ hg commit -m "1"
rename a single file rename a single file
$ hg rename d1/d11/a1 d2/c $ hg rename d1/d11/a1 d2/c
$ hg --config ui.portablefilenames=abort rename d1/a d1/con.xml $ hg --config ui.portablefilenames=abort rename d1/a d1/con.xml
abort: filename contains 'con', which is reserved on Windows: 'd1/con.xml' abort: filename contains 'con', which is reserved on Windows: d1/con.xml
[255] [255]
$ hg sum $ hg sum
parent: 0:9b4b6e7b2c26 tip parent: 0:9b4b6e7b2c26 tip
1 1
branch: default branch: default
commit: 1 renamed commit: 1 renamed
update: (current) update: (current)
phases: 1 draft phases: 1 draft