Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py
src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py
- branch
- eric7
- changeset 9482
- a2bc06a54d9d
- parent 9473
- 3f23dbf37dbe
- child 9653
- e67609152c5e
equal
deleted
inserted
replaced
| 9481:0b936ff1bbb9 | 9482:a2bc06a54d9d |
|---|---|
| 381 | 381 |
| 382 @param rev1 first revision number (integer) | 382 @param rev1 first revision number (integer) |
| 383 @param rev2 second revision number (integer) | 383 @param rev2 second revision number (integer) |
| 384 @param peg_rev revision number to use as a reference (integer) | 384 @param peg_rev revision number to use as a reference (integer) |
| 385 """ | 385 """ |
| 386 from .SvnDiffDialog import SvnDiffDialog | |
| 387 | |
| 386 if self.sbsCheckBox.isEnabled() and self.sbsCheckBox.isChecked(): | 388 if self.sbsCheckBox.isEnabled() and self.sbsCheckBox.isChecked(): |
| 387 self.vcs.vcsSbsDiff(self.filename, revisions=(str(rev1), str(rev2))) | 389 self.vcs.vcsSbsDiff(self.filename, revisions=(str(rev1), str(rev2))) |
| 388 else: | 390 else: |
| 389 if self.diff is None: | 391 if self.diff is None: |
| 390 from .SvnDiffDialog import SvnDiffDialog | |
| 391 | |
| 392 self.diff = SvnDiffDialog(self.vcs) | 392 self.diff = SvnDiffDialog(self.vcs) |
| 393 self.diff.show() | 393 self.diff.show() |
| 394 self.diff.raise_() | 394 self.diff.raise_() |
| 395 QApplication.processEvents() | 395 QApplication.processEvents() |
| 396 self.diff.start(self.filename, [rev1, rev2], pegRev=peg_rev) | 396 self.diff.start(self.filename, [rev1, rev2], pegRev=peg_rev) |
