Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py
Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py
- changeset 4111
- 82e21ab01491
- parent 4110
- 5a106c734527
- child 4130
- c5af9f10a061
equal
deleted
inserted
replaced
| 4110:5a106c734527 | 4111:82e21ab01491 |
|---|---|
| 273 @return extracted file name (string) | 273 @return extracted file name (string) |
| 274 """ | 274 """ |
| 275 f = line.split(None, 1)[1] | 275 f = line.split(None, 1)[1] |
| 276 f = f.rsplit(None, 6)[0] | 276 f = f.rsplit(None, 6)[0] |
| 277 if f == "/dev/null": | 277 if f == "/dev/null": |
| 278 f = "" | 278 f = "__NULL__" |
| 279 else: | 279 else: |
| 280 f = f.split("/", 1)[1] | 280 f = f.split("/", 1)[1] |
| 281 return f | 281 return f |
| 282 | 282 |
| 283 def __processFileLine(self, line): | 283 def __processFileLine(self, line): |
| 288 """ | 288 """ |
| 289 if line.startswith('---'): | 289 if line.startswith('---'): |
| 290 self.__oldFileLine = self.paras | 290 self.__oldFileLine = self.paras |
| 291 self.__oldFile = self.__extractFileName(line) | 291 self.__oldFile = self.__extractFileName(line) |
| 292 else: | 292 else: |
| 293 self.__fileSeparators.append( | 293 newFile = self.__extractFileName(line) |
| 294 (self.__oldFile, self.__extractFileName(line), | 294 if self.__oldFile == "__NULL__": |
| 295 self.__oldFileLine)) | 295 self.__fileSeparators.append( |
| 296 (newFile, newFile, self.__oldFileLine)) | |
| 297 else: | |
| 298 self.__fileSeparators.append( | |
| 299 (self.__oldFile, newFile, self.__oldFileLine)) | |
| 296 | 300 |
| 297 def __processOutputLine(self, line): | 301 def __processOutputLine(self, line): |
| 298 """ | 302 """ |
| 299 Private method to process the lines of output. | 303 Private method to process the lines of output. |
| 300 | 304 |
