# HG changeset patch
# User Kevin Bullock <kbullock@ringworld.org>
# Date 2012-12-17 04:00:38
# Node ID 2c1fc483efa493ceea74329b9b98f3f813828795
# Parent  8c9a52492d426741ab24392d49f44a1d4f23613e

commands: 'hg bookmark NAME' should work even with ui.strict=True

Before this patch, enabling strict command processing (ui.strict=True)
meant that 'hg bookmark NAME', as referenced several places in the
documentation, would not work. This adds 'bookmark' as an explicit alias
to 'bookmarks'.

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -758,7 +758,7 @@ def bisect(ui, repo, rev=None, extra=Non
             cmdutil.bailifchanged(repo)
             return hg.clean(repo, node)
 
-@command('bookmarks',
+@command('bookmarks|bookmark',
     [('f', 'force', False, _('force')),
     ('r', 'rev', '', _('revision'), _('REV')),
     ('d', 'delete', False, _('delete a given bookmark')),
diff --git a/tests/test-bookmarks.t b/tests/test-bookmarks.t
--- a/tests/test-bookmarks.t
+++ b/tests/test-bookmarks.t
@@ -40,9 +40,9 @@ look up bookmark
   summary:     0
   
 
-second bookmark for rev 0
+second bookmark for rev 0, command should work even with ui.strict on
 
-  $ hg bookmark X2
+  $ hg --config ui.strict=1 bookmark X2
 
 bookmark rev -1 again