Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 36473:ab5f18a9dcac
py3: slice over bytes or use startswith() to prevent getting ascii values
Differential Revision: https://phab.mercurial-scm.org/D2496
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Wed, 28 Feb 2018 19:54:10 +0530 |
| parents | 04c319a07c7b |
| children | 6e90c59b6da1 |
comparison
equal
deleted
inserted
replaced
| 36472:d0d5eef57fb0 | 36473:ab5f18a9dcac |
|---|---|
| 4480 pats = ['path:%s' % p for p in pats] | 4480 pats = ['path:%s' % p for p in pats] |
| 4481 m = scmutil.match(wctx, pats, opts) | 4481 m = scmutil.match(wctx, pats, opts) |
| 4482 for f in ms: | 4482 for f in ms: |
| 4483 if not m(f): | 4483 if not m(f): |
| 4484 continue | 4484 continue |
| 4485 flags = ''.join(['-%s ' % o[0] for o in flaglist | 4485 flags = ''.join(['-%s ' % o[0:1] for o in flaglist |
| 4486 if opts.get(o)]) | 4486 if opts.get(o)]) |
| 4487 hint = _("(try: hg resolve %s%s)\n") % ( | 4487 hint = _("(try: hg resolve %s%s)\n") % ( |
| 4488 flags, | 4488 flags, |
| 4489 ' '.join(pats)) | 4489 ' '.join(pats)) |
| 4490 break | 4490 break |