--- a/mercurial/crecord.py Sat Nov 21 17:40:26 2015 +0200
+++ b/mercurial/crecord.py Mon Nov 30 16:35:21 2015 -0800
@@ -454,7 +454,7 @@
uiheaders = [uiheader(h) for h in headers]
# let user choose headers/hunks/lines, and mark their applied flags
# accordingly
- chunkselector(ui, uiheaders)
+ ret = chunkselector(ui, uiheaders)
appliedhunklist = []
for hdr in uiheaders:
if (hdr.applied and
@@ -472,7 +472,7 @@
else:
fixoffset += hnk.removed - hnk.added
- return appliedhunklist
+ return (appliedhunklist, ret)
def gethw():
"""
@@ -501,6 +501,7 @@
raise error.Abort(chunkselector.initerr)
# ncurses does not restore signal handler for SIGTSTP
signal.signal(signal.SIGTSTP, f)
+ return chunkselector.opts
def testdecorator(testfn, f):
def u(*args, **kwargs):
@@ -521,6 +522,7 @@
while True:
if chunkselector.handlekeypressed(testcommands.pop(0), test=True):
break
+ return chunkselector.opts
class curseschunkselector(object):
def __init__(self, headerlist, ui):
@@ -528,6 +530,7 @@
self.headerlist = patch(headerlist)
self.ui = ui
+ self.opts = {}
self.errorstr = None
# list of all chunks