| 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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 return {} # No changes. | 168 return {} # No changes. |
| 169 unstaged_changes = {} | 169 unstaged_changes = {} |
| 170 for line in change_lines.split('\x00'): | 170 for line in change_lines.split('\x00'): |
| 171 assert len(line) >= 4, 'Unexpected change line format %s' % line | 171 assert len(line) >= 4, 'Unexpected change line format %s' % line |
| 172 if line[1] == ' ': | 172 if line[1] == ' ': |
| 173 continue # Already staged for commit. | 173 continue # Already staged for commit. |
| 174 path = line[3:] | 174 path = line[3:] |
| 175 unstaged_changes[path] = line[1] | 175 unstaged_changes[path] = line[1] |
| 176 return unstaged_changes | 176 return unstaged_changes |
| 177 | 177 |
| 178 def add_all(self, pathspec=None): | |
| 179 command = ['add', '--all'] | |
| 180 if pathspec: | |
| 181 command.append(pathspec) | |
| 182 return self._run_git(command) | |
| 183 | |
| 184 def add_list(self, paths, return_exit_code=False): | 178 def add_list(self, paths, return_exit_code=False): |
| 185 return self._run_git(['add'] + paths, return_exit_code=return_exit_code) | 179 return self._run_git(['add'] + paths, return_exit_code=return_exit_code) |
| 186 | 180 |
| 187 def delete_list(self, paths): | 181 def delete_list(self, paths): |
| 188 return self._run_git(['rm', '-f'] + paths) | 182 return self._run_git(['rm', '-f'] + paths) |
| 189 | 183 |
| 190 def move(self, origin, destination): | 184 def move(self, origin, destination): |
| 191 return self._run_git(['mv', '-f', origin, destination]) | 185 return self._run_git(['mv', '-f', origin, destination]) |
| 192 | 186 |
| 193 def exists(self, path): | 187 def exists(self, path): |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 412 if self.current_branch() != self._branch_tracking_remote_master(): | 406 if self.current_branch() != self._branch_tracking_remote_master(): |
| 413 return False | 407 return False |
| 414 if len(self._local_commits(self._branch_tracking_remote_master())) > 0: | 408 if len(self._local_commits(self._branch_tracking_remote_master())) > 0: |
| 415 return False | 409 return False |
| 416 return True | 410 return True |
| 417 | 411 |
| 418 def ensure_cleanly_tracking_remote_master(self): | 412 def ensure_cleanly_tracking_remote_master(self): |
| 419 self._discard_working_directory_changes() | 413 self._discard_working_directory_changes() |
| 420 self._run_git(['checkout', '-q', self._branch_tracking_remote_master()]) | 414 self._run_git(['checkout', '-q', self._branch_tracking_remote_master()]) |
| 421 self._discard_local_commits() | 415 self._discard_local_commits() |
| OLD | NEW |