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

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

Issue 2469153002: Remove remaining unused imports in webkitpy. (Closed)
Patch Set: Remove unused imports in webkitpy. Created 4 years, 1 month 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
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 12 matching lines...) Expand all
23 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 29
30 import datetime 30 import datetime
31 import re 31 import re
32 32
33 import webkitpy.common.config
34 from webkitpy.common.checkout.scm.scm import SCM 33 from webkitpy.common.checkout.scm.scm import SCM
35 from webkitpy.common.memoized import memoized 34 from webkitpy.common.memoized import memoized
36 from webkitpy.common.system.executive import Executive, ScriptError 35 from webkitpy.common.system.executive import Executive, ScriptError
37 36
38 37
39 class AmbiguousCommitError(Exception): 38 class AmbiguousCommitError(Exception):
40 39
41 def __init__(self, num_local_commits, has_working_directory_changes): 40 def __init__(self, num_local_commits, has_working_directory_changes):
42 Exception.__init__(self, "Found %s local commits and the working directo ry is %s" % ( 41 Exception.__init__(self, "Found %s local commits and the working directo ry is %s" % (
43 num_local_commits, ["clean", "not clean"][has_working_directory_chan ges])) 42 num_local_commits, ["clean", "not clean"][has_working_directory_chan ges]))
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 if self.current_branch() != self._branch_tracking_remote_master(): 330 if self.current_branch() != self._branch_tracking_remote_master():
332 return False 331 return False
333 if len(self._local_commits(self._branch_tracking_remote_master())) > 0: 332 if len(self._local_commits(self._branch_tracking_remote_master())) > 0:
334 return False 333 return False
335 return True 334 return True
336 335
337 def ensure_cleanly_tracking_remote_master(self): 336 def ensure_cleanly_tracking_remote_master(self):
338 self._discard_working_directory_changes() 337 self._discard_working_directory_changes()
339 self._run_git(['checkout', '-q', self._branch_tracking_remote_master()]) 338 self._run_git(['checkout', '-q', self._branch_tracking_remote_master()])
340 self._discard_local_commits() 339 self._discard_local_commits()
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698