mercurial/crew at 10359: new changeset

[Brendan Cully]

On Monday, 08 February 2010 at 19:20, Brendan Cully wrote:
> On Monday, 08 February 2010 at 23:25, Patrick Mézard wrote:
> > Le 07/02/10 12:20, Mercurial Commits a écrit :
> > > New changeset in mercurial/crew:
> > > 
> > > http://hg.intevation.org/mercurial/crew/rev/ec02cf8d1628
> > > changeset:   10359:ec02cf8d1628
> > > tag:         tip
> > > user:        Brendan Cully <brendan at kublai.com>
> > > date:        Tue Dec 23 09:46:40 2008 -0800
> > > summary:     mq: add --mq option to some commands
> > 
> > I think it need more smarts from dispatch to mimic -R. If I do:
> > 
> > $ hg out --mq
> > 
> > It will pick the base repo default path, not the queue one.
> 
> True. I think the way to go is to read in the mq repo config before
> calling the original function. We could try to make -Q a globalopt
> like -R, but then we have some chicken-and-egg problems with e.g., the
> main repo enabling mq in the .hgrc. I also like the idea of being able
> to "hg -R foo status --mq", where I get the mq repo status from any hg
> repo without having to know that it lives in $(hg root)/.hg/patches.

How about this?
-------------- next part --------------
# HG changeset patch
# User Brendan Cully <brendan at kublai.com>
# Date 1265767568 28800
# Node ID 2b598a13010362c6be26d3027187eaf458af8119
# Parent  2d30d66a89ad29f471aa6918fc46121a4bc3fbe8
mq: incorporate mq repo config when using --mq

For example, incoming should use the paths defined in .hg/patches/hgrc
instead of .hg/hgrc.

diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -2660,7 +2660,7 @@
     r = q.qrepo()
     if not r:
         raise util.Abort('no queue repository')
-    return orig(ui, r, *args, **kwargs)
+    return orig(r.ui, r, *args, **kwargs)
 
 def uisetup(ui):
     mqopt = [('Q', 'mq', None, _("operate on patch repository"))]