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

Add patch_udpater.py support for added files. 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1823 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2014-09-09 14:51:22 +00:00
parent 70165e0ab8
commit 335ba8031a
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/patch_updater.py
View File

@ -94,11 +94,15 @@ for patch in patches:
# Retrieve the list of paths modified by the patch file. # Retrieve the list of paths modified by the patch file.
patch_paths = extract_paths(patch_file) patch_paths = extract_paths(patch_file)
# List of paths added by the patch file.
added_paths = []
if not options.resave: if not options.resave:
# Revert any changes to existing files in the patch. # Revert any changes to existing files in the patch.
for patch_path in patch_paths: for patch_path in patch_paths:
patch_path_abs = os.path.abspath(os.path.join(patch_root_abs, \ patch_path_abs = os.path.abspath(os.path.join(patch_root_abs, \
patch_path)) patch_path))
if os.path.exists(patch_path_abs):
msg('Reverting changes to %s' % patch_path_abs) msg('Reverting changes to %s' % patch_path_abs)
if src_is_git: if src_is_git:
cmd = 'git checkout -- %s' % (patch_path_abs) cmd = 'git checkout -- %s' % (patch_path_abs)
@ -106,9 +110,15 @@ for patch in patches:
cmd = 'svn revert %s' % (patch_path_abs) cmd = 'svn revert %s' % (patch_path_abs)
result = exec_cmd(cmd, patch_root_abs) result = exec_cmd(cmd, patch_root_abs)
if result['err'] != '': if result['err'] != '':
raise Exception('Failed to revert file: %s' % result['err']) msg('Failed to revert file: %s' % result['err'])
msg('Deleting file %s' % patch_path_abs)
os.remove(patch_path_abs)
added_paths.append(patch_path_abs)
if result['out'] != '': if result['out'] != '':
sys.stdout.write(result['out']) sys.stdout.write(result['out'])
else:
msg('Skipping non-existing file %s' % patch_path_abs)
added_paths.append(patch_path_abs)
if not options.revert: if not options.revert:
# Apply the patch file. # Apply the patch file.
@ -123,8 +133,15 @@ for patch in patches:
continue continue
if not options.revert: if not options.revert:
# Re-create the patch file.
msg('Saving changes to %s' % patch_file) msg('Saving changes to %s' % patch_file)
if src_is_git and added_paths:
# Inform git of the added paths so they appear in the patch file.
cmd = 'git add -N %s' % ' '.join(added_paths)
result = exec_cmd(cmd, patch_root_abs)
if result['err'] != '' and result['err'].find('warning:') != 0:
raise Exception('Failed to add paths: %s' % result['err'])
# Re-create the patch file.
patch_paths_str = ' '.join(patch_paths) patch_paths_str = ' '.join(patch_paths)
if src_is_git: if src_is_git:
cmd = 'git diff --no-prefix --relative %s' % patch_paths_str cmd = 'git diff --no-prefix --relative %s' % patch_paths_str