| 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 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 # Special-case <refname>.. to include working copy changes, e.g., 'H
EAD....' shows only the diffs from HEAD. | 230 # Special-case <refname>.. to include working copy changes, e.g., 'H
EAD....' shows only the diffs from HEAD. |
| 231 if git_commit.endswith('....'): | 231 if git_commit.endswith('....'): |
| 232 return git_commit[:-4] | 232 return git_commit[:-4] |
| 233 | 233 |
| 234 if '..' not in git_commit: | 234 if '..' not in git_commit: |
| 235 git_commit = git_commit + "^.." + git_commit | 235 git_commit = git_commit + "^.." + git_commit |
| 236 return git_commit | 236 return git_commit |
| 237 | 237 |
| 238 return self._remote_merge_base() | 238 return self._remote_merge_base() |
| 239 | 239 |
| 240 def changed_files(self, git_commit=None): | 240 def changed_files(self, git_commit=None, diff_filter='ADM'): |
| 241 # FIXME: --diff-filter could be used to avoid the "extract_filenames" st
ep. | 241 # FIXME: --diff-filter could be used to avoid the "extract_filenames" st
ep. |
| 242 status_command = ['diff', '-r', '--name-status', | 242 status_command = ['diff', '-r', '--name-status', |
| 243 "--no-renames", "--no-ext-diff", "--full-index", self.
_merge_base(git_commit)] | 243 "--no-renames", "--no-ext-diff", "--full-index", self.
_merge_base(git_commit)] |
| 244 # FIXME: I'm not sure we're returning the same set of files that SVN.cha
nged_files is. | 244 # FIXME: I'm not sure we're returning the same set of files that SVN.cha
nged_files is. |
| 245 # Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R) | 245 # Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R) |
| 246 return self._run_status_and_extract_filenames(status_command, self._stat
us_regexp("ADM")) | 246 return self._run_status_and_extract_filenames(status_command, self._stat
us_regexp(diff_filter)) |
| 247 | 247 |
| 248 def added_files(self): | 248 def added_files(self): |
| 249 return self._run_status_and_extract_filenames(self.status_command(), sel
f._status_regexp("A")) | 249 return self._run_status_and_extract_filenames(self.status_command(), sel
f._status_regexp("A")) |
| 250 | 250 |
| 251 def _run_status_and_extract_filenames(self, status_command, status_regexp): | 251 def _run_status_and_extract_filenames(self, status_command, status_regexp): |
| 252 filenames = [] | 252 filenames = [] |
| 253 # We run with cwd=self.checkout_root so that returned-paths are root-rel
ative. | 253 # We run with cwd=self.checkout_root so that returned-paths are root-rel
ative. |
| 254 for line in self._run_git(status_command, cwd=self.checkout_root).splitl
ines(): | 254 for line in self._run_git(status_command, cwd=self.checkout_root).splitl
ines(): |
| 255 match = re.search(status_regexp, line) | 255 match = re.search(status_regexp, line) |
| 256 if not match: | 256 if not match: |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 412 if self.current_branch() != self._branch_tracking_remote_master(): | 412 if self.current_branch() != self._branch_tracking_remote_master(): |
| 413 return False | 413 return False |
| 414 if len(self._local_commits(self._branch_tracking_remote_master())) > 0: | 414 if len(self._local_commits(self._branch_tracking_remote_master())) > 0: |
| 415 return False | 415 return False |
| 416 return True | 416 return True |
| 417 | 417 |
| 418 def ensure_cleanly_tracking_remote_master(self): | 418 def ensure_cleanly_tracking_remote_master(self): |
| 419 self._discard_working_directory_changes() | 419 self._discard_working_directory_changes() |
| 420 self._run_git(['checkout', '-q', self._branch_tracking_remote_master()]) | 420 self._run_git(['checkout', '-q', self._branch_tracking_remote_master()]) |
| 421 self._discard_local_commits() | 421 self._discard_local_commits() |
| OLD | NEW |