Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

hglib: do not use non-python2.4 safe calling convention

Changeset 3167426739c0

Parent 4037b8e6c0f1

by Steve Borho

Changes to 4 files · Browse files at 3167426739c0 Showing diff from parent 4037b8e6c0f1 Diff from another changeset...

 
940
941
942
943
944
 
 
 
945
946
947
 
940
941
942
 
 
943
944
945
946
947
948
@@ -940,8 +940,9 @@
  return   try:   q = Queue.Queue() - hglib.hgcmd_toq(q, 'cat', '--rev', - str(self.currev), '--output', hglib.fromutf(result), self.curfile) + hglib.hgcmd_toq(q, False, ('cat', '--rev', + str(self.currev), '--output', hglib.fromutf(result), + self.curfile))   except (util.Abort, IOError), e:   gdialog.Prompt(_('Unable to save file'), str(e), self).run()  
 
461
462
463
464
 
465
466
467
 
773
774
775
776
 
777
778
779
 
461
462
463
 
464
465
466
467
 
773
774
775
 
776
777
778
779
@@ -461,7 +461,7 @@
    def threadfunc(q, *args):   try: - hglib.hgcmd_toq(q, *args, label=True) + hglib.hgcmd_toq(q, True, args)   except (util.Abort, error.LookupError), e:   self.stbar.set_text(_('Abort: %s') % str(e))   @@ -773,7 +773,7 @@
  '''   def threadfunc(q, *args):   try: - hglib.hgcmd_toq(q, *args) + hglib.hgcmd_toq(q, False, args)   except (util.Abort, error.LookupError), e:   self.stbar.set_text(_('Abort: %s') % str(e))  
 
223
224
225
226
 
227
228
229
 
223
224
225
 
226
227
228
229
@@ -223,7 +223,7 @@
  def _start_server(self):   def threadfunc(q, *args):   try: - hglib.hgcmd_toq(q, *args) + hglib.hgcmd_toq(q, False, args)   except util.Abort, e:   self._write(_('Abort: %s\n') % str(e))  
 
310
311
312
313
 
314
315
316
317
318
319
320
321
 
310
311
312
 
313
314
315
316
317
 
318
319
320
@@ -310,12 +310,11 @@
  return tools     -def hgcmd_toq(q, *args, **opts): +def hgcmd_toq(q, label, args):   '''   Run an hg command in a background thread, pipe all output to a Queue   object. Assumes command is completely noninteractive.   ''' - label = opts.get('label', False)   class Qui(ui.ui):   def __init__(self, src=None):   super(Qui, self).__init__(src)