| OLD | NEW |
| 1 # Copyright (c) 2009, 2010, 2011 Google Inc. All rights reserved. | 1 # Copyright (c) 2009, 2010, 2011 Google Inc. All rights reserved. |
| 2 # Copyright (c) 2009 Apple Inc. All rights reserved. | 2 # Copyright (c) 2009 Apple Inc. All rights reserved. |
| 3 # | 3 # |
| 4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
| 5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
| 6 # met: | 6 # met: |
| 7 # | 7 # |
| 8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
| 9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
| 10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
| (...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 293 self._run_git(['pull']) | 293 self._run_git(['pull']) |
| 294 | 294 |
| 295 def latest_git_commit(self): | 295 def latest_git_commit(self): |
| 296 return self._run_git(['log', '-1', '--format=%H']).strip() | 296 return self._run_git(['log', '-1', '--format=%H']).strip() |
| 297 | 297 |
| 298 def git_commits_since(self, commit): | 298 def git_commits_since(self, commit): |
| 299 return self._run_git(['log', commit + '..master', '--format=%H', '--reve
rse']).split() | 299 return self._run_git(['log', commit + '..master', '--format=%H', '--reve
rse']).split() |
| 300 | 300 |
| 301 def git_commit_detail(self, commit, log_format=None): | 301 def git_commit_detail(self, commit, log_format=None): |
| 302 args = ['log', '-1', commit] | 302 args = ['log', '-1', commit] |
| 303 if log_format: | 303 if format: |
| 304 args.append('--format=' + log_format) | 304 args.append('--format=' + log_format) |
| 305 return self._run_git(args) | 305 return self._run_git(args) |
| 306 | 306 |
| 307 def affected_files(self, commit): | 307 def affected_files(self, commit): |
| 308 output = self._run_git(['log', '-1', '--format=', '--name-only', commit]
) | 308 output = self._run_git(['log', '-1', '--format=', '--name-only', commit]
) |
| 309 return output.strip().split('\n') | 309 return output.strip().split('\n') |
| 310 | 310 |
| 311 def _branch_tracking_remote_master(self): | 311 def _branch_tracking_remote_master(self): |
| 312 origin_info = self._run_git(['remote', 'show', 'origin', '-n']) | 312 origin_info = self._run_git(['remote', 'show', 'origin', '-n']) |
| 313 match = re.search(r"^\s*(?P<branch_name>\S+)\s+merges with remote master
$", origin_info, re.MULTILINE) | 313 match = re.search(r"^\s*(?P<branch_name>\S+)\s+merges with remote master
$", origin_info, re.MULTILINE) |
| (...skipping 11 matching lines...) Expand all Loading... |
| 325 return False | 325 return False |
| 326 return True | 326 return True |
| 327 | 327 |
| 328 def ensure_cleanly_tracking_remote_master(self): | 328 def ensure_cleanly_tracking_remote_master(self): |
| 329 self._discard_working_directory_changes() | 329 self._discard_working_directory_changes() |
| 330 self._run_git(['checkout', '-q', self._branch_tracking_remote_master()]) | 330 self._run_git(['checkout', '-q', self._branch_tracking_remote_master()]) |
| 331 self._discard_local_commits() | 331 self._discard_local_commits() |
| 332 | 332 |
| 333 def get_issue_number(self): | 333 def get_issue_number(self): |
| 334 return str(self._run_git(['cl', 'issue']).split()[2]) | 334 return str(self._run_git(['cl', 'issue']).split()[2]) |
| OLD | NEW |