Augie Fackler <augie@google.com> [Tue, 20 Feb 2018 22:23:06 -0500] rev 36333
merge with stable
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 19 Feb 2018 23:47:53 +0530] rev 36332
convert: don't use type as a variable name
Differential Revision: https://phab.mercurial-scm.org/D2358
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 19 Feb 2018 23:47:15 +0530] rev 36331
convert: don't use bytes as a variable name
Differential Revision: https://phab.mercurial-scm.org/D2357
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 19 Feb 2018 23:46:42 +0530] rev 36330
py3: add a r'' prefix to prevent transformer from adding b''
# skip-blame as only r'' prefix was added
Differential Revision: https://phab.mercurial-scm.org/D2356
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 19 Feb 2018 23:44:41 +0530] rev 36329
py3: use pycompat.byteskwargs in hgext/convert/
Differential Revision: https://phab.mercurial-scm.org/D2355
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 19 Feb 2018 21:45:49 +0530] rev 36328
py3: add b'' prefixes in test-mdiff.py
# skip-blame because we are just adding b''
Differential Revision: https://phab.mercurial-scm.org/D2354
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 19 Feb 2018 21:18:52 +0530] rev 36327
py3: use dict.items() instead of dict.iteritems() in tests
dict.iteritems() is not present in Python 3.
Differential Revision: https://phab.mercurial-scm.org/D2353
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 19 Feb 2018 15:28:54 +0530] rev 36326
py3: add b'' prefixes in test-transplant.t
# skip-blame because we are just adding b''
Differential Revision: https://phab.mercurial-scm.org/D2352
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 19 Feb 2018 15:28:16 +0530] rev 36325
py3: add b'' prefixes in fakepatchtime.py
# skip-blame because we are just adding b''
Differential Revision: https://phab.mercurial-scm.org/D2351
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 19 Feb 2018 15:27:25 +0530] rev 36324
py3: add b'' prefixes in fakedirstatewritetime.py
# skip-blame because we are just adding b''
Differential Revision: https://phab.mercurial-scm.org/D2350