510 Private method to do a diff of two revisions. |
510 Private method to do a diff of two revisions. |
511 |
511 |
512 @param rev1 first revision number (integer) |
512 @param rev1 first revision number (integer) |
513 @param rev2 second revision number (integer) |
513 @param rev2 second revision number (integer) |
514 """ |
514 """ |
|
515 from .SvnDiffDialog import SvnDiffDialog |
|
516 |
515 if self.sbsCheckBox.isEnabled() and self.sbsCheckBox.isChecked(): |
517 if self.sbsCheckBox.isEnabled() and self.sbsCheckBox.isChecked(): |
516 self.vcs.vcsSbsDiff(self.filename, revisions=(str(rev1), str(rev2))) |
518 self.vcs.vcsSbsDiff(self.filename, revisions=(str(rev1), str(rev2))) |
517 else: |
519 else: |
518 if self.diff is None: |
520 if self.diff is None: |
519 from .SvnDiffDialog import SvnDiffDialog |
|
520 |
|
521 self.diff = SvnDiffDialog(self.vcs) |
521 self.diff = SvnDiffDialog(self.vcs) |
522 self.diff.show() |
522 self.diff.show() |
523 self.diff.raise_() |
523 self.diff.raise_() |
524 self.diff.start(self.filename, [rev1, rev2]) |
524 self.diff.start(self.filename, [rev1, rev2]) |
525 |
525 |