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

merge: use a single QSettings instance to save commit page settings

Changeset 801d3279c1c9…

Parent cff83b6292d8…

by Steve Borho

Changes to one file · Browse files at 801d3279c1c9 Showing diff from parent cff83b6292d8 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
543
544
545
546
 
 
 
547
548
549
 
559
560
561
562
563
564
565
 
543
544
545
 
546
547
548
549
550
551
 
561
562
563
 
564
565
566
@@ -543,7 +543,9 @@
  def validatePage(self):   if len(self.repo.parents()) == 1:   # commit succeeded, repositoryChanged() called wizard().next() - QSettings().setValue('merge/skiplast', self.skiplast.isChecked()) + s = QSettings() + s.setValue('merge/skiplast', self.skiplast.isChecked()) + self.msgEntry.saveSettings(s, 'merge/message')   if self.skiplast.isChecked():   self.wizard().close()   return True @@ -559,7 +561,6 @@
  self.repo.incrementBusyCount()   self.cmd.setShowOutput(True)   self.cmd.run(cmdline) - self.msgEntry.saveSettings(QSettings(), 'merge/message')   return False     def repositoryChanged(self):