Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0.2, 1.0.3, and 1.0.4

stable hgthread, hglib: ignore extra options to ui.write

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

Changeset 2f55c8d4197c…

Parent bd134fa3985b…

by Steve Borho

Changes to 2 files · Browse files at 2f55c8d4197c Showing diff from parent bd134fa3985b Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​hgthread.py Stacked
 
42
43
44
45
 
46
47
48
49
50
 
51
52
53
 
42
43
44
 
45
46
47
48
49
 
50
51
52
53
@@ -42,12 +42,12 @@
  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))  
Change 1 of 1 Show Entire File tortoisehg/​util/​hglib.py Stacked
 
330
331
332
333
 
334
335
336
 
330
331
332
 
333
334
335
336
@@ -330,7 +330,7 @@
  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))