Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/hg.py
eric6/Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 7429
- 6983c461550f
- parent 7396
- c6399bce2c0b
- child 7430
- 79eb37083821
equal
deleted
inserted
replaced
| 7427:362cd1b6f81a | 7429:6983c461550f |
|---|---|
| 3177 """ | 3177 """ |
| 3178 args = self.initCommand("showconfig") | 3178 args = self.initCommand("showconfig") |
| 3179 args.append('paths') | 3179 args.append('paths') |
| 3180 | 3180 |
| 3181 output, error = self.__client.runcommand(args) | 3181 output, error = self.__client.runcommand(args) |
| 3182 print(output, error) | |
| 3182 | 3183 |
| 3183 self.__defaultConfigured = False | 3184 self.__defaultConfigured = False |
| 3184 self.__defaultPushConfigured = False | 3185 self.__defaultPushConfigured = False |
| 3185 if output: | 3186 if output: |
| 3186 for line in output.splitlines(): | 3187 for line in output.splitlines(): |
| 3188 line = line.strip() | |
| 3187 if ( | 3189 if ( |
| 3188 line.startswith("paths.default=") and | 3190 line.startswith("paths.default=") and |
| 3189 not line.strip().endswith("=") | 3191 not line.endswith("=") |
| 3190 ): | 3192 ): |
| 3191 self.__defaultConfigured = True | 3193 self.__defaultConfigured = True |
| 3192 if ( | 3194 if ( |
| 3193 line.startswith("paths.default-push=") and | 3195 line.startswith("paths.default-push=") and |
| 3194 not line.strip().endswith("=") | 3196 not line.endswith("=") |
| 3195 ): | 3197 ): |
| 3196 self.__defaultPushConfigured = True | 3198 self.__defaultPushConfigured = True |
| 3197 | 3199 |
| 3198 def canCommitMerge(self, name): | 3200 def canCommitMerge(self, name): |
| 3199 """ | 3201 """ |
