Commit 05418890 authored by Kai Willadsen's avatar Kai Willadsen

Support passing along a bunch of metadata to tab creation

The goal of this is to allow some degree of parent-child communication,
mostly for file comparisons launched from VC tabs.
parent 97f368c7
......@@ -196,6 +196,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):'file-changed', self.notify_file_changed)
self._keymask = 0
self.meta = {}
self.deleted_lines_pending = -1
self.textview_overwrite = 0
self.focus_pane = None
......@@ -1229,6 +1230,9 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
for i in self._diff_files():
yield i
def set_meta(self, meta):
self.meta = meta
def notify_file_changed(self, data):
pane = [ for b in self.textbuffer].index(data)
......@@ -598,13 +598,15 @@ class MeldWindow(gnomeglade.Component):
return doc
def append_filediff(self, files, merge_output=None):
def append_filediff(self, files, merge_output=None, meta=None):
assert len(files) in (1, 2, 3)
doc = filediff.FileDiff(len(files))
self._append_page(doc, "text-x-generic")
if merge_output is not None:
if meta is not None:
return doc
def append_filemerge(self, files, merge_output=None):
......@@ -617,7 +619,7 @@ class MeldWindow(gnomeglade.Component):
return doc
def append_diff(self, paths, auto_compare=False, auto_merge=False,
merge_output=None, meta=None):
dirslist = [p for p in paths if os.path.isdir(p)]
fileslist = [p for p in paths if os.path.isfile(p)]
if dirslist and fileslist:
......@@ -628,7 +630,8 @@ class MeldWindow(gnomeglade.Component):
elif auto_merge:
return self.append_filemerge(paths, merge_output=merge_output)
return self.append_filediff(paths, merge_output=merge_output)
return self.append_filediff(
paths, merge_output=merge_output, meta=meta)
def append_vcview(self, location, auto_compare=False):
doc = vcview.VcView()
......@@ -678,7 +681,8 @@ class MeldWindow(gnomeglade.Component):
tab = self.append_vcview(a, auto_compare)
elif len(paths) in (2, 3):
tab = self.append_diff(paths, auto_compare, auto_merge)
tab = self.append_diff(
paths, auto_compare=auto_compare, auto_merge=auto_merge)
if tab:
if focus:
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