ui: remove labeled argument from popbuffer

It was moved to pushbuffer and currently does nothing.
This commit is contained in:
Gregory Szorc 2015-11-24 11:23:10 -08:00
parent d3425fdff9
commit b184853d7f
3 changed files with 5 additions and 13 deletions

View File

@ -419,9 +419,9 @@ def configstyles(ui):
_styles[status] = ' '.join(good)
class colorui(uimod.ui):
def popbuffer(self, labeled=False):
def popbuffer(self):
if self._colormode is None:
return super(colorui, self).popbuffer(labeled)
return super(colorui, self).popbuffer()
self._bufferstates.pop()
return ''.join(self._buffers.pop())

View File

@ -1188,7 +1188,7 @@ class changeset_printer(object):
if self.buffered:
self.ui.pushbuffer(labeled=True)
self._show(ctx, copies, matchfn, props)
self.hunk[ctx.rev()] = self.ui.popbuffer(labeled=True)
self.hunk[ctx.rev()] = self.ui.popbuffer()
else:
self._show(ctx, copies, matchfn, props)

View File

@ -594,16 +594,8 @@ class ui(object):
self._bufferstates.append((error, subproc, labeled))
self._bufferapplylabels = labeled
def popbuffer(self, labeled=False):
'''pop the last buffer and return the buffered output
If labeled is True, any labels associated with buffered
output will be handled. By default, this has no effect
on the output returned, but extensions and GUI tools may
handle this argument and returned styled output. If output
is being buffered so it can be captured and parsed or
processed, labeled should not be set to True.
'''
def popbuffer(self):
'''pop the last buffer and return the buffered output'''
self._bufferstates.pop()
if self._bufferstates:
self._bufferapplylabels = self._bufferstates[-1][2]