# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1267382601 -3600
# Node ID 6505773080e43e01828a7ddd5caa7522ab4debe6
# Parent  9bd0bd785696994390df074af3d737d1e2a4cedb
mq: simplify --mq handling / keep compatibility with other extensions

reported by edgimar on IRC

diff -r 9bd0bd785696 -r 6505773080e4 hgext/mq.py
--- a/hgext/mq.py	Sun Feb 28 18:02:20 2010 +0100
+++ b/hgext/mq.py	Sun Feb 28 19:43:21 2010 +0100
@@ -2629,8 +2629,7 @@
     return orig(ui, repo, *args, **kwargs)
 
 def mqinit(orig, ui, *args, **kwargs):
-    mq = kwargs['mq']
-    del kwargs['mq']
+    mq = kwargs.pop('mq', None)
 
     if not mq:
         return orig(ui, *args, **kwargs)
@@ -2643,8 +2642,7 @@
     """Add --mq option to operate on patch repository instead of main"""
 
     # some commands do not like getting unknown options
-    mq = kwargs['mq']
-    del kwargs['mq']
+    mq = kwargs.pop('mq', None)
 
     if not mq:
         return orig(ui, repo, *args, **kwargs)