facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

simplemerge: flush stdout before writing to stderr.

Browse Source 
Besides, stderr is not always unbuffered under win32 (when redirections occur for instance), and it should be flushed too.
This commit is contained in:
Patrick Mezard 2007-05-06 16:40:53 +02:00
parent b4ca391b19
commit 2b6cc17dd7
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/simplemerge
View File

@ -28,6 +28,12 @@ from mercurial.i18n import _
class CantReprocessAndShowBase(Exception):
pass
def warn(message):
sys.stdout.flush()
sys.stderr.write(message)
sys.stderr.flush()
def intersect(ra, rb):
@ -453,7 +459,7 @@ def simplemerge(local, base, other, **opts):
if not opts.get('text'):
raise util.Abort(msg)
elif not opts.get('quiet'):
sys.stderr.write(_('warning: %s\n') % msg)
warn(_('warning: %s\n') % msg)
return text
name_a = local
@ -490,8 +496,7 @@ def simplemerge(local, base, other, **opts):
if m3.conflicts:
if not opts.get('quiet'):
sys.stdout.flush()
sys.stderr.write(_("warning: conflicts during merge.\n"))
warn(_("warning: conflicts during merge.\n"))
return 1
options = [('L', 'label', [], _('labels to use on conflict markers')),