Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsGit/GitDiffGenerator.py
eric6/Plugins/VcsPlugins/vcsGit/GitDiffGenerator.py
- changeset 7628
- f904d0eef264
- parent 7360
- 9190402e4505
- child 7771
- 787a6b3f8c9f
equal
deleted
inserted
replaced
| 7626:7f643d41464e | 7628:f904d0eef264 |
|---|---|
| 76 'work2stage2repo' compares the working tree with the staging area | 76 'work2stage2repo' compares the working tree with the staging area |
| 77 and the staging area with the HEAD commit, | 77 and the staging area with the HEAD commit, |
| 78 'stash' shows the diff for a stash) | 78 'stash' shows the diff for a stash) |
| 79 @param stashName name of the stash to show a diff for (string) | 79 @param stashName name of the stash to show a diff for (string) |
| 80 @return flag indicating the start status (boolean) | 80 @return flag indicating the start status (boolean) |
| 81 """ | 81 @exception ValueError raised to indicate a bad value for the 'diffMode' |
| 82 assert diffMode in ["work2repo", "work2stage", "stage2repo", | 82 parameter. |
| 83 "work2stage2repo", "stash"] | 83 """ |
| 84 if diffMode not in ["work2repo", "work2stage", "stage2repo", | |
| 85 "work2stage2repo", "stash"]: | |
| 86 raise ValueError("Bad value for 'diffMode' parameter.") | |
| 84 | 87 |
| 85 self.__output1 = [] | 88 self.__output1 = [] |
| 86 self.__output2 = [] | 89 self.__output2 = [] |
| 87 self.__errors = [] | 90 self.__errors = [] |
| 88 self.__fileSeparators = [] | 91 self.__fileSeparators = [] |
