[PATCH 3 of 4] record: move ui.write wrapping where it should be
Laurent Charignon
lcharignon at fb.com
Tue Mar 17 21:17:35 CDT 2015
# HG changeset patch
# User Laurent Charignon <lcharignon at fb.com>
# Date 1426545420 25200
# Mon Mar 16 15:37:00 2015 -0700
# Node ID 86f9b176ee03b719c29f260776932b4263691f65
# Parent 69389fa752562fb5888ffa44716d120c242d4f0f
record: move ui.write wrapping where it should be
We have to do that for the coloring to work in interactive revert
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -51,7 +51,11 @@
def recordfilter(ui, originalhunks):
usecurses = ui.configbool('experimental', 'crecord', False)
testfile = ui.config('experimental', 'crecordtest', None)
- newchunks = filterchunks(ui, originalhunks, usecurses, testfile)
+ oldwrite = setupwrapcolorwrite(ui)
+ try:
+ newchunks = filterchunks(ui, originalhunks, usecurses, testfile)
+ finally:
+ ui.write = oldwrite
return newchunks
def dorecord(ui, repo, commitfunc, cmdsuggest, backupall,
@@ -207,12 +211,7 @@
except OSError:
pass
- oldwrite = setupwrapcolorwrite(ui)
- try:
- return commit(ui, repo, recordfunc, pats, opts)
- finally:
- ui.write = oldwrite
-
+ return commit(ui, repo, recordfunc, pats, opts)
def findpossible(cmd, table, strict=False):
"""
More information about the Mercurial-devel
mailing list