13900 2007-05-28 16:08:21 -0700 svnStatus($) subroutine in svn-[un]apply does not work properly with directories 2007-05-29 11:41:35 -0700 1 1 1 Unclassified WebKit Tools / Tests 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 ddkilzer webkit-unassigned aroben oldest_to_newest 8937 0 ddkilzer 2007-05-28 16:08:21 -0700 The svnStatus($) subroutine used in both svn-apply and svn-unapply is broken when used with directories, especially when a directory contains modified files. Patch forthcoming. 8940 1 14763 ddkilzer 2007-05-28 16:19:31 -0700 Created attachment 14763 Patch v1 Proposed fix. 8850 2 ddkilzer 2007-05-29 11:41:35 -0700 $ svn commit `grep '^Index: ' bug-13900-v1.diff.txt | cut -d' ' -f2` Sending WebKitTools/ChangeLog Sending WebKitTools/Scripts/svn-apply Sending WebKitTools/Scripts/svn-unapply Transmitting file data ... Committed revision 21857. 14763 2007-05-28 16:19:31 -0700 2007-05-28 20:28:56 -0700 Patch v1 bug-13900-v1.diff text/plain 4017 ddkilzer SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDIxODUwKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMDctMDUtMjggIERhdmlkIEtpbHplciAgPGRk a2lsemVyQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgLSBmaXggaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTM5MDAKKyAgICAgICAgICBzdm5TdGF0dXMoJCkgc3Vicm91dGluZSBpbiBzdm4tW3VuXWFwcGx5 IGRvZXMgbm90IHdvcmsgcHJvcGVybHkgd2l0aCBkaXJlY3RvcmllcworCisgICAgICAgIFRoaXMg cGF0Y2ggYWxzbyBmaXhlcyBhbiBpbnN0YW5jZSBvZiB0aGUgImJyb2tlbiBwaXBlIiB3YXJuaW5n IHRoYXQgaGFwcGVuZWQgd2hlbgorICAgICAgICBhIGRpcmVjdG9yeSBjb250YWluZWQgbW9kaWZp ZWQgZmlsZXMgdGhhdCB3ZXJlIG5vdCBwYXJ0IG9mIGFuIGFwcGxpZWQgb3IgdW5hcHBsaWVkCisg ICAgICAgIHBhdGNoLgorCisgICAgICAgICogU2NyaXB0cy9zdm4tYXBwbHk6CisgICAgICAgIChz dm5TdGF0dXMoJCkpOiBJZiB3ZSdyZSB0cnlpbmcgdG8gZ2V0IHN0YXR1cyBvbiBhIGRpcmVjdG9y eSAoaW5zdGVhZCBvZiBhIGZpbGUpLAorICAgICAgICBtYWtlIHN1cmUgd2UgYWN0dWFsbHkgZ2V0 IHRoZSBkaXJlY3RvcnkncyBzdGF0dXMgKGlmIGl0IGhhcyBvbmUpLCBub3QgdGhlIGZpcnN0Cisg ICAgICAgIGZpbGUncyBzdGF0dXMgcmVwb3J0ZWQgd2l0aGluIHRoZSBkaXJlY3RvcnkuICBGaXgg ImJyb2tlbiBwaXBlIiB3YXJuaW5ncyBieQorICAgICAgICByZWFkaW5nIGFsbCBvZiB0aGUgb3V0 cHV0IGZyb20gdGhlIFNWTiBmaWxlaGFuZGxlIGJlZm9yZSBjbG9zaW5nIGl0LgorICAgICAgICAq IFNjcmlwdHMvc3ZuLXVuYXBwbHk6CisgICAgICAgIChzdm5TdGF0dXMoJCkpOiBEaXR0by4KKwog MjAwNy0wNS0yOCAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAd2Via2l0Lm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBEYXJpbi4KSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5CShyZXZpc2lvbiAy MTg1MCkKKysrIFdlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5CSh3b3JraW5nIGNvcHkpCkBA IC0zODAsOCArMzgwLDMwIEBAIHN1YiBzZXRDaGFuZ2VMb2dEYXRlKCQpCiBzdWIgc3ZuU3RhdHVz KCQpCiB7CiAgICAgbXkgKCRmdWxsUGF0aCkgPSBAXzsKKyAgICBteSAkc3ZuU3RhdHVzOwogICAg IG9wZW4gU1ZOLCAic3ZuIHN0YXR1cyAtLW5vbi1pbnRlcmFjdGl2ZSAtLW5vbi1yZWN1cnNpdmUg JyRmdWxsUGF0aCcgfCIgb3IgZGllOwotICAgIG15ICRzdm5TdGF0dXMgPSA8U1ZOPjsKKyAgICBp ZiAoLWQgJGZ1bGxQYXRoKSB7CisgICAgICAgICMgV2hlbiBydW5uaW5nICJzdm4gc3RhdCIgb24g YSBkaXJlY3RvcnksIHdlIGNhbid0IGFzc3VtZSB0aGF0IG9ubHkgb25lCisgICAgICAgICMgc3Rh dHVzIHdpbGwgYmUgcmV0dXJuZWQgKHNpbmNlIGFueSBmaWxlcyB3aXRoIGEgc3RhdHVzIGJlbG93 IHRoZQorICAgICAgICAjIGRpcmVjdG9yeSB3aWxsIGJlIHJldHVybmVkKSwgYW5kIHdlIGNhbid0 IGFzc3VtZSB0aGF0IHRoZSBkaXJlY3Rvcnkgd2lsbAorICAgICAgICAjIGJlIGZpcnN0IChzaW5j ZSBhbnkgZmlsZXMgd2l0aCB1bmtub3duIHN0YXR1cyB3aWxsIGJlIGxpc3RlZCBmaXJzdCkuCisg ICAgICAgIG15ICRub3JtYWxpemVkRnVsbFBhdGggPSBGaWxlOjpTcGVjLT5jYXRkaXIoRmlsZTo6 U3BlYy0+c3BsaXRkaXIoJGZ1bGxQYXRoKSk7CisgICAgICAgIHdoaWxlICg8U1ZOPikgeworICAg ICAgICAgICAgY2hvbXA7CisgICAgICAgICAgICBteSAkbm9ybWFsaXplZFN0YXRQYXRoID0gRmls ZTo6U3BlYy0+Y2F0ZGlyKEZpbGU6OlNwZWMtPnNwbGl0ZGlyKHN1YnN0cigkXywgNykpKTsKKyAg ICAgICAgICAgIGlmICgkbm9ybWFsaXplZEZ1bGxQYXRoIGVxICRub3JtYWxpemVkU3RhdFBhdGgp IHsKKyAgICAgICAgICAgICAgICAkc3ZuU3RhdHVzID0gJF87CisgICAgICAgICAgICAgICAgbGFz dDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICAjIFJlYWQgdGhlIHJlc3Qgb2Yg dGhlIHN2biBjb21tYW5kIG91dHB1dCB0byBhdm9pZCBhIGJyb2tlbiBwaXBlIHdhcm5pbmcuCisg ICAgICAgIGxvY2FsICQvID0gdW5kZWY7CisgICAgICAgIDxTVk4+OworICAgIH0KKyAgICBlbHNl IHsKKyAgICAgICAgIyBGaWxlcyB3aWxsIGhhdmUgb25seSBvbmUgc3RhdHVzIHJldHVybmVkLgor ICAgICAgICAkc3ZuU3RhdHVzID0gPFNWTj47CisgICAgfQogICAgIGNsb3NlIFNWTjsKICAgICBy ZXR1cm4gJHN2blN0YXR1czsKIH0KSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLXVuYXBw bHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy9zdm4tdW5hcHBseQkocmV2aXNp b24gMjE4NTApCisrKyBXZWJLaXRUb29scy9TY3JpcHRzL3N2bi11bmFwcGx5CSh3b3JraW5nIGNv cHkpCkBAIC0yOTIsOCArMjkyLDMwIEBAIHN1YiByZXZlcnREaXJlY3RvcmllcygpCiBzdWIgc3Zu U3RhdHVzKCQpCiB7CiAgICAgbXkgKCRmdWxsUGF0aCkgPSBAXzsKKyAgICBteSAkc3ZuU3RhdHVz OwogICAgIG9wZW4gU1ZOLCAic3ZuIHN0YXR1cyAtLW5vbi1pbnRlcmFjdGl2ZSAtLW5vbi1yZWN1 cnNpdmUgJyRmdWxsUGF0aCcgfCIgb3IgZGllOwotICAgIG15ICRzdm5TdGF0dXMgPSA8U1ZOPjsK KyAgICBpZiAoLWQgJGZ1bGxQYXRoKSB7CisgICAgICAgICMgV2hlbiBydW5uaW5nICJzdm4gc3Rh dCIgb24gYSBkaXJlY3RvcnksIHdlIGNhbid0IGFzc3VtZSB0aGF0IG9ubHkgb25lCisgICAgICAg ICMgc3RhdHVzIHdpbGwgYmUgcmV0dXJuZWQgKHNpbmNlIGFueSBmaWxlcyB3aXRoIGEgc3RhdHVz IGJlbG93IHRoZQorICAgICAgICAjIGRpcmVjdG9yeSB3aWxsIGJlIHJldHVybmVkKSwgYW5kIHdl IGNhbid0IGFzc3VtZSB0aGF0IHRoZSBkaXJlY3Rvcnkgd2lsbAorICAgICAgICAjIGJlIGZpcnN0 IChzaW5jZSBhbnkgZmlsZXMgd2l0aCB1bmtub3duIHN0YXR1cyB3aWxsIGJlIGxpc3RlZCBmaXJz dCkuCisgICAgICAgIG15ICRub3JtYWxpemVkRnVsbFBhdGggPSBGaWxlOjpTcGVjLT5jYXRkaXIo RmlsZTo6U3BlYy0+c3BsaXRkaXIoJGZ1bGxQYXRoKSk7CisgICAgICAgIHdoaWxlICg8U1ZOPikg eworICAgICAgICAgICAgY2hvbXA7CisgICAgICAgICAgICBteSAkbm9ybWFsaXplZFN0YXRQYXRo ID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKEZpbGU6OlNwZWMtPnNwbGl0ZGlyKHN1YnN0cigkXywgNykp KTsKKyAgICAgICAgICAgIGlmICgkbm9ybWFsaXplZEZ1bGxQYXRoIGVxICRub3JtYWxpemVkU3Rh dFBhdGgpIHsKKyAgICAgICAgICAgICAgICAkc3ZuU3RhdHVzID0gJF87CisgICAgICAgICAgICAg ICAgbGFzdDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICAjIFJlYWQgdGhlIHJl c3Qgb2YgdGhlIHN2biBjb21tYW5kIG91dHB1dCB0byBhdm9pZCBhIGJyb2tlbiBwaXBlIHdhcm5p bmcuCisgICAgICAgIGxvY2FsICQvID0gdW5kZWY7CisgICAgICAgIDxTVk4+OworICAgIH0KKyAg ICBlbHNlIHsKKyAgICAgICAgIyBGaWxlcyB3aWxsIGhhdmUgb25seSBvbmUgc3RhdHVzIHJldHVy bmVkLgorICAgICAgICAkc3ZuU3RhdHVzID0gPFNWTj47CisgICAgfQogICAgIGNsb3NlIFNWTjsK ICAgICByZXR1cm4gJHN2blN0YXR1czsKIH0K