evolve: comparison hgext/evolve.py

equal deleted inserted replaced

-:296d48e1f55a
+:d830377bf186
 ui.write('        mean length:        %9i\n' % mean)
 @command('^evolve|stabilize|solve',
 [('n', 'dry-run', False,
 'do not perform actions, just print what would be done'),
+('', 'confirm', False,
+'ask for confirmation before performing the action'),
 ('A', 'any', False, 'also consider troubled changesets unrelated to current working directory'),
 ('a', 'all', False, 'evolve all troubled changesets in the repo '
 '(implies any)'),
 ('c', 'continue', False, 'continue an interrupted evolution'),
 ] + mergetoolopts,
 contopt = opts['continue']
 anyopt = opts['any']
 allopt = opts['all']
 dryrunopt = opts['dry_run']
+confirmopt = opts['confirm']
 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'evolve')
 if contopt:
 if anyopt:
 raise util.Abort('cannot specify both "--any" and "--continue"')
 wlock = lock = tr = None
 try:
 wlock = repo.wlock()
 lock = repo.lock()
 tr = repo.transaction("evolve")
-result = _evolveany(ui, repo, tro, dryrunopt,
+result = _evolveany(ui, repo, tro, dryrunopt, confirmopt,
 progresscb=progresscb)
 tr.close()
 finally:
 lockmod.release(tr, lock, wlock)
 progresscb()
 if allopt:
 ui.progress('evolve', None)
-def _evolveany(ui, repo, tro, dryrunopt, progresscb):
+def _evolveany(ui, repo, tro, dryrunopt, confirmopt, progresscb):
 repo = repo.unfiltered()
 tro = repo[tro.rev()]
 cmdutil.bailifchanged(repo)
 troubles = tro.troubles()
 if 'unstable' in troubles:
-return _solveunstable(ui, repo, tro, dryrunopt, progresscb)
+return _solveunstable(ui, repo, tro, dryrunopt, confirmopt, progresscb)
 elif 'bumped' in troubles:
-return _solvebumped(ui, repo, tro, dryrunopt, progresscb)
+return _solvebumped(ui, repo, tro, dryrunopt, confirmopt, progresscb)
 elif 'divergent' in troubles:
 repo = repo.unfiltered()
 tro = repo[tro.rev()]
-return _solvedivergent(ui, repo, tro, dryrunopt, progresscb)
+return _solvedivergent(ui, repo, tro, dryrunopt, confirmopt,
+progresscb)
 else:
 assert False  # WHAT? unknown troubles
 def _counttroubled(ui, repo):
 """Count the amount of troubled changesets"""
 for child in ctx.children():
 if child.unstable():
 return child
 return None
-def _solveunstable(ui, repo, orig, dryrun=False, progresscb=None):
+def _solveunstable(ui, repo, orig, dryrun=False, confirm=False,
+progresscb=None):
 """Stabilize a unstable changeset"""
 obs = orig.parents()[0]
 if not obs.obsolete():
 print obs.rev(), orig.parents()
 print orig.rev()
 raise util.Abort(_("does not handle split parents yet\n"))
 return 2
 target = targets[0]
 displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
 target = repo[target]
-if not ui.quiet:
+if not ui.quiet or confirm:
 repo.ui.write(_('move:'))
 displayer.show(orig)
 repo.ui.write(_('atop:'))
 displayer.show(target)
+if confirm and ui.prompt('perform evolve? [Ny]') != 'y':
+raise util.Abort(_('evolve aborted by user'))
 if progresscb: progresscb()
 todo = 'hg rebase -r %s -d %s\n' % (orig, target)
 if dryrun:
 repo.ui.write(todo)
 else:
 repo.ui.write_err(_('evolve failed!\n'))
 repo.ui.write_err(
 _('fix conflict and run "hg evolve --continue"\n'))
 raise
-def _solvebumped(ui, repo, bumped, dryrun=False, progresscb=None):
+def _solvebumped(ui, repo, bumped, dryrun=False, confirm=False,
+progresscb=None):
 """Stabilize a bumped changeset"""
 # For now we deny bumped merge
 if len(bumped.parents()) > 1:
 raise util.Abort('late comer stabilization is confused by bumped'
 ' %s being a merge' % bumped)
 if len(prec.parents()) > 1:
 raise util.Abort('late comer evolution is confused by precursors'
 ' %s being a merge' % prec)
 displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
-if not ui.quiet:
+if not ui.quiet or confirm:
 repo.ui.write(_('recreate:'))
 displayer.show(bumped)
 repo.ui.write(_('atop:'))
 displayer.show(prec)
+if confirm and ui.prompt('perform evolve? [Ny]') != 'y':
+raise util.Abort(_('evolve aborted by user'))
 if dryrun:
 todo = 'hg rebase --rev %s --dest %s;\n' % (bumped, prec.p1())
 repo.ui.write(todo)
 repo.ui.write('hg update %s;\n' % prec)
 repo.ui.write('hg revert --all --rev %s;\n' % bumped)
 finally:
 tr.release()
 # reroute the working copy parent to the new changeset
 repo.dirstate.setparents(newid, node.nullid)
-def _solvedivergent(ui, repo, divergent, dryrun=False, progresscb=None):
+def _solvedivergent(ui, repo, divergent, dryrun=False, confirm=False,
+progresscb=None):
 base, others = divergentdata(divergent)
 if len(others) > 1:
 othersstr = "[%s]" % (','.join([str(i) for i in others]))
 hint = ("changeset %d is divergent with a changeset that got splitted "
 "| into multiple ones:\n[%s]\n"
 "| - either: hg rebase -dest 'p1(%(d)s)' -r %(o)s"
 "| - or:     hg rebase -dest 'p1(%(d)s)' -r %(o)s"
 % {'d': divergent, 'o': other})
 displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
-if not ui.quiet:
+if not ui.quiet or confirm:
 ui.write(_('merge:'))
 displayer.show(divergent)
 ui.write(_('with: '))
 displayer.show(other)
 ui.write(_('base: '))
 displayer.show(base)
+if confirm and ui.prompt('perform evolve? [Ny]') != 'y':
+raise util.Abort(_('evolve aborted by user'))
 if dryrun:
 ui.write('hg update -c %s &&\n' % divergent)
 ui.write('hg merge %s &&\n' % other)
 ui.write('hg commit -m "auto merge resolving conflict between '
 '%s and %s"&&\n' % (divergent, other))

changeset 1047	d830377bf186
parent 1046	296d48e1f55a
child 1052	ac47c2f774a8