py3: convert key to str to make kwargs.pop work in mq

The keys are passed here and there as unicodes and our transformer make things
bytes. Due to that, mq was not poped and this results in error on Py3.
Here we abuse r'' to make that str on Python 3.
This commit is contained in:
Pulkit Goyal 2017-05-05 04:48:42 +05:30
parent c3219cc9ed
commit 60e05dd544

View File

@ -3540,7 +3540,7 @@ def mqcommand(orig, ui, repo, *args, **kwargs):
"""Add --mq option to operate on patch repository instead of main"""
# some commands do not like getting unknown options
mq = kwargs.pop('mq', None)
mq = kwargs.pop(r'mq', None)
if not mq:
return orig(ui, repo, *args, **kwargs)