13565 2007-05-02 00:37:53 -0700 Change svn-create-patch to put LayoutTests in the end 2007-05-20 07:35:41 -0700 1 1 1 Unclassified WebKit Tools / Tests 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED P4 Enhancement --- 1 mitz webkit-unassigned aroben ddkilzer oldest_to_newest 11430 0 mitz 2007-05-02 00:37:53 -0700 It's arguably easier to review patches when the code changes come before the tests. 9566 1 mitz 2007-05-19 23:21:56 -0700 *** Bug 13788 has been marked as a duplicate of this bug. *** 9570 2 14633 ddkilzer 2007-05-20 00:18:49 -0700 Created attachment 14633 Patch v1 9571 3 14633 aroben 2007-05-20 00:26:51 -0700 Comment on attachment 14633 Patch v1 + In addition reordering non-binary files under the LayoutTests directory, this Typo: "In addition" -> "In addition to" + $dir = File::Spec->catdir($dirs[0], ".svn") if -d $dirs[0]; + $dir = File::Spec->catdir(dirname($dirs[0]), ".svn") if -f $dirs[0]; It would be nice not to repeat the catdir call -- can you put the directory name in a local and then call catdir? +# Generate the diff for text files, layout files then binary files for easy reviewing "layout files" is a confusing term (and "layoutFiles" is a similarly misleading variable name). Perhaps "test files"/"testFiles" would be more appropriate? r=me 9580 4 ddkilzer 2007-05-20 07:03:08 -0700 (In reply to comment #3) > (From update of attachment 14633 [edit]) > + In addition reordering non-binary files under the LayoutTests > directory, this > > Typo: "In addition" -> "In addition to" Thanks! > + $dir = File::Spec->catdir($dirs[0], ".svn") if -d $dirs[0]; > + $dir = File::Spec->catdir(dirname($dirs[0]), ".svn") if -f $dirs[0]; > > It would be nice not to repeat the catdir call -- can you put the directory > name in a local and then call catdir? It won't because the 'if' part of the statement will be executed first in both lines, and a path can't be both a file and a directory. Regardless, the code is confusing to read, so I'll change this anyway. :) > +# Generate the diff for text files, layout files then binary files for easy > reviewing > > "layout files" is a confusing term (and "layoutFiles" is a similarly misleading > variable name). Perhaps "test files"/"testFiles" would be more appropriate? "layoutTestsFiles"? (Kidding!) I'll change it to "test files"/"testFiles" and land. 9581 5 ddkilzer 2007-05-20 07:35:41 -0700 $ svn commit WebKitTools/ChangeLog WebKitTools/Scripts/prepare-ChangeLog WebKitTools/Scripts/svn-create-patch Sending WebKitTools/ChangeLog Sending WebKitTools/Scripts/prepare-ChangeLog Sending WebKitTools/Scripts/svn-create-patch Transmitting file data ... Committed revision 21608. 14633 2007-05-20 00:18:49 -0700 2007-05-20 00:26:51 -0700 Patch v1 bug-13565-v1.diff text/plain 4022 ddkilzer SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDIxNjA3KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMDctMDUtMTkgIERhdmlkIEtpbHplciAgPGRk a2lsemVyQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgLSBmaXggaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTM1NjUKKyAgICAgICAgICBDaGFuZ2Ugc3ZuLWNyZWF0ZS1wYXRjaCB0byBwdXQgTGF5b3V0VGVz dHMgaW4gdGhlIGVuZAorCisgICAgICAgIEluIGFkZGl0aW9uIHJlb3JkZXJpbmcgbm9uLWJpbmFy eSBmaWxlcyB1bmRlciB0aGUgTGF5b3V0VGVzdHMgZGlyZWN0b3J5LCB0aGlzCisgICAgICAgIHBh dGNoIGFsc28gZml4ZXMgYW4gaXNzdWUgd2l0aCBwcmVwYXJlLUNoYW5nZUxvZyBpZiB0aGUgZmly c3QgYXJndW1lbnQgcGFzc2VkCisgICAgICAgIHRvIGl0IGlzIGEgZmlsZW5hbWUgaW5zdGVhZCBv ZiBhIGRpcmVjdG9yeSBuYW1lLgorCisgICAgICAgICogU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxv ZzoKKyAgICAgICAgKGlzR0lUKCkpOiBJZiBmaXJzdCB2YWx1ZSBpbiBAZGlycyBhcnJheSBpcyBh IGZpbGUsIHVzZSBkaXJuYW1lKCkgdG8gZ2V0IHRoZSBkaXJlY3RvcnkuCisgICAgICAgIChpc1NW TigpKTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoOgorICAgICAg ICAoZ2VuZXJhdGVGaWxlTGlzdCgkXCVcJVwlKSk6IERpZmZlcmVudGlhdGUgZmlsZXMgaW4gdGhl IExheW91dFRlc3RzIGRpcmVjdG9yeSBmcm9tCisgICAgICAgIG90aGVyIHRleHQgZmlsZXMuCisK IDIwMDctMDUtMTggIE1hcmsgUm93ZSAgPG1yb3dlQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBPbGl2ZXIuCkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cJ KHJldmlzaW9uIDIxNjAwKQorKysgV2ViS2l0VG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMTA3Myw3ICsxMDczLDEyIEBAIHN1YiBpc0dpdCgpCiAKICAg ICBteSAkZGlyID0gIi4iOwogICAgIG15IEBkaXJzID0ga2V5cyglcGF0aHMpOwotICAgICRkaXIg PSAkZGlyc1swXSBpZiBAZGlyczsKKworICAgIGlmIChAZGlycykgeworICAgICAgICAkZGlyID0g JGRpcnNbMF0gaWYgLWQgJGRpcnNbMF07CisgICAgICAgICRkaXIgPSBkaXJuYW1lKCRkaXJzWzBd KSBpZiAtZiAkZGlyc1swXTsKKyAgICB9CisKICAgICAkaXNHaXQgPSBzeXN0ZW0oImNkICRkaXIg JiYgZ2l0IHJldi1wYXJzZSA+IC9kZXYvbnVsbCAyPiYxIikgPT0gMDsKICAgICByZXR1cm4gJGlz R2l0OwogfQpAQCAtMTA4NSw3ICsxMDkwLDExIEBAIHN1YiBpc1NWTigpCiAKICAgICBteSAkZGly ID0gIi5zdm4iOwogICAgIG15IEBkaXJzID0ga2V5cyglcGF0aHMpOwotICAgICRkaXIgPSBGaWxl OjpTcGVjLT5jYXRkaXIoKCRkaXJzWzBdLCAiLnN2biIpKSBpZiBAZGlyczsKKworICAgIGlmIChA ZGlycykgeworICAgICAgICAkZGlyID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCRkaXJzWzBdLCAiLnN2 biIpIGlmIC1kICRkaXJzWzBdOworICAgICAgICAkZGlyID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKGRp cm5hbWUoJGRpcnNbMF0pLCAiLnN2biIpIGlmIC1mICRkaXJzWzBdOworICAgIH0KIAogICAgICRp c1NWTiA9IC1kICRkaXI7CiAgICAgcmV0dXJuICRpc1NWTjsKSW5kZXg6IFdlYktpdFRvb2xzL1Nj cmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3JpcHRz L3N2bi1jcmVhdGUtcGF0Y2gJKHJldmlzaW9uIDIxNjAwKQorKysgV2ViS2l0VG9vbHMvU2NyaXB0 cy9zdm4tY3JlYXRlLXBhdGNoCSh3b3JraW5nIGNvcHkpCkBAIC01OSw3ICs1OSw3IEBAIHN1YiBm aW5kTW9kaWZpY2F0aW9uVHlwZSgkKTsKIHN1YiBmaW5kU291cmNlRmlsZUFuZFJldmlzaW9uKCQp Owogc3ViIGZpeENoYW5nZUxvZ1BhdGNoKCQpOwogc3ViIGdlbmVyYXRlRGlmZigkJCQpOwotc3Vi IGdlbmVyYXRlRmlsZUxpc3QoJFwlXCUpOworc3ViIGdlbmVyYXRlRmlsZUxpc3QoJFwlXCVcJSk7 CiBzdWIgaXNCaW5hcnlNaW1lVHlwZSgkKTsKIHN1YiBtYW51ZmFjdHVyZVBhdGNoRm9yQWRkaXRp b25XaXRoSGlzdG9yeSgkJCk7CiBzdWIgbnVtZXJpY2NtcCgkJCk7CkBAIC04MCwxNSArODAsMTkg QEAgbXkgJXBhdGhzID0gcHJvY2Vzc1BhdGhzKEBBUkdWKTsKIAogIyBHZW5lcmF0ZSBhIGxpc3Qg b2YgZmlsZXMgcmVxdWlyaW5nIGRpZmZzCiBteSAldGV4dEZpbGVzOworbXkgJWxheW91dEZpbGVz OwogbXkgJWJpbmFyeUZpbGVzOwogZm9yIG15ICRwYXRoIChrZXlzICVwYXRocykgewotICAgIGdl bmVyYXRlRmlsZUxpc3QoJHBhdGgsICV0ZXh0RmlsZXMsICViaW5hcnlGaWxlcyk7CisgICAgZ2Vu ZXJhdGVGaWxlTGlzdCgkcGF0aCwgJXRleHRGaWxlcywgJWxheW91dEZpbGVzLCAlYmluYXJ5Rmls ZXMpOwogfQogCi0jIEdlbmVyYXRlIHRoZSBkaWZmIGZvciB0ZXh0IGZpbGVzLCB0aGVuIGJpbmFy eSBmaWxlcywgZm9yIGVhc3kgcmV2aWV3aW5nCisjIEdlbmVyYXRlIHRoZSBkaWZmIGZvciB0ZXh0 IGZpbGVzLCBsYXlvdXQgZmlsZXMgdGhlbiBiaW5hcnkgZmlsZXMgZm9yIGVhc3kgcmV2aWV3aW5n CiBmb3IgbXkgJGZpbGUgKHNvcnQgcGF0aGNtcCBrZXlzICV0ZXh0RmlsZXMpIHsKICAgICBnZW5l cmF0ZURpZmYoJGZpbGUsICR0ZXh0RmlsZXN7JGZpbGV9LCAwKTsKIH0KK2ZvciBteSAkZmlsZSAo c29ydCBwYXRoY21wIGtleXMgJWxheW91dEZpbGVzKSB7CisgICAgZ2VuZXJhdGVEaWZmKCRmaWxl LCAkbGF5b3V0RmlsZXN7JGZpbGV9LCAwKTsKK30KIGZvciBteSAkZmlsZSAoc29ydCBwYXRoY21w IGtleXMgJWJpbmFyeUZpbGVzKSB7CiAgICAgZ2VuZXJhdGVEaWZmKCRmaWxlLCAkYmluYXJ5Rmls ZXN7JGZpbGV9LCAxKTsKIH0KQEAgLTIzNiw5ICsyNDAsOSBAQCBzdWIgZ2VuZXJhdGVEaWZmKCQk JCkKICAgICB9CiB9CiAKLXN1YiBnZW5lcmF0ZUZpbGVMaXN0KCRcJVwlKQorc3ViIGdlbmVyYXRl RmlsZUxpc3QoJFwlXCVcJSkKIHsKLSAgICBteSAoJHN0YXRQYXRoLCAkdGV4dEZpbGVzLCAkYmlu YXJ5RmlsZXMpID0gQF87CisgICAgbXkgKCRzdGF0UGF0aCwgJHRleHRGaWxlcywgJGxheW91dEZp bGVzLCAkYmluYXJ5RmlsZXMpID0gQF87CiAgICAgb3BlbiBTVEFULCAic3ZuIHN0YXQgJyRzdGF0 UGF0aCcgfCIgb3IgZGllOwogICAgIHdoaWxlIChteSAkbGluZSA9IDxTVEFUPikgewogICAgICAg ICBjaG9tcCAkbGluZTsKQEAgLTI0OSw2ICsyNTMsOCBAQCBzdWIgZ2VuZXJhdGVGaWxlTGlzdCgk XCVcJSkKICAgICAgICAgaWYgKCRtb2RpZmljYXRpb25UeXBlKSB7CiAgICAgICAgICAgICBpZiAo aXNCaW5hcnlNaW1lVHlwZSgkcGF0aCkpIHsKICAgICAgICAgICAgICAgICAkYmluYXJ5RmlsZXMt PnskcGF0aH0gPSAkbW9kaWZpY2F0aW9uVHlwZTsKKyAgICAgICAgICAgIH0gZWxzaWYgKChGaWxl OjpTcGVjLT5zcGxpdGRpcigkcGF0aCkpWzBdIGVxICJMYXlvdXRUZXN0cyIpIHsKKyAgICAgICAg ICAgICAgICAkbGF5b3V0RmlsZXMtPnskcGF0aH0gPSAkbW9kaWZpY2F0aW9uVHlwZTsKICAgICAg ICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgJHRleHRGaWxlcy0+eyRwYXRofSA9ICRt b2RpZmljYXRpb25UeXBlOwogICAgICAgICAgICAgfQo=