Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

stable filedialogs: add context menu to "Compare file revisions" dialog

Note that I had only been able to test the Edit Local, View at revision and
revert commands, because I am unable to run the other commands when running
from source (the diff tool does not open).

However, I have the exact same problem with the File History dialog, and the
code is exactly the same, so it should work fine when not running from source.

Changeset ccfa5be655fb…

Parent a201cf91be82…

by Angel Ezquerra

Changes to one file · Browse files at ccfa5be655fb Showing diff from parent a201cf91be82 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​filedialogs.py Stacked
 
282
283
284
285
286
287
288
 
320
321
322
 
323
324
325
 
459
460
461
 
 
462
463
464
 
659
660
661
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
282
283
284
 
285
286
287
 
319
320
321
322
323
324
325
 
459
460
461
462
463
464
465
466
 
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
@@ -282,7 +282,6 @@
  for filename in filenames]   qtlib.editfiles(self.repo, files, parent=self)   -   @pyqtSlot(QString)   def onLinkActivated(self, link):   link = unicode(link) @@ -320,6 +319,7 @@
  def __init__(self, repo, filename, repoviewer=None):   super(FileDiffDialog, self).__init__(repo, filename, repoviewer)   self._readSettings() + self.menu = None     def closeEvent(self, event):   self._writeSettings() @@ -459,6 +459,8 @@
  self.filerevmodel.filled.connect(self.modelFilled)   self.tableView_revisions_left.setModel(self.filerevmodel)   self.tableView_revisions_right.setModel(self.filerevmodel) + self.tableView_revisions_left.menuRequested.connect(self.viewMenuRequest) + self.tableView_revisions_right.menuRequested.connect(self.viewMenuRequest)     def createActions(self):   self.actionClose.triggered.connect(self.close) @@ -659,3 +661,99 @@
  self.tableView_revisions_left.saveSettings()   self.tableView_revisions_right.saveSettings()   super(FileDiffDialog, self).reload() + + @pyqtSlot(QPoint, object) + def viewMenuRequest(self, point, selection): + 'User requested a context menu in repo view widget' + if not selection: + return + if self.menu is None: + self.menu = menu = QMenu(self) + a = menu.addAction(_('Visual diff...')) + a.setIcon(qtlib.getmenuicon('visualdiff')) + a.triggered.connect(self.onVisualDiff) + a = menu.addAction(_('Diff to local...')) + a.setIcon(qtlib.getmenuicon('ldiff')) + a.triggered.connect(self.onVisualDiffToLocal) + menu.addSeparator() + a = menu.addAction(_('Visual diff file...')) + a.setIcon(qtlib.getmenuicon('visualdiff')) + a.triggered.connect(self.onVisualDiffFile) + a = menu.addAction(_('Diff file to local...')) + a.setIcon(qtlib.getmenuicon('ldiff')) + a.triggered.connect(self.onVisualDiffFileToLocal) + menu.addSeparator() + a = menu.addAction(_('View at revision...')) + a.setIcon(qtlib.getmenuicon('view-at-revision')) + a.triggered.connect(self.onViewFileAtRevision) + a = menu.addAction(_('Edit local')) + a.setIcon(qtlib.getmenuicon('edit-file')) + a.triggered.connect(self.onEditLocal) + a = menu.addAction(_('Revert to revision...')) + a.setIcon(qtlib.getmenuicon('hg-revert')) + a.triggered.connect(self.onRevertFileToRevision) + self.selection = selection + self.menu.exec_(point) + + def onVisualDiff(self): + opts = dict(change=self.selection[0]) + dlg = visdiff.visualdiff(self.repo.ui, self.repo, [], opts) + if dlg: + dlg.exec_() + dlg.deleteLater() + + def onVisualDiffToLocal(self): + opts = dict(rev=['rev(%d)' % self.selection[0]]) + dlg = visdiff.visualdiff(self.repo.ui, self.repo, [], opts) + if dlg: + dlg.exec_() + dlg.deleteLater() + + def onVisualDiffFile(self): + rev = self.selection[0] + paths = [self.filerevmodel.graph.filename(rev)] + opts = dict(change=self.selection[0]) + dlg = visdiff.visualdiff(self.repo.ui, self.repo, paths, opts) + if dlg: + dlg.exec_() + dlg.deleteLater() + + def onVisualDiffFileToLocal(self): + rev = self.selection[0] + paths = [self.filerevmodel.graph.filename(rev)] + opts = dict(rev=['rev(%d)' % rev]) + dlg = visdiff.visualdiff(self.repo.ui, self.repo, paths, opts) + if dlg: + dlg.exec_() + dlg.deleteLater() + + def onEditLocal(self): + filenames = [self.filename] + if not filenames: + return + qtlib.editfiles(self.repo, filenames, parent=self) + + def onRevertFileToRevision(self): + rev = self.selection[0] + if rev is None: + rev = self.repo['.'].rev() + fileSelection = [self.filerevmodel.graph.filename(rev)] + if len(fileSelection) == 0: + return + dlg = revert.RevertDialog(self.repo, fileSelection, rev, self) + if dlg: + dlg.exec_() + dlg.deleteLater() + + def onViewFileAtRevision(self): + rev = self.selection[0] + filenames = [self.filerevmodel.graph.filename(rev)] + if not filenames: + return + if rev is None: + qtlib.editfiles(self.repo, filenames, parent=self) + else: + base, _ = visdiff.snapshot(self.repo, filenames, self.repo[rev]) + files = [os.path.join(base, filename) + for filename in filenames] + qtlib.editfiles(self.repo, files, parent=self)