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 dbf9bd4d899d…

Parents 18ee8b422267…

Parents 79a5b5077fa4…

by Steve Borho

Changes to one file · Browse files at dbf9bd4d899d Showing diff from parent 18ee8b422267 79a5b5077fa4 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​annotate.py Stacked
 
171
172
173
174
175
176
177
178
 
 
 
 
179
180
181
182
183
184
185
186
 
 
 
 
 
 
 
 
 
 
 
 
 
187
188
189
 
171
172
173
 
 
 
 
 
174
175
176
177
178
 
 
 
 
 
 
 
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
@@ -171,19 +171,24 @@
  qtlib.ErrorMsgBox(_('Unable to annotate'),   _('%s is not found in revision %d') % (wfile, ctx.rev()))   return - self._rev = ctx.rev() - self.clear() - self.annfile = wfile - if util.binary(fctx.data()): - self.setText(_('File is binary.\n')) + + if fctx._filelog.rawsize(fctx.filerev()) > ctx._repo.maxdiff: + self.setText(_('File or diffs not displayed: ') + \ + _('File is larger than the specified max size.\n'))   else: - self.setText(hglib.tounicode(fctx.data())) - if line: - self.setCursorPosition(int(line) - 1, 0) - self._updatelexer(fctx) - self._updatemarginwidth() - self.sourceChanged.emit(wfile, self._rev) - self._updateannotation() + self._rev = ctx.rev() + self.clear() + self.annfile = wfile + if util.binary(fctx.data()): + self.setText(_('File is binary.\n')) + else: + self.setText(hglib.tounicode(fctx.data())) + if line: + self.setCursorPosition(int(line) - 1, 0) + self._updatelexer(fctx) + self._updatemarginwidth() + self.sourceChanged.emit(wfile, self._rev) + self._updateannotation()     def _updateannotation(self):   if not self.isAnnotationEnabled() or not self.annfile: