diff -r 8c377f2feee1 -r d4cafcb63f77 mercurial/parser.py
--- a/mercurial/parser.py	Tue Jun 08 09:30:33 2010 +0200
+++ b/mercurial/parser.py	Tue Jun 08 09:30:45 2010 +0200
@@ -33,8 +33,8 @@
     def _match(self, m):
         'make sure the tokenizer matches an end condition'
         if self.current[0] != m:
-            raise error.ParseError("unexpected token: %s" % self.current[2],
-                                   pos)
+            raise error.ParseError("unexpected token: %s" % self.current[0],
+                                   self.current[2])
         self._advance()
     def _parse(self, bind=0):
         token, value, pos = self._advance()