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

status: present a link to show contents

and hide the 'Show Contents' checkbox (might as well remove it)

Changeset a0e71797c203…

Parent b66994097cd0…

by Adrian Buehlmann

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

Change 1 of 7 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
11
12
13
 
14
15
16
 
172
173
174
 
175
176
177
178
179
180
181
182
 
 
 
183
184
185
 
190
191
192
 
 
 
193
194
195
 
309
310
311
 
312
313
314
 
320
321
322
323
 
 
324
325
 
326
327
328
329
330
 
337
338
339
340
 
341
342
343
344
345
 
367
368
369
370
 
371
372
373
374
375
376
377
 
378
379
380
381
382
383
384
385
 
11
12
13
14
15
16
17
 
173
174
175
176
177
178
 
179
180
181
182
 
183
184
185
186
187
188
 
193
194
195
196
197
198
199
200
201
 
315
316
317
318
319
320
321
 
327
328
329
 
330
331
332
 
333
334
 
335
336
337
 
344
345
346
 
347
348
 
349
350
351
 
373
374
375
 
376
377
 
378
379
380
381
 
382
383
 
384
385
 
386
387
388
@@ -11,6 +11,7 @@
 from mercurial import context, merge, commands, subrepo  from tortoisehg.hgqt import qtlib, htmlui, chunkselect, wctxactions, visdiff  from tortoisehg.util import paths, hglib +from tortoisehg.util.util import xml_escape  from tortoisehg.hgqt.i18n import _    from PyQt4.QtCore import * @@ -172,14 +173,16 @@
  hbox.addStretch()     self.override = QCheckBox() + self.override.hide()   self.override.setText(_('Show Contents'))   self.override.setCheckable(True) - self.override.setEnabled(False)   self.override.toggled.connect(self.refreshDiff)   hbox.addWidget(self.override)   hbox.addSpacing(6)   - self.te = QTextEdit() + self.te = QTextBrowser() + self.te.setOpenLinks(False) + self.connect(self.te, SIGNAL('anchorClicked(QUrl)'), self.teLinkClicked)   self.te.document().setDefaultStyleSheet(qtlib.thgstylesheet)   self.te.setReadOnly(True)   self.te.setLineWrapMode(QTextEdit.NoWrap) @@ -190,6 +193,9 @@
  self.diffvbox = vbox   QTimer.singleShot(0, self.refreshWctx)   + def teLinkClicked(self, url): + self.override.setChecked(True) +   def getTitle(self):   if self.pats:   return hglib.tounicode(_('%s - status (selection filtered)') % @@ -309,6 +315,7 @@
  showanyway = self.override.isChecked()   hu = htmlui.htmlui()   + show = '&nbsp;&nbsp;(<a href="cmd:show">%s</a>)' % _('show anyway')   if status in '?I':   if showanyway:   # Read untracked file contents from working directory @@ -320,11 +327,11 @@
  diff = _('<b>Contents are binary, not previewable</b>')   self.te.setHtml(diff)   else: - self.te.setText(diff) + diff = '<pre>%s</pre>' % xml_escape(diff) + self.te.setHtml(diff)   else: - diff = _('<b>Not displayed</b>') + diff = _('<b>Not displayed</b>') + show   self.te.setHtml(diff) - self.override.setEnabled(True)   return   elif status in '!C':   if showanyway: @@ -337,9 +344,8 @@
  else:   self.te.setText(diff)   else: - diff = _('<b>Not displayed</b>') + diff = _('<b>Not displayed</b>') + show   self.te.setHtml(diff) - self.override.setEnabled(True)   return   elif status in 'S':   if showanyway: @@ -367,19 +373,16 @@
  except error.RepoError:   diff = _('<b>Not an hg subrepo, not previewable</b>')   else: - diff = _('<b>Subrepository status not displayed</b>') + diff = _('<b>Subrepository status not displayed</b>') + show   self.te.setHtml(diff) - self.override.setEnabled(True)   return     warnings = chunkselect.check_max_diff(self.wctx, wfile)   if warnings and not showanyway: - text = '<b>Diffs not displayed: %s</b>' % warnings[1] + text = '<b>Diffs not displayed: %s</b>' % warnings[1] + show   self.te.setHtml(text) - self.override.setEnabled(True)   return   - self.override.setEnabled(False)   self.override.setChecked(True)     # Generate diffs to first parent