diff options
Diffstat (limited to 'project.py')
-rwxr-xr-x | project.py | 19 |
1 files changed, 14 insertions, 5 deletions
@@ -230,6 +230,7 @@ class DiffColoring(Coloring): | |||
230 | def __init__(self, config): | 230 | def __init__(self, config): |
231 | Coloring.__init__(self, config, 'diff') | 231 | Coloring.__init__(self, config, 'diff') |
232 | self.project = self.printer('header', attr='bold') | 232 | self.project = self.printer('header', attr='bold') |
233 | self.fail = self.printer('fail', fg='red') | ||
233 | 234 | ||
234 | 235 | ||
235 | class _Annotation(object): | 236 | class _Annotation(object): |
@@ -1136,10 +1137,18 @@ class Project(object): | |||
1136 | cmd.append('--src-prefix=a/%s/' % self.relpath) | 1137 | cmd.append('--src-prefix=a/%s/' % self.relpath) |
1137 | cmd.append('--dst-prefix=b/%s/' % self.relpath) | 1138 | cmd.append('--dst-prefix=b/%s/' % self.relpath) |
1138 | cmd.append('--') | 1139 | cmd.append('--') |
1139 | p = GitCommand(self, | 1140 | try: |
1140 | cmd, | 1141 | p = GitCommand(self, |
1141 | capture_stdout=True, | 1142 | cmd, |
1142 | capture_stderr=True) | 1143 | capture_stdout=True, |
1144 | capture_stderr=True) | ||
1145 | except GitError as e: | ||
1146 | out.nl() | ||
1147 | out.project('project %s/' % self.relpath) | ||
1148 | out.nl() | ||
1149 | out.fail('%s', str(e)) | ||
1150 | out.nl() | ||
1151 | return False | ||
1143 | has_diff = False | 1152 | has_diff = False |
1144 | for line in p.process.stdout: | 1153 | for line in p.process.stdout: |
1145 | if not hasattr(line, 'encode'): | 1154 | if not hasattr(line, 'encode'): |
@@ -1150,7 +1159,7 @@ class Project(object): | |||
1150 | out.nl() | 1159 | out.nl() |
1151 | has_diff = True | 1160 | has_diff = True |
1152 | print(line[:-1]) | 1161 | print(line[:-1]) |
1153 | p.Wait() | 1162 | return p.Wait() == 0 |
1154 | 1163 | ||
1155 | 1164 | ||
1156 | # Publish / Upload ## | 1165 | # Publish / Upload ## |