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 6fa25cb9ee01…

Parents 5681789ce8a7…

Parents b8d547669f61…

by Steve Borho

Changes to 7 files · Browse files at 6fa25cb9ee01 Showing diff from parent 5681789ce8a7 b8d547669f61 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
986
987
988
 
 
 
 
 
 
 
989
990
991
 
986
987
988
989
990
991
992
993
994
995
996
997
998
@@ -986,6 +986,13 @@
  self.commit.msgte.setFocus()   QShortcut(QKeySequence.Refresh, self, self.refresh)   + def done(self, ret): + self.commit.repo.configChanged.disconnect(self.commit.configChanged) + self.commit.repo.repositoryChanged.disconnect(self.commit.repositoryChanged) + self.commit.repo.workingBranchChanged.disconnect(self.commit.workingBranchChanged) + self.commit.repo.repositoryChanged.disconnect(self.updateUndo) + super(CommitDialog, self).done(ret) +   def linkActivated(self, link):   link = hglib.fromunicode(link)   if link.startswith('subrepo:'):
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​mq.py Stacked
 
227
228
229
 
 
 
 
 
230
231
232
 
227
228
229
230
231
232
233
234
235
236
237
@@ -227,6 +227,11 @@
  self.loadConfigs()   QTimer.singleShot(0, self.reload)   + def closeEvent(self, event): + self.repo.configChanged.disconnect(self.onConfigChanged) + self.repo.repositoryChanged.disconnect(self.onRepositoryChanged) + super(PatchBranchWidget, self).closeEvent(event) +   def getUserOptions(self, *optionlist):   out = []   for opt in optionlist:
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​pbranch.py Stacked
 
491
492
493
 
 
 
 
 
 
494
495
496
 
491
492
493
494
495
496
497
498
499
500
501
502
@@ -491,6 +491,12 @@
  self.patchDiffMessage.setText(_('No patch branch selected'))   self.patchDiffStack.setCurrentWidget(self.patchDiffMessage)   + def closeEvent(self, event): + self.repo.configChanged.disconnect(self.configChanged) + self.repo.repositoryChanged.disconnect(self.repositoryChanged) + self.repo.workingBranchChanged.disconnect(self.workingBranchChanged) + super(PatchBranchWidget, self).closeEvent(event) +   def contextMenuEvent(self, event):   if self.patchlist.geometry().contains(event.pos()):   self.show_patch_cmenu(event.globalPos())
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​qqueue.py Stacked
 
321
322
323
324
 
325
326
327
328
329
330
 
 
331
332
333
 
321
322
323
 
324
325
 
 
 
 
 
326
327
328
329
330
@@ -321,13 +321,10 @@
  self.repo.incrementBusyCount()   self.cmd.run(cmdline)   - def accept(self): + def done(self, ret):   self._writesettings() - QDialog.accept(self) - - def close(self, event): - self._writesettings() - QDialog.close(self) + self.repo.repositoryChanged.disconnect(self.reload) + super(QQueueDialog, self).done(ret)     def _readsettings(self):   s = QSettings()
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​qreorder.py Stacked
 
206
207
208
 
209
210
211
 
206
207
208
209
210
211
212
@@ -206,6 +206,7 @@
    def closeEvent(self, event):   self._writesettings() + self.repo.repositoryChanged.disconnect(self.refresh)   super(QReorderDialog, self).closeEvent(event)     def _readsettings(self):
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​resolve.py Stacked
 
181
182
183
 
 
 
 
 
184
185
186
 
181
182
183
184
185
186
187
188
189
190
191
@@ -181,6 +181,11 @@
  repo.configChanged.connect(self.configChanged)   repo.repositoryChanged.connect(self.repositoryChanged)   + def done(self, ret): + self.repo.configChanged.disconnect(self.configChanged) + self.repo.repositoryChanged.disconnect(self.repositoryChanged) + super(ResolveDialog, self).done(ret) +   def repositoryChanged(self):   self.refresh()  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​shelve.py Stacked
 
190
191
192
 
 
 
 
193
194
195
 
190
191
192
193
194
195
196
197
198
199
@@ -190,6 +190,10 @@
  self.setWindowTitle(_('TortoiseHg Shelve - %s') % repo.displayname)   self.restoreSettings()   + def done(self, ret): + self.repo.repositoryChanged.disconnect(self.refreshCombos) + super(ShelveDialog, self).done(ret) +   @pyqtSlot()   def moveFileRight(self):   if self.combob.currentIndex() == -1: