Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/hg.py
eric6/Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 7836
- 2f0d208b8137
- parent 7791
- f07ded9bc64d
- child 7900
- 72b88fb20261
- child 7924
- 8a96736d465e
equal
deleted
inserted
replaced
| 7835:0835ed67714b | 7836:2f0d208b8137 |
|---|---|
| 1711 else: | 1711 else: |
| 1712 try: | 1712 try: |
| 1713 with open(name, "r", encoding="utf-8") as f1: | 1713 with open(name, "r", encoding="utf-8") as f1: |
| 1714 output2 = f1.read() | 1714 output2 = f1.read() |
| 1715 name2 = "{0} (Work)".format(name) | 1715 name2 = "{0} (Work)".format(name) |
| 1716 except IOError: | 1716 except OSError: |
| 1717 E5MessageBox.critical( | 1717 E5MessageBox.critical( |
| 1718 self.__ui, | 1718 self.__ui, |
| 1719 self.tr("Mercurial Side-by-Side Difference"), | 1719 self.tr("Mercurial Side-by-Side Difference"), |
| 1720 self.tr( | 1720 self.tr( |
| 1721 """<p>The file <b>{0}</b> could not be read.</p>""") | 1721 """<p>The file <b>{0}</b> could not be read.</p>""") |
| 2161 cfg.write("patterns =\n") | 2161 cfg.write("patterns =\n") |
| 2162 cfg.write(" {0}\n".format( | 2162 cfg.write(" {0}\n".format( |
| 2163 "\n ".join(lfPattern))) | 2163 "\n ".join(lfPattern))) |
| 2164 self.__monitorRepoIniFile(repodir) | 2164 self.__monitorRepoIniFile(repodir) |
| 2165 self.__iniFileChanged(cfgFile) | 2165 self.__iniFileChanged(cfgFile) |
| 2166 except IOError: | 2166 except OSError: |
| 2167 pass | 2167 pass |
| 2168 self.repoEditor = MiniEditor(cfgFile, "Properties") | 2168 self.repoEditor = MiniEditor(cfgFile, "Properties") |
| 2169 self.repoEditor.show() | 2169 self.repoEditor.show() |
| 2170 | 2170 |
| 2171 def hgVerify(self, name): | 2171 def hgVerify(self, name): |
| 2327 # create a .hgignore file | 2327 # create a .hgignore file |
| 2328 with open(ignoreName, "w") as ignore: | 2328 with open(ignoreName, "w") as ignore: |
| 2329 ignore.write("\n".join(ignorePatterns)) | 2329 ignore.write("\n".join(ignorePatterns)) |
| 2330 ignore.write("\n") | 2330 ignore.write("\n") |
| 2331 status = True | 2331 status = True |
| 2332 except IOError: | 2332 except OSError: |
| 2333 status = False | 2333 status = False |
| 2334 | 2334 |
| 2335 if status and autoAdd: | 2335 if status and autoAdd: |
| 2336 self.vcsAdd(ignoreName, noDialog=True) | 2336 self.vcsAdd(ignoreName, noDialog=True) |
| 2337 project = e5App().getObject("Project") | 2337 project = e5App().getObject("Project") |
| 3061 # file exists; check, if such an entry exists already | 3061 # file exists; check, if such an entry exists already |
| 3062 needsAdd = False | 3062 needsAdd = False |
| 3063 try: | 3063 try: |
| 3064 with open(hgsub, "r") as f: | 3064 with open(hgsub, "r") as f: |
| 3065 contents = f.readlines() | 3065 contents = f.readlines() |
| 3066 except IOError as err: | 3066 except OSError as err: |
| 3067 E5MessageBox.critical( | 3067 E5MessageBox.critical( |
| 3068 self.__ui, | 3068 self.__ui, |
| 3069 self.tr("Add Sub-repository"), | 3069 self.tr("Add Sub-repository"), |
| 3070 self.tr( | 3070 self.tr( |
| 3071 """<p>The sub-repositories file .hgsub could not""" | 3071 """<p>The sub-repositories file .hgsub could not""" |
| 3089 contents[-1] = contents[-1] + "\n" | 3089 contents[-1] = contents[-1] + "\n" |
| 3090 contents.append(entry) | 3090 contents.append(entry) |
| 3091 try: | 3091 try: |
| 3092 with open(hgsub, "w") as f: | 3092 with open(hgsub, "w") as f: |
| 3093 f.writelines(contents) | 3093 f.writelines(contents) |
| 3094 except IOError as err: | 3094 except OSError as err: |
| 3095 E5MessageBox.critical( | 3095 E5MessageBox.critical( |
| 3096 self.__ui, | 3096 self.__ui, |
| 3097 self.tr("Add Sub-repository"), | 3097 self.tr("Add Sub-repository"), |
| 3098 self.tr( | 3098 self.tr( |
| 3099 """<p>The sub-repositories file .hgsub could not""" | 3099 """<p>The sub-repositories file .hgsub could not""" |
| 3121 return | 3121 return |
| 3122 | 3122 |
| 3123 try: | 3123 try: |
| 3124 with open(hgsub, "r") as f: | 3124 with open(hgsub, "r") as f: |
| 3125 subrepositories = [line.strip() for line in f.readlines()] | 3125 subrepositories = [line.strip() for line in f.readlines()] |
| 3126 except IOError as err: | 3126 except OSError as err: |
| 3127 E5MessageBox.critical( | 3127 E5MessageBox.critical( |
| 3128 self.__ui, | 3128 self.__ui, |
| 3129 self.tr("Remove Sub-repositories"), | 3129 self.tr("Remove Sub-repositories"), |
| 3130 self.tr("""<p>The sub-repositories file .hgsub could not""" | 3130 self.tr("""<p>The sub-repositories file .hgsub could not""" |
| 3131 """ be read.</p><p>Reason: {0}</p>""") | 3131 """ be read.</p><p>Reason: {0}</p>""") |
| 3140 subrepositories, removedSubrepos, deleteSubrepos = dlg.getData() | 3140 subrepositories, removedSubrepos, deleteSubrepos = dlg.getData() |
| 3141 contents = "\n".join(subrepositories) + "\n" | 3141 contents = "\n".join(subrepositories) + "\n" |
| 3142 try: | 3142 try: |
| 3143 with open(hgsub, "w") as f: | 3143 with open(hgsub, "w") as f: |
| 3144 f.write(contents) | 3144 f.write(contents) |
| 3145 except IOError as err: | 3145 except OSError as err: |
| 3146 E5MessageBox.critical( | 3146 E5MessageBox.critical( |
| 3147 self.__ui, | 3147 self.__ui, |
| 3148 self.tr("Remove Sub-repositories"), | 3148 self.tr("Remove Sub-repositories"), |
| 3149 self.tr( | 3149 self.tr( |
| 3150 """<p>The sub-repositories file .hgsub could not""" | 3150 """<p>The sub-repositories file .hgsub could not""" |
