Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

status: connect CTRL-D to visual diff of selected files

Changeset 3ac9f0f8b27b…

Parent d622a93f4ab3…

by Steve Borho

Changes to one file · Browse files at 3ac9f0f8b27b Showing diff from parent d622a93f4ab3 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
8
9
10
11
 
12
13
14
 
23
24
25
26
 
27
28
29
 
200
201
202
 
 
 
 
 
 
 
 
 
203
204
205
 
8
9
10
 
11
12
13
14
 
23
24
25
 
26
27
28
29
 
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
@@ -8,7 +8,7 @@
 import os    from mercurial import ui, hg, util, patch, cmdutil, error, mdiff, context, merge -from tortoisehg.hgqt import qtlib, htmlui, chunkselect, wctxactions +from tortoisehg.hgqt import qtlib, htmlui, chunkselect, wctxactions, visdiff  from tortoisehg.util import paths, hglib  from tortoisehg.util.i18n import _   @@ -23,7 +23,7 @@
 # Technical Debt  # Add some initial drag distance before starting QDrag  # (it interferes with selection the way it is now) -# CTRL-D, double-click visual diffs +# double-click visual diffs  # Disable check column when wctx has two parents  # Thread refreshWctx, connect to an external progress bar  # Thread rowSelected, connect to an external progress bar @@ -200,6 +200,15 @@
  if event.key() == 32:   for index in self.selectedIndexes():   self.model().toggleRow(index) + if event.key() == Qt.Key_D and event.modifiers() == Qt.ControlModifier: + rows = set() + selfiles = [] + for index in self.selectedIndexes(): + if index.row() in rows: + continue + rows.add(index.row()) + selfiles.append(self.model().getRow(index)[COL_PATH]) + visdiff.visualdiff(self.repo.ui, self.repo, selfiles, {})   else:   return super(WctxFileTree, self).keyPressEvent(event)