Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffGenerator.py
src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffGenerator.py
- branch
- eric7
- changeset 10690
- fab36645aa7d
- parent 10439
- 21c28b0f9e41
- child 11090
- f5f5f5803935
equal
deleted
inserted
replaced
| 10689:3ede487187f2 | 10690:fab36645aa7d |
|---|---|
| 126 elif diffMode == "work2repo": | 126 elif diffMode == "work2repo": |
| 127 args.append("HEAD") | 127 args.append("HEAD") |
| 128 | 128 |
| 129 args.append("--") | 129 args.append("--") |
| 130 if isinstance(fn, list): | 130 if isinstance(fn, list): |
| 131 dname, fnames = self.vcs.splitPathList(fn) | 131 dname, _fnames = self.vcs.splitPathList(fn) |
| 132 self.vcs.addArguments(args, fn) | 132 self.vcs.addArguments(args, fn) |
| 133 if args2: | 133 if args2: |
| 134 self.vcs.addArguments(args2, fn) | 134 self.vcs.addArguments(args2, fn) |
| 135 else: | 135 else: |
| 136 dname, fname = self.vcs.splitPath(fn) | 136 dname, _fname = self.vcs.splitPath(fn) |
| 137 args.append(fn) | 137 args.append(fn) |
| 138 if args2: | 138 if args2: |
| 139 args2.append(fn) | 139 args2.append(fn) |
| 140 elif diffMode == "stash": | 140 elif diffMode == "stash": |
| 141 dname, fname = self.vcs.splitPath(fn) | 141 dname, _fname = self.vcs.splitPath(fn) |
| 142 args = self.vcs.initCommand("stash") | 142 args = self.vcs.initCommand("stash") |
| 143 args.append("show") | 143 args.append("show") |
| 144 args.append("--patch") | 144 args.append("--patch") |
| 145 if stashName: | 145 if stashName: |
| 146 args.append(stashName) | 146 args.append(stashName) |
| 166 return False | 166 return False |
| 167 | 167 |
| 168 return True | 168 return True |
| 169 | 169 |
| 170 @pyqtSlot(int, QProcess.ExitStatus) | 170 @pyqtSlot(int, QProcess.ExitStatus) |
| 171 def __procFinished(self, exitCode, exitStatus): | 171 def __procFinished(self, _exitCode, _exitStatus): |
| 172 """ | 172 """ |
| 173 Private slot connected to the finished signal. | 173 Private slot connected to the finished signal. |
| 174 | 174 |
| 175 @param exitCode exit code of the process | 175 @param _exitCode exit code of the process (unused) |
| 176 @type int | 176 @type int |
| 177 @param exitStatus exit status of the process | 177 @param _exitStatus exit status of the process (unused) |
| 178 @type QProcess.ExitStatus | 178 @type QProcess.ExitStatus |
| 179 """ | 179 """ |
| 180 if ( | 180 if ( |
| 181 self.__process.state() == QProcess.ProcessState.NotRunning | 181 self.__process.state() == QProcess.ProcessState.NotRunning |
| 182 and self.__process2.state() == QProcess.ProcessState.NotRunning | 182 and self.__process2.state() == QProcess.ProcessState.NotRunning |
| 203 @type str | 203 @type str |
| 204 @param isTopDiff flag indicating to show the output in the top | 204 @param isTopDiff flag indicating to show the output in the top |
| 205 output widget | 205 output widget |
| 206 @type bool | 206 @type bool |
| 207 """ | 207 """ |
| 208 prefix, filenames = line.split(" a/", 1) | 208 _prefix, filenames = line.split(" a/", 1) |
| 209 oldFile, newFile = filenames.split(" b/", 1) | 209 oldFile, newFile = filenames.split(" b/", 1) |
| 210 if isTopDiff: | 210 if isTopDiff: |
| 211 self.__fileSeparators.append( | 211 self.__fileSeparators.append( |
| 212 (oldFile.strip(), newFile.strip(), len(self.__output1), -2) | 212 (oldFile.strip(), newFile.strip(), len(self.__output1), -2) |
| 213 ) | 213 ) |
