Mercurial Repositories > eric / file comparison
comparison: eric7/Plugins/VcsPlugins/vcsGit/git.py
eric7/Plugins/VcsPlugins/vcsGit/git.py
- branch
- eric7
- changeset 9016
- 6f079c524e99
- parent 8881
- 54e42bc2437a
- child 9153
- 506e35e424d5
equal
deleted
inserted
replaced
| 9015:dfeefad914ed | 9016:6f079c524e99 |
|---|---|
| 23 from VCS.VersionControl import VersionControl | 23 from VCS.VersionControl import VersionControl |
| 24 from VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog | 24 from VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog |
| 25 | 25 |
| 26 from .GitDialog import GitDialog | 26 from .GitDialog import GitDialog |
| 27 | 27 |
| 28 import Globals | |
| 28 import Utilities | 29 import Utilities |
| 29 import Preferences | 30 import Preferences |
| 30 | 31 |
| 31 | 32 |
| 32 class Git(VersionControl): | 33 class Git(VersionControl): |
| 1830 if os.path.splitdrive(repodir)[1] == os.sep: | 1831 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1831 return | 1832 return |
| 1832 | 1833 |
| 1833 import sys | 1834 import sys |
| 1834 editor = sys.argv[0].replace(".py", "_editor.py") | 1835 editor = sys.argv[0].replace(".py", "_editor.py") |
| 1835 env = {"GIT_EDITOR": "{0} {1}".format(sys.executable, editor)} | 1836 env = {"GIT_EDITOR": "{0} {1}".format( |
| 1837 Globals.getPythonExecutable(), editor)} | |
| 1836 | 1838 |
| 1837 args = self.initCommand("commit") | 1839 args = self.initCommand("commit") |
| 1838 | 1840 |
| 1839 dia = GitDialog(self.tr('Committing failed merge'), self) | 1841 dia = GitDialog(self.tr('Committing failed merge'), self) |
| 1840 res = dia.startProcess(args, repodir, environment=env) | 1842 res = dia.startProcess(args, repodir, environment=env) |
| 3219 if os.path.splitdrive(repodir)[1] == os.sep: | 3221 if os.path.splitdrive(repodir)[1] == os.sep: |
| 3220 return False | 3222 return False |
| 3221 | 3223 |
| 3222 import sys | 3224 import sys |
| 3223 editor = sys.argv[0].replace(".py", "_editor.py") | 3225 editor = sys.argv[0].replace(".py", "_editor.py") |
| 3224 env = {"GIT_EDITOR": "{0} {1}".format(sys.executable, editor)} | 3226 env = {"GIT_EDITOR": "{0} {1}".format( |
| 3227 Globals.getPythonExecutable(), editor)} | |
| 3225 | 3228 |
| 3226 args = self.initCommand("cherry-pick") | 3229 args = self.initCommand("cherry-pick") |
| 3227 args.append("--continue") | 3230 args.append("--continue") |
| 3228 | 3231 |
| 3229 dia = GitDialog(self.tr('Copy Changesets (Continue)'), self) | 3232 dia = GitDialog(self.tr('Copy Changesets (Continue)'), self) |
