From 139ddc681f9a8e10a967aacd17202db1d3f13011 Mon Sep 17 00:00:00 2001 From: Andrew Hamilton Date: Thu, 18 Jul 2019 13:17:23 +1000 Subject: [PATCH] tools: Fix git_blame and git_log results not displaying correctly. --- eris/tools.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eris/tools.py b/eris/tools.py index d804cd4..41beeda 100644 --- a/eris/tools.py +++ b/eris/tools.py @@ -407,8 +407,8 @@ def git_blame(path): "--color-by-age", path], text=True, capture_output=True) status = (Status.normal if process.returncode == 0 else Status.not_applicable) - return status, fill3.Fixed(termstr.TermStr.from_term( - process.stdout + process.stderr). splitlines()) + return status, fill3.Text(termstr.TermStr.from_term( + process.stdout + process.stderr)) @deps(deps={"git"}, url="https://git-scm.com/docs/git-log", @@ -419,8 +419,8 @@ def git_log(path): capture_output=True) status = (Status.normal if process.returncode == 0 else Status.not_applicable) - return status, fill3.Fixed(termstr.TermStr.from_term( - process.stdout + process.stderr). splitlines()) + return status, fill3.Text(termstr.TermStr.from_term( + process.stdout + process.stderr)) @deps(deps={"tidy"}, url="tidy", executables={"tidy"})