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

commit: store splitter and qsci settings locally, history globally

The standalone commit tool should have separate configurable space for its
splitter and qsci settings from the tool built into the workbench.

Changeset df8f6a8e2ac2…

Parent cd7d35c1435b…

by Steve Borho

Changes to 2 files · Browse files at df8f6a8e2ac2 Showing diff from parent cd7d35c1435b Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
386
387
388
389
 
390
391
 
 
392
393
394
 
 
 
 
395
396
397
 
398
399
400
401
402
403
 
410
411
412
413
 
414
415
416
417
418
419
420
 
 
 
 
 
 
 
421
422
423
 
910
911
912
913
 
914
915
916
 
962
963
964
965
 
966
967
968
 
386
387
388
 
389
390
391
392
393
394
 
 
395
396
397
398
399
400
 
401
402
 
 
403
404
405
 
412
413
414
 
415
416
417
 
 
 
 
 
418
419
420
421
422
423
424
425
426
427
 
914
915
916
 
917
918
919
920
 
966
967
968
 
969
970
971
972
@@ -386,18 +386,20 @@
  # files partially selected.   return not self.runner.core.running()   - def loadSettings(self, s): + def loadSettings(self, s, prefix):   'Load history, etc, from QSettings instance'   repoid = str(self.repo[0]) + lpref = prefix + '/commit/' # local settings (splitter, etc) + gpref = 'commit/' # global settings (history, etc)   # message history is stored in unicode - self.split.restoreState(s.value('commit/split').toByteArray()) - self.msghistory = list(s.value('commit/history-'+repoid).toStringList()) + self.split.restoreState(s.value(lpref+'split').toByteArray()) + self.msgte.loadSettings(s, lpref+'msgte') + self.stwidget.loadSettings(s, lpref+'status') + self.msghistory = list(s.value(gpref+'history-'+repoid).toStringList())   self.msghistory = [m for m in self.msghistory if m]   self.msgcombo.reset(self.msghistory) - self.userhist = s.value('commit/userhist').toStringList() + self.userhist = s.value(gpref+'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)) @@ -410,14 +412,16 @@
  except EnvironmentError:   pass   - def saveSettings(self, s): + def saveSettings(self, s, prefix):   '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') + lpref = prefix + '/commit/' + gpref = 'commit/' + s.setValue(lpref+'split', self.split.saveState()) + self.msgte.saveSettings(s, lpref+'msgte') + self.stwidget.saveSettings(s, lpref+'status') + s.setValue(gpref+'history-'+repoid, self.msghistory) + s.setValue(gpref+'userhist', self.userhist)   try:   msg = self.getMessage()   self.repo.opener('cur-message.txt', 'w').write(msg) @@ -910,7 +914,7 @@
    s = QSettings()   self.restoreGeometry(s.value('commit/geom').toByteArray()) - commit.loadSettings(s) + commit.loadSettings(s, 'committool')   commit.repo.repositoryChanged.connect(self.updateUndo)   commit.commitComplete.connect(self.postcommit)   commit.commitButtonEnable.connect(self.commitButton.setEnabled) @@ -962,7 +966,7 @@
  if self.commit.canExit():   s = QSettings()   s.setValue('commit/geom', self.saveGeometry()) - self.commit.saveSettings(s) + self.commit.saveSettings(s, 'committool')   QDialog.reject(self)    def run(ui, *pats, **opts):
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
255
256
257
258
 
259
260
261
 
704
705
706
707
 
708
709
710
 
255
256
257
 
258
259
260
261
 
704
705
706
 
707
708
709
710
@@ -255,7 +255,7 @@
  cw.buttonHBox.addWidget(b)   cw.commitButtonEnable.connect(b.setEnabled)   b.clicked.connect(cw.commit) - cw.loadSettings(QSettings()) + cw.loadSettings(QSettings(), 'workbench')   QTimer.singleShot(0, cw.reload)   self.repo._commitwidget = cw   @@ -704,7 +704,7 @@
  self.storeSettings()   self.revDetailsWidget.storeSettings()   s = QSettings() - self.commitDemand.forward('saveSettings', s) + self.commitDemand.forward('saveSettings', s, 'workbench')   self.manifestDemand.forward('saveSettings', s, 'workbench')   self.filterbar.storeConfigs(s)   return True