Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset f88b2ec8c2ee…

Parents 2116fc7baeaa…

Parents 610cff8add6f…

by Steve Borho

Changes to 2 files · Browse files at f88b2ec8c2ee Showing diff from parent 2116fc7baeaa 610cff8add6f Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​grep.py Stacked
 
460
461
462
463
 
464
465
466
 
460
461
462
 
463
464
465
466
@@ -460,7 +460,7 @@
  try:   data = ctx[wfile].data() # load file data   except EnvironmentError: - self.showMessage.emit(_('Skipping %s, unable to read') % + self.showMessage.emit(_('Skipping %s, unable to read') %   hglib.tounicode(wfile))   continue   if util.binary(data):
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​settings.py Stacked
 
42
43
44
 
45
46
47
 
109
110
111
 
112
113
114
 
134
135
136
 
137
138
139
 
42
43
44
45
46
47
48
 
110
111
112
113
114
115
116
 
136
137
138
139
140
141
142
@@ -42,6 +42,7 @@
  slist = settings.value('settings/'+opts['cpath']).toStringList()   self.previous = [s for s in slist if s]   self.setMinimumWidth(ENTRY_WIDTH) +   def resetList(self):   self.clear()   ucur = hglib.tounicode(self.curvalue) @@ -109,6 +110,7 @@
  self.curvalue = None   self.setEchoMode(QLineEdit.Password)   self.setMinimumWidth(ENTRY_WIDTH) +   ## common APIs for all edit widgets   def setValue(self, curvalue):   self.curvalue = curvalue @@ -134,6 +136,7 @@
  assert cpath.startswith('tortoisehg.')   self.fname = cpath[11:]   self.setMinimumWidth(ENTRY_WIDTH) +   def on_clicked(self, checked):   def newFont(font):   self.setText(font.toString())