Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/PluginVcsMercurial.py
src/eric7/Plugins/PluginVcsMercurial.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.vcsMercurial.HgUtilities import ( | 18 from eric7.Plugins.VcsPlugins.vcsMercurial.HgUtilities import ( |
| 19 getConfigPath, | 19 getConfigPath, |
| 20 getHgExecutable, | 20 getHgExecutable, |
| 287 "CreateBackup", | 287 "CreateBackup", |
| 288 "InternalMerge", | 288 "InternalMerge", |
| 289 "ConsiderHidden", | 289 "ConsiderHidden", |
| 290 "LogBrowserShowFullLog", | 290 "LogBrowserShowFullLog", |
| 291 ): | 291 ): |
| 292 return Preferences.toBool( | 292 return EricUtilities.toBool( |
| 293 Preferences.getSettings().value( | 293 Preferences.getSettings().value( |
| 294 "Mercurial/" + key, cls.MercurialDefaults[key] | 294 "Mercurial/" + key, cls.MercurialDefaults[key] |
| 295 ) | 295 ) |
| 296 ) | 296 ) |
| 297 elif key in ( | 297 elif key in ( |
| 304 Preferences.getSettings().value( | 304 Preferences.getSettings().value( |
| 305 "Mercurial/" + key, cls.MercurialDefaults[key] | 305 "Mercurial/" + key, cls.MercurialDefaults[key] |
| 306 ) | 306 ) |
| 307 ) | 307 ) |
| 308 elif key in ("Commits", "CommitAuthors", "RepositoryUrlHistory"): | 308 elif key in ("Commits", "CommitAuthors", "RepositoryUrlHistory"): |
| 309 return Preferences.toList( | 309 return EricUtilities.toList( |
| 310 Preferences.getSettings().value( | 310 Preferences.getSettings().value( |
| 311 "Mercurial/" + key, cls.MercurialDefaults[key] | 311 "Mercurial/" + key, cls.MercurialDefaults[key] |
| 312 ) | 312 ) |
| 313 ) | 313 ) |
| 314 elif key in ( | 314 elif key in ( |
