Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.3, 2.0.4, and 2.0.5

stable Merge cmenu fixes (fixes #337)

Changeset 5544f6e12df4…

Parents 131971d99ecf…

Parents 18980afadbae…

by Adrian Buehlmann

Changes to 5 files · Browse files at 5544f6e12df4 Showing diff from parent 131971d99ecf 18980afadbae Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
628
629
630
 
631
632
633
 
628
629
630
631
632
633
634
@@ -628,6 +628,7 @@
  self.commitButtonEnable.emit(True)   self.repo.decrementBusyCount()   if ret == 0: + self.branchop = None   umsg = self.msgte.text()   if umsg:   self.addMessageToHistory(umsg)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
 
622
623
624
 
 
 
625
626
627
 
622
623
624
625
626
627
628
629
630
@@ -622,6 +622,9 @@
  olddata = ctx.p1()[wfile].data()   if '\0' in olddata:   self.error = 'binary file' + elif len(olddata) > ctx._repo.maxdiff: + p = _('File or diffs not displayed: ') + self.error = p + _('File is larger than the specified max size.\n')   else:   self.contents = hglib.tounicode(olddata)   self.flabel += _(' <i>(was deleted)</i>')
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​grep.py Stacked
 
226
227
228
229
230
 
231
232
233
 
226
227
228
 
 
229
230
231
232
@@ -226,8 +226,7 @@
  def stopClicked(self):   if self.thread and self.thread.isRunning():   self.thread.cancel() - if self.thread.wait( 2000 ): - self.thread = None + self.thread.wait(2000)     def keyPressEvent(self, event):   if event.key() == Qt.Key_Escape:
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​settings.py Stacked
 
41
42
43
44
45
 
46
47
48
 
109
110
111
112
113
 
114
115
116
117
118
 
136
137
138
139
140
 
141
142
143
 
41
42
43
 
 
44
45
46
47
 
108
109
110
 
 
111
112
 
113
114
115
 
133
134
135
 
 
136
137
138
139
@@ -41,8 +41,7 @@
  settings = opts['settings']   slist = settings.value('settings/'+opts['cpath']).toStringList()   self.previous = [s for s in slist if s] - self.setFixedWidth(ENTRY_WIDTH) - + self.setMinimumWidth(ENTRY_WIDTH)   def resetList(self):   self.clear()   ucur = hglib.tounicode(self.curvalue) @@ -109,10 +108,8 @@
  self.opts = opts   self.curvalue = None   self.setEchoMode(QLineEdit.Password) - self.setFixedWidth(ENTRY_WIDTH) - + self.setMinimumWidth(ENTRY_WIDTH)   ## common APIs for all edit widgets -   def setValue(self, curvalue):   self.curvalue = curvalue   if curvalue: @@ -136,8 +133,7 @@
  cpath = self.opts['cpath']   assert cpath.startswith('tortoisehg.')   self.fname = cpath[11:] - self.setFixedWidth(ENTRY_WIDTH) - + self.setMinimumWidth(ENTRY_WIDTH)   def on_clicked(self, checked):   def newFont(font):   self.setText(font.toString())
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​wctxactions.py Stacked
 
105
106
107
108
 
 
109
110
 
 
111
112
113
 
105
106
107
 
108
109
110
 
111
112
113
114
115
@@ -105,9 +105,11 @@
  notify = func(parent, hu, repo, files)   o, e = hu.getdata()   if e: - QMessageBox.warning(parent, name + _(' errors'), str(e)) + QMessageBox.warning(parent, name + _(' errors'), + hglib.tounicode(str(e)))   elif o: - QMessageBox.information(parent, name + _(' output'), str(o)) + QMessageBox.information(parent, name + _(' output'), + hglib.tounicode(str(o)))   elif notify:   wfiles = [repo.wjoin(x) for x in files]   shlib.shell_notify(wfiles)