[meld: 7/63] filediff, filemerge: Fix auto-merge mode for file loading changes
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld: 7/63] filediff, filemerge: Fix auto-merge mode for file loading changes
- Date: Wed, 16 Dec 2015 21:19:33 +0000 (UTC)
commit 299294bbf0e09950c04880041526f92f3e3e9bc1
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun Jul 19 09:59:57 2015 +1000
filediff, filemerge: Fix auto-merge mode for file loading changes
meld/filediff.py | 6 +++++-
meld/filemerge.py | 2 ++
2 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index e7d5182..b75ac01 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1106,7 +1106,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
buf.data.loaded = True
if all(b.data.loaded for b in self.textbuffer[:self.num_panes]):
- self.scheduler.add_task(self._diff_files())
+ self.scheduler.add_task(self._compare_files_internal())
def _diff_files(self, refresh=False):
yield _("[%s] Computing differences") % self.label_text
@@ -1157,6 +1157,10 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
for i in self._load_files(files, self.textbuffer):
yield i
+ def _compare_files_internal(self):
+ for i in self._diff_files():
+ yield i
+
def set_meta(self, meta):
self.meta = meta
labels = meta.get('labels', ())
diff --git a/meld/filemerge.py b/meld/filemerge.py
index a1c27f4..9f2e85c 100644
--- a/meld/filemerge.py
+++ b/meld/filemerge.py
@@ -38,6 +38,8 @@ class FileMerge(filediff.FileDiff):
self.textview[1].set_buffer(meldbuffer.MeldBuffer())
for i in self._load_files(files, self.textbuffer):
yield i
+
+ def _compare_files_internal(self):
for i in self._merge_files():
yield i
self.textview[1].set_buffer(self.textbuffer[1])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]