--- 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())