Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(208)

Side by Side Diff: third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/git.py

Issue 2636453005: Follow-up fix to Git module. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 return git_commit[:-4] 204 return git_commit[:-4]
205 205
206 if '..' not in git_commit: 206 if '..' not in git_commit:
207 git_commit = git_commit + "^.." + git_commit 207 git_commit = git_commit + "^.." + git_commit
208 return git_commit 208 return git_commit
209 209
210 return self._remote_merge_base() 210 return self._remote_merge_base()
211 211
212 def changed_files(self, git_commit=None): 212 def changed_files(self, git_commit=None):
213 # FIXME: --diff-filter could be used to avoid the "extract_filenames" st ep. 213 # FIXME: --diff-filter could be used to avoid the "extract_filenames" st ep.
214 status_command = [self.executable_name, 'diff', '-r', '--name-status', 214 status_command = ['diff', '-r', '--name-status',
215 "--no-renames", "--no-ext-diff", "--full-index", self. _merge_base(git_commit)] 215 "--no-renames", "--no-ext-diff", "--full-index", self. _merge_base(git_commit)]
216 # FIXME: I'm not sure we're returning the same set of files that SVN.cha nged_files is. 216 # FIXME: I'm not sure we're returning the same set of files that SVN.cha nged_files is.
217 # Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R) 217 # Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R)
218 return self._run_status_and_extract_filenames(status_command, self._stat us_regexp("ADM")) 218 return self._run_status_and_extract_filenames(status_command, self._stat us_regexp("ADM"))
219 219
220 def added_files(self): 220 def added_files(self):
221 return self._run_status_and_extract_filenames(self.status_command(), sel f._status_regexp("A")) 221 return self._run_status_and_extract_filenames(self.status_command(), sel f._status_regexp("A"))
222 222
223 def _run_status_and_extract_filenames(self, status_command, status_regexp): 223 def _run_status_and_extract_filenames(self, status_command, status_regexp):
224 filenames = [] 224 filenames = []
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 if self.current_branch() != self._branch_tracking_remote_master(): 384 if self.current_branch() != self._branch_tracking_remote_master():
385 return False 385 return False
386 if len(self._local_commits(self._branch_tracking_remote_master())) > 0: 386 if len(self._local_commits(self._branch_tracking_remote_master())) > 0:
387 return False 387 return False
388 return True 388 return True
389 389
390 def ensure_cleanly_tracking_remote_master(self): 390 def ensure_cleanly_tracking_remote_master(self):
391 self._discard_working_directory_changes() 391 self._discard_working_directory_changes()
392 self._run_git(['checkout', '-q', self._branch_tracking_remote_master()]) 392 self._run_git(['checkout', '-q', self._branch_tracking_remote_master()])
393 self._discard_local_commits() 393 self._discard_local_commits()
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698