Commit 299294bb authored by Kai Willadsen's avatar Kai Willadsen

filediff, filemerge: Fix auto-merge mode for file loading changes

parent 96d6cc7c
......@@ -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', ())
......
......@@ -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])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment