OpenGrok
Home
Sort by relevance
Sort by last modified time
Full Search
Definition
Symbol
File Path
History
|
|
Help
Searched
full:merge_common
(Results
1 - 2
of
2
) sorted by null
/frameworks/webview/chromium/tools/
merge_to_master.py
26
import
merge_common
namespace
40
for path in
merge_common
.PROJECTS_WITH_FLAT_HISTORY:
41
dest_dir = os.path.join(
merge_common
.REPOSITORY_ROOT, path)
42
merge_common
.GetCommandStdout(['git', 'remote', 'update',
44
merge_common
.GetCommandStdout(['git', 'checkout',
47
merge_common
.GetCommandStdout(['git', 'fetch', 'history',
50
merge_sha1 =
merge_common
.GetCommandStdout(['git', 'rev-parse',
53
old_sha1 =
merge_common
.GetCommandStdout(['git', 'rev-parse', 'HEAD'],
60
if
merge_common
.GetCommandStdout(['git', 'rev-list', '-1',
64
merge_common
.GetCommandStdout(['git', 'merge', '--no-commit', '--squash'
[
all
...]
merge_from_chromium.py
27
import
merge_common
namespace
51
merge_common
.GetCommandStdout(['git', 'fetch', '-f', git_url, git_branch])
52
return
merge_common
.GetCommandStdout(['git', 'show', '%s:%s' % (sha1, path)])
120
raise
merge_common
.TemporaryMergeError(
165
merge_info = _GetProjectMergeInfo(
merge_common
.THIRD_PARTY_PROJECTS,
173
dest_dir = os.path.join(
merge_common
.REPOSITORY_ROOT, path)
178
merge_common
.GetCommandStdout(['git', 'checkout',
184
merge_common
.GetCommandStdout(['git', 'fetch', url, sha1], cwd=dest_dir)
185
if
merge_common
.GetCommandStdout(['git', 'rev-list', '-1', 'HEAD..' + sha1],
189
merge_common
.GetCommandStdout(['git', 'merge', '--no-commit', sha1]
[
all
...]
Completed in 46 milliseconds