aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libbe/diff.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/libbe/diff.py b/libbe/diff.py
index 46b8bda..b3cd6bc 100644
--- a/libbe/diff.py
+++ b/libbe/diff.py
@@ -210,12 +210,15 @@ class DiffTree (tree.Tree):
raise KeyError, "%s doesn't match '%s'" % (names, self.name)
raise KeyError, "%s points to child not in %s" % (names, [c.name for c in self])
def report_string(self):
- return "\n".join(self.report())
+ report = self.report()
+ if report == None:
+ return ''
+ return '\n'.join(report)
def report(self, root=None, parent=None, depth=0):
if root == None:
root = self.make_root()
if self.masked == True:
- return None
+ return root
data_part = self.data_part(depth)
if self.requires_children == True \
and len([c for c in self if c.masked == False]) == 0: