Commits

Yuya Nishihara committed 3f240b2

filedata: prepend diff header only if diff text is not empty (fixes #2462)

It acted as such before 0041b29c4b8b.

Comments (0)

Files changed (1)

tortoisehg/hgqt/filedata.py

             if isbfile:
                 olddata += '\0'
                 newdata += '\0'
-            self.diff = 'diff -r %s -r %s %s\n' % (ctx, ctx2, oldname)
-            self.diff += mdiff.unidiff(olddata, olddate, newdata, newdate,
-                                       oldname, wfile, opts=diffopts)
+            difftext = mdiff.unidiff(olddata, olddate, newdata, newdate,
+                                     oldname, wfile, opts=diffopts)
+            if difftext:
+                self.diff = ('diff -r %s -r %s %s\n' % (ctx, ctx2, oldname)
+                             + difftext)
+            else:
+                self.diff = ''
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.