diff -r 87e4d1eec5e8 -r 6622a24f3b0f hgext/obsolete.py --- a/hgext/obsolete.py Tue Jun 19 10:02:32 2012 +0200 +++ b/hgext/obsolete.py Tue Jun 19 09:23:50 2012 +0200 @@ -230,12 +230,12 @@ repo.addobsolete(newnode, oldnode) return newrev -def cmdrebase(orig, repo, ui, *args, **kwargs): +def cmdrebase(orig, ui, repo, *args, **kwargs): oldkeep = kwargs.pop('keep', False) if oldkeep: ui.warn('WARNING --keep option ignored by experimental obsolete extension') kwargs['keep'] = True - return orig(repo, ui, *args, **kwargs) + return orig(ui, repo, *args, **kwargs)