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

Merge with stable

Changeset 320540eb79ea…

Parents c0110bb1099f…

Parents e882f630e4c3…

by Steve Borho

Changes to 2 files · Browse files at 320540eb79ea Showing diff from parent c0110bb1099f e882f630e4c3 Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​hgqt/​filelistview.py Stacked
 
31
32
33
 
34
35
36
 
46
47
48
49
 
50
51
52
 
201
202
203
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
204
205
206
 
226
227
228
 
 
 
229
230
231
 
238
239
240
241
 
242
243
244
245
246
247
248
 
249
250
251
 
31
32
33
34
35
36
37
 
47
48
49
 
50
51
52
53
 
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
 
243
244
245
246
247
248
249
250
251
 
258
259
260
 
261
262
263
264
265
266
267
 
268
269
270
271
@@ -31,6 +31,7 @@
    fileSelected = pyqtSignal(QString, QString)   clearDisplay = pyqtSignal() + linkActivated = pyqtSignal(QString)   filecontextmenu = None   subrepocontextmenu = None   @@ -46,7 +47,7 @@
    self.createActions()   - self.doubleClicked.connect(self.vdiff) + self.doubleClicked.connect(self.doubleClickHandler)   self._diff_dialogs = {}   self._nav_dialogs = {}   @@ -201,6 +202,22 @@
  dlg.raise_()   dlg.activateWindow()   + def opensubrepo(self): + path = os.path.join(self.model().repo.root, self.currentFile()) + if os.path.isdir(path): + self.linkActivated.emit(u'subrepo:'+hglib.tounicode(path)) + else: + QMessageBox.warning(self, + _("Cannot open subrepository"), + _("The selected subrepository does not exist on the working directory")) + + def doubleClickHandler(self): + itemissubrepo = (self.model().dataFromIndex(self.currentIndex())['status'] == 'S') + if itemissubrepo: + self.opensubrepo() + else: + self.vdiff() +   def createActions(self):   self.actionShowAllMerge = QAction(_('Show All'), self)   self.actionShowAllMerge.setToolTip( @@ -226,6 +243,9 @@
  ('revert', _('Revert to Revision'), 'hg-revert', 'Alt+Ctrl+T',   _('Revert file(s) to contents at this revision'),   self.revertfile), + ('opensubrepo', _('Open subrepository'), 'thg-repository-open', + 'Alt+Ctrl+O', _('Open the selected subrepository'), + self.opensubrepo),   ]:   act = QAction(desc, self)   if icon: @@ -238,14 +258,14 @@
  act.triggered.connect(cb)   self._actions[name] = act   self.addAction(act) - +   def contextMenuEvent(self, event):   itemissubrepo = (self.model().dataFromIndex(self.currentIndex())['status'] == 'S')     # Subrepos and regular items have different context menus   if itemissubrepo:   contextmenu = self.subrepocontextmenu - actionlist = [] + actionlist = ['opensubrepo']   else:   contextmenu = self.filecontextmenu   actionlist = ['diff', 'ldiff', 'edit', 'ledit', 'revert',
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​revdetails.py Stacked
 
89
90
91
 
92
93
94
 
89
90
91
92
93
94
95
@@ -89,6 +89,7 @@
  self.filelistToolbar = QToolBar(_('File List Toolbar'))   self.filelistToolbar.setIconSize(QSize(16,16))   self.filelist = HgFileListView() + self.filelist.linkActivated.connect(self.linkActivated)     self.tbarFileListFrame = QFrame(self.filelist_splitter)   sp = SP(SP.Preferred, SP.Preferred)