# HG changeset patch # User Matt Harbison # Date 2021-03-13 05:41:37 # Node ID 70f8c64812db874acb9924672ce7a8ccdad0554d # Parent 52528570312e1e109c93736fb4a8c49782b18bae typing: fix directives mangled by black Differential Revision: https://phab.mercurial-scm.org/D10209 diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py --- a/mercurial/changegroup.py +++ b/mercurial/changegroup.py @@ -1162,9 +1162,10 @@ class cgpacker(object): def makelookupmflinknode(tree, nodes): if fastpathlinkrev: assert not tree - return ( - manifests.__getitem__ - ) # pytype: disable=unsupported-operands + + # pytype: disable=unsupported-operands + return manifests.__getitem__ + # pytype: enable=unsupported-operands def lookupmflinknode(x): """Callback for looking up the linknode for manifests. diff --git a/mercurial/dagparser.py b/mercurial/dagparser.py --- a/mercurial/dagparser.py +++ b/mercurial/dagparser.py @@ -168,9 +168,9 @@ def parsedag(desc): if not desc: return - wordchars = pycompat.bytestr( - string.ascii_letters + string.digits - ) # pytype: disable=wrong-arg-types + # pytype: disable=wrong-arg-types + wordchars = pycompat.bytestr(string.ascii_letters + string.digits) + # pytype: enable=wrong-arg-types labels = {} p1 = -1 @@ -179,9 +179,9 @@ def parsedag(desc): def resolve(ref): if not ref: return p1 - elif ref[0] in pycompat.bytestr( - string.digits - ): # pytype: disable=wrong-arg-types + # pytype: disable=wrong-arg-types + elif ref[0] in pycompat.bytestr(string.digits): + # pytype: enable=wrong-arg-types return r - int(ref) else: return labels[ref] @@ -215,9 +215,9 @@ def parsedag(desc): c = nextch() while c != b'\0': - while c in pycompat.bytestr( - string.whitespace - ): # pytype: disable=wrong-arg-types + # pytype: disable=wrong-arg-types + while c in pycompat.bytestr(string.whitespace): + # pytype: enable=wrong-arg-types c = nextch() if c == b'.': yield b'n', (r, [p1]) @@ -225,9 +225,9 @@ def parsedag(desc): r += 1 c = nextch() elif c == b'+': - c, digs = nextrun( - nextch(), pycompat.bytestr(string.digits) - ) # pytype: disable=wrong-arg-types + # pytype: disable=wrong-arg-types + c, digs = nextrun(nextch(), pycompat.bytestr(string.digits)) + # pytype: enable=wrong-arg-types n = int(digs) for i in pycompat.xrange(0, n): yield b'n', (r, [p1])