Patchwork D2496: py3: slice over bytes or use startswith() to prevent getting ascii values

login
register
mail settings
Submitter phabricator
Date Feb. 28, 2018, 10:29 p.m.
Message ID <differential-rev-PHID-DREV-qrfq47jgi26afk74stns-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/28499/
State Superseded
Headers show

Comments

phabricator - Feb. 28, 2018, 10:29 p.m.
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2496

AFFECTED FILES
  mercurial/commands.py
  mercurial/fileset.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-devel
phabricator - March 1, 2018, 9:41 a.m.
yuja added inline comments.

INLINE COMMENTS

> commands.py:4485
>                          continue
> -                    flags = ''.join(['-%s ' % o[0] for o in flaglist
> +                    flags = ''.join(['-%s ' % o[0:1] for o in flaglist
>                                                     if opts.get(o)])

Could be '-%c ', but I don't have preference.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2496

To: pulkit, #hg-reviewers
Cc: yuja, mercurial-devel

Patch

diff --git a/mercurial/fileset.py b/mercurial/fileset.py
--- a/mercurial/fileset.py
+++ b/mercurial/fileset.py
@@ -392,7 +392,7 @@ 
     elif expr.startswith(">"):
         a = util.sizetoint(expr[1:])
         return lambda x: x > a
-    elif expr[0].isdigit or expr[0] == '.':
+    elif expr[0:1].isdigit or expr.startswith('.'):
         a = util.sizetoint(expr)
         b = _sizetomax(expr)
         return lambda x: x >= a and x <= b
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4482,7 +4482,7 @@ 
                 for f in ms:
                     if not m(f):
                         continue
-                    flags = ''.join(['-%s ' % o[0] for o in flaglist
+                    flags = ''.join(['-%s ' % o[0:1] for o in flaglist
                                                    if opts.get(o)])
                     hint = _("(try: hg resolve %s%s)\n") % (
                              flags,