Commits

Steve Borho committed 2f55c8d

hgthread, hglib: ignore extra options to ui.write

Allow stable branch to work with > hg-1.5 default branch

Comments (0)

Files changed (2)

tortoisehg/hgtk/hgthread.py

         self.setconfig('ui', 'interactive', 'on')
         self.setconfig('progress', 'disable', 'True')
 
-    def write(self, *args):
+    def write(self, *args, **opts):
         if hglib.uiwrite(self, args):
             for a in args:
                 self.outputq.put(str(a))
 
-    def write_err(self, *args):
+    def write_err(self, *args, **opts):
         for a in args:
             self.errorq.put(str(a))
 

tortoisehg/util/hglib.py

             super(Qui, self).__init__(src)
             self.setconfig('ui', 'interactive', 'off')
 
-        def write(self, *args):
+        def write(self, *args, **opts):
             if uiwrite(self, args):
                 for a in args:
                     q.put(str(a))