changegroup: flush the ui stdio buffers after adding a changegroup
authorMatt Harbison <matt_harbison@yahoo.com>
Fri, 10 Apr 2015 23:34:06 -0400
changeset 24717 90f2b9de30f2
parent 24716 2abbf4750915
child 24718 a4191e0c728f
changegroup: flush the ui stdio buffers after adding a changegroup This eliminates the following test failure on Windows, as well as a similar one in evolve's test-wireproto.t. See the previous patch for details on the problem. --- e:/Projects/hg/tests/test-init.t +++ e:/Projects/hg/tests/test-init.t.err @@ -216,10 +216,10 @@ * test 0:08b9e9f63b32 $ hg clone -e "python \"$TESTDIR/dummyssh\"" local ssh://user@dummy/remote-bookmarks searching for changes + exporting bookmark test remote: adding changesets remote: adding manifests remote: adding file changes remote: added 1 changesets with 1 changes to 1 files - exporting bookmark test $ hg -R remote-bookmarks bookmarks test 0:08b9e9f63b32
mercurial/changegroup.py
--- a/mercurial/changegroup.py	Fri Apr 10 22:30:19 2015 -0400
+++ b/mercurial/changegroup.py	Fri Apr 10 23:34:06 2015 -0400
@@ -891,6 +891,7 @@
 
     finally:
         tr.release()
+        repo.ui.flush()
     # never return 0 here:
     if dh < 0:
         return dh - 1