Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/PluginVcsMercurial.py
eric6/Plugins/PluginVcsMercurial.py
- changeset 7009
- eaf5ed6ef298
- parent 6942
- 2602857055c5
- child 7199
- c71bd6f21748
equal
deleted
inserted
replaced
| 7008:e1b80fb11cc7 | 7009:eaf5ed6ef298 |
|---|---|
| 173 "InternalMerge": False, | 173 "InternalMerge": False, |
| 174 "Encoding": "utf-8", | 174 "Encoding": "utf-8", |
| 175 "EncodingMode": "strict", | 175 "EncodingMode": "strict", |
| 176 "ConsiderHidden": False, | 176 "ConsiderHidden": False, |
| 177 "LogMessageColumnWidth": 30, | 177 "LogMessageColumnWidth": 30, |
| 178 "LogBrowserShowFullLog": True, | |
| 178 "LogBrowserGeometry": QByteArray(), | 179 "LogBrowserGeometry": QByteArray(), |
| 179 "LogBrowserSplitterStates": [QByteArray(), QByteArray(), | 180 "LogBrowserSplitterStates": [QByteArray(), QByteArray(), |
| 180 QByteArray()], | 181 QByteArray()], |
| 181 # mainSplitter, detailsSplitter, diffSplitter | 182 # mainSplitter, detailsSplitter, diffSplitter |
| 182 "StatusDialogGeometry": QByteArray(), | 183 "StatusDialogGeometry": QByteArray(), |
| 264 | 265 |
| 265 @param key the key of the value to get | 266 @param key the key of the value to get |
| 266 @return the requested setting | 267 @return the requested setting |
| 267 """ | 268 """ |
| 268 if key in ["StopLogOnCopy", "PullUpdate", "PreferUnbundle", | 269 if key in ["StopLogOnCopy", "PullUpdate", "PreferUnbundle", |
| 269 "CreateBackup", "InternalMerge", "ConsiderHidden"]: | 270 "CreateBackup", "InternalMerge", "ConsiderHidden", |
| 271 "LogBrowserShowFullLog"]: | |
| 270 return Preferences.toBool(Preferences.Prefs.settings.value( | 272 return Preferences.toBool(Preferences.Prefs.settings.value( |
| 271 "Mercurial/" + key, cls.MercurialDefaults[key])) | 273 "Mercurial/" + key, cls.MercurialDefaults[key])) |
| 272 elif key in ["LogLimit", "CommitMessages", "CommitAuthorsLimit", | 274 elif key in ["LogLimit", "CommitMessages", "CommitAuthorsLimit", |
| 273 "ServerPort", "LogMessageColumnWidth"]: | 275 "ServerPort", "LogMessageColumnWidth"]: |
| 274 return int(Preferences.Prefs.settings.value( | 276 return int(Preferences.Prefs.settings.value( |
