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

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

Issue 2713383002: Fix rebaseline bug when new files are under untracked directories (Closed)
Patch Set: --untracked-files=all Created 3 years, 9 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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 156
157 def unstaged_changes(self): 157 def unstaged_changes(self):
158 """Lists files with unstaged changes, including untracked files. 158 """Lists files with unstaged changes, including untracked files.
159 159
160 Returns a dict mapping modified file paths (relative to checkout root) 160 Returns a dict mapping modified file paths (relative to checkout root)
161 to one-character codes identifying the change, e.g. 'M' for modified, 161 to one-character codes identifying the change, e.g. 'M' for modified,
162 'D' for deleted, '?' for untracked. 162 'D' for deleted, '?' for untracked.
163 """ 163 """
164 # `git status -z` is a version of `git status -s`, that's recommended 164 # `git status -z` is a version of `git status -s`, that's recommended
165 # for machine parsing. Lines are terminated with NUL rather than LF. 165 # for machine parsing. Lines are terminated with NUL rather than LF.
166 change_lines = self._run_git(['status', '-z']).rstrip('\x00') 166 change_lines = self._run_git(['status', '-z', '--untracked-files=all']). rstrip('\x00')
167 if not change_lines: 167 if not change_lines:
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
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
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()
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