From eb569c8b47c2b78750d8fc38592eeec095b95782 Mon Sep 17 00:00:00 2001
From: Dan Villiom Podlaski Christiansen <danchr@gmail.com>
Date: Mon, 7 Jun 2010 15:28:54 +0200
Subject: [PATCH] color: use ui.formatted().

---
 hgext/color.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/hgext/color.py b/hgext/color.py
index a55c5a2926..2a01c2ec70 100644
--- a/hgext/color.py
+++ b/hgext/color.py
@@ -198,14 +198,10 @@ def uisetup(ui):
         _effects.update(w32effects)
     elif mode != 'ansi':
         return
-
-    # check isatty() before anything else changes it (like pager)
-    isatty = sys.__stdout__.isatty()
-
     def colorcmd(orig, ui_, opts, cmd, cmdfunc):
         if (opts['color'] == 'always' or
             (opts['color'] == 'auto' and (os.environ.get('TERM') != 'dumb'
-                                          and isatty))):
+                                          and ui_.formatted()))):
             global _buffers
             _buffers = ui_._buffers
             extensions.wrapfunction(ui_, 'popbuffer', popbuffer)