procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix patch mangling with --inline option

Browse source 
2014-11-14  Tom de Vries  <tom@codesourcery.com>

	* mklog: Move reading of .diff file up and add comment.  Copy diff_lines
	to orig_diff_lines.  Use orig_diff_lines when appending patch.

From-SVN: r217558
This commit is contained in:
Tom de Vries 2014-11-14 12:09:45 +00:00 • committed by Tom de Vries
parent cbe4c88c5e
commit 78d7f09fff
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
contrib/ChangeLog
View file

@ -1,3 +1,8 @@
2014-11-14 Tom de Vries <tom@codesourcery.com>
* mklog: Move reading of .diff file up and add comment. Copy diff_lines
to orig_diff_lines. Use orig_diff_lines when appending patch.
2014-11-11 David Malcolm <dmalcolm@redhat.com>
* ChangeLog.jit: New.

16
contrib/mklog
View file

@ -132,15 +132,23 @@ sub is_top_level {
return $function && $function !~ /^[\s{]/;
}
# Read contents of .diff file
open (DFILE, $diff) or die "Could not open file $diff for reading";
chomp (my @diff_lines = <DFILE>);
close (DFILE);
# Array diff_lines is modified by the log generation, so save a copy in
# orig_diff_lines if needed.
if ($inline) {
@orig_diff_lines = @diff_lines;
}
# For every file in the .diff print all the function names in ChangeLog
# format.
%cl_entries = ();
$change_msg = undef;
$look_for_funs = 0;
$clname = get_clname('');
open (DFILE, $diff) or die "Could not open file $diff for reading";
chomp (my @diff_lines = <DFILE>);
close (DFILE);
$line_idx = 0;
foreach (@diff_lines) {
# Stop processing functions if we found a new file.
@ -313,7 +321,7 @@ foreach my $clname (keys %cl_entries) {
if ($inline) {
# Append the patch to the log
foreach (@diff_lines) {
foreach (@orig_diff_lines) {
print OUTPUTFILE "$_\n";
}
}