ui: remove labeled argument from popbuffer
It was moved to pushbuffer and currently does nothing.
--- a/hgext/color.py Sun Nov 22 14:18:42 2015 -0800
+++ b/hgext/color.py Tue Nov 24 11:23:10 2015 -0800
@@ -419,9 +419,9 @@
_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())
--- a/mercurial/cmdutil.py Sun Nov 22 14:18:42 2015 -0800
+++ b/mercurial/cmdutil.py Tue Nov 24 11:23:10 2015 -0800
@@ -1188,7 +1188,7 @@
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)
--- a/mercurial/ui.py Sun Nov 22 14:18:42 2015 -0800
+++ b/mercurial/ui.py Tue Nov 24 11:23:10 2015 -0800
@@ -594,16 +594,8 @@
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]