Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py
- branch
- 5_2_x
- changeset 1827
- ecf5de426b82
- parent 1509
- c0b5e693b0eb
- child 2303
- 0ed4ed026c16
equal
deleted
inserted
replaced
| 1826:23a58e2b056c | 1827:ecf5de426b82 |
|---|---|
| 255 Preferences.getSystem("IOEncoding"), | 255 Preferences.getSystem("IOEncoding"), |
| 256 'replace') | 256 'replace') |
| 257 if self.summaryPath: | 257 if self.summaryPath: |
| 258 line = line.replace(self.summaryPath + '/', '') | 258 line = line.replace(self.summaryPath + '/', '') |
| 259 line = " ".join(line.split()) | 259 line = " ".join(line.split()) |
| 260 if line.startswith("---") or \ | 260 if line.startswith("--- ") or \ |
| 261 line.startswith("+++"): | 261 line.startswith("+++ "): |
| 262 self.__processFileLine(line) | 262 self.__processFileLine(line) |
| 263 | 263 |
| 264 if line.startswith('+') or line.startswith('>') or line.startswith('A '): | 264 if line.startswith('+') or line.startswith('>') or line.startswith('A '): |
| 265 format = self.cAddedFormat | 265 format = self.cAddedFormat |
| 266 elif line.startswith('-') or line.startswith('<') or line.startswith('D '): | 266 elif line.startswith('-') or line.startswith('<') or line.startswith('D '): |
