96   def __init__(self, returncode, cmd, cwd, stdout, stderr):  argument
100     self.cwd = cwd
107             (self.cmd, self.returncode, self.cwd, self.stdout, self.stderr))
114 def GetCommandStdout(args, cwd=REPOSITORY_ROOT, ignore_errors=False):  argument
129   p = subprocess.Popen(args=args, cwd=cwd, stdout=subprocess.PIPE,
135     raise CommandError(p.returncode, ' '.join(args), cwd, stdout, stderr)
139                                    cwd=REPOSITORY_ROOT):  argument
152   status = GetCommandStdout(['git', 'status', '--porcelain'], cwd=cwd)
159                      conflicts_deleted_by_us, cwd=cwd)
170     GetCommandStdout(['git', 'add', '-f'] + conflicts_renamed_by_them, cwd=cwd)
173     status = GetCommandStdout(['git', 'status', '--porcelain'], cwd=cwd)
179       GetCommandStdout(['git', 'reset', '--hard'], cwd=cwd)
189   GetCommandStdout(['git', 'commit', '-m', commit_message], cwd=cwd)