Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsGit/git.py
eric6/Plugins/VcsPlugins/vcsGit/git.py
- changeset 7785
- 9978016560ec
- parent 7780
- 41420f82c0ac
- child 7836
- 2f0d208b8137
equal
deleted
inserted
replaced
| 7784:3257703e10c5 | 7785:9978016560ec |
|---|---|
| 1398 else: | 1398 else: |
| 1399 res = True | 1399 res = True |
| 1400 if res: | 1400 if res: |
| 1401 try: | 1401 try: |
| 1402 # create a .gitignore file | 1402 # create a .gitignore file |
| 1403 ignore = open(ignoreName, "w") | 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 ignore.close() | |
| 1407 status = True | 1406 status = True |
| 1408 except IOError: | 1407 except IOError: |
| 1409 status = False | 1408 status = False |
| 1410 | 1409 |
| 1411 if status and autoAdd: | 1410 if status and autoAdd: |
| 1625 error) | 1624 error) |
| 1626 return | 1625 return |
| 1627 name2 = "{0} (rev. {1})".format(name, rev2) | 1626 name2 = "{0} (rev. {1})".format(name, rev2) |
| 1628 else: | 1627 else: |
| 1629 try: | 1628 try: |
| 1630 f1 = open(name, "r", encoding="utf-8") | 1629 with open(name, "r", encoding="utf-8") as f1: |
| 1631 output2 = f1.read() | 1630 output2 = f1.read() |
| 1632 f1.close() | 1631 f1.close() |
| 1633 name2 = "{0} (Work)".format(name) | 1632 name2 = "{0} (Work)".format(name) |
| 1634 except IOError: | 1633 except IOError: |
| 1635 E5MessageBox.critical( | 1634 E5MessageBox.critical( |
| 1636 self.__ui, | 1635 self.__ui, |
| 1637 self.tr("Git Side-by-Side Difference"), | 1636 self.tr("Git Side-by-Side Difference"), |
| 2661 return | 2660 return |
| 2662 fname = Utilities.toNativeSeparators(fname) | 2661 fname = Utilities.toNativeSeparators(fname) |
| 2663 self.__lastReplayPath = os.path.dirname(fname) | 2662 self.__lastReplayPath = os.path.dirname(fname) |
| 2664 | 2663 |
| 2665 try: | 2664 try: |
| 2666 f = open(fname, "w") | 2665 with open(fname, "w") as f: |
| 2667 f.write(output) | 2666 f.write(output) |
| 2668 f.close() | |
| 2669 except (OSError, IOError) as err: | 2667 except (OSError, IOError) as err: |
| 2670 E5MessageBox.critical( | 2668 E5MessageBox.critical( |
| 2671 self.__ui, | 2669 self.__ui, |
| 2672 self.tr("Create Bisect Replay File"), | 2670 self.tr("Create Bisect Replay File"), |
| 2673 self.tr( | 2671 self.tr( |
| 3577 | 3575 |
| 3578 cfgFile = os.path.join(repodir, self.adminDir, "config") | 3576 cfgFile = os.path.join(repodir, self.adminDir, "config") |
| 3579 if not os.path.exists(cfgFile): | 3577 if not os.path.exists(cfgFile): |
| 3580 # create an empty one | 3578 # create an empty one |
| 3581 try: | 3579 try: |
| 3582 cfg = open(cfgFile, "w") | 3580 with open(cfgFile, "w"): |
| 3583 cfg.close() | 3581 pass |
| 3584 except IOError: | 3582 except IOError: |
| 3585 pass | 3583 pass |
| 3586 self.repoEditor = MiniEditor(cfgFile, "Properties") | 3584 self.repoEditor = MiniEditor(cfgFile, "Properties") |
| 3587 self.repoEditor.show() | 3585 self.repoEditor.show() |
| 3588 | 3586 |
| 3599 firstName, lastName, email = dlg.getData() | 3597 firstName, lastName, email = dlg.getData() |
| 3600 else: | 3598 else: |
| 3601 firstName, lastName, email = ( | 3599 firstName, lastName, email = ( |
| 3602 "Firstname", "Lastname", "email_address") | 3600 "Firstname", "Lastname", "email_address") |
| 3603 try: | 3601 try: |
| 3604 f = open(cfgFile, "w") | 3602 with open(cfgFile, "w") as f: |
| 3605 f.write("[user]\n") | 3603 f.write("[user]\n") |
| 3606 f.write(" name = {0} {1}\n".format(firstName, lastName)) | 3604 f.write(" name = {0} {1}\n".format(firstName, lastName)) |
| 3607 f.write(" email = {0}\n".format(email)) | 3605 f.write(" email = {0}\n".format(email)) |
| 3608 f.close() | |
| 3609 except (IOError, OSError): | 3606 except (IOError, OSError): |
| 3610 # ignore these | 3607 # ignore these |
| 3611 pass | 3608 pass |
| 3612 self.userEditor = MiniEditor(cfgFile, "Properties") | 3609 self.userEditor = MiniEditor(cfgFile, "Properties") |
| 3613 self.userEditor.show() | 3610 self.userEditor.show() |
| 3884 submodulesFile = os.path.join(repodir, ".gitmodules") | 3881 submodulesFile = os.path.join(repodir, ".gitmodules") |
| 3885 if not os.path.exists(submodulesFile): | 3882 if not os.path.exists(submodulesFile): |
| 3886 return [] | 3883 return [] |
| 3887 | 3884 |
| 3888 try: | 3885 try: |
| 3889 modulesFile = open(submodulesFile, "r") | 3886 with open(submodulesFile, "r") as modulesFile: |
| 3890 contents = modulesFile.readlines() | 3887 contents = modulesFile.readlines() |
| 3891 modulesFile.close() | |
| 3892 except OSError: | 3888 except OSError: |
| 3893 # silently ignore them | 3889 # silently ignore them |
| 3894 return [] | 3890 return [] |
| 3895 | 3891 |
| 3896 submodules = [] | 3892 submodules = [] |
