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

status: add (currently ineffectual) 'show contents' button

Only visible when file contents are normally not shown. The button should be
used to override all checks that prevent data from being shown to the user.
Large or binary diffs, missing, unknown, ignored, or clean files.

Changeset 79bd4dd3a480…

Parent c0ae1e4496bd…

by Steve Borho

Changes to one file · Browse files at 79bd4dd3a480 Showing diff from parent c0ae1e4496bd Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
141
142
143
144
 
145
 
 
 
 
146
147
148
 
217
218
219
220
221
222
223
 
224
225
226
227
 
228
229
230
231
232
233
 
234
235
 
236
237
238
 
141
142
143
 
144
145
146
147
148
149
150
151
152
 
221
222
223
 
 
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
@@ -141,8 +141,12 @@
  docf.setLayout(vbox)   hbox = QHBoxLayout()   hbox.setContentsMargins (5, 7, 0, 0) - self.fnamelabel = QLabel('<insert filename here>') + self.fnamelabel = QLabel()   hbox.addWidget(self.fnamelabel) + hbox.addStretch() + self.override = QPushButton(_('Show Contents')) + hbox.addWidget(self.override) + self.override.setVisible(False)     self.te = QTextEdit()   self.te.document().setDefaultStyleSheet(qtlib.thgstylesheet) @@ -217,22 +221,24 @@
  self.fnamelabel.setText(statusMessage(status, mst, upath))     if status in '?IC': - # TODO: Display file contents if a button clicked, - # add to a toolbar above the diff panel   diff = _('<em>No displayable differences</em>')   self.te.setHtml(diff) + self.override.setVisible(True)   return   elif status in '!':   diff = _('<em>No displayable differences</em>')   self.te.setHtml(diff) + self.override.setVisible(True)   return     warnings = chunkselect.check_max_diff(self.wctx, wfile)   if warnings:   text = '<b>Diffs not displayed: %s</b>' % warnings[1]   self.te.setHtml(text) + self.override.setVisible(True)   return   + self.override.setVisible(False)   if self.isMerge():   header = _('===== Diff to first parent %d:%s =====\n') % (   self.wctx.p1().rev(), str(self.wctx.p1()))