# HG changeset patch # User Martin Geisler <mg@lazybytes.net> # Date 1300020767 -3600 # Sun Mar 13 13:52:47 2011 +0100 # Node ID e035356dbfdca08af4b0461549379dfa27432f76 # Parent 63ab6b0ccedcb393c5adba9be3a8d72fe0e7fb57 rebase: don't use util.Abort for an internal error diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -90,7 +90,7 @@ contf = opts.get('continue') abortf = opts.get('abort') collapsef = opts.get('collapse', False) - extrafn = opts.get('extrafn') + extrafn = opts.get('extrafn') # internal, used by e.g. hgsubversion keepf = opts.get('keep', False) keepbranchesf = opts.get('keepbranches', False) detachf = opts.get('detach', False) @@ -138,8 +138,7 @@ external = checkexternal(repo, state, targetancestors) if keepbranchesf: - if extrafn: - raise util.Abort(_('cannot use both keepbranches and extrafn')) + assert not extrafn, 'cannot use both keepbranches and extrafn' def extrafn(ctx, extra): extra['branch'] = ctx.branch()