Module: tools Branch: master Commit: d84c6603d7bf9db05318d2c17db6ff9529cb92f8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d84c6603d7bf9db05318d2c17...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Nov 8 21:08:25 2017 +0100
patches: Remove some no longer used patch states.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
patches/expire | 15 ++------------- patches/patches.css | 2 -- patches/update | 5 ----- 3 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/patches/expire b/patches/expire index 4dd8a1a..305e7e5 100755 --- a/patches/expire +++ b/patches/expire @@ -24,7 +24,6 @@ my %status_expiry = ( "nil" => 30, - "pending" => 30, "assigned" => 30, "applied" => 30, "committed" => 1, @@ -35,12 +34,11 @@ my %status_expiry = "formatting" => 7, "other" => 7, "nopatch" => 3, - "reply" => 7, + "reply" => 1, "rejected" => 7, "split" => 7, "depend" => 7, "sequence" => 7, - "signoff" => 1, "superseded" => 1, "testcase" => 7, "testfail" => 7, @@ -49,7 +47,6 @@ my %status_expiry = my %status_descr = ( "nil" => "New", - "pending" => "Pending", "assigned" => "Assigned", "applied" => "Applied", "committed" => "Committed", @@ -65,7 +62,6 @@ my %status_descr = "split" => "Needs splitting", "depend" => "Dependency", "sequence" => "Bad sequence", - "signoff" => "Sign-off", "superseded" => "Superseded", "testcase" => "Needs tests", "testfail" => "Test failure", @@ -73,12 +69,6 @@ my %status_descr =
my %status_explanation = ( - "pending" => -"This means that the patch is not necessarily wrong, but its -correctness is not obvious. You should either write a test case -demonstrating that it is correct, try to fix the problem in a more -straightforward way, or better explain why you are doing things this -way.", "assigned" => "This means that the patch has been assigned to a reviewer. If the reviewer signs off on the patch, it will be committed, otherwise @@ -142,7 +132,6 @@ to enable the Testbot to figure it out.", the patch is correct.", # No notifications are sent for the following: # "nil" -# "signoff" # "reply" # "superseded" # "testfail" @@ -213,7 +202,7 @@ sub get_patch_state($) { $status = <STATUS>; chomp $status; - $mtime = (stat STATUS)[9] unless ($status eq "nil" || $status eq "pending"); + $mtime = (stat STATUS)[9] unless $status eq "nil"; close STATUS; } $mtime ||= (stat "$dir/$file")[9]; diff --git a/patches/patches.css b/patches/patches.css index f7bb560..24e8f37 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -153,7 +153,6 @@ tr.odd { background-color: #f8e8e8; } .id :hover, .sha1 :hover, .subject :hover { color: #FF6666; text-decoration: underline; }
.nil, .nil :link, .nil :visited { color: blue; font-weight: bold; } -.pending, .pending :link, .pending :visited { color: blue; } .assigned, .assigned :link, .assigned :visited { color: blue; } .committed, .committed :link, .committed :visited { color: green; } .depend, .depend :link, .depend :visited { color: #e08000; } @@ -161,7 +160,6 @@ tr.odd { background-color: #f8e8e8; } .sequence, .sequence :link, .sequence :visited { color: #e08000; } .deferred, .deferred :link, .deferred :visited { color: #e08000; } .testcase, .testcase :link, .testcase :visited { color: #e08000; } -.signoff, .signoff :link, .signoff :visited { color: #e08000; } .reply, .reply :link, .reply :visited { color: #e08000; } .other, .other :link, .other :visited { color: #e08000; } .applyfail, .applyfail :link, .applyfail :visited { color: red; } diff --git a/patches/update b/patches/update index ca4d2e5..5e82927 100755 --- a/patches/update +++ b/patches/update @@ -24,7 +24,6 @@ use CGI qw(:standard); my %status_descr = ( "nil" => "New", - "pending" => "Pending", "assigned" => "Assigned", "applied" => "Applied", "committed" => "Committed", @@ -42,14 +41,12 @@ my %status_descr = "sequence" => "Bad sequence", "testcase" => "Needs tests", "testfail" => "Test failure", - "signoff" => "Sign-off", "reply" => "Reply", );
my @legend = ( [ "nil", "<ul><li>Patch not even looked at yet, there's still hope...</li></ul>" ], - [ "pending", "<ul><li>The patch is not obviously correct at first glance. Making a more convincing argument, preferably in the form of a test case, may help.</li></ul>" ], [ "assigned", "<ul><li>Waiting for sign-off or feedback from the assigned reviewer. If you don't hear anything after a couple of weeks, please resend the patch.</li></ul>" ], [ "committed", "<ul><li>You have done everything right; congratulations!</li>" . "<li>You screwed up but AJ missed it, send a fix before someone notices ;-)</li></ul>" ], @@ -59,8 +56,6 @@ my @legend = "<li>Someone else fixed the problem already.</li></ul>" ], [ "testcase", "<ul><li>You need to write some test cases demonstrating that the patch is correct.</li></ul>" ], [ "deferred", "<ul><li>The patch is deferred because of code freeze for an upcoming release. Either resend after the release, make the patch less intrusive, or make a convincing argument that it needs to be included in the release.</li></ul>" ], - [ "signoff", "<ul><li>This is a Signed-off-by reply to another patch.</li></ul>" ], - [ "reply", "<ul><li>The mail is a reply to another patch.</li></ul>" ], [ "other", "<ul><li>The patch belongs to another WineHQ project (website, appdb, etc.) and will be applied by the respective maintainer.</li></ul>" ], [ "applyfail", "<ul><li>The patch got mangled in transit.</li>" . "<li>It's not relative to the latest git.</li>" .
-
Alexandre Julliard