merge with crew.
--- a/mercurial/commands.py Thu Mar 09 16:26:49 2006 -0800
+++ b/mercurial/commands.py Thu Mar 09 16:27:21 2006 -0800
@@ -2563,9 +2563,9 @@
"recover": (recover, [], _('hg recover')),
"^remove|rm":
(remove,
- [('I', 'include', [], _('include names matching the given patterns')),
- ('X', 'exclude', [], _('exclude names matching the given patterns')),
- ('f', 'force', None, _('remove file even if modified'))],
+ [('f', 'force', None, _('remove file even if modified')),
+ ('I', 'include', [], _('include names matching the given patterns')),
+ ('X', 'exclude', [], _('exclude names matching the given patterns'))],
_('hg remove [OPTION]... FILE...')),
"rename|mv":
(rename,
@@ -2574,7 +2574,7 @@
_('forcibly copy over an existing managed file')),
('I', 'include', [], _('include names matching the given patterns')),
('X', 'exclude', [], _('exclude names matching the given patterns'))],
- _('hg rename [OPTION]... [SOURCE]... DEST')),
+ _('hg rename [OPTION]... SOURCE... DEST')),
"^revert":
(revert,
[('r', 'rev', '', _('revision to revert to')),
--- a/mercurial/httprepo.py Thu Mar 09 16:26:49 2006 -0800
+++ b/mercurial/httprepo.py Thu Mar 09 16:27:21 2006 -0800
@@ -67,6 +67,9 @@
def dev(self):
return -1
+ def lock(self):
+ raise util.Abort(_('operation not supported over http'))
+
def do_cmd(self, cmd, **args):
self.ui.debug(_("sending %s command\n") % cmd)
q = {"cmd": cmd}