Mercurial > public > mercurial-scm > hg
diff mercurial/changegroup.py @ 46794:e2f7b2695ba1
merge with stable
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Thu, 18 Mar 2021 18:24:59 -0400 |
| parents | 6266d19556ad 70f8c64812db |
| children | d4ba4d51f85f |
line wrap: on
line diff
--- a/mercurial/changegroup.py Tue Mar 02 00:05:22 2021 +0100 +++ b/mercurial/changegroup.py Thu Mar 18 18:24:59 2021 -0400 @@ -910,7 +910,7 @@ configtarget = repo.ui.config(b'devel', b'bundle.delta') if configtarget not in (b'', b'p1', b'full'): - msg = _("""config "devel.bundle.delta" as unknown value: %s""") + msg = _(b"""config "devel.bundle.delta" as unknown value: %s""") repo.ui.warn(msg % configtarget) deltamode = repository.CG_DELTAMODE_STD @@ -1311,9 +1311,10 @@ 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.