Index: bugzilla.dtd =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/bugzilla.dtd,v retrieving revision 1.15 diff -u -r1.15 bugzilla.dtd --- bugzilla.dtd +++ bugzilla.dtd @@ -5,7 +5,7 @@ maintainer CDATA #REQUIRED exporter CDATA #IMPLIED > - + @@ -38,7 +38,7 @@ - + Index: email_in.pl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/email_in.pl,v retrieving revision 1.5 diff -u -r1.5 email_in.pl --- email_in.pl +++ email_in.pl @@ -77,7 +77,7 @@ # bug object, if they're not specified. use constant REQUIRED_PROCESS_FIELDS => qw( dependson - blocked + blocks version product target_milestone @@ -92,6 +92,11 @@ cclist_accessible ); +# Fields for backwards compatibility. +use constant BACKWARDS_COMPATIBILTY => ( + blocked => blocks +); + # $input_email is a global so that it can be used in die_handler. our ($input_email, %switch); @@ -142,6 +147,8 @@ if ($line =~ /^@(\S+)\s*=\s*(.*)\s*/) { $current_field = lc($1); + $current_field = $BACKWARDS_COMPATIBILTY{$current_field} || + $current_field; $fields{$current_field} = $2; } else { Index: enter_bug.cgi =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/enter_bug.cgi,v retrieving revision 1.157 diff -u -r1.157 enter_bug.cgi --- enter_bug.cgi +++ enter_bug.cgi @@ -398,7 +398,7 @@ $vars->{'bug_file_loc'} = $cloned_bug->{'bug_file_loc'}; $vars->{'keywords'} = $cloned_bug->keywords; $vars->{'dependson'} = $cloned_bug_id; - $vars->{'blocked'} = ""; + $vars->{'blocks'} = ""; $vars->{'deadline'} = $cloned_bug->{'deadline'}; if (defined $cloned_bug->cc) { @@ -446,7 +446,7 @@ $vars->{'bug_file_loc'} = formvalue('bug_file_loc', "http://"); $vars->{'keywords'} = formvalue('keywords'); $vars->{'dependson'} = formvalue('dependson'); - $vars->{'blocked'} = formvalue('blocked'); + $vars->{'blocks'} = formvalue('blocks'); $vars->{'deadline'} = formvalue('deadline'); $vars->{'cc'} = join(', ', $cgi->param('cc')); Index: importxml.pl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/importxml.pl,v retrieving revision 1.76 diff -u -r1.76 importxml.pl --- importxml.pl +++ importxml.pl @@ -566,8 +566,8 @@ if ( defined $bug_fields{'dependson'} ) { $comments .= "This bug depended on bug(s) $bug_fields{'dependson'}.\n"; } - if ( defined $bug_fields{'blocked'} ) { - $comments .= "This bug blocked bug(s) $bug_fields{'blocked'}.\n"; + if ( defined $bug_filed{'blocks'} || defined $bug_fields{'blocked'} ) { + $comments .= "This bug blocked bug(s) ".($bug_filed{'blocks'} || $bug_fields{'blocked'}).".\n"; } # Now we process each of the fields in turn and make sure they contain Index: post_bug.cgi =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/post_bug.cgi,v retrieving revision 1.186 diff -u -r1.186 post_bug.cgi --- post_bug.cgi +++ post_bug.cgi @@ -140,7 +140,7 @@ qa_contact alias - blocked + blocks commentprivacy bug_file_loc bug_severity @@ -246,7 +246,7 @@ id => $id, }); -foreach my $i (@{$bug->dependson || []}, @{$bug->blocked || []}) { +foreach my $i (@{$bug->dependson || []}, @{$bug->blocks || []}) { push (@{$vars->{'sentmail'}}, { type => 'dep', id => $i, }); } Index: process_bug.cgi =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/process_bug.cgi,v retrieving revision 1.369 diff -u -r1.369 process_bug.cgi --- process_bug.cgi +++ process_bug.cgi @@ -168,14 +168,14 @@ # during validation. if ($cgi->param('id')) { my ($dependson, $blocks) = $bug->_check_dependencies( - scalar $cgi->param('dependson'), scalar $cgi->param('blocked')); + scalar $cgi->param('dependson'), scalar $cgi->param('blocks')); $cgi->param('dependson', $dependson); - $cgi->param('blocked', $blocks); + $cgi->param('blocks', $blocks); } # Right now, you can't modify dependencies on a mass change. else { $cgi->delete('dependson'); - $cgi->delete('blocked'); + $cgi->delete('blocks'); } # do a match on the fields if applicable @@ -999,18 +999,18 @@ foreach my $id (@idlist) { $sth_cc->execute($id); - my @blocked_cc = (); + my @blocks_cc = (); while (my ($pid) = $sth_cc->fetchrow_array) { # Ignore deleted accounts. They will never get notification. $usercache{$pid} ||= Bugzilla::User->new($pid) || next; my $cc_user = $usercache{$pid}; if (!$cc_user->can_edit_product($product->id)) { - push (@blocked_cc, $cc_user->login); + push (@blocks_cc, $cc_user->login); } } - if (scalar(@blocked_cc)) { + if (scalar(@blocks_cc)) { ThrowUserError('invalid_user_group', - {'users' => \@blocked_cc, + {'users' => \@blocks_cc, 'bug_id' => $id, 'product' => $product->name}); } @@ -1253,7 +1253,7 @@ # Gather the dependency list, and make sure there are no circular refs my %deps = Bugzilla::Bug::ValidateDependencies(scalar($cgi->param('dependson')), - scalar($cgi->param('blocked')), + scalar($cgi->param('blocks')), $id); # @@ -1419,11 +1419,11 @@ $cc_removed = [map {$_->login} @$cc_removed]; - # We need to send mail for dependson/blocked bugs if the dependencies + # We need to send mail for dependson/blocks bugs if the dependencies # change or the status or resolution change. This var keeps track of that. my $check_dep_bugs = 0; - foreach my $pair ("blocked/dependson", "dependson/blocked") { + foreach my $pair ("blocks/dependson", "dependson/blocks") { my ($me, $target) = split("/", $pair); my @oldlist = @{$dbh->selectcol_arrayref("SELECT $target FROM dependencies Index: sanitycheck.cgi =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/sanitycheck.cgi,v retrieving revision 1.132 diff -u -r1.132 sanitycheck.cgi --- sanitycheck.cgi +++ sanitycheck.cgi @@ -269,7 +269,7 @@ 'longdescs WRITE', 'votes WRITE', 'bugs READ'); foreach my $pair ('attachments/', 'bug_group_map/', 'bugs_activity/', 'cc/', - 'dependencies/blocked', 'dependencies/dependson', + 'dependencies/blocks', 'dependencies/dependson', 'duplicates/dupe', 'duplicates/dupe_of', 'flags/', 'keywords/', 'longdescs/', 'votes/') { @@ -405,7 +405,7 @@ ["attachments", "bug_id"], ["cc", "bug_id"], ["longdescs", "bug_id"], - ["dependencies", "blocked"], + ["dependencies", "blocks"], ["dependencies", "dependson"], ['flags', 'bug_id'], ["votes", "bug_id"], Index: showdependencygraph.cgi =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/showdependencygraph.cgi,v retrieving revision 1.59 diff -u -r1.59 showdependencygraph.cgi --- showdependencygraph.cgi +++ showdependencygraph.cgi @@ -84,12 +84,12 @@ } sub AddLink { - my ($blocked, $dependson, $fh) = (@_); - my $key = "$blocked,$dependson"; + my ($blocks, $dependson, $fh) = (@_); + my $key = "$blocks,$dependson"; if (!exists $edgesdone{$key}) { $edgesdone{$key} = 1; - print $fh "$blocked -> $dependson\n"; - $seen{$blocked} = 1; + print $fh "$blocks -> $dependson\n"; + $seen{$blocks} = 1; $seen{$dependson} = 1; } } @@ -126,11 +126,11 @@ if ($display eq 'doall') { my $dependencies = $dbh->selectall_arrayref( - "SELECT blocked, dependson FROM dependencies"); + "SELECT blocks, dependson FROM dependencies"); foreach my $dependency (@$dependencies) { - my ($blocked, $dependson) = @$dependency; - AddLink($blocked, $dependson, $fh); + my ($blocks, $dependson) = @$dependency; + AddLink($blocks, $dependson, $fh); } } else { foreach my $i (split('[\s,]+', $cgi->param('id'))) { @@ -141,21 +141,21 @@ my @stack = keys(%baselist); if ($display eq 'web') { - my $sth = $dbh->prepare(q{SELECT blocked, dependson + my $sth = $dbh->prepare(q{SELECT blocks, dependson FROM dependencies - WHERE blocked = ? OR dependson = ?}); + WHERE blocks = ? OR dependson = ?}); foreach my $id (@stack) { my $dependencies = $dbh->selectall_arrayref($sth, undef, ($id, $id)); foreach my $dependency (@$dependencies) { - my ($blocked, $dependson) = @$dependency; - if ($blocked != $id && !exists $seen{$blocked}) { - push @stack, $blocked; + my ($blocks, $dependson) = @$dependency; + if ($blocks != $id && !exists $seen{$blocks}) { + push @stack, $blocks; } if ($dependson != $id && !exists $seen{$dependson}) { push @stack, $dependson; } - AddLink($blocked, $dependson, $fh); + AddLink($blocks, $dependson, $fh); } } } @@ -163,7 +163,7 @@ else { my @blocker_stack = @stack; foreach my $id (@blocker_stack) { - my $blocker_ids = Bugzilla::Bug::EmitDependList('blocked', 'dependson', $id); + my $blocker_ids = Bugzilla::Bug::EmitDependList('blocks', 'dependson', $id); foreach my $blocker_id (@$blocker_ids) { push(@blocker_stack, $blocker_id) unless $seen{$blocker_id}; AddLink($id, $blocker_id, $fh); @@ -171,7 +171,7 @@ } my @dependent_stack = @stack; foreach my $id (@dependent_stack) { - my $dep_bug_ids = Bugzilla::Bug::EmitDependList('dependson', 'blocked', $id); + my $dep_bug_ids = Bugzilla::Bug::EmitDependList('dependson', 'blocks', $id); foreach my $dep_bug_id (@$dep_bug_ids) { push(@dependent_stack, $dep_bug_id) unless $seen{$dep_bug_id}; AddLink($dep_bug_id, $id, $fh); Index: showdependencytree.cgi =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/showdependencytree.cgi,v retrieving revision 1.50 diff -u -r1.50 showdependencytree.cgi --- showdependencytree.cgi +++ showdependencytree.cgi @@ -77,7 +77,7 @@ # appearing in the tree. my $blocked_tree = { $id => $current_bug }; my $blocked_ids = {}; -GenerateTree($id, "blocked", 1, $blocked_tree, $blocked_ids); +GenerateTree($id, "blocks", 1, $blocked_tree, $blocked_ids); $vars->{'blocked_tree'} = $blocked_tree; $vars->{'blocked_ids'} = [keys(%$blocked_ids)]; @@ -105,7 +105,7 @@ @dependencies = @{$bugs->{$bug_id}->dependson}; } else { - @dependencies = @{$bugs->{$bug_id}->blocked}; + @dependencies = @{$bugs->{$bug_id}->blocks}; } # Don't do anything if this bug doesn't have any dependencies. Index: summarize_time.cgi =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/summarize_time.cgi,v retrieving revision 1.21 diff -u -r1.21 summarize_time.cgi --- summarize_time.cgi +++ summarize_time.cgi @@ -243,7 +243,7 @@ sub get_blocker_ids_deep { my ($bug_id, $ret) = @_; - my $deps = Bugzilla::Bug::EmitDependList("blocked", "dependson", $bug_id); + my $deps = Bugzilla::Bug::EmitDependList("blocks", "dependson", $bug_id); push @{$ret}, @$deps; foreach $bug_id (@$deps) { get_blocker_ids_deep($bug_id, $ret); Index: Bugzilla/Bug.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Bug.pm,v retrieving revision 1.184 diff -u -r1.184 Bugzilla/Bug.pm --- Bugzilla/Bug.pm +++ Bugzilla/Bug.pm @@ -270,7 +270,7 @@ $class->check_required_create_fields(@_); my $params = $class->run_create_validators(@_); - # These are not a fields in the bugs table, so we don't pass them to + # These are not fields in the bugs table, so we don't pass them to # insert_create_data. my $cc_ids = $params->{cc}; delete $params->{cc}; @@ -278,8 +278,8 @@ delete $params->{groups}; my $depends_on = $params->{dependson}; delete $params->{dependson}; - my $blocked = $params->{blocked}; - delete $params->{blocked}; + my $blocks = $params->{blocks}; + delete $params->{blocks}; my ($comment, $privacy) = ($params->{comment}, $params->{commentprivacy}); delete $params->{comment}; delete $params->{commentprivacy}; @@ -321,19 +321,19 @@ $sth_keyword->execute($bug->bug_id, $keyword_id); } - # Set up dependencies (blocked/dependson) + # Set up dependencies (blocks/dependson) my $sth_deps = $dbh->prepare( - 'INSERT INTO dependencies (blocked, dependson) VALUES (?, ?)'); + 'INSERT INTO dependencies (blocks, dependson) VALUES (?, ?)'); my $sth_bug_time = $dbh->prepare('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?'); foreach my $depends_on_id (@$depends_on) { $sth_deps->execute($bug->bug_id, $depends_on_id); # Log the reverse action on the other bug. - LogActivityEntry($depends_on_id, 'blocked', '', $bug->bug_id, + LogActivityEntry($depends_on_id, 'blocks', '', $bug->bug_id, $bug->{reporter_id}, $timestamp); $sth_bug_time->execute($timestamp, $depends_on_id); } - foreach my $blocked_id (@$blocked) { + foreach my $blocked_id (@$blocks) { $sth_deps->execute($blocked_id, $bug->bug_id); # Log the reverse action on the other bug. LogActivityEntry($blocked_id, 'dependson', '', $bug->bug_id, @@ -416,8 +416,8 @@ $class->_check_strict_isolation($product, $params->{cc}, $params->{assigned_to}, $params->{qa_contact}); - ($params->{dependson}, $params->{blocked}) = - $class->_check_dependencies($params->{dependson}, $params->{blocked}, + ($params->{dependson}, $params->{blocks}) = + $class->_check_dependencies($params->{dependson}, $params->{blocks}, $product); # You can't set these fields on bug creation (or sometimes ever). @@ -544,7 +544,7 @@ $dbh->do("DELETE FROM bug_group_map WHERE bug_id = ?", undef, $bug_id); $dbh->do("DELETE FROM bugs_activity WHERE bug_id = ?", undef, $bug_id); $dbh->do("DELETE FROM cc WHERE bug_id = ?", undef, $bug_id); - $dbh->do("DELETE FROM dependencies WHERE blocked = ? OR dependson = ?", + $dbh->do("DELETE FROM dependencies WHERE blocks = ? OR dependson = ?", undef, ($bug_id, $bug_id)); $dbh->do("DELETE FROM duplicates WHERE dupe = ? OR dupe_of = ?", undef, ($bug_id, $bug_id)); @@ -746,9 +746,9 @@ $product->id); } - my %deps_in = (dependson => $depends_on || '', blocked => $blocks || ''); + my %deps_in = (dependson => $depends_on || '', blocks => $blocks || ''); - foreach my $type qw(dependson blocked) { + foreach my $type qw(dependson blocks) { my @bug_ids = split(/[\s,]+/, $deps_in{$type}); # Eliminate nulls. @bug_ids = grep {$_} @bug_ids; @@ -790,9 +790,9 @@ } # And finally, check for dependency loops. - my %deps = ValidateDependencies($deps_in{dependson}, $deps_in{blocked}); + my %deps = ValidateDependencies($deps_in{dependson}, $deps_in{blocks}); - return ($deps{'dependson'}, $deps{'blocked'}); + return ($deps{'dependson'}, $deps{'blocks'}); } sub _check_estimated_time { @@ -1034,7 +1034,7 @@ bug_status resolution dup_id bug_file_loc status_whiteboard keywords priority bug_severity target_milestone - dependson blocked votes everconfirmed + dependson blocks votes everconfirmed reporter assigned_to cc), # Conditional Fields @@ -1222,12 +1222,12 @@ return $self->{'assigned_to'}; } -sub blocked { +sub blocks { my ($self) = @_; - return $self->{'blocked'} if exists $self->{'blocked'}; + return $self->{'blocks'} if exists $self->{'blocks'}; return [] if $self->{'error'}; - $self->{'blocked'} = EmitDependList("dependson", "blocked", $self->bug_id); - return $self->{'blocked'}; + $self->{'blocks'} = EmitDependList("dependson", "blocks", $self->bug_id); + return $self->{'blocks'}; } # Even bugs in an error state always have a bug_id. @@ -1299,7 +1299,7 @@ return $self->{'dependson'} if exists $self->{'dependson'}; return [] if $self->{'error'}; $self->{'dependson'} = - EmitDependList("blocked", "dependson", $self->bug_id); + EmitDependList("blocks", "dependson", $self->bug_id); return $self->{'dependson'}; } @@ -2203,12 +2203,12 @@ my $dbh = Bugzilla->dbh; my $sth = $dbh->prepare( - "SELECT blocked, COUNT(bug_status) " . + "SELECT blocks, COUNT(bug_status) " . "FROM bugs, dependencies " . - "WHERE blocked IN (" . (join "," , @bug_list) . ") " . + "WHERE blocks IN (" . (join "," , @bug_list) . ") " . "AND bug_id = dependson " . "AND bug_status IN (" . join(', ', map {$dbh->quote($_)} BUG_STATE_OPEN) . ") " . - $dbh->sql_group_by('blocked')); + $dbh->sql_group_by('blocks')); $sth->execute(); while (my ($bug_id, $dependencies) = $sth->fetchrow_array()) { @@ -2531,7 +2531,7 @@ $dbh->selectrow_array("SELECT bug_id FROM bugs WHERE bug_id = ?", undef, $id) || ThrowUserError("invalid_bug_id_non_existent", {'bug_id' => $id}); - return if (defined $field && ($field eq "dependson" || $field eq "blocked")); + return if (defined $field && ($field eq "dependson" || $field eq "blocks")); return if $user->can_see_bug($id); @@ -2598,11 +2598,11 @@ my $fields = {}; # These can be arrayrefs or they can be strings. $fields->{'dependson'} = shift; - $fields->{'blocked'} = shift; + $fields->{'blocks'} = shift; my $id = shift || 0; unless (defined($fields->{'dependson'}) - || defined($fields->{'blocked'})) + || defined($fields->{'blocks'})) { return; } @@ -2610,7 +2610,7 @@ my $dbh = Bugzilla->dbh; my %deps; my %deptree; - foreach my $pair (["blocked", "dependson"], ["dependson", "blocked"]) { + foreach my $pair (["blocks", "dependson"], ["dependson", "blocks"]) { my ($me, $target) = @{$pair}; $deptree{$target} = []; $deps{$target} = []; @@ -2651,7 +2651,7 @@ } my @deps = @{$deptree{'dependson'}}; - my @blocks = @{$deptree{'blocked'}}; + my @blocks = @{$deptree{'blocks'}}; my %union = (); my %isect = (); foreach my $b (@deps, @blocks) { $union{$b}++ && $isect{$b}++ } Index: Bugzilla/BugMail.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm,v retrieving revision 1.106 diff -u -r1.106 Bugzilla/BugMail.pm --- Bugzilla/BugMail.pm +++ Bugzilla/BugMail.pm @@ -181,17 +181,17 @@ my $dependslist = $dbh->selectcol_arrayref( 'SELECT dependson FROM dependencies - WHERE blocked = ? ORDER BY dependson', + WHERE blocks = ? ORDER BY dependson', undef, ($id)); $values{'dependson'} = join(",", @$dependslist); my $blockedlist = $dbh->selectcol_arrayref( - 'SELECT blocked FROM dependencies - WHERE dependson = ? ORDER BY blocked', + 'SELECT blocks FROM dependencies + WHERE dependson = ? ORDER BY block', undef, ($id)); - $values{'blocked'} = join(",", @$blockedlist); + $values{'blocks'} = join(",", @$blockedlist); my @args = ($id); @@ -278,7 +278,7 @@ ON bugs_activity.bug_id = dependencies.dependson INNER JOIN fielddefs ON fielddefs.id = bugs_activity.fieldid - WHERE dependencies.blocked = ? + WHERE dependencies.blocks = ? AND (fielddefs.name = 'bug_status' OR fielddefs.name = 'resolution') $when_restriction Index: Bugzilla/Field.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Field.pm,v retrieving revision 1.26 diff -u -r1.26 Bugzilla/Field.pm --- Bugzilla/Field.pm +++ Bugzilla/Field.pm @@ -154,7 +154,7 @@ {name => 'qa_contact', desc => 'QAContact', in_new_bugmail => 1}, {name => 'cc', desc => 'CC', in_new_bugmail => 1}, {name => 'dependson', desc => 'Depends on', in_new_bugmail => 1}, - {name => 'blocked', desc => 'Blocks', in_new_bugmail => 1}, + {name => 'blocks', desc => 'Blocks', in_new_bugmail => 1}, {name => 'attachments.description', desc => 'Attachment description'}, {name => 'attachments.filename', desc => 'Attachment filename'}, Index: Bugzilla/Search.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Search.pm,v retrieving revision 1.146 diff -u -r1.146 Bugzilla/Search.pm --- Bugzilla/Search.pm +++ Bugzilla/Search.pm @@ -979,13 +979,13 @@ my $ref = $funcsbykey{",$t"}; &$ref; push(@supptables, "LEFT JOIN dependencies AS $table " . - "ON $table.blocked = bugs.bug_id " . + "ON $table.blocks = bugs.bug_id " . "AND ($term)"); $term = "$ff IS NOT NULL"; }, - "^blocked,(?!changed)" => sub { - my $table = "blocked_" . $chartid; + "^blocks,(?!changed)" => sub { + my $table = "blocks_" . $chartid; $ff = "$table.$f"; my $ref = $funcsbykey{",$t"}; &$ref; Index: Bugzilla/DB/Schema.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/DB/Schema.pm,v retrieving revision 1.87 diff -u -r1.87 Bugzilla/DB/Schema.pm --- Bugzilla/DB/Schema.pm +++ Bugzilla/DB/Schema.pm @@ -342,11 +342,11 @@ dependencies => { FIELDS => [ - blocked => {TYPE => 'INT3', NOTNULL => 1}, + blocks => {TYPE => 'INT3', NOTNULL => 1}, dependson => {TYPE => 'INT3', NOTNULL => 1}, ], INDEXES => [ - dependencies_blocked_idx => ['blocked'], + dependencies_blocks_idx => ['blocks'], dependencies_dependson_idx => ['dependson'], ], }, Index: Bugzilla/Install/DB.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Install/DB.pm,v retrieving revision 1.35 diff -u -r1.35 Bugzilla/Install/DB.pm --- Bugzilla/Install/DB.pm +++ Bugzilla/Install/DB.pm @@ -510,6 +510,12 @@ # 2007-05-17 LpSolit@gmail.com - Bug 344965 _initialize_workflow($old_params); + # 2007-07-04 timeless@gmail.com - Bug 386845 + $dbh->bz_rename_column('dependencies', 'blocked', 'blocks'); + $dbh->bz_drop_index('dependencies', 'dependencies_blocked_idx'); + $dbh->bz_add_index('dependencies', 'dependencies_blocks_idx', + [qw(blocks)]); + ################################################################ # New --TABLE-- changes should go *** A B O V E *** this point # ################################################################ @@ -1055,7 +1061,7 @@ # Need to get field id's for the fields that have multiple values my @multi; - foreach my $f ("cc", "dependson", "blocked", "keywords") { + foreach my $f ("cc", "dependson", "blocks", "keywords") { my $sth = $dbh->prepare("SELECT id " . "FROM fielddefs " . "WHERE name = '$f'"); Index: contrib/bugzilla-submit/bugzilla-submit =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/contrib/bugzilla-submit/bugzilla-submit,v retrieving revision 1.6 diff -u -r1.6 contrib/bugzilla-submit/bugzilla-submit --- contrib/bugzilla-submit/bugzilla-submit +++ contrib/bugzilla-submit/bugzilla-submit @@ -92,8 +92,10 @@ help='Set the Keywords field.') parser.add_option('-D', '--depends-on', dest='dependson', help='Set the Depends-On field.') - parser.add_option('-B', '--blocked', dest='blocked', - help='Set the Blocked field.') + parser.add_option('-B', '--blocks', dest='blocks', + help='Set the Blocks field.') + parser.add_option('', '--blocked', dest='blocks', + help='(compat) Set the Blocks field.') parser.add_option('-n', '--no-stdin', dest='read', default=True, action='store_false', help='Suppress reading fields from stdin.') @@ -168,7 +170,7 @@ "comment", ) legal_fields = required_fields + ( - "assigned_to", "cc", "keywords", "dependson", "blocked", + "assigned_to", "cc", "keywords", "dependson", "blocks", ) my_fields = data.keys() for field in my_fields: @@ -216,7 +218,7 @@ platform = data.get('rep_platform') opsys = data.get('op_sys') keywords = data.get('keywords') - deps = data.get('dependson', '') + " " + data.get('blocked', '') + deps = data.get('dependson', '') + " " + data.get('blocks', '') deps = deps.replace(" ", ", ") # XXX: we should really not be using plain find() here, as it can # match the bug content inadvertedly Index: contrib/bugzilla-submit/bugzilla-submit.xml =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/contrib/bugzilla-submit/bugzilla-submit.xml,v retrieving revision 1.7 diff -u -r1.7 contrib/bugzilla-submit/bugzilla-submit.xml --- contrib/bugzilla-submit/bugzilla-submit.xml +++ contrib/bugzilla-submit/bugzilla-submit.xml @@ -30,7 +30,7 @@ --cc cc --keywords keywords --depends-on dependson - --blocked blocked + --blocks blocks --description comment --no-stdin bugzilla-url @@ -161,7 +161,7 @@ -B, --assigned-to -Set the optional blocked field, overriding the Blocked +Set the optional blocks field, overriding the Blocks header from standard input if necessary. Index: contrib/cmdline/query.conf =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/contrib/cmdline/query.conf,v retrieving revision 1.3 diff -u -r1.3 contrib/cmdline/query.conf --- contrib/cmdline/query.conf +++ contrib/cmdline/query.conf @@ -46,4 +46,4 @@ attach_data.thedata substring "attachdata" attachments.mimetype substring "attachmime" dependson substring # bug 30823 -blocked substring # bug 30823 +blocks substring # bug 386845 Index: template/en/default/bug/dependency-tree.html.tmpl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl,v retrieving revision 1.25 diff -u -r1.25 template/en/default/bug/dependency-tree.html.tmpl --- template/en/default/bug/dependency-tree.html.tmpl +++ template/en/default/bug/dependency-tree.html.tmpl @@ -51,7 +51,7 @@ [% BLOCK tree_section %] [%# INTERFACE # - ids: a list of bug IDs to be displayed as children - # - type: the type of tree. 1 = depends on, 2 = blockeds + # - type: the type of tree. 1 = depends on, 2 = blocked # GLOBALS # - seen: Maintains a global hash of bugs that have been displayed #%] Index: template/en/default/bug/edit.html.tmpl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/bug/edit.html.tmpl,v retrieving revision 1.103 diff -u -r1.103 template/en/default/bug/edit.html.tmpl --- template/en/default/bug/edit.html.tmpl +++ template/en/default/bug/edit.html.tmpl @@ -232,7 +232,7 @@ [% PROCESS dependencies accesskey = "b" - dep = { title => "Blocks", fieldname => "blocked" } %] + dep = { title => "Blocks", fieldname => "blocks" } %] Index: template/en/default/bug/show-multiple.html.tmpl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/bug/show-multiple.html.tmpl,v retrieving revision 1.35 diff -u -r1.35 template/en/default/bug/show-multiple.html.tmpl --- template/en/default/bug/show-multiple.html.tmpl +++ template/en/default/bug/show-multiple.html.tmpl @@ -178,9 +178,9 @@ [%# And we have to finish the row if we ended on an odd number. %] [% '' IF field_counter % 2 %] - [% IF (bug.dependson.size || bug.blocked.size) %] + [% IF (bug.dependson.size || bug.blocks.size) %] [% PROCESS dependencies name = "dependson" %] - [% PROCESS dependencies name = "blocked" %] + [% PROCESS dependencies name = "blocks" %] [% END %] [% IF user.in_group(Param("timetrackinggroup")) %] Index: template/en/default/bug/activity/table.html.tmpl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/bug/activity/table.html.tmpl,v retrieving revision 1.14 diff -u -r1.14 template/en/default/bug/activity/table.html.tmpl --- template/en/default/bug/activity/table.html.tmpl +++ template/en/default/bug/activity/table.html.tmpl @@ -86,7 +86,7 @@ [% get_status(change.removed) FILTER html %] [% ELSIF change.fieldname == 'resolution' %] [% get_resolution(change.removed) FILTER html %] - [% ELSIF change.fieldname == 'blocked' || + [% ELSIF change.fieldname == 'blocks' || change.fieldname == 'dependson' %] [% change.removed FILTER bug_list_link FILTER none %] [% ELSE %] @@ -106,7 +106,7 @@ [% get_status(change.added) FILTER html %] [% ELSIF change.fieldname == 'resolution' %] [% get_resolution(change.added) FILTER html %] - [% ELSIF change.fieldname == 'blocked' || + [% ELSIF change.fieldname == 'blocks' || change.fieldname == 'dependson' %] [% change.added FILTER bug_list_link FILTER none %] [% ELSE %] Index: template/en/default/bug/create/create.html.tmpl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl,v retrieving revision 1.77 diff -u -r1.77 template/en/default/bug/create/create.html.tmpl --- template/en/default/bug/create/create.html.tmpl +++ template/en/default/bug/create/create.html.tmpl @@ -503,7 +503,7 @@ Blocks: - + [% END %] Index: template/en/default/global/field-descs.none.tmpl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/global/field-descs.none.tmpl,v retrieving revision 1.19 diff -u -r1.19 template/en/default/global/field-descs.none.tmpl --- template/en/default/global/field-descs.none.tmpl +++ template/en/default/global/field-descs.none.tmpl @@ -27,7 +27,7 @@ "actual_time" => "Actual Hours" "alias" => "Alias", "assigned_to" => "Assignee", - "blocked" => "Blocks", + "blocks" => "Blocks", "bug_file_loc" => "URL", "bug_id" => "$terms.Bug ID", "bug_severity" => "Severity",