Mercurial Repositories > eric / file comparison
comparison: Plugins/PluginVcsMercurial.py
Plugins/PluginVcsMercurial.py
- changeset 3269
- 866c3a2f5380
- parent 3256
- 1a43351889d5
- child 3302
- e92f0dd51979
equal
deleted
inserted
replaced
| 3268:8bfa66a9138a | 3269:866c3a2f5380 |
|---|---|
| 209 | 209 |
| 210 @param key the key of the value to get | 210 @param key the key of the value to get |
| 211 @return the requested setting | 211 @return the requested setting |
| 212 """ | 212 """ |
| 213 if key in ["StopLogOnCopy", "UseLogBrowser", "PullUpdate", | 213 if key in ["StopLogOnCopy", "UseLogBrowser", "PullUpdate", |
| 214 "PreferUnbundle", "CreateBackup"]: | 214 "PreferUnbundle", "CreateBackup", "InternalMerge"]: |
| 215 return Preferences.toBool(Preferences.Prefs.settings.value( | 215 return Preferences.toBool(Preferences.Prefs.settings.value( |
| 216 "Mercurial/" + key, self.__mercurialDefaults[key])) | 216 "Mercurial/" + key, self.__mercurialDefaults[key])) |
| 217 elif key in ["LogLimit", "CommitMessages", "ServerPort"]: | 217 elif key in ["LogLimit", "CommitMessages", "ServerPort"]: |
| 218 return int(Preferences.Prefs.settings.value( | 218 return int(Preferences.Prefs.settings.value( |
| 219 "Mercurial/" + key, self.__mercurialDefaults[key])) | 219 "Mercurial/" + key, self.__mercurialDefaults[key])) |
