Mercurial Repositories > eric / file comparison
comparison: eric6/UI/CompareDialog.py
eric6/UI/CompareDialog.py
- changeset 8220
- 006ee31b4835
- parent 8218
- 7c09585bd960
- child 8273
- 698ae46f40a4
equal
deleted
inserted
replaced
| 8219:013aee248a62 | 8220:006ee31b4835 |
|---|---|
| 305 # counters for changes | 305 # counters for changes |
| 306 added = 0 | 306 added = 0 |
| 307 deleted = 0 | 307 deleted = 0 |
| 308 changed = 0 | 308 changed = 0 |
| 309 | 309 |
| 310 paras = 1 | |
| 311 self.diffParas = [] | 310 self.diffParas = [] |
| 312 self.currentDiffPos = -1 | 311 self.currentDiffPos = -1 |
| 313 oldOpcode = '' | 312 oldOpcode = '' |
| 314 for opcode, ln1, l1, ln2, l2 in sbsdiff(lines1, lines2): | 313 for paras, (opcode, ln1, l1, ln2, l2) in enumerate( |
| 314 sbsdiff(lines1, lines2), start=1 | |
| 315 ): | |
| 315 if opcode in 'idr': | 316 if opcode in 'idr': |
| 316 if oldOpcode != opcode: | 317 if oldOpcode != opcode: |
| 317 oldOpcode = opcode | 318 oldOpcode = opcode |
| 318 self.diffParas.append(paras) | 319 self.diffParas.append(paras) |
| 319 # update counters | 320 # update counters |
| 342 oldOpcode = '' | 343 oldOpcode = '' |
| 343 format1 = self.cNormalFormat | 344 format1 = self.cNormalFormat |
| 344 format2 = self.cNormalFormat | 345 format2 = self.cNormalFormat |
| 345 self.__appendText(self.contents_1, ln1, l1, format1, opcode == 'r') | 346 self.__appendText(self.contents_1, ln1, l1, format1, opcode == 'r') |
| 346 self.__appendText(self.contents_2, ln2, l2, format2, opcode == 'r') | 347 self.__appendText(self.contents_2, ln2, l2, format2, opcode == 'r') |
| 347 paras += 1 | |
| 348 if not (paras % self.updateInterval): | 348 if not (paras % self.updateInterval): |
| 349 QApplication.processEvents() | 349 QApplication.processEvents() |
| 350 | 350 |
| 351 self.vsb1.setValue(0) | 351 self.vsb1.setValue(0) |
| 352 self.vsb2.setValue(0) | 352 self.vsb2.setValue(0) |
