[PATCH 3 of 3] bookmarks: pass arguments to original rollback

Steve Borho steve at borho.org
Fri Apr 9 17:48:01 CDT 2010


On Fri, Apr 9, 2010 at 5:33 PM, Steve Borho <steve at borho.org> wrote:
> # HG changeset patch
> # User Steve Borho <steve at borho.org>
> # Date 1270851817 18000
> # Node ID e74e89de2d0c0c0fc4c9774948dbad9b740f2c87
> # Parent  a886b3aa478a0c9b6b4b57356cd66d4aa0be1378
> bookmarks: pass arguments to original rollback
>
> diff -r a886b3aa478a -r e74e89de2d0c hgext/bookmarks.py
> --- a/hgext/bookmarks.py        Fri Apr 09 17:23:37 2010 -0500
> +++ b/hgext/bookmarks.py        Fri Apr 09 17:23:37 2010 -0500
> @@ -241,10 +241,10 @@
>                 file.close()
>             return mark
>
> -        def rollback(self):
> +        def rollback(self, **opts):
>             if os.path.exists(self.join('undo.bookmarks')):
>                 util.rename(self.join('undo.bookmarks'), self.join('bookmarks'))
> -            return super(bookmark_repo, self).rollback()
> +            return super(bookmark_repo, self).rollback(**opts)
>
>         def lookup(self, key):
>             if key in self._bookmarks:

FYI; I neglected to qrefresh this patch before patchbombing.  I had to
use *args instead of **opts, since commands.rollback() did not call
rollback() with a keyword argument.

--
Steve Borho


More information about the Mercurial-devel mailing list