# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 2017-05-04 23:18:42 # Node ID c6cbd0b66465bcaa41f03c9498555f04d3dfbe7c # Parent 76f938ec68a52afa8bb536116a84348353e51424 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. diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -3540,7 +3540,7 @@ def mqcommand(orig, ui, repo, *args, **k """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)