##// END OF EJS Templates
Prevent type exception on concatenation if diffstat returns None....
Sean Dague -
r4077:1305ba7d default
parent child Browse files
Show More
@@ -241,7 +241,9 b' class notifier(object):'
241 difflines = self.ui.popbuffer().splitlines(1)
241 difflines = self.ui.popbuffer().splitlines(1)
242 if self.ui.configbool('notify', 'diffstat', True):
242 if self.ui.configbool('notify', 'diffstat', True):
243 s = patch.diffstat(difflines)
243 s = patch.diffstat(difflines)
244 self.ui.write('\ndiffstat:\n\n' + s)
244 # s may be nil, don't include the header if it is
245 if s:
246 self.ui.write('\ndiffstat:\n\n%s' % s)
245 if maxdiff > 0 and len(difflines) > maxdiff:
247 if maxdiff > 0 and len(difflines) > maxdiff:
246 self.ui.write(_('\ndiffs (truncated from %d to %d lines):\n\n') %
248 self.ui.write(_('\ndiffs (truncated from %d to %d lines):\n\n') %
247 (len(difflines), maxdiff))
249 (len(difflines), maxdiff))
General Comments 0
You need to be logged in to leave comments. Login now