# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: ../mainline/
# testament_sha1: 0603fbd94ec9aec98a975dc1dde3aa3ce4aa4b4d
# timestamp: 2010-09-05 14:57:40 +0530
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'Makefile.util.def'
--- Makefile.util.def	2010-09-04 17:04:32 +0000
+++ Makefile.util.def	2010-09-05 09:27:28 +0000
@@ -531,6 +531,12 @@
   common = tests/grub_script_expansion.in;
 };
 
+script = {
+  testcase;
+  name = grub_script_not;
+  common = tests/grub_script_not.in;
+};
+
 program = {
   testcase;
   name = example_unit_test;

=== modified file 'grub-core/script/execute.c'
--- grub-core/script/execute.c	2010-09-04 17:04:32 +0000
+++ grub-core/script/execute.c	2010-09-05 09:27:28 +0000
@@ -547,13 +547,32 @@
   grub_script_function_t func = 0;
   char errnobuf[18];
   char *cmdname;
+  int argc;
+  char **args;
+  int invert;
   struct grub_script_argv argv = { 0, 0, 0 };
 
   /* Lookup the command.  */
   if (grub_script_arglist_to_argv (cmdline->arglist, &argv) || ! argv.args[0])
     return grub_errno;
 
+  invert = 0;
+  argc = argv.argc - 1;
+  args = argv.args + 1;
   cmdname = argv.args[0];
+  if (grub_strcmp (cmdname, "!") == 0)
+    {
+      if (argv.argc < 2 || ! argv.args[1])
+	{
+	  grub_script_argv_free (&argv);
+	  return grub_error (GRUB_ERR_BAD_ARGUMENT, "missing arguments");
+	}
+
+      invert = 1;
+      argc = argv.argc - 2;
+      args = argv.args + 2;
+      cmdname = argv.args[1];
+    }
   grubcmd = grub_command_find (cmdname);
   if (! grubcmd)
     {
@@ -594,13 +613,15 @@
     {
       if ((grubcmd->flags & GRUB_COMMAND_FLAG_BLOCKS) &&
 	  (grubcmd->flags & GRUB_COMMAND_FLAG_EXTCMD))
-	ret = grub_extcmd_dispatcher (grubcmd, argv.argc - 1, argv.args + 1,
-				      argv.script);
+	ret = grub_extcmd_dispatcher (grubcmd, argc, args, argv.script);
       else
-	ret = (grubcmd->func) (grubcmd, argv.argc - 1, argv.args + 1);
+	ret = (grubcmd->func) (grubcmd, argc, args);
     }
   else
-    ret = grub_script_function_call (func, argv.argc - 1, argv.args + 1);
+    ret = grub_script_function_call (func, argc, args);
+
+  if (invert)
+    ret = ! ret;
 
   /* Free arguments.  */
   grub_script_argv_free (&argv);

=== modified file 'grub-core/script/yylex.l'
--- grub-core/script/yylex.l	2010-09-04 16:43:45 +0000
+++ grub-core/script/yylex.l	2010-09-05 09:27:28 +0000
@@ -155,7 +155,6 @@
 ">"             { RECORD; return GRUB_PARSER_TOKEN_GT;      }
 
  /* Reserved words */
-"!"             { RECORD; return GRUB_PARSER_TOKEN_NOT;       }
 "{"             { RECORD; return GRUB_PARSER_TOKEN_LBR;       }
 "}"             { RECORD; return GRUB_PARSER_TOKEN_RBR;       }
 "[["            { RECORD; return GRUB_PARSER_TOKEN_RSQBR2;    }

=== added file 'tests/grub_script_not.in'
--- tests/grub_script_not.in	1970-01-01 00:00:00 +0000
+++ tests/grub_script_not.in	2010-09-05 09:27:28 +0000
@@ -0,0 +1,62 @@
+#! @builddir@/grub-shell-tester
+#
+# Copyright (C) 2010  Free Software Foundation, Inc.
+#
+# GRUB is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# GRUB is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+
+true
+echo $?
+
+! true
+echo $?
+
+false
+echo $?
+
+! false
+echo $?
+
+#
+# Negated forms (copied from grub_script_if.in)
+#
+
+#basic if, execute
+if ! true; then echo yes; fi
+
+#basic if, no execution
+if ! false; then echo no; fi
+
+#if else, execute if path
+if ! true; then echo yes; else echo no; fi
+
+#if else, execute else path
+if ! false; then echo no; else echo yes; fi
+
+#if elif, execute elif
+if ! false; then echo no; elif ! true; then echo yes; fi
+
+#if elif else, execute else
+if ! false; then echo no; elif ! false; then echo no; else echo yes; fi
+
+#if elif(1) elif(2), execute elif(2)
+if false; then echo no; elif ! false; then echo no; elif ! true; then echo yes; fi
+
+#if elif(1) elif(2) else, execute else
+if false; then echo no; elif false; then echo no; elif ! false; then echo no; else echo yes; fi
+
+#if {if elif else}, execute elif
+if true; then if false; then echo no; elif ! true; then echo yes; else echo no; fi; fi
+
+#if {if elif} else, execute elif. ofcourse no dangling-else problem due to "fi"
+if true; then if ! false; then echo no; elif true; then echo yes; fi; else echo no; fi

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWR5yFzEABL/fgFAwfX/////v
36q////+YAmu7ZTfd7b2eK3u6XaedBz3u1wOh27cp6DfCSSaaJponqeRTyaYRiaCNkIaaHpNGjEN
GgybSCSUMk1T/Qk/TQkyj2pHpGmj1AAyDQAAADQJRACGiU/JpT9U9TIDTQAGgDRoAAAAJTREEyan
op+pqbTRqGI9TIMjTQAANANAaBzCaMjQ0MhhGhkNNGgAxGTIBhAMAkiCnoEYRPSNqGSMRptUelNP
UwjTQAYQDT0PQPF44bZZceTZFY6xGK9tZSeUrNEwx+J8bdo1itt5MWSFYGW5w3HTpRBLmpIT4e9H
Kh9znM1QxkYxvfbfByGKoBQFhvqT39HKr3Pyna+eHw+itvXmvnSVGs2bqQnIKLg4NthM3lMBwsi7
hZg7aO/BDB/O/+vuQn2XxQcxnBNgyEkkmCnQtTNnxa1Lo0T6kdNcNfFLjy70qKy7edW2G8h0Re5C
3aHJrGopvIMv20YBBmIgVl1Ofq7Pliv9kxvMnrg+qfmoUIHvnyqSM7deTdZ1MK6ic5fvKGCjFZXi
/deJbHBVn49lmISEwmVrnEN2BCHyjukQMuSJJraGDFlkkISYqBqmP1x5LljwyK9SqnMVmgrhyX8Q
7W2zdIdgIY4oiYxMOfwUjyWUCk1kurO6aKuqe9pbpgQMbFWW7wRK0UllCRuhpq3IPsjdUcFjW9TI
GZFHPwcejRnzvYnzY9jRG2fRmCrfsyU4cdxKVkihhmFihKYMGIoZC++m2OG5L06XRHRb+Oug1noY
3fVvt19wypDI599EQa2wh8QbviVldxI+QVowLt7FzCiavI7GcIcyvgvSxW8NbZOivVVydlvHPiSv
KeU1WpWV5dyqrt7YV34TDg5VPQ+1yvo1WAJAJMa60w50nZCZI0DewhTUE7nM4kZ2kjlgFgvkJkIC
XaQoGpraD6zE1zAXKYKQpq+BAlHpLj4h2lD9qYCq4K0L+uWOOoxC1QQ3GGxQa6wz7WNhcC1I5m9K
cKusKsBlK1zuxnALR5IiSEhxXaI9ySOC3aU05AqGUxaGqO9Pw6+/pQsRFwTEP2YFoo+Oe6bKvpdi
x2isOsIsgU3lQopm0Oq8w1Y+d4LPTfWCsLd4MDDMo1EwKl+4ajaSaZYGZWpQygPS64deWNcFxMUh
yByZQIgdtM7Gc1giwyZqCoteuqxCKx5LGt8wl1+oSrrfFTyICsA3hY5UuuHlt1Ty8fAiajITms8T
yNRstlN7Da6SzNRKR8VQtTXMayDEVXIqrGIVGoxgJipgZFB0SRiLpzjaTtVX3Y64KNYyrniTipDb
NZxBVSJ6VPYdNorfUZHQWGgeFdhi8kce2wN4LjLpDHPaWyNRmPdoOt2G4UMjaYNiSN4NwEtrffLY
5jwTM0fbxniwwxe9SbZ6hymI0G0ZS5FluvWSDCloLgtviGtUpQrJDzBhIGgDoTFKEiFYxgNYXYco
gogodlLrVNqwFjWbBUazsXvNDKlTYrZqalwnEupU4/JFJW+vPfydrdAjfTsmEJ3dSBjyZzwAkjwo
GrmFgtt7Ac6JzMhmjzZ0Zdz7BuwekDcubu+D/3q1eP0WuvMmTMxH9OOPn5p++wSddePwK/+mlBTQ
cuq0WqfC1A1U0xA5r9axUeKV9bNn90e9QbBsptytY5bAhsk+aRbrL4rerQaGVL5LUxJrDsxtmqvJ
rZcuX3nW8fiTkzMkyK/zgBEA3TZ+HoOZ0gjQUnEMe45CQZHlTp000aauJKMtUcL1y02+gSupSvh0
woidH0VE936q0kdSl1MDhnMu2Id5McrI45Xa+wU2JHT/ehxFUQ3Ptc6511GIiJQgkQ7i48evTpqv
b0YQSCP8Q2iIXSVkMDu+wQuHxAGUqMOQiTh2+ZHsNxMc9xZCJyt7+WOG0zKHQ2KLyhhCyyYJb4zU
f4+Hq8atjQbLZ5AtetCZg72XrUJHCfmUJmGBuqFQWqZyB99tBUVmBvJBsJo5zmZKl1UIQOBGyOvB
9hbcamy10I1dE0pLSrCs2igIJQhps1gPOEnbholQ6tszSClVZG6GS8Vsly8YLpcm4SXbzlsFAwxm
cs3akLECAYBkZmMWmzhelp0FgYFmwOcAvihX5rMMznSlLLTtGyYJIr1TXwtnzr+x+WqjYmwNDucQ
BFpkHkwtIAjP9asRmiCtcW2drO7dmxYQ8aheFxL4INLigXItZXslROg5+jPMC5qWeVgAfWzpkdDA
aDjnqoHQXn3ahvYRPad3hghS8+B538jwMTvRaZIsEb2P0BPWEA4subcGLlOPf6TsKHublRgNBsgJ
yl8vLWjB2Z7QqEfgDJHatPNu4R9jxowG2Q4Ii3enBKUY1L06cjgI6kJp5M5sVqrP5g8N3PZYFwTr
RYK9OkJI70Hf50yk4pqTp3IHYhM1XkJ7avhehdOUSpdaPmSu22SNM+E45SeujJkmbYCuL5FnolD5
WIq+fU0nqCl6rBbz3Hj5HH2CDnMIQwSDZwS96ugm6tGH8egyDIUXD2go501Ysgowc4nvWKgvb67Q
R4xvKo8a+wl8Am5NJMCbHEfN0EMta1JwwZkn17IG2rMtEqLR1EIVIqrLwUJ2M4wSRRJ0SZCZIbYr
SC47tLooZnailoHUq6UBMzX0SIgMAzJQpiScZreAN8YBPTkl3EZMxYjwGUUgc4wVhMwLf0a0gfa1
MG7E07c265K3ugHvDkSW0DDu+7Z/UhfC0zKtmjAws3JIsTXHYSUp7wWqE05AzD9QdAcls19lBut1
reAnrilBcKo0jmtN3AadI/3KM44S/hnRVSJKyBv6pAuIFSE8t9L6oY6gspRhQZvWkqhGigtIhmPS
cU3CifvIwQMQ69vLxMANXKsGYTYOk9rgs8d8ovsYKg1NjIrR6qJAL0OUsXd5KsVLESLRo92uxxQU
zwlf0QfVEbVObDSYOJGkJzJgwvaBLCppxrQmd6owv1mO10G3MJlkUJMPsrsxG2SOH7CrYlir3T9M
UDwLHFdu28FHsMB+wkcwVSS/oseuAzAeuyuI+bKBfeP9GTxo+5A7JuL/UViN/cCzy3KwYHSrSD5r
lLJZL0hoMT8+nrZrF3HQ6F4eYLrBQEXnaaTbkpS7gUHSHSQRTD+sMcF7arzSiwvLtu2tcrTz3uwS
C7kinChIDzkLmIA=