comparison mercurial/color.py @ 31499:31d2ddfd338c

color: sync text attributes and buffered text output on Windows (issue5508) I originally noticed that log output wasn't being colored after 3a4c0905f357, but there were other complications too. With a bunch of untracked files, only the first 1K of characters were colored pink, and the rest were normal white. A single modified file at the top would also be colored pink. Line buffering and full buffering are treated as the same thing in Windows [1], meaning the stream is either buffered or not. I can't find any explicit documentation to say stdout is unbuffered by default when attached to a console (but some internet postings indicated that is the case[2]). Therefore, it seems that explicit flushes are better than just not reopening stdout. NB: pager is now on by default, and needs to be disabled to see any color on Windows. [1] https://msdn.microsoft.com/en-us/library/86cebhfs(v=vs.140).aspx [2] https://sourceforge.net/p/mingw/mailman/message/27121137/
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 19 Mar 2017 12:44:45 -0400
parents df0a0734304a
children 43d6ef658874
comparison
equal deleted inserted replaced
31498:a248bbfa0bc7 31499:31d2ddfd338c
461 try: 461 try:
462 while m: 462 while m:
463 for sattr in m.group(1).split(';'): 463 for sattr in m.group(1).split(';'):
464 if sattr: 464 if sattr:
465 attr = mapcolor(int(sattr), attr) 465 attr = mapcolor(int(sattr), attr)
466 ui.flush()
466 _kernel32.SetConsoleTextAttribute(stdout, attr) 467 _kernel32.SetConsoleTextAttribute(stdout, attr)
467 writefunc(m.group(2), **opts) 468 writefunc(m.group(2), **opts)
468 m = re.match(ansire, m.group(3)) 469 m = re.match(ansire, m.group(3))
469 finally: 470 finally:
470 # Explicitly reset original attributes 471 # Explicitly reset original attributes
472 ui.flush()
471 _kernel32.SetConsoleTextAttribute(stdout, origattr) 473 _kernel32.SetConsoleTextAttribute(stdout, origattr)