Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py
src/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py
- branch
- eric7
- changeset 9482
- a2bc06a54d9d
- parent 9473
- 3f23dbf37dbe
- child 9573
- 9960d19d66b5
equal
deleted
inserted
replaced
| 9481:0b936ff1bbb9 | 9482:a2bc06a54d9d |
|---|---|
| 864 | 864 |
| 865 def __diff(self): | 865 def __diff(self): |
| 866 """ | 866 """ |
| 867 Private slot to handle the Diff context menu entry. | 867 Private slot to handle the Diff context menu entry. |
| 868 """ | 868 """ |
| 869 from .GitDiffDialog import GitDiffDialog | |
| 870 | |
| 869 namesW = [ | 871 namesW = [ |
| 870 os.path.join(self.dname, itm.text(self.__pathColumn)) | 872 os.path.join(self.dname, itm.text(self.__pathColumn)) |
| 871 for itm in self.__getStageableItems() | 873 for itm in self.__getStageableItems() |
| 872 ] | 874 ] |
| 873 namesS = [ | 875 namesS = [ |
| 886 | 888 |
| 887 diffMode = "work2stage2repo" | 889 diffMode = "work2stage2repo" |
| 888 names = namesW + namesS | 890 names = namesW + namesS |
| 889 | 891 |
| 890 if self.diff is None: | 892 if self.diff is None: |
| 891 from .GitDiffDialog import GitDiffDialog | |
| 892 | |
| 893 self.diff = GitDiffDialog(self.vcs) | 893 self.diff = GitDiffDialog(self.vcs) |
| 894 self.diff.show() | 894 self.diff.show() |
| 895 self.diff.start(names, diffMode=diffMode, refreshable=True) | 895 self.diff.start(names, diffMode=diffMode, refreshable=True) |
| 896 | 896 |
| 897 def __sbsDiff(self): | 897 def __sbsDiff(self): |
