Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.3, 2.0, and 2.0.1

stable fileview: do not show contents of deleted binary files (closes #115)

Changeset 99e0c4546e0c…

Parent 395c8e21d348…

by Steve Borho

Changes to one file · Browse files at 99e0c4546e0c Showing diff from parent 395c8e21d348 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
 
616
617
618
619
620
 
 
 
 
 
621
622
623
 
616
617
618
 
 
619
620
621
622
623
624
625
626
@@ -616,8 +616,11 @@
    if status in ('R', '!'):   if wfile in ctx.p1(): - newdata = ctx.p1()[wfile].data() - self.contents = hglib.tounicode(newdata) + olddata = ctx.p1()[wfile].data() + if '\0' in olddata: + self.error = 'binary file' + else: + self.contents = hglib.tounicode(olddata)   self.flabel += _(' <i>(was deleted)</i>')   else:   self.flabel += _(' <i>(was added, now missing)</i>')