Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py
eric6/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py
- changeset 7628
- f904d0eef264
- parent 7360
- 9190402e4505
- child 7771
- 787a6b3f8c9f
equal
deleted
inserted
replaced
| 7626:7f643d41464e | 7628:f904d0eef264 |
|---|---|
| 121 'work2stage2repo' compares the working tree with the staging area | 121 'work2stage2repo' compares the working tree with the staging area |
| 122 and the staging area with the HEAD commit, | 122 and the staging area with the HEAD commit, |
| 123 'stash' shows the diff for a stash) | 123 'stash' shows the diff for a stash) |
| 124 @param stashName name of the stash to show a diff for (string) | 124 @param stashName name of the stash to show a diff for (string) |
| 125 @param refreshable flag indicating a refreshable diff (boolean) | 125 @param refreshable flag indicating a refreshable diff (boolean) |
| 126 """ | 126 @exception ValueError raised to indicate a bad value for the 'diffMode' |
| 127 assert diffMode in ["work2repo", "work2stage", "stage2repo", | 127 parameter. |
| 128 "work2stage2repo", "stash"] | 128 """ |
| 129 if diffMode not in ["work2repo", "work2stage", "stage2repo", | |
| 130 "work2stage2repo", "stash"]: | |
| 131 raise ValueError("Bad value for 'diffMode' parameter.") | |
| 129 | 132 |
| 130 self.refreshButton.setVisible(refreshable) | 133 self.refreshButton.setVisible(refreshable) |
| 131 | 134 |
| 132 self.__filename = fn | 135 self.__filename = fn |
| 133 self.__diffMode = diffMode | 136 self.__diffMode = diffMode |
