# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1344272587 18000
# Node ID 96189d60d810317ef8f707ec3ab123a9beb288cd
# Parent  b5c560787a4e61be322059fbaf6a2269bad6a917# Parent  94b77f8858bd04bcf49b35fd2470f4c0d7156f10
merge with i18n

diff -r 94b77f8858bd -r 96189d60d810 hgext/histedit.py
--- a/hgext/histedit.py	Mon Aug 06 18:15:16 2012 +0400
+++ b/hgext/histedit.py	Mon Aug 06 12:03:07 2012 -0500
@@ -33,7 +33,7 @@
  # Commands:
  #  p, pick = use commit
  #  e, edit = use commit, but stop for amending
- #  f, fold = use commit, but fold into previous commit
+ #  f, fold = use commit, but fold into previous commit (combines N and N-1)
  #  d, drop = remove commit from history
  #  m, mess = edit message without changing commit content
  #
@@ -52,7 +52,7 @@
  # Commands:
  #  p, pick = use commit
  #  e, edit = use commit, but stop for amending
- #  f, fold = use commit, but fold into previous commit
+ #  f, fold = use commit, but fold into previous commit (combines N and N-1)
  #  d, drop = remove commit from history
  #  m, mess = edit message without changing commit content
  #
diff -r 94b77f8858bd -r 96189d60d810 mercurial/help/hgweb.txt
--- a/mercurial/help/hgweb.txt	Mon Aug 06 18:15:16 2012 +0400
+++ b/mercurial/help/hgweb.txt	Mon Aug 06 12:03:07 2012 -0500
@@ -46,5 +46,5 @@
 - The fourth entry will publish both ``http://server/user/bob/quux/``
   and ``http://server/user/bob/quux/testsubrepo/``
 
-The ``collections`` section is deprecated and has been superseeded by
+The ``collections`` section is deprecated and has been superseded by
 ``paths``.
diff -r 94b77f8858bd -r 96189d60d810 mercurial/templater.py
--- a/mercurial/templater.py	Mon Aug 06 18:15:16 2012 +0400
+++ b/mercurial/templater.py	Mon Aug 06 12:03:07 2012 -0500
@@ -295,6 +295,8 @@
         conf.read(mapfile)
 
         for key, val in conf[''].items():
+            if not val:
+                raise SyntaxError(_('%s: missing value') % conf.source('', key))
             if val[0] in "'\"":
                 try:
                     self.cache[key] = parsestring(val)
diff -r 94b77f8858bd -r 96189d60d810 tests/test-command-template.t
--- a/tests/test-command-template.t	Mon Aug 06 18:15:16 2012 +0400
+++ b/tests/test-command-template.t	Mon Aug 06 12:03:07 2012 -0500
@@ -463,6 +463,13 @@
   abort: "changeset" not in template map
   [255]
 
+Error if style missing value:
+
+  $ echo 'changeset =' > t
+  $ hg log --style t
+  abort: t:1: missing value
+  [255]
+
 Error if include fails:
 
   $ echo 'changeset = q' >> t