| 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 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 323 if self.current_branch() != self._branch_tracking_remote_master(): | 323 if self.current_branch() != self._branch_tracking_remote_master(): |
| 324 return False | 324 return False |
| 325 if len(self._local_commits(self._branch_tracking_remote_master())) > 0: | 325 if len(self._local_commits(self._branch_tracking_remote_master())) > 0: |
| 326 return False | 326 return False |
| 327 return True | 327 return True |
| 328 | 328 |
| 329 def ensure_cleanly_tracking_remote_master(self): | 329 def ensure_cleanly_tracking_remote_master(self): |
| 330 self._discard_working_directory_changes() | 330 self._discard_working_directory_changes() |
| 331 self._run_git(['checkout', '-q', self._branch_tracking_remote_master()]) | 331 self._run_git(['checkout', '-q', self._branch_tracking_remote_master()]) |
| 332 self._discard_local_commits() | 332 self._discard_local_commits() |
| 333 |
| 334 def get_issue_number(self): |
| 335 return str(self._run_git(['cl', 'issue']).split()[2]) |
| OLD | NEW |