34871 2010-02-11 19:08:11 -0800 svn-apply errors out when removing directories in git 2010-04-11 13:19:15 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 34879 1 eric webkit-unassigned cjerdonek commit-queue joepeck oldest_to_newest 189881 0 eric 2010-02-11 19:08:11 -0800 svn-apply errors out when removing directories in git https://webkit-commit-queue.appspot.com/results/259424 Failed to run "['/Users/eseidel/Projects/MacEWS/WebKitTools/Scripts/svn-apply', '--reviewer', 'Adam Barth', '--force']" exit_code: 2 Could not open 'LayoutTests/fast/wcss' to list files: 0 at /Users/eseidel/Projects/MacEWS/WebKitTools/Scripts/svn-apply line 314, <> line 573. https://bugs.webkit.org/attachment.cgi?id=48606 210589 1 eric 2010-04-09 00:03:43 -0700 There are two comments about this bug in scm_unittest.py which should be removed or updated when/if this bug is ever fixed. One in SVNTestRepository.setUp() and one in GitTest.test_apply_git_patch() 211340 2 53082 joepeck 2010-04-11 01:34:16 -0700 Created attachment 53082 [PATCH] Remove Directories in Git Note that git rm's "--ignore-unmatch" is available on my system's (Snow Leopard) default git version 1.6.2 and in the newest git 1.7+. I'm pretty sure it would be available on any system with git installed, but I don't know what the rule is here. I tested this on a git checkout: - remove a directory - create a patch > $patch - reset hard - apply patch to svn-apply - svn-apply --force $patch - SUCCEEDED I have not tested this on a svn checkout. 211380 3 eric 2010-04-11 11:24:15 -0700 Clearly "ignore-unmatch" hides the error. But why do we have the error in the first place? Do we try to remove the directory twice? 211392 4 joepeck 2010-04-11 11:49:04 -0700 (In reply to comment #3) > Clearly "ignore-unmatch" hides the error. But why do we have the error in the > first place? Do we try to remove the directory twice? I'm guessing git actually removes the directory when it becomes empty (the files are removed before the directory). I'll investigate this. 211398 5 joepeck 2010-04-11 11:55:43 -0700 (In reply to comment #4) > (In reply to comment #3) > > Clearly "ignore-unmatch" hides the error. But why do we have the error in the > > first place? Do we try to remove the directory twice? > > I'm guessing git actually removes the directory when it becomes empty (the > files are removed before the directory). I'll investigate this. Looks like it. As you know, git doesn't handle empty directories very well. When you `git rm` all the files in a directory (making the directory empty) git automatically removes the directory. I whipped up a sample git repo to verify this behavior: # Directory bar with two files shell> ls -l total 0 drwxr-xr-x 4 pecoraro_mbp staff 136B Apr 11 11:50 bar/ shell> ls -l bar/ total 0 -rw-r--r-- 1 pecoraro_mbp staff 0B Apr 11 11:50 a.txt -rw-r--r-- 1 pecoraro_mbp staff 0B Apr 11 11:50 b.txt # Remove a file, the directory still exists shell> git rm bar/a.txt rm 'bar/a.txt' shell> ls -l total 0 drwxr-xr-x 4 pecoraro_mbp staff 136B Apr 11 11:50 bar/ # Remove the last file, the directory gets deleted shell> git rm bar/b.txt rm 'bar/b.txt' shell> ls -l # NO OUTPUT # Trying to remove what was already removed? Priceless shell> git rm bar fatal: pathspec 'bar' did not match any files 211401 6 eric 2010-04-11 12:40:41 -0700 OK. We just need to add a comment in the code to explain why we're using ignore-unmatch then. 211404 7 53095 joepeck 2010-04-11 12:55:05 -0700 Created attachment 53095 [PATCH] With Comment 211406 8 53096 joepeck 2010-04-11 13:00:10 -0700 Created attachment 53096 [PATCH] With Comment and Updated die() message I update the die message to be accurate if this change gets approved. 211408 9 53096 eric 2010-04-11 13:03:19 -0700 Comment on attachment 53096 [PATCH] With Comment and Updated die() message LGTM. 211416 10 53096 commit-queue 2010-04-11 13:19:09 -0700 Comment on attachment 53096 [PATCH] With Comment and Updated die() message Clearing flags on attachment: 53096 Committed r57455: <http://trac.webkit.org/changeset/57455> 211417 11 commit-queue 2010-04-11 13:19:15 -0700 All reviewed patches have been landed. Closing bug. 53082 2010-04-11 01:34:16 -0700 2010-04-11 12:55:05 -0700 [PATCH] Remove Directories in Git git-rm.txt text/plain 1555 joepeck ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAxNzcyNTVjLi4zNmQwZjJmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAKIDIwMTAtMDQt MTEgIEpvc2VwaCBQZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KIAorICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBzdm4tYXBwbHkgZXJyb3JzIG91dCB3 aGVuIHJlbW92aW5nIGRpcmVjdG9yaWVzIGluIGdpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQ4NzEKKworICAgICAgICAqIFNjcmlwdHMvc3ZuLWFw cGx5OgorICAgICAgICAoaXNEaXJlY3RvcnlFbXB0eUZvclJlbW92YWwpOiBlYXJseSBicmVhayBp ZiB0aGUgZGlyZWN0b3J5IGRvZXNuJ3QgZXhpc3QKKyAgICAgICAgKHNjbVJlbW92ZSk6IGhhdmUg Z2l0IGlnbm9yZSB1bm1hdGNoZWQgZmlsZXMKKworMjAxMC0wNC0xMSAgSm9zZXBoIFBlY29yYXJv ICA8am9lcGVja0B3ZWJraXQub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcmsgUm93ZS4K IAogICAgICAgICBNYWtlIGNvbW1pdC1sb2ctZWRpdG9yIFJ1YmJlci1zdGFtcCBhd2FyZS4gQW5k IG90aGVyIG1pbm9yIGNsZWFudXBzLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9z dm4tYXBwbHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3N2bi1hcHBseQppbmRleCA4NjIxOTNlLi4x MDc5NjQ5IDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3N2bi1hcHBseQorKysgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3N2bi1hcHBseQpAQCAtMzIxLDYgKzMyMSw3IEBAIHN1YiBoYW5k bGVHaXRCaW5hcnlDaGFuZ2UoJCQpCiBzdWIgaXNEaXJlY3RvcnlFbXB0eUZvclJlbW92YWwoJCkK IHsKICAgICBteSAoJGRpcikgPSBAXzsKKyAgICByZXR1cm4gMSB1bmxlc3MgLWQgJGRpcjsKICAg ICBteSAkZGlyZWN0b3J5SXNFbXB0eSA9IDE7CiAgICAgb3BlbmRpciBESVIsICRkaXIgb3IgZGll ICJDb3VsZCBub3Qgb3BlbiAnJGRpcicgdG8gbGlzdCBmaWxlczogJD8iOwogICAgIGZvciAobXkg JGl0ZW0gPSByZWFkZGlyIERJUjsgJGl0ZW0gJiYgJGRpcmVjdG9yeUlzRW1wdHk7ICRpdGVtID0g cmVhZGRpciBESVIpIHsKQEAgLTQ5Nyw2ICs0OTgsNiBAQCBzdWIgc2NtUmVtb3ZlKCQpCiAgICAg ICAgIGNsb3NlIFNWTjsKICAgICAgICAgcHJpbnQgJHN2bk91dHB1dCBpZiAkc3ZuT3V0cHV0Owog ICAgIH0gZWxzaWYgKGlzR2l0KCkpIHsKLSAgICAgICAgc3lzdGVtKCJnaXQiLCAicm0iLCAiLS1m b3JjZSIsICRwYXRoKSA9PSAwIG9yIGRpZSAgIkZhaWxlZCB0byBnaXQgcm0gLS1mb3JjZSAkcGF0 aC4iOworICAgICAgICBzeXN0ZW0oImdpdCIsICJybSIsICItLWZvcmNlIiwgIi0taWdub3JlLXVu bWF0Y2giLCAkcGF0aCkgPT0gMCBvciBkaWUgICJGYWlsZWQgdG8gZ2l0IHJtIC0tZm9yY2UgJHBh dGguIjsKICAgICB9CiB9Cg== 53095 2010-04-11 12:55:05 -0700 2010-04-11 13:00:10 -0700 [PATCH] With Comment take2.patch text/plain 2085 joepeck ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAxNzcyNTVjLi4zNmQwZjJmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAKIDIwMTAtMDQt MTEgIEpvc2VwaCBQZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KIAorICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBzdm4tYXBwbHkgZXJyb3JzIG91dCB3 aGVuIHJlbW92aW5nIGRpcmVjdG9yaWVzIGluIGdpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQ4NzEKKworICAgICAgICAqIFNjcmlwdHMvc3ZuLWFw cGx5OgorICAgICAgICAoaXNEaXJlY3RvcnlFbXB0eUZvclJlbW92YWwpOiBlYXJseSBicmVhayBp ZiB0aGUgZGlyZWN0b3J5IGRvZXNuJ3QgZXhpc3QKKyAgICAgICAgKHNjbVJlbW92ZSk6IGhhdmUg Z2l0IGlnbm9yZSB1bm1hdGNoZWQgZmlsZXMKKworMjAxMC0wNC0xMSAgSm9zZXBoIFBlY29yYXJv ICA8am9lcGVja0B3ZWJraXQub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcmsgUm93ZS4K IAogICAgICAgICBNYWtlIGNvbW1pdC1sb2ctZWRpdG9yIFJ1YmJlci1zdGFtcCBhd2FyZS4gQW5k IG90aGVyIG1pbm9yIGNsZWFudXBzLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9z dm4tYXBwbHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3N2bi1hcHBseQppbmRleCA4NjIxOTNlLi5h YTUyYWM4IDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3N2bi1hcHBseQorKysgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3N2bi1hcHBseQpAQCAtMzIxLDYgKzMyMSw3IEBAIHN1YiBoYW5k bGVHaXRCaW5hcnlDaGFuZ2UoJCQpCiBzdWIgaXNEaXJlY3RvcnlFbXB0eUZvclJlbW92YWwoJCkK IHsKICAgICBteSAoJGRpcikgPSBAXzsKKyAgICByZXR1cm4gMSB1bmxlc3MgLWQgJGRpcjsKICAg ICBteSAkZGlyZWN0b3J5SXNFbXB0eSA9IDE7CiAgICAgb3BlbmRpciBESVIsICRkaXIgb3IgZGll ICJDb3VsZCBub3Qgb3BlbiAnJGRpcicgdG8gbGlzdCBmaWxlczogJD8iOwogICAgIGZvciAobXkg JGl0ZW0gPSByZWFkZGlyIERJUjsgJGl0ZW0gJiYgJGRpcmVjdG9yeUlzRW1wdHk7ICRpdGVtID0g cmVhZGRpciBESVIpIHsKQEAgLTQ5Nyw2ICs0OTgsMTIgQEAgc3ViIHNjbVJlbW92ZSgkKQogICAg ICAgICBjbG9zZSBTVk47CiAgICAgICAgIHByaW50ICRzdm5PdXRwdXQgaWYgJHN2bk91dHB1dDsK ICAgICB9IGVsc2lmIChpc0dpdCgpKSB7Ci0gICAgICAgIHN5c3RlbSgiZ2l0IiwgInJtIiwgIi0t Zm9yY2UiLCAkcGF0aCkgPT0gMCBvciBkaWUgICJGYWlsZWQgdG8gZ2l0IHJtIC0tZm9yY2UgJHBh dGguIjsKKyAgICAgICAgIyBHaXQgcmVtb3ZlcyBhIGRpcmVjdG9yeSBpZiBpdCBiZWNvbWVzIGVt cHR5IHdoZW4gdGhlIGxhc3QgZmlsZSBpdCBjb250YWlucyBpcworICAgICAgICAjIHJlbW92ZWQg YnkgYGdpdCBybWAuIEluIHN2bi1hcHBseSB0aGlzIGNhbiBoYXBwZW4gd2hlbiBhIGRpcmVjdG9y eSBpcyBiZWluZworICAgICAgICAjIHJlbW92ZWQgaW4gYSBwYXRjaCwgYW5kIGFsbCBvZiB0aGUg ZmlsZXMgaW5zaWRlIG9mIHRoZSBkaXJlY3RvcnkgYXJlIHJlbW92ZWQKKyAgICAgICAgIyBiZWZv cmUgYXR0ZW1waW5nIHRvIHJlbW92ZSB0aGUgZGlyZWN0b3J5IGl0c2VsZi4gSW4gdGhpcyBjYXNl LCBHaXQgd2lsbCBoYXZlIAorICAgICAgICAjIGFscmVhZHkgZGVsZXRlZCB0aGUgZGlyZWN0b3J5 IGFuZCBgZ2l0IHJtYCB3b3VsZCBleGl0IHdpdGggYW4gZXJyb3IgY2xhaW1pbmcKKyAgICAgICAg IyB0aGVyZSB3YXMgbm8gZmlsZS4gVGhlIC0taWdub3JlLXVubWF0Y2ggc3dpdGNoIGdyYWNlZnVs bHkgaGFuZGxlcyB0aGlzIGNhc2UuCisgICAgICAgIHN5c3RlbSgiZ2l0IiwgInJtIiwgIi0tZm9y Y2UiLCAiLS1pZ25vcmUtdW5tYXRjaCIsICRwYXRoKSA9PSAwIG9yIGRpZSAgIkZhaWxlZCB0byBn aXQgcm0gLS1mb3JjZSAkcGF0aC4iOwogICAgIH0KIH0K 53096 2010-04-11 13:00:10 -0700 2010-04-11 13:19:09 -0700 [PATCH] With Comment and Updated die() message take3.patch text/plain 2101 joepeck ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAxNzcyNTVjLi4zNmQwZjJmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAKIDIwMTAtMDQt MTEgIEpvc2VwaCBQZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KIAorICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBzdm4tYXBwbHkgZXJyb3JzIG91dCB3 aGVuIHJlbW92aW5nIGRpcmVjdG9yaWVzIGluIGdpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQ4NzEKKworICAgICAgICAqIFNjcmlwdHMvc3ZuLWFw cGx5OgorICAgICAgICAoaXNEaXJlY3RvcnlFbXB0eUZvclJlbW92YWwpOiBlYXJseSBicmVhayBp ZiB0aGUgZGlyZWN0b3J5IGRvZXNuJ3QgZXhpc3QKKyAgICAgICAgKHNjbVJlbW92ZSk6IGhhdmUg Z2l0IGlnbm9yZSB1bm1hdGNoZWQgZmlsZXMKKworMjAxMC0wNC0xMSAgSm9zZXBoIFBlY29yYXJv ICA8am9lcGVja0B3ZWJraXQub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcmsgUm93ZS4K IAogICAgICAgICBNYWtlIGNvbW1pdC1sb2ctZWRpdG9yIFJ1YmJlci1zdGFtcCBhd2FyZS4gQW5k IG90aGVyIG1pbm9yIGNsZWFudXBzLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9z dm4tYXBwbHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3N2bi1hcHBseQppbmRleCA4NjIxOTNlLi4w Zjk5OWExIDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3N2bi1hcHBseQorKysgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3N2bi1hcHBseQpAQCAtMzIxLDYgKzMyMSw3IEBAIHN1YiBoYW5k bGVHaXRCaW5hcnlDaGFuZ2UoJCQpCiBzdWIgaXNEaXJlY3RvcnlFbXB0eUZvclJlbW92YWwoJCkK IHsKICAgICBteSAoJGRpcikgPSBAXzsKKyAgICByZXR1cm4gMSB1bmxlc3MgLWQgJGRpcjsKICAg ICBteSAkZGlyZWN0b3J5SXNFbXB0eSA9IDE7CiAgICAgb3BlbmRpciBESVIsICRkaXIgb3IgZGll ICJDb3VsZCBub3Qgb3BlbiAnJGRpcicgdG8gbGlzdCBmaWxlczogJD8iOwogICAgIGZvciAobXkg JGl0ZW0gPSByZWFkZGlyIERJUjsgJGl0ZW0gJiYgJGRpcmVjdG9yeUlzRW1wdHk7ICRpdGVtID0g cmVhZGRpciBESVIpIHsKQEAgLTQ5Nyw2ICs0OTgsMTIgQEAgc3ViIHNjbVJlbW92ZSgkKQogICAg ICAgICBjbG9zZSBTVk47CiAgICAgICAgIHByaW50ICRzdm5PdXRwdXQgaWYgJHN2bk91dHB1dDsK ICAgICB9IGVsc2lmIChpc0dpdCgpKSB7Ci0gICAgICAgIHN5c3RlbSgiZ2l0IiwgInJtIiwgIi0t Zm9yY2UiLCAkcGF0aCkgPT0gMCBvciBkaWUgICJGYWlsZWQgdG8gZ2l0IHJtIC0tZm9yY2UgJHBh dGguIjsKKyAgICAgICAgIyBHaXQgcmVtb3ZlcyBhIGRpcmVjdG9yeSBpZiBpdCBiZWNvbWVzIGVt cHR5IHdoZW4gdGhlIGxhc3QgZmlsZSBpdCBjb250YWlucyBpcworICAgICAgICAjIHJlbW92ZWQg YnkgYGdpdCBybWAuIEluIHN2bi1hcHBseSB0aGlzIGNhbiBoYXBwZW4gd2hlbiBhIGRpcmVjdG9y eSBpcyBiZWluZworICAgICAgICAjIHJlbW92ZWQgaW4gYSBwYXRjaCwgYW5kIGFsbCBvZiB0aGUg ZmlsZXMgaW5zaWRlIG9mIHRoZSBkaXJlY3RvcnkgYXJlIHJlbW92ZWQKKyAgICAgICAgIyBiZWZv cmUgYXR0ZW1waW5nIHRvIHJlbW92ZSB0aGUgZGlyZWN0b3J5IGl0c2VsZi4gSW4gdGhpcyBjYXNl LCBHaXQgd2lsbCBoYXZlIAorICAgICAgICAjIGFscmVhZHkgZGVsZXRlZCB0aGUgZGlyZWN0b3J5 IGFuZCBgZ2l0IHJtYCB3b3VsZCBleGl0IHdpdGggYW4gZXJyb3IgY2xhaW1pbmcKKyAgICAgICAg IyB0aGVyZSB3YXMgbm8gZmlsZS4gVGhlIC0taWdub3JlLXVubWF0Y2ggc3dpdGNoIGdyYWNlZnVs bHkgaGFuZGxlcyB0aGlzIGNhc2UuCisgICAgICAgIHN5c3RlbSgiZ2l0IiwgInJtIiwgIi0tZm9y Y2UiLCAiLS1pZ25vcmUtdW5tYXRjaCIsICRwYXRoKSA9PSAwIG9yIGRpZSAiRmFpbGVkIHRvIGdp dCBybSAtLWZvcmNlIC0taWdub3JlLXVubWF0Y2ggJHBhdGguIjsKICAgICB9CiB9Cg==