--- a/hgext/histedit.py Fri Aug 03 17:33:44 2012 +0200
+++ b/hgext/histedit.py Sat Aug 04 15:58:23 2012 +0200
@@ -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
#
--- a/mercurial/help/hgweb.txt Fri Aug 03 17:33:44 2012 +0200
+++ b/mercurial/help/hgweb.txt Sat Aug 04 15:58:23 2012 +0200
@@ -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``.
--- a/mercurial/templater.py Fri Aug 03 17:33:44 2012 +0200
+++ b/mercurial/templater.py Sat Aug 04 15:58:23 2012 +0200
@@ -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)
--- a/tests/test-command-template.t Fri Aug 03 17:33:44 2012 +0200
+++ b/tests/test-command-template.t Sat Aug 04 15:58:23 2012 +0200
@@ -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