tools: moveconfig: show result of header cleaning in unified diff

The header cleanup feature of this tool now removes empty ifdef's,
successive blank lines as well as moved option defines.  So, we
want to see a little more context to check which lines were deleted.

It is true that we can see it by "git diff", but it would not work
in the --dry-run mode.  So, here, this commit.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
master
Masahiro Yamada 8 years ago committed by Tom Rini
parent 8ba1f5de45
commit f2f6981a14
  1. 30
      tools/moveconfig.py

@ -161,6 +161,7 @@ To see the complete list of supported options, run
""" """
import copy import copy
import difflib
import filecmp import filecmp
import fnmatch import fnmatch
import multiprocessing import multiprocessing
@ -275,6 +276,22 @@ def color_text(color_enabled, color, string):
else: else:
return string return string
def show_diff(a, b, file_path):
"""Show unidified diff.
Arguments:
a: A list of lines (before)
b: A list of lines (after)
file_path: Path to the file
"""
diff = difflib.unified_diff(a, b,
fromfile=os.path.join('a', file_path),
tofile=os.path.join('b', file_path))
for line in diff:
print line,
def update_cross_compile(color_enabled): def update_cross_compile(color_enabled):
"""Update per-arch CROSS_COMPILE via environment variables """Update per-arch CROSS_COMPILE via environment variables
@ -414,16 +431,19 @@ def cleanup_one_header(header_path, patterns, dry_run):
if matched == old_matched: if matched == old_matched:
break break
for i in matched: tolines = copy.copy(lines)
print '%s: %s: %s' % (header_path, i + 1, lines[i]),
for i in reversed(matched):
tolines.pop(i)
show_diff(lines, tolines, header_path)
if dry_run: if dry_run:
return return
with open(header_path, 'w') as f: with open(header_path, 'w') as f:
for i, line in enumerate(lines): for line in tolines:
if not i in matched: f.write(line)
f.write(line)
def cleanup_headers(configs, dry_run): def cleanup_headers(configs, dry_run):
"""Delete config defines from board headers. """Delete config defines from board headers.

Loading…
Cancel
Save