Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsGit/git.py
eric6/Plugins/VcsPlugins/vcsGit/git.py
- changeset 7836
- 2f0d208b8137
- parent 7785
- 9978016560ec
- child 7900
- 72b88fb20261
- child 7924
- 8a96736d465e
equal
deleted
inserted
replaced
| 7835:0835ed67714b | 7836:2f0d208b8137 |
|---|---|
| 1402 # create a .gitignore file | 1402 # create a .gitignore file |
| 1403 with open(ignoreName, "w") as ignore: | 1403 with open(ignoreName, "w") as ignore: |
| 1404 ignore.write("\n".join(ignorePatterns)) | 1404 ignore.write("\n".join(ignorePatterns)) |
| 1405 ignore.write("\n") | 1405 ignore.write("\n") |
| 1406 status = True | 1406 status = True |
| 1407 except IOError: | 1407 except OSError: |
| 1408 status = False | 1408 status = False |
| 1409 | 1409 |
| 1410 if status and autoAdd: | 1410 if status and autoAdd: |
| 1411 self.vcsAdd(ignoreName, noDialog=True) | 1411 self.vcsAdd(ignoreName, noDialog=True) |
| 1412 project = e5App().getObject("Project") | 1412 project = e5App().getObject("Project") |
| 1628 try: | 1628 try: |
| 1629 with open(name, "r", encoding="utf-8") as f1: | 1629 with open(name, "r", encoding="utf-8") as f1: |
| 1630 output2 = f1.read() | 1630 output2 = f1.read() |
| 1631 f1.close() | 1631 f1.close() |
| 1632 name2 = "{0} (Work)".format(name) | 1632 name2 = "{0} (Work)".format(name) |
| 1633 except IOError: | 1633 except OSError: |
| 1634 E5MessageBox.critical( | 1634 E5MessageBox.critical( |
| 1635 self.__ui, | 1635 self.__ui, |
| 1636 self.tr("Git Side-by-Side Difference"), | 1636 self.tr("Git Side-by-Side Difference"), |
| 1637 self.tr( | 1637 self.tr( |
| 1638 """<p>The file <b>{0}</b> could not be read.</p>""") | 1638 """<p>The file <b>{0}</b> could not be read.</p>""") |
| 2662 self.__lastReplayPath = os.path.dirname(fname) | 2662 self.__lastReplayPath = os.path.dirname(fname) |
| 2663 | 2663 |
| 2664 try: | 2664 try: |
| 2665 with open(fname, "w") as f: | 2665 with open(fname, "w") as f: |
| 2666 f.write(output) | 2666 f.write(output) |
| 2667 except (OSError, IOError) as err: | 2667 except OSError as err: |
| 2668 E5MessageBox.critical( | 2668 E5MessageBox.critical( |
| 2669 self.__ui, | 2669 self.__ui, |
| 2670 self.tr("Create Bisect Replay File"), | 2670 self.tr("Create Bisect Replay File"), |
| 2671 self.tr( | 2671 self.tr( |
| 2672 """<p>The file <b>{0}</b> could not be written.</p>""" | 2672 """<p>The file <b>{0}</b> could not be written.</p>""" |
| 3577 if not os.path.exists(cfgFile): | 3577 if not os.path.exists(cfgFile): |
| 3578 # create an empty one | 3578 # create an empty one |
| 3579 try: | 3579 try: |
| 3580 with open(cfgFile, "w"): | 3580 with open(cfgFile, "w"): |
| 3581 pass | 3581 pass |
| 3582 except IOError: | 3582 except OSError: |
| 3583 pass | 3583 pass |
| 3584 self.repoEditor = MiniEditor(cfgFile, "Properties") | 3584 self.repoEditor = MiniEditor(cfgFile, "Properties") |
| 3585 self.repoEditor.show() | 3585 self.repoEditor.show() |
| 3586 | 3586 |
| 3587 def gitEditUserConfig(self): | 3587 def gitEditUserConfig(self): |
| 3601 try: | 3601 try: |
| 3602 with open(cfgFile, "w") as f: | 3602 with open(cfgFile, "w") as f: |
| 3603 f.write("[user]\n") | 3603 f.write("[user]\n") |
| 3604 f.write(" name = {0} {1}\n".format(firstName, lastName)) | 3604 f.write(" name = {0} {1}\n".format(firstName, lastName)) |
| 3605 f.write(" email = {0}\n".format(email)) | 3605 f.write(" email = {0}\n".format(email)) |
| 3606 except (IOError, OSError): | 3606 except OSError: |
| 3607 # ignore these | 3607 # ignore these |
| 3608 pass | 3608 pass |
| 3609 self.userEditor = MiniEditor(cfgFile, "Properties") | 3609 self.userEditor = MiniEditor(cfgFile, "Properties") |
| 3610 self.userEditor.show() | 3610 self.userEditor.show() |
| 3611 | 3611 |
