tools/sync-webkit-git.py - Issue 8678023: Fix python scripts in src/tools/

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: tools/sync-webkit-git.py

Issue 8678023: Fix python scripts in src/tools/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 9 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 | Annotate | Revision Log

« tools/site_compare/site_compare.py ('K') | « tools/symsrc/source_index.py ('k') | tools/traceline/traceline/scripts/__init__.py » ('j') | no next file with comments »

OLD	NEW
1 #!/usr/bin/python	1 #!/usr/bin/env python

2 # Copyright (c) 2011 The Chromium Authors. All rights reserved.	2 # Copyright (c) 2011 The Chromium Authors. All rights reserved.

3 # Use of this source code is governed by a BSD-style license that can be	3 # Use of this source code is governed by a BSD-style license that can be

4 # found in the LICENSE file.	4 # found in the LICENSE file.

5	5

6 """Update third_party/WebKit using git.	6 """Update third_party/WebKit using git.

7	7

8 Under the assumption third_party/WebKit is a clone of git.webkit.org,	8 Under the assumption third_party/WebKit is a clone of git.webkit.org,

9 we can use git commands to make it match the version requested by DEPS.	9 we can use git commands to make it match the version requested by DEPS.

10	10

11 See http://code.google.com/p/chromium/wiki/UsingWebKitGit for details on	11 See http://code.google.com/p/chromium/wiki/UsingWebKitGit for details on

(...skipping 162 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
174 webkit_rev = GetWebKitRev()	174 webkit_rev = GetWebKitRev()

175 print 'Desired revision: r%s.' % webkit_rev	175 print 'Desired revision: r%s.' % webkit_rev

176 os.chdir('third_party/WebKit')	176 os.chdir('third_party/WebKit')

177 magic_gclient_branch = GetGClientBranchName()	177 magic_gclient_branch = GetGClientBranchName()

178 changed = UpdateGClientBranch(webkit_rev, magic_gclient_branch)	178 changed = UpdateGClientBranch(webkit_rev, magic_gclient_branch)

179 if changed:	179 if changed:

180 return UpdateCurrentCheckoutIfAppropriate(magic_gclient_branch)	180 return UpdateCurrentCheckoutIfAppropriate(magic_gclient_branch)

181 else:	181 else:

182 print "Already on correct revision."	182 print "Already on correct revision."

183 return 0	183 return 0

184	184
	Alexander Potapenko 2011/11/24 07:53:02 Add a blank line here. Add a blank line here.
185 if __name__ == '__main__':	185 if __name__ == '__main__':

186 sys.exit(main())	186 sys.exit(main())

OLD	NEW