29622 2009-09-21 16:32:13 -0700 svn-apply can exit(0) even on patch failure 2009-10-27 10:26:40 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 30826 1 eric eric commit-queue mark oldest_to_newest 148894 0 eric 2009-09-21 16:32:13 -0700 svn-apply can exit(0) even on patch failure This is bad for the commit-queue/bugzilla-tool as it depends on svn-apply exiting non-zero on patch failure. It's possible that bugzilla-tool could land an incomplete patch as-is. Some examples from the code: sub scmCopy($$) { my ($source, $destination) = @_; if ($isSVN) { system "svn", "copy", $source, $destination; } elsif ($isGit) { system "cp", $source, $destination; system "git", "add", $destination; } } sub scmAdd($) { my ($path) = @_; if ($isSVN) { system "svn", "add", $path; } elsif ($isGit) { system "git", "add", $path; } } sub scmRemove($) { my ($path) = @_; if ($isSVN) { # SVN is very verbose when removing directories. Squelch all output except the last line. my $svnOutput; open SVN, "svn rm --force '$path' |" or die "svn rm --force '$path' failed!"; # Only print the last line. Subversion outputs all changed statuses below $dir while (<SVN>) { $svnOutput = $_; } close SVN; print $svnOutput if $svnOutput; } elsif ($isGit) { system "git", "rm", "--force", $path; } } 149858 1 40081 eric 2009-09-24 15:03:00 -0700 Created attachment 40081 log from another silent failure 149860 2 mark 2009-09-24 15:08:33 -0700 git diffs don't have Index: lines? 149862 3 eric 2009-09-24 15:09:14 -0700 I think the log message from svn-apply is misleading. 149864 4 eric 2009-09-24 15:11:00 -0700 svn-apply uses this magic function to convert git diffs to svn diffs before processing: http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/svn-apply#L316 Also, I probably should have split out these two bugs. The fact that that patch failed to apply is likely a separate bug from the fact that svn-apply can error out silently (thus causing badness!) 157381 5 41766 eric 2009-10-23 17:15:48 -0700 Created attachment 41766 Hopefully catch all cases 157382 6 41767 eric 2009-10-23 17:19:04 -0700 Created attachment 41767 Hopefully catch all cases 158110 7 41767 abarth 2009-10-27 00:38:03 -0700 Comment on attachment 41767 Hopefully catch all cases die die die! 158138 8 41767 commit-queue 2009-10-27 03:09:28 -0700 Comment on attachment 41767 Hopefully catch all cases Clearing flags on attachment: 41767 Committed r50137: <http://trac.webkit.org/changeset/50137> 158139 9 commit-queue 2009-10-27 03:09:32 -0700 All reviewed patches have been landed. Closing bug. 40081 2009-09-24 15:03:00 -0700 2009-09-24 15:03:00 -0700 log from another silent failure :tmp:failure.txt text/plain 1744 eric QXBwbHlpbmcgNDAwNzggZnJvbSBidWcgMjk3MjEuCkZhaWxlZCB0byBmaW5kICdJbmRleDonIGlu OgotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCmRpZmYgLS1naXQgQ2hhbmdlTG9nIENoYW5nZUxvZwppbmRleCBjZmIyOWEy Li5jMGU2ZWMzIDEwMDY0NAotLS0gQ2hhbmdlTG9nCisrKyBDaGFuZ2VMb2cKQEAgLTEsNCArMSwx NiBAQAorMjAwOS0wOS0yNCAgVG9ueSBDaGFuZyAgPHRvbnlAY2hyb21pdW0ub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIGd5cCB2YXJp YWJsZSB0byBhbGxvdyBidWlsZGluZyBhIGRlYnVnIHdlYmNvcmUgd2l0aG91dCBkZWJ1ZworICAg ICAgICBzeW1ib2xzLiAgVGhpcyBhbGxvd3MgZm9yIGZhc3RlciBjb21waWxlLCBsaW5rLCBhbmQg Z2RiIHRpbWVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9Mjk3MjEKKworICAgICAgICBObyBuZXcgdGVzdHMsIGJ1aWxkIGNvbmZpZyBjaGFuZ2UuCisK KyAgICAgICAgKiBXZWJDb3JlLmd5cC9XZWJDb3JlLmd5cDoKKwogMjAwOS0wOS0yNCAgQnJhZHkg RWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdl aW5pZy4KIApkaWZmIC0tZ2l0IFdlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwIFdlYkNvcmUuZ3lwL1dl YkNvcmUuZ3lwCmluZGV4IGYzMmM1OWQuLmViZTQ2OGUgMTAwNjQ0Ci0tLSBXZWJDb3JlLmd5cC9X ZWJDb3JlLmd5cAorKysgV2ViQ29yZS5neXAvV2ViQ29yZS5neXAKQEAgLTM4LDggKzM4LDEyIEBA CiAgICd2YXJpYWJsZXMnOiB7CiAgICAgIyBGSVhFTUU6IFNlbnNlIHdoZXRoZXIgdXBzdHJlYW0g b3IgZG93bnN0cmVhbSBidWlsZCwgYW5kCiAgICAgIyBwb2ludCB0byB0aGUgcmlnaHQgc3JjIGRp cgogICAgICdjaHJvbWl1bV9zcmNfZGlyJzogJy4uLy4uLy4uLy4uJywKKworICAgICMgSWYgc2V0 IHRvIDEsIGRvZXNuJ3QgY29tcGlsZSBkZWJ1ZyBzeW1ib2xzIGludG8gd2ViY29yZSByZWR1Y2lu ZyB0aGUKKyAgICAjIHNpemUgb2YgdGhlIGJpbmFyeSBhbmQgaW5jcmVhc2luZyB0aGUgc3BlZWQg b2YgZ2RiLiAgZ2NjIG9ubHkuCisgICAgJ3JlbW92ZV93ZWJjb3JlX2RlYnVnX3N5bWJvbHMlJzog MCwKICAgCiAgICAgJ3dlYmNvcmVfaW5jbHVkZV9kaXJzJzogWwogICAgICAgJy4uLycsCiAgICAg ICAnLi4vYWNjZXNzaWJpbGl0eScsCkBAIC03ODgsOCArNzkyLDE1IEBACiAgICAgICAgICAgICBb J2V4Y2x1ZGUnLCAnV2luXFwuY3BwJCddLAogICAgICAgICAgICAgWydleGNsdWRlJywgJy8oV2lu ZG93c3xVbmlzY3JpYmUpW14vXSpcXC5jcHAkJ10KICAgICAgICAgICBdLAogICAgICAgICB9XSwK KyAgICAgICAgWydPUyE9IndpbiIgYW5kIHJlbW92ZV93ZWJjb3JlX2RlYnVnX3N5bWJvbHM9PTEn LCB7CisgICAgICAgICAgJ2NvbmZpZ3VyYXRpb25zJzogeworICAgICAgICAgICAgJ0RlYnVnJzog eworICAgICAgICAgICAgICAnY2ZsYWdzISc6IFsnLWcnXSwKKyAgICAgICAgICAgIH0KKyAgICAg ICAgICB9LAorICAgICAgICB9XSwKICAgICAgIF0sCiAgICAgfSwKICAgXSwgIyB0YXJnZXRzCiB9 CgotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tClJ1bm5pbmcgYnVpbGQtd2Via2l0Cg== 41766 2009-10-23 17:15:48 -0700 2009-10-23 17:19:00 -0700 Hopefully catch all cases bug-29622-20091023171546.patch text/plain 1807 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAwZjczMmRlLi5jMGI0NTMwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAKIDIwMDktMTAt MjMgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHN2bi1hcHBseSBjYW4gZXhpdCgwKSBldmVuIG9u IHBhdGNoIGZhaWx1cmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI5NjIyCisKKyAgICAgICAgKiBTY3JpcHRzL3N2bi1hcHBseToKKyAgICAgICAgIC0g QWRkIGEgYnVuY2ggb2YgIm9yIGRpZSIgc3RhdGVtZW50cywgaG9wZWZ1bGx5IGNhdGNoaW5nIGFs bAorICAgICAgICAgICBwb3NzaWJsZSBjYXNlcyB3aGVyZSBmYWlsdXJlIGNvdWxkIHN0aWxsIGV4 aXQoMCkuCisKKzIwMDktMTAtMjMgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCiAg ICAgICAgIE5vIHJldmlldywgb25seSBhZGRpbmcgQWxpY2UgdG8gdGhlIGxpc3Qgb2YgcmV2aWV3 ZXJzLgogCiAgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL2NvbW1pdHRlcnMucHk6CmRpZmYgLS1n aXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3N2bi1hcHBseSBiL1dlYktpdFRvb2xzL1NjcmlwdHMv c3ZuLWFwcGx5CmluZGV4IDE5YzhjNTYuLmQzZWY2MzkgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xz L1NjcmlwdHMvc3ZuLWFwcGx5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5CkBA IC01MjQsMTAgKzUyNCwxMCBAQCBzdWIgc2NtQ29weSgkJCkKIHsKICAgICBteSAoJHNvdXJjZSwg JGRlc3RpbmF0aW9uKSA9IEBfOwogICAgIGlmIChpc1NWTigpKSB7Ci0gICAgICAgIHN5c3RlbSAi c3ZuIiwgImNvcHkiLCAkc291cmNlLCAkZGVzdGluYXRpb247CisgICAgICAgIHN5c3RlbSAic3Zu IiwgImNvcHkiLCAkc291cmNlLCAkZGVzdGluYXRpb24gb3IgZGllOwogICAgIH0gZWxzaWYgKGlz R2l0KCkpIHsKLSAgICAgICAgc3lzdGVtICJjcCIsICRzb3VyY2UsICRkZXN0aW5hdGlvbjsKLSAg ICAgICAgc3lzdGVtICJnaXQiLCAiYWRkIiwgJGRlc3RpbmF0aW9uOworICAgICAgICBzeXN0ZW0g ImNwIiwgJHNvdXJjZSwgJGRlc3RpbmF0aW9uIG9yIGRpZTsKKyAgICAgICAgc3lzdGVtICJnaXQi LCAiYWRkIiwgJGRlc3RpbmF0aW9uIG9yIGRpZTsKICAgICB9CiB9CiAKQEAgLTUzNSw5ICs1MzUs OSBAQCBzdWIgc2NtQWRkKCQpCiB7CiAgICAgbXkgKCRwYXRoKSA9IEBfOwogICAgIGlmIChpc1NW TigpKSB7Ci0gICAgICAgIHN5c3RlbSAic3ZuIiwgImFkZCIsICRwYXRoOworICAgICAgICBzeXN0 ZW0gInN2biIsICJhZGQiLCAkcGF0aCBvciBkaWU7CiAgICAgfSBlbHNpZiAoaXNHaXQoKSkgewot ICAgICAgICBzeXN0ZW0gImdpdCIsICJhZGQiLCAkcGF0aDsKKyAgICAgICAgc3lzdGVtICJnaXQi LCAiYWRkIiwgJHBhdGggb3IgZGllOwogICAgIH0KIH0KIApAQCAtNTU1LDYgKzU1NSw2IEBAIHN1 YiBzY21SZW1vdmUoJCkKICAgICAgICAgY2xvc2UgU1ZOOwogICAgICAgICBwcmludCAkc3ZuT3V0 cHV0IGlmICRzdm5PdXRwdXQ7CiAgICAgfSBlbHNpZiAoaXNHaXQoKSkgewotICAgICAgICBzeXN0 ZW0gImdpdCIsICJybSIsICItLWZvcmNlIiwgJHBhdGg7CisgICAgICAgIHN5c3RlbSAiZ2l0Iiwg InJtIiwgIi0tZm9yY2UiLCAkcGF0aCBvciBkaWU7CiAgICAgfQogfQ== 41767 2009-10-23 17:19:04 -0700 2009-10-27 03:09:28 -0700 Hopefully catch all cases bug-29622-20091023171903.patch text/plain 2078 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAwZjczMmRlLi5jMGI0NTMwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAKIDIwMDktMTAt MjMgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHN2bi1hcHBseSBjYW4gZXhpdCgwKSBldmVuIG9u IHBhdGNoIGZhaWx1cmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI5NjIyCisKKyAgICAgICAgKiBTY3JpcHRzL3N2bi1hcHBseToKKyAgICAgICAgIC0g QWRkIGEgYnVuY2ggb2YgIm9yIGRpZSIgc3RhdGVtZW50cywgaG9wZWZ1bGx5IGNhdGNoaW5nIGFs bAorICAgICAgICAgICBwb3NzaWJsZSBjYXNlcyB3aGVyZSBmYWlsdXJlIGNvdWxkIHN0aWxsIGV4 aXQoMCkuCisKKzIwMDktMTAtMjMgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCiAg ICAgICAgIE5vIHJldmlldywgb25seSBhZGRpbmcgQWxpY2UgdG8gdGhlIGxpc3Qgb2YgcmV2aWV3 ZXJzLgogCiAgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL2NvbW1pdHRlcnMucHk6CmRpZmYgLS1n aXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3N2bi1hcHBseSBiL1dlYktpdFRvb2xzL1NjcmlwdHMv c3ZuLWFwcGx5CmluZGV4IDE5YzhjNTYuLmZkMGQ2NDkgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xz L1NjcmlwdHMvc3ZuLWFwcGx5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5CkBA IC0zNzMsNiArMzczLDcgQEAgc3ViIHBhdGNoKCQpCiAgICAgdW5sZXNzICgkcGF0Y2ggPX4gbXxe SW5kZXg6IChbXlxyXG5dKyl8KSB7CiAgICAgICAgIG15ICRzZXBhcmF0b3IgPSAnLScgeCA2NzsK ICAgICAgICAgd2FybiAiRmFpbGVkIHRvIGZpbmQgJ0luZGV4OicgaW46XG4kc2VwYXJhdG9yXG4k cGF0Y2hcbiRzZXBhcmF0b3JcbiI7CisgICAgICAgIGRpZSB1bmxlc3MgJGZvcmNlOwogICAgICAg ICByZXR1cm47CiAgICAgfQogICAgIG15ICRmdWxsUGF0aCA9ICQxOwpAQCAtNTI0LDEwICs1MjUs MTAgQEAgc3ViIHNjbUNvcHkoJCQpCiB7CiAgICAgbXkgKCRzb3VyY2UsICRkZXN0aW5hdGlvbikg PSBAXzsKICAgICBpZiAoaXNTVk4oKSkgewotICAgICAgICBzeXN0ZW0gInN2biIsICJjb3B5Iiwg JHNvdXJjZSwgJGRlc3RpbmF0aW9uOworICAgICAgICBzeXN0ZW0gInN2biIsICJjb3B5IiwgJHNv dXJjZSwgJGRlc3RpbmF0aW9uIG9yIGRpZTsKICAgICB9IGVsc2lmIChpc0dpdCgpKSB7Ci0gICAg ICAgIHN5c3RlbSAiY3AiLCAkc291cmNlLCAkZGVzdGluYXRpb247Ci0gICAgICAgIHN5c3RlbSAi Z2l0IiwgImFkZCIsICRkZXN0aW5hdGlvbjsKKyAgICAgICAgc3lzdGVtICJjcCIsICRzb3VyY2Us ICRkZXN0aW5hdGlvbiBvciBkaWU7CisgICAgICAgIHN5c3RlbSAiZ2l0IiwgImFkZCIsICRkZXN0 aW5hdGlvbiBvciBkaWU7CiAgICAgfQogfQogCkBAIC01MzUsOSArNTM2LDkgQEAgc3ViIHNjbUFk ZCgkKQogewogICAgIG15ICgkcGF0aCkgPSBAXzsKICAgICBpZiAoaXNTVk4oKSkgewotICAgICAg ICBzeXN0ZW0gInN2biIsICJhZGQiLCAkcGF0aDsKKyAgICAgICAgc3lzdGVtICJzdm4iLCAiYWRk IiwgJHBhdGggb3IgZGllOwogICAgIH0gZWxzaWYgKGlzR2l0KCkpIHsKLSAgICAgICAgc3lzdGVt ICJnaXQiLCAiYWRkIiwgJHBhdGg7CisgICAgICAgIHN5c3RlbSAiZ2l0IiwgImFkZCIsICRwYXRo IG9yIGRpZTsKICAgICB9CiB9CiAKQEAgLTU1NSw2ICs1NTYsNiBAQCBzdWIgc2NtUmVtb3ZlKCQp CiAgICAgICAgIGNsb3NlIFNWTjsKICAgICAgICAgcHJpbnQgJHN2bk91dHB1dCBpZiAkc3ZuT3V0 cHV0OwogICAgIH0gZWxzaWYgKGlzR2l0KCkpIHsKLSAgICAgICAgc3lzdGVtICJnaXQiLCAicm0i LCAiLS1mb3JjZSIsICRwYXRoOworICAgICAgICBzeXN0ZW0gImdpdCIsICJybSIsICItLWZvcmNl IiwgJHBhdGggb3IgZGllOwogICAgIH0KIH0=