##// END OF EJS Templates
ui: remove labeled argument from popbuffer...
Gregory Szorc -
r27109:a93d53f7 default
parent child Browse files
Show More
@@ -419,9 +419,9 b' def configstyles(ui):'
419 _styles[status] = ' '.join(good)
419 _styles[status] = ' '.join(good)
420
420
421 class colorui(uimod.ui):
421 class colorui(uimod.ui):
422 def popbuffer(self, labeled=False):
422 def popbuffer(self):
423 if self._colormode is None:
423 if self._colormode is None:
424 return super(colorui, self).popbuffer(labeled)
424 return super(colorui, self).popbuffer()
425
425
426 self._bufferstates.pop()
426 self._bufferstates.pop()
427 return ''.join(self._buffers.pop())
427 return ''.join(self._buffers.pop())
@@ -1188,7 +1188,7 b' class changeset_printer(object):'
1188 if self.buffered:
1188 if self.buffered:
1189 self.ui.pushbuffer(labeled=True)
1189 self.ui.pushbuffer(labeled=True)
1190 self._show(ctx, copies, matchfn, props)
1190 self._show(ctx, copies, matchfn, props)
1191 self.hunk[ctx.rev()] = self.ui.popbuffer(labeled=True)
1191 self.hunk[ctx.rev()] = self.ui.popbuffer()
1192 else:
1192 else:
1193 self._show(ctx, copies, matchfn, props)
1193 self._show(ctx, copies, matchfn, props)
1194
1194
@@ -594,16 +594,8 b' class ui(object):'
594 self._bufferstates.append((error, subproc, labeled))
594 self._bufferstates.append((error, subproc, labeled))
595 self._bufferapplylabels = labeled
595 self._bufferapplylabels = labeled
596
596
597 def popbuffer(self, labeled=False):
597 def popbuffer(self):
598 '''pop the last buffer and return the buffered output
598 '''pop the last buffer and return the buffered output'''
599
600 If labeled is True, any labels associated with buffered
601 output will be handled. By default, this has no effect
602 on the output returned, but extensions and GUI tools may
603 handle this argument and returned styled output. If output
604 is being buffered so it can be captured and parsed or
605 processed, labeled should not be set to True.
606 '''
607 self._bufferstates.pop()
599 self._bufferstates.pop()
608 if self._bufferstates:
600 if self._bufferstates:
609 self._bufferapplylabels = self._bufferstates[-1][2]
601 self._bufferapplylabels = self._bufferstates[-1][2]
General Comments 0
You need to be logged in to leave comments. Login now