Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/PluginVcsGit.py
src/eric7/Plugins/PluginVcsGit.py
- branch
- eric7
- changeset 10806
- 2f6df822e3b9
- parent 10730
- 454f6ff4e1cd
- child 11006
- a671918232f3
equal
deleted
inserted
replaced
| 10805:c114e9476034 | 10806:2f6df822e3b9 |
|---|---|
| 10 import contextlib | 10 import contextlib |
| 11 import os | 11 import os |
| 12 | 12 |
| 13 from PyQt6.QtCore import QByteArray, QCoreApplication, QObject | 13 from PyQt6.QtCore import QByteArray, QCoreApplication, QObject |
| 14 | 14 |
| 15 from eric7 import Preferences | 15 from eric7 import EricUtilities, Preferences |
| 16 from eric7.__version__ import VersionOnly | 16 from eric7.__version__ import VersionOnly |
| 17 from eric7.EricWidgets.EricApplication import ericApp | 17 from eric7.EricWidgets.EricApplication import ericApp |
| 18 from eric7.Plugins.VcsPlugins.vcsGit.GitUtilities import getConfigPath | 18 from eric7.Plugins.VcsPlugins.vcsGit.GitUtilities import getConfigPath |
| 19 from eric7.Preferences.Shortcuts import readShortcuts | 19 from eric7.Preferences.Shortcuts import readShortcuts |
| 20 from eric7.SystemUtilities import FileSystemUtilities, OSUtilities | 20 from eric7.SystemUtilities import FileSystemUtilities, OSUtilities |
| 283 "ShowBranchesColumn", | 283 "ShowBranchesColumn", |
| 284 "ShowTagsColumn", | 284 "ShowTagsColumn", |
| 285 "FindCopiesHarder", | 285 "FindCopiesHarder", |
| 286 "AggressiveGC", | 286 "AggressiveGC", |
| 287 ]: | 287 ]: |
| 288 return Preferences.toBool( | 288 return EricUtilities.toBool( |
| 289 Preferences.getSettings().value("Git/" + key, cls.GitDefaults[key]) | 289 Preferences.getSettings().value("Git/" + key, cls.GitDefaults[key]) |
| 290 ) | 290 ) |
| 291 elif key in ["LogLimit", "CommitIdLength", "LogSubjectColumnWidth"]: | 291 elif key in ["LogLimit", "CommitIdLength", "LogSubjectColumnWidth"]: |
| 292 return int( | 292 return int( |
| 293 Preferences.getSettings().value("Git/" + key, cls.GitDefaults[key]) | 293 Preferences.getSettings().value("Git/" + key, cls.GitDefaults[key]) |
| 294 ) | 294 ) |
| 295 elif key in ["Commits", "RepositoryUrlHistory"]: | 295 elif key in ["Commits", "RepositoryUrlHistory"]: |
| 296 return Preferences.toList(Preferences.getSettings().value("Git/" + key)) | 296 return EricUtilities.toList(Preferences.getSettings().value("Git/" + key)) |
| 297 elif key in ["LogBrowserGeometry", "StatusDialogGeometry"]: | 297 elif key in ["LogBrowserGeometry", "StatusDialogGeometry"]: |
| 298 v = Preferences.getSettings().value("Git/" + key) | 298 v = Preferences.getSettings().value("Git/" + key) |
| 299 if v is not None: | 299 if v is not None: |
| 300 return v | 300 return v |
| 301 else: | 301 else: |
