137982 2014-10-22 14:45:52 -0700 prepare-changelog does not read paths containing spaces properly 2019-11-15 11:17:43 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 204236 1 rdemarest bburg bburg dbates ddkilzer joepeck oldest_to_newest 1043560 0 rdemarest 2014-10-22 14:45:52 -0700 I run prepare-changelog on a repository that contains changes inside folders whose name contains spaces and I get multiple errors like this: fatal: Path 'Safari/AppKit' does not exist in 'origin/master' We have two folder named "AppKit Extra Classes" and "AppKit Extra Methods" for which this could apply. 1155568 1 bburg 2016-01-14 13:53:49 -0800 Ugh, just ran into this too. 1155577 2 bburg 2016-01-14 14:19:38 -0800 Relevant trace from using `perl -d:Trace prepare-Changelog`: >> /Users/bburg/repos/webkit-tot/OpenSource/Tools/Scripts/prepare-ChangeLog:335: my @deleted_function_ranges = get_function_line_ranges(\*SOURCE, $file); >> /Users/bburg/repos/webkit-tot/OpenSource/Tools/Scripts/prepare-ChangeLog:688: my ($file_handle, $file_name) = @_; >> /Users/bburg/repos/webkit-tot/OpenSource/Tools/Scripts/prepare-ChangeLog:692: return get_function_line_ranges_for_cpp($file_handle, $file_name) if $file_name =~ /\.(c|cpp|m|mm|h)$/; >> /Users/bburg/repos/webkit-tot/OpenSource/Tools/Scripts/prepare-ChangeLog:693: return get_function_line_ranges_for_java($file_handle, $file_name) if $file_name =~ /\.java$/; >> /Users/bburg/repos/webkit-tot/OpenSource/Tools/Scripts/prepare-ChangeLog:694: return get_function_line_ranges_for_javascript($file_handle, $file_name) if $file_name =~ /\.js$/; >> /Users/bburg/repos/webkit-tot/OpenSource/Tools/Scripts/prepare-ChangeLog:695: return get_selector_line_ranges_for_css($file_handle, $file_name) if $file_name =~ /\.css$/; >> /Users/bburg/repos/webkit-tot/OpenSource/Tools/Scripts/prepare-ChangeLog:696: return get_function_line_ranges_for_perl($file_handle, $file_name) if $file_name =~ /\.p[lm]$/; >> /Users/bburg/repos/webkit-tot/OpenSource/Tools/Scripts/prepare-ChangeLog:697: return get_function_line_ranges_for_python($file_handle, $file_name) if $file_name =~ /\.py$/ or $file_name =~ /master\.cfg$/; >> /Users/bburg/repos/webkit-tot/OpenSource/Tools/Scripts/prepare-ChangeLog:698: return get_function_line_ranges_for_swift($file_handle, $file_name) if $file_name =~ /\.swift$/; >> /Users/bburg/repos/webkit-tot/OpenSource/Tools/Scripts/prepare-ChangeLog:702: my $first_line = <$file_handle>; fatal: Path 'Safari.xcworkspace/xcshareddata/xcschemes/Only' does not exist in 'HEAD' >> /Users/bburg/repos/webkit-tot/OpenSource/Tools/Scripts/prepare-ChangeLog:703: seek($file_handle, 0, 0); >> /Users/bburg/repos/webkit-tot/OpenSource/Tools/Scripts/prepare-ChangeLog:705: return () unless $first_line =~ m|^#!(?:/usr/bin/env\s+)?(\S+)|; Use of uninitialized value $first_line in pattern match (m//) at /Users/bburg/repos/webkit-tot/OpenSource/Tools/Scripts/prepare-ChangeLog line 705. 1155601 3 269012 bburg 2016-01-14 15:01:32 -0800 Created attachment 269012 Proposed Fix 1155603 4 269012 joepeck 2016-01-14 15:03:21 -0800 Comment on attachment 269012 Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=269012&action=review r=me > Tools/Scripts/prepare-ChangeLog:319 > + $file =~ s/ /\\ /; I think this needs the trailing /g in order to change all occurrences. 1155605 5 bburg 2016-01-14 15:07:58 -0800 Committed r195080: <http://trac.webkit.org/changeset/195080> 1590559 6 269012 dbates 2019-11-15 11:14:51 -0800 Comment on attachment 269012 Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=269012&action=review >> Tools/Scripts/prepare-ChangeLog:319 >> + $file =~ s/ /\\ /; > > I think this needs the trailing /g in order to change all occurrences. This change, including the chomp(), is not necessary. The actual fix for this bug was below with using the open() call that takes a mode. In fact, this change breaks function list generation for file paths that have a space in them because the code above ^^^ built up a dictionaries of line ranges keyed off the **unescaped** filename. However, after this substitution the code below will query these dictionaries for the **escaped** filename and hence **never** find a match. > Tools/Scripts/prepare-ChangeLog:323 > + open(SOURCE, "<", $file) or next; This is the actual fix! 269012 2016-01-14 15:01:32 -0800 2016-01-14 15:03:21 -0800 Proposed Fix bug-137982-20160114150101.patch text/plain 1855 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0OTAwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWYzYWRjOGU1OGJiOGNlZTdlMjM5NjkyMmJlZTVmNTc1 NWJlYjhiNC4uMTEzMDE4MjdkYTM2MWNiY2Y1OTM2YWIxMjY4YWRjOTgyNWYyYzE3MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE2LTAxLTE0ICBCcmlhbiBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgorCisgICAgICAg IHByZXBhcmUtY2hhbmdlbG9nIGRvZXMgbm90IHJlYWQgcGF0aHMgY29udGFpbmluZyBzcGFjZXMg cHJvcGVybHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzNzk4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEVzY2FwZSB3aGl0ZXNwYWNlIGluIGZpbGVuYW1lcyBiZWZvcmUgcGFzc2luZyB0aGUgZmlsZSBw YXRoIHRvIG90aGVyIGZ1bmN0aW9ucy4KKworICAgICAgICAqIFNjcmlwdHMvcHJlcGFyZS1DaGFu Z2VMb2c6CisgICAgICAgIChnZW5lcmF0ZUZ1bmN0aW9uTGlzdHMpOgorCiAyMDE2LTAxLTEyICBC ZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtKU0NdIEFk ZCBhIGhlbHAgbWVzc2FnZSB3aGVuIHJ1bi1qc2Mtc3RyZXNzLXRlc3RzIGZhaWxzCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nIGIvVG9vbHMvU2NyaXB0cy9wcmVw YXJlLUNoYW5nZUxvZwppbmRleCAyNzBiYzNjMWEwYjI0MDgxODllYzEzNGRmNjg3YjU0ZTcwOTAw NmM5Li5kMzg3MGMyYjYxOGIzZDVhMTgwODUxNzE2NGI5M2UyZGU3ZTlhYmQ4IDEwMDc1NQotLS0g YS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL1NjcmlwdHMvcHJl cGFyZS1DaGFuZ2VMb2cKQEAgLTMxMywxMCArMzEzLDE0IEBAIHN1YiBnZW5lcmF0ZUZ1bmN0aW9u TGlzdHMoJCQkJCQpCiAgICAgcHJpbnQgU1RERVJSICIgIEV4dHJhY3RpbmcgYWZmZWN0ZWQgZnVu Y3Rpb24gbmFtZXMgZnJvbSBzb3VyY2UgZmlsZXMuXG4iOwogICAgIG15ICVmaWxlc1RvRXhhbWlu ZSA9IG1hcCB7ICRfID0+IDEgfSAoa2V5cyglbGluZV9yYW5nZXNfYmVmb3JlX2NoYW5nZWQpLCBr ZXlzKCVsaW5lX3Jhbmdlc19hZnRlcl9jaGFuZ2VkKSk7CiAgICAgZm9yZWFjaCBteSAkZmlsZSAo a2V5cyAlZmlsZXNUb0V4YW1pbmUpIHsKKyAgICAgICAgIyBFc2NhcGUgd2hpdGVzcGFjZSBpbiBm aWxlbmFtZXMgcmF0aGVyIHRoYW4gYWRkaW5nIHF1b3Rlcywgc2luY2UgbWFueSBmdW5jdGlvbnMg Y2FuIG9wZW4gZmlsZXMKKyAgICAgICAgIyBhbmQgb3RoZXIgY29kZSBkb2Vzbid0IGV4cGVjdCB0 byBzZWUgYSB0cmFpbGluZyAiIGNoYXJhY3RlciB3aGVuIHNuaWZmaW5nIGEgZmlsZSBleHRlbnNp b24uCisgICAgICAgIGNob21wICRmaWxlOworICAgICAgICAkZmlsZSA9fiBzLyAvXFwgLzsKICAg ICAgICAgbXkgJXNhd19mdW5jdGlvbjsKICAgICAgICAgIyBGaW5kIGFsbCB0aGUgZnVuY3Rpb25z IGluIHRoZSBmaWxlLgogICAgICAgICBpZiAoJGxpbmVfcmFuZ2VzX2FmdGVyX2NoYW5nZWR7JGZp bGV9KSB7Ci0gICAgICAgICAgICBvcGVuIFNPVVJDRSwgJGZpbGUgb3IgbmV4dDsKKyAgICAgICAg ICAgIG9wZW4oU09VUkNFLCAiPCIsICRmaWxlKSBvciBuZXh0OwogICAgICAgICAgICAgbXkgQGZ1 bmN0aW9uX3JhbmdlcyA9IGdldF9mdW5jdGlvbl9saW5lX3JhbmdlcyhcKlNPVVJDRSwgJGZpbGUp OwogICAgICAgICAgICAgY2xvc2UgU09VUkNFOwogCg==