Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

visdiff: be a little more consistent in naming convention

Changeset 58ced9a149ba…

Parent f9259378e8a0…

by Steve Borho

Changes to one file · Browse files at 58ced9a149ba Showing diff from parent f9259378e8a0 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​visdiff.py Stacked
 
370
371
372
373
 
374
375
376
 
468
469
470
471
 
472
473
474
 
370
371
372
 
373
374
375
376
 
468
469
470
 
471
472
473
474
@@ -370,7 +370,7 @@
  patterns = repo.ui.configitems('diff-patterns')   patterns = [(p, t) for p,t in patterns if t in tools]   - callable = lambda row: self.fileselect(row, repo, combo, + callable = lambda row: self.fileSelect(row, repo, combo,   patterns, preferred)   self.connect(list, QtCore.SIGNAL('currentRowChanged(int)'),   callable) @@ -468,7 +468,7 @@
  d2 = self.ui.configbool('merge-tools', tool + '.dirdiff')   self.dbutton.setEnabled(d2)   - def fileselect(self, row, repo, combo, patterns, preferred): + def fileSelect(self, row, repo, combo, patterns, preferred):   'user selected a file, pick an appropriate tool from combo'   fname = self.list.item(row).text()[2:]   fname = hglib.fromunicode(fname)