[PATCH] Commands: resolve accepts walkopts (-I and -X)

[Simon Heimberg]

# HG changeset patch
# User simohe at besonet.ch
# Date 1217027217 -7200
# Node ID 95b81e0c0635b3abb5d3bffccda4cb04054bf111
# Parent  cbdfd08eabc96116d801d0e2e7d1856adfdde911
Commands: resolve accepts walkopts (-I and -X)

diff -r cbdfd08eabc9 -r 95b81e0c0635 mercurial/commands.py
--- a/mercurial/commands.py     Tue Jul 22 13:03:31 2008 -0500
+++ b/mercurial/commands.py     Sat Jul 26 01:06:57 2008 +0200
@@ -2242,7 +2242,7 @@
     R = resolved
     """

-    if len([x for x in opts if opts[x]]) > 1:
+    if len([x for x in opts if opts[x] == True]) > 1:
         raise util.Abort(_("too many options specified"))

     ms = merge_.mergestate(repo)
@@ -3207,7 +3207,8 @@
         (resolve,
          [('l', 'list', None, _('list state of files needing merge')),
           ('m', 'mark', None, _('mark files as resolved')),
-          ('u', 'unmark', None, _('unmark files as resolved'))],
+          ('u', 'unmark', None, _('unmark files as resolved')),]
+          + walkopts,
           ('hg resolve [OPTION] [FILES...]')),
     "revert":
         (revert,