[meld] filediff: Show line ending difference in file identical notification
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] filediff: Show line ending difference in file identical notification
- Date: Sat, 7 Feb 2015 23:45:59 +0000 (UTC)
commit cf3017d6e723d3a526a06ad5322b704a91bc5184
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun Feb 8 09:14:24 2015 +1000
filediff: Show line ending difference in file identical notification
meld/filediff.py | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 5d516c7..9a2d733 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1429,11 +1429,30 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
# better if we only showed this message if the filters *did*
# change the text in question.
active_filters = any([f.active for f in self.text_filters])
+
+ bufs = self.textbuffer[:self.num_panes]
+ newlines = [b.data.newlines for b in bufs]
+ different_newlines = not misc.all_same(newlines)
+
if active_filters:
secondary_text = _("Text filters are being used, and may "
"be masking differences between files. "
"Would you like to compare the "
"unfiltered files?")
+ elif different_newlines:
+ primary = _("Files differ in line endings only")
+ secondary_text = _(
+ "Files are identical except for differing line "
+ "endings:\n%s")
+
+ labels = [b.data.label for b in bufs]
+ newline_types = [
+ n if isinstance(n, tuple) else (n,) for n in newlines]
+ newline_strings = []
+ for label, nl_types in zip(labels, newline_types):
+ nl_string = ", ".join(NEWLINES[n] for n in nl_types)
+ newline_strings.append("\t%s: %s" % (label, nl_string))
+ secondary_text %= "\n".join(newline_strings)
msgarea = mgr.new_from_text_and_icon(
Gtk.STOCK_INFO, primary, secondary_text)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]