--- a/hgext/color.py Mon Jun 07 16:14:12 2010 +0200
+++ b/hgext/color.py Mon Jun 07 15:28:54 2010 +0200
@@ -198,14 +198,10 @@
_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)