Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.2, 1.9.3, and 2.0

status, commit: standardize on loadSettings/saveSettings methods

Changeset 141a401d6360…

Parent 83b527cfa8b5…

by Steve Borho

Changes to 2 files · Browse files at 141a401d6360 Showing diff from parent 83b527cfa8b5 Diff from another changeset...

Change 1 of 6 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
342
343
344
345
346
347
348
349
350
351
352
353
 
418
419
420
421
 
422
423
424
 
429
430
431
 
432
433
434
 
441
442
443
444
 
445
446
447
448
449
450
 
451
452
453
 
985
986
987
988
989
990
 
991
992
993
 
1041
1042
1043
1044
1045
1046
 
1047
1048
1049
 
342
343
344
 
 
 
 
 
 
345
346
347
 
412
413
414
 
415
416
417
418
 
423
424
425
426
427
428
429
 
436
437
438
 
439
440
441
442
443
444
445
446
447
448
449
 
981
982
983
 
984
 
985
986
987
988
 
1036
1037
1038
 
1039
 
1040
1041
1042
1043
@@ -342,12 +342,6 @@
  add(name, func)   return menu.exec_(point)   - def restoreState(self, data): - return self.stwidget.restoreState(data) - - def saveState(self): - return self.stwidget.saveState() -   def branchOp(self):   d = branchop.BranchOpDialog(self.repo, self.branchop, self)   d.setWindowFlags(Qt.Sheet) @@ -418,7 +412,7 @@
  # files partially selected.   return not self.runner.core.running()   - def loadConfigs(self, s): + def loadSettings(self, s):   'Load history, etc, from QSettings instance'   repoid = str(self.repo[0])   # message history is stored in unicode @@ -429,6 +423,7 @@
  self.userhist = s.value('commit/userhist').toStringList()   self.userhist = [u for u in self.userhist if u]   self.msgte.loadSettings(s, 'commit/msgte') + self.stwidget.loadSettings(s, 'commit/status')   try:   curmsg = self.repo.opener('cur-message.txt').read()   self.setMessage(hglib.tounicode(curmsg)) @@ -441,13 +436,14 @@
  except EnvironmentError:   pass   - def storeConfigs(self, s): + def saveSettings(self, s):   'Save history, etc, in QSettings instance'   repoid = str(self.repo[0])   s.setValue('commit/history-'+repoid, self.msghistory)   s.setValue('commit/split', self.split.saveState())   s.setValue('commit/userhist', self.userhist)   self.msgte.saveSettings(s, 'commit/msgte') + self.stwidget.saveSettings(s, 'commit/status')   try:   if self.qref:   # don't store patch summary as current working comment @@ -985,9 +981,8 @@
  layout.addLayout(hbox)     s = QSettings() - commit.restoreState(s.value('commit/state').toByteArray())   self.restoreGeometry(s.value('commit/geom').toByteArray()) - commit.loadConfigs(s) + commit.loadSettings(s)   commit.repo.repositoryChanged.connect(self.updateUndo)   commit.commitComplete.connect(self.postcommit)   commit.commitButtonName.connect(self.setButtonName) @@ -1041,9 +1036,8 @@
  def reject(self):   if self.commit.canExit():   s = QSettings() - s.setValue('commit/state', self.commit.saveState())   s.setValue('commit/geom', self.saveGeometry()) - self.commit.storeConfigs(s) + self.commit.saveSettings(s)   QDialog.reject(self)    def run(ui, *pats, **opts):
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
190
191
192
193
194
 
 
 
195
196
197
 
 
 
198
199
200
 
684
685
686
687
 
688
689
690
 
716
717
718
719
 
720
721
722
723
724
725
 
726
727
728
 
190
191
192
 
 
193
194
195
196
 
 
197
198
199
200
201
202
 
686
687
688
 
689
690
691
692
 
718
719
720
 
721
722
723
724
725
726
 
727
728
729
730
@@ -190,11 +190,13 @@
  else:   return _('%s - status') % self.repo.displayname   - def restoreState(self, data): - return self.split.restoreState(data) + def loadSettings(self, qs, prefix): + self.fileview.loadSettings(qs, prefix+'/fileview') + self.split.restoreState(qs.value(prefix+'/state').toByteArray())   - def saveState(self): - return self.split.saveState() + def saveSettings(self, qs, prefix): + self.fileview.saveSettings(qs, prefix+'/fileview') + qs.setValue(prefix+'/state', self.split.saveState())     def refreshWctx(self):   if self.refreshing: @@ -684,7 +686,7 @@
  layout.addWidget(self.stwidget, 1)     s = QSettings() - self.stwidget.restoreState(s.value('status/state').toByteArray()) + self.stwidget.loadSettings(s, 'status')   self.restoreGeometry(s.value('status/geom').toByteArray())     self.statusbar = cmdui.ThgStatusBar(self) @@ -716,13 +718,13 @@
    def accept(self):   s = QSettings() - s.setValue('status/state', self.stwidget.saveState()) + self.stwidget.saveSettings(s, 'status')   s.setValue('status/geom', self.saveGeometry())   QDialog.accept(self)     def reject(self):   s = QSettings() - s.setValue('status/state', self.stwidget.saveState()) + self.stwidget.saveSettings(s, 'status')   s.setValue('status/geom', self.saveGeometry())   QDialog.reject(self)