mojo/tools/roll/update_from_chromium.py - Issue 946243002: Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b

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: mojo/tools/roll/update_from_chromium.py

Issue 946243002: Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Fix git cl upload to include ots Created 5 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

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

2 # Copyright 2014 The Chromium Authors. All rights reserved.	2 # Copyright 2014 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 import argparse	6 import argparse

7 import json	7 import json

8 import os	8 import os

9 import subprocess	9 import subprocess

10 import sys	10 import sys

(...skipping 30 matching lines...) Expand all Loading...
41 "third_party/jstemplate",	41 "third_party/jstemplate",

42 "third_party/khronos",	42 "third_party/khronos",

43 "third_party/libXNVCtrl",	43 "third_party/libXNVCtrl",

44 "third_party/libevent",	44 "third_party/libevent",

45 "third_party/libjpeg",	45 "third_party/libjpeg",

46 "third_party/libpng",	46 "third_party/libpng",

47 "third_party/libxml",	47 "third_party/libxml",

48 "third_party/markupsafe",	48 "third_party/markupsafe",

49 "third_party/mesa",	49 "third_party/mesa",

50 "third_party/modp_b64",	50 "third_party/modp_b64",

	51 "third_party/ots",

51 "third_party/ply",	52 "third_party/ply",

52 "third_party/protobuf",	53 "third_party/protobuf",

53 "third_party/pymock",	54 "third_party/pymock",

54 "third_party/qcms",	55 "third_party/qcms",

55 "third_party/re2",	56 "third_party/re2",

56 "third_party/sfntly",	57 "third_party/sfntly",

57 "third_party/smhasher",	58 "third_party/smhasher",

58 "third_party/tcmalloc",	59 "third_party/tcmalloc",

59 "third_party/yasm",	60 "third_party/yasm",

60 "third_party/zlib",	61 "third_party/zlib",

(...skipping 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
128	129

129 print "Restoring files whose contents don't track Chromium"	130 print "Restoring files whose contents don't track Chromium"

130 for f in files_not_to_roll:	131 for f in files_not_to_roll:

131 system(["git", "checkout", pre_roll_commit, "--", f], cwd=mojo_root_dir)	132 system(["git", "checkout", pre_roll_commit, "--", f], cwd=mojo_root_dir)

132 if files_not_to_roll:	133 if files_not_to_roll:

133 commit("Restored pre-roll versions of files that don't get rolled")	134 commit("Restored pre-roll versions of files that don't get rolled")

134 return 0	135 return 0

135	136

136 if __name__ == "__main__":	137 if __name__ == "__main__":

137 sys.exit(main())	138 sys.exit(main())

OLD	NEW

« no previous file with comments | « mojo/tools/roll/net_sql.patch ('k') | sandbox/linux/BUILD.gn » ('j') | no next file with comments »