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 e9a74148270f…

Parents 0aff3f298c3a…

Parents d75166b2d43c…

by Steve Borho

Changes to 5 files · Browse files at e9a74148270f Showing diff from parent 0aff3f298c3a d75166b2d43c Diff from another changeset...

Show Entire File tortoisehg/​hgqt/​backout.py Stacked
(No changes)
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
176
177
178
179
 
180
181
182
 
659
660
661
662
 
663
664
665
666
667
668
 
669
670
671
 
966
967
968
969
 
970
971
972
 
176
177
178
 
179
180
181
182
 
659
660
661
 
662
663
664
665
666
667
 
668
669
670
671
 
966
967
968
 
969
970
971
972
@@ -176,7 +176,7 @@
  self.msghistory = []   self.repo = repo = self.stwidget.repo   self.runner = cmdui.Runner(not embedded, self) - self.runner.setTitle(_('Commit')) + self.runner.setTitle(_('Commit', 'window title'))   self.runner.output.connect(self.output)   self.runner.progress.connect(self.progress)   self.runner.makeLogVisible.connect(self.makeLogVisible) @@ -659,13 +659,13 @@
  self.commitButtonEnable.emit(False)   self.runner.run(*commandlines)   self.stopAction.setEnabled(True) - self.progress.emit(*cmdui.startProgress(_('Commit'), '')) + self.progress.emit(*cmdui.startProgress(_('Commit', 'start progress'), ''))     def stop(self):   self.runner.cancel()     def commandFinished(self, ret): - self.progress.emit(*cmdui.stopProgress(_('Commit'))) + self.progress.emit(*cmdui.stopProgress(_('Commit', 'stop progress')))   self.stopAction.setEnabled(False)   self.commitButtonEnable.emit(True)   self.repo.decrementBusyCount() @@ -966,7 +966,7 @@
  bb.button(BB.Discard).setDefault(False)   bb.button(BB.Ok).setDefault(True)   self.commitButton = bb.button(BB.Ok) - self.commitButton.setText(_('Commit')) + self.commitButton.setText(_('Commit', 'action button'))   self.bb = bb     layout.addWidget(self.bb)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​compress.py Stacked
 
119
120
121
122
 
123
124
125
 
119
120
121
 
122
123
124
125
@@ -119,7 +119,7 @@
  def commandFinished(self, ret):   self.repo.decrementBusyCount()   self.showMessage.emit(_('Changes have been moved, you must now commit')) - self.compressbtn.setText(_('Commit')) + self.compressbtn.setText(_('Commit', 'action button'))   self.compressbtn.clicked.disconnect(self.compress)   self.compressbtn.clicked.connect(self.commit)  
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
160
161
162
163
 
164
165
166
167
168
 
169
170
171
172
173
 
174
175
176
 
178
179
180
181
 
182
183
184
185
186
 
187
188
189
190
191
 
192
193
194
195
196
 
197
198
199
 
238
239
240
241
 
242
243
244
 
160
161
162
 
163
164
165
166
167
 
168
169
170
171
172
 
173
174
175
176
 
178
179
180
 
181
182
183
184
185
 
186
187
188
189
190
 
191
192
193
194
195
 
196
197
198
199
 
238
239
240
 
241
242
243
244
@@ -160,17 +160,17 @@
  w.updateToRevision.connect(lambda rev: self.updateToRevision())   self.logTabIndex = idx = tt.addTab(w, qtlib.geticon('hg-log'), '')   self.namedTabs['log'] = idx - tt.setTabToolTip(idx, _("Revision details")) + tt.setTabToolTip(idx, _("Revision details", "tab tooltip"))     self.commitDemand = w = DemandWidget('createCommitWidget', self)   self.commitTabIndex = idx = tt.addTab(w, qtlib.geticon('hg-commit'), '')   self.namedTabs['commit'] = idx - tt.setTabToolTip(idx, _("Commit")) + tt.setTabToolTip(idx, _("Commit", "tab tooltip"))     if 'mq' in self.repo.extensions():   self.mqDemand = w = DemandWidget('createMQWidget', self)   self.mqTabIndex = idx = tt.addTab(w, qtlib.geticon('thg-mq'), '') - tt.setTabToolTip(idx, _("Patch Queue")) + tt.setTabToolTip(idx, _("Patch Queue", "tab tooltip"))   self.namedTabs['mq'] = idx   else:   self.mqTabIndex = -1 @@ -178,22 +178,22 @@
  self.syncDemand = w = DemandWidget('createSyncWidget', self)   self.syncTabIndex = idx = tt.addTab(w, qtlib.geticon('thg-sync'), '')   self.namedTabs['sync'] = idx - tt.setTabToolTip(idx, _("Synchronize")) + tt.setTabToolTip(idx, _("Synchronize", "tab tooltip"))     self.manifestDemand = w = DemandWidget('createManifestWidget', self)   self.manifestTabIndex = idx = tt.addTab(w, qtlib.geticon('hg-annotate'), '')   self.namedTabs['manifest'] = idx - tt.setTabToolTip(idx, _('Manifest')) + tt.setTabToolTip(idx, _('Manifest', "tab tooltip"))     self.grepDemand = w = DemandWidget('createGrepWidget', self)   self.grepTabIndex = idx = tt.addTab(w, qtlib.geticon('hg-grep'), '')   self.namedTabs['grep'] = idx - tt.setTabToolTip(idx, _("Search")) + tt.setTabToolTip(idx, _("Search", "tab tooltip"))     if 'pbranch' in self.repo.extensions():   self.pbranchDemand = w = DemandWidget('createPatchBranchWidget', self)   self.pbranchTabIndex = idx = tt.addTab(w, qtlib.geticon('branch'), '') - tt.setTabToolTip(idx, _("Patch Branch")) + tt.setTabToolTip(idx, _("Patch Branch", "tab tooltip"))   self.namedTabs['pbranch'] = idx   else:   self.pbranchTabIndex = -1 @@ -238,7 +238,7 @@
  pats, opts = {}, {}   cw = CommitWidget(pats, opts, self.repo.root, True, self)   - b = QPushButton(_('Commit')) + b = QPushButton(_('Commit', 'action button'))   b.setAutoDefault(True)   f = b.font()   f.setWeight(QFont.Bold)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​settings.py Stacked
 
447
448
449
450
 
451
452
453
 
447
448
449
 
450
451
452
453
@@ -447,7 +447,7 @@
  'extension, rebase equates to pull --rebase. Default: none')),   )),   -({'name': 'commit', 'label': _('Commit'), 'icon': 'menucommit'}, ( +({'name': 'commit', 'label': _('Commit', 'config item'), 'icon': 'menucommit'}, (   _fi(_('Username'), 'ui.username', genEditCombo,   _('Name associated with commits. The common format is<br>'   '"Full Name &lt;email@example.com&gt;"')),