Skip to content
Snippets Groups Projects
Commit e035356d authored by Martin Geisler's avatar Martin Geisler
Browse files

rebase: don't use util.Abort for an internal error

parent 63ab6b0c
No related branches found
No related tags found
No related merge requests found
......@@ -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()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment