[PATCH 2 of 2 RFC] merge-tools: move gui check into the ui object, and make it platform-specific

Matt Mackall mpm at selenic.com
Wed Mar 23 16:43:04 CDT 2011


On Wed, 2011-03-23 at 22:36 +0100, Dan Villiom Podlaski Christiansen
wrote:
> On 23 Mar 2011, at 22:29, Matt Mackall wrote:
> 
> > On Wed, 2011-03-23 at 22:24 +0100, Dan Villiom Podlaski Christiansen
> > wrote:
> >> # HG changeset patch
> >> # User Dan Villiom Podlaski Christiansen <danchr at gmail.com>
> >> # Date 1300915163 -3600
> >> # Node ID 52010b7def45ae910491aba4331f88b1502785e8
> >> # Parent  ca4aae97f719b657182e7a426cb4d62ada9bc7a7
> >> merge-tools: move gui check into the ui object, and make it  
> >> platform-specific
> >
> > Bzzt. util exists to keep platform-specific bits out of the rest of  
> > the
> > code.
> 
> Oh, right. Still, is the patch sensible apart from that?

Maybe. I think that OS X presents an interesting problem in that there
are multiple GUIs. So we can imagine util.isgui() returning ['true',
'mac', 'x11'] or whatever and having filemerge look for a match in
there.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list