third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/git.py - Issue 2680173002: Move webkitpy/common/checkout/scm/* -> webkitpy/common/checkout/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2680173002: Move webkitpy/common/checkout/scm/* -> webkitpy/common/checkout/. (Closed)

Patch Set: Created 3 years, 10 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 | third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/git_mock.py » ('j') | no next file with comments »

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 401 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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()

OLD	NEW