Commit b38020a
Sverre Rabbelier
Improved the GIT_PYTHON_TRACE=full output format
It now also shows stderr if there was any on it, and only
shows stdout if there was any output. Also added a '->'
between the command and the return value as a visual clue.1 parent 9b63b3b commit b38020a
1 file changed
Lines changed: 10 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -107,6 +107,10 @@ def execute(self, command, | |||
| 107 | 107 | status = proc.wait() | |
| 108 | 108 | proc.stdout.close() | |
| 109 | 109 | ||
| 110 | + if proc.stderr: | ||
| 111 | + stderr_value = proc.stderr.read() | ||
| 112 | + proc.stderr.close() | ||
| 113 | + | ||
| 110 | 114 | # Strip off trailing whitespace by default | |
| 111 | 115 | if not with_raw_output: | |
| 112 | 116 | stdout_value = stdout_value.rstrip() | |
@@ -118,7 +122,12 @@ def execute(self, command, | |||
| 118 | 122 | % (str(command), status)) | |
| 119 | 123 | ||
| 120 | 124 | if GIT_PYTHON_TRACE == 'full': | |
| 121 | - print "%s %d: '%s'" % (command, status, stdout_value) | ||
| 125 | + if stderr_value: | ||
| 126 | + print "%s -> %d: '%s' !! '%s'" % (command, status, stdout_value, stderr_value) | ||
| 127 | + elif stdout_value: | ||
| 128 | + print "%s -> %d: '%s'" % (command, status, stdout_value) | ||
| 129 | + else: | ||
| 130 | + print "%s -> %d" % (command, status) | ||
| 122 | 131 | ||
| 123 | 132 | # Allow access to the command's status code | |
| 124 | 133 | if with_status: | |
0 commit comments