bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Force revert local changes when using the --force-clean switch (issue #1300). 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1720 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2014-06-06 19:14:56 +00:00
parent 62d9365b51
commit 3da202a5b9
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/automate/automate-git.py
View File

@ -650,7 +650,9 @@ if not options.noupdate and os.path.exists(cef_dir):
run('%s fetch' % (git_exe), cef_dir, depot_tools_dir) run('%s fetch' % (git_exe), cef_dir, depot_tools_dir)
# Checkout the requested branch. # Checkout the requested branch.
run('%s checkout %s' % (git_exe, cef_checkout), cef_dir, depot_tools_dir) run('%s checkout %s%s' %
(git_exe, ('--force ' if options.forceclean else ''), cef_checkout), \
cef_dir, depot_tools_dir)
else: else:
cef_current_info = get_svn_info(cef_dir) cef_current_info = get_svn_info(cef_dir)
if cef_current_info['url'] != cef_url: if cef_current_info['url'] != cef_url:
@ -804,8 +806,9 @@ if chromium_checkout_changed:
run("%s fetch" % (git_exe), chromium_src_dir, depot_tools_dir) run("%s fetch" % (git_exe), chromium_src_dir, depot_tools_dir)
# Checkout the requested branch. # Checkout the requested branch.
run("%s checkout %s" % (git_exe, chromium_checkout), chromium_src_dir, \ run("%s checkout %s%s" % \
depot_tools_dir) (git_exe, ('--force ' if options.forceclean else ''), chromium_checkout), \
chromium_src_dir, depot_tools_dir)
if cef_branch != 'trunk': if cef_branch != 'trunk':
# Remove the 'src' entry from .DEPS.git for release branches. # Remove the 'src' entry from .DEPS.git for release branches.
@ -814,8 +817,9 @@ if chromium_checkout_changed:
remove_deps_entry(deps_path, "'src'") remove_deps_entry(deps_path, "'src'")
# Update third-party dependencies including branch/tag information. # Update third-party dependencies including branch/tag information.
run("gclient sync %s--with_branch_heads --jobs 16" % \ run("gclient sync %s%s--with_branch_heads --jobs 16" % \
('--nohooks ' if chromium_nohooks else ''), \ (('--reset ' if options.forceclean else ''), \
('--nohooks ' if chromium_nohooks else '')), \
chromium_dir, depot_tools_dir) chromium_dir, depot_tools_dir)
# Delete the src/out directory created by `gclient sync`. # Delete the src/out directory created by `gclient sync`.