evolve: comparison hgext/evolve.py

equal deleted inserted replaced

-:b2b3d5aa16bc
+:2b2a4ab0eb68
 if ui.config('alias', 'pdiff', None) is None:
 ui.setconfig('alias', 'pdiff', 'diff --rev .^')
 if ui.config('alias', 'olog', None) is None:
 ui.setconfig('alias', 'olog', "log -r 'precursors(.)' --hidden")
 if ui.config('alias', 'odiff', None) is None:
-ui.setconfig('alias', 'odiff', "diff --hidden --rev 'limit(precursors(.),1)' --rev .")
+ui.setconfig('alias', 'odiff',
+"diff --hidden --rev 'limit(precursors(.),1)' --rev .")
 if ui.config('alias', 'grab', None) is None:
-ui.setconfig('alias', 'grab', "! $HG rebase --dest . --rev $@ && $HG up tip")
+ui.setconfig('alias', 'grab',
+"! $HG rebase --dest . --rev $@ && $HG up tip")
 ### Troubled revset symbol
 @eh.revset('troubled')
 priordivergents = len(set(getrevs(repo, 'divergent')) - filtered)
 ret = orig(ui, repo, *args, **kwargs)
 # workaround phase stupidity
 #phases._filterunknown(ui, repo.changelog, repo._phasecache.phaseroots)
 filtered = repo.changelog.filteredrevs
-newunstables = len(set(getrevs(repo, 'unstable')) - filtered) - priorunstables
+newunstables = \
-newbumpeds = len(set(getrevs(repo, 'bumped')) - filtered) - priorbumpeds
+len(set(getrevs(repo, 'unstable')) - filtered) - priorunstables
-newdivergents = len(set(getrevs(repo, 'divergent')) - filtered) - priordivergents
+newbumpeds = \
+len(set(getrevs(repo, 'bumped')) - filtered) - priorbumpeds
+newdivergents = \
+len(set(getrevs(repo, 'divergent')) - filtered) - priordivergents
 if newunstables > 0:
 ui.warn(_('%i new unstable changesets\n') % newunstables)
 if newbumpeds > 0:
 ui.warn(_('%i new bumped changesets\n') % newbumpeds)
 if newdivergents > 0:
 try:
 if orig.rev() == dest.rev():
 raise util.Abort(_('tried to relocate a node on top of itself'),
 hint=_("This shouldn't happen. If you still "
 "need to move changesets, please do so "
-"manually with nothing to rebase - working directory parent is also destination"))
+"manually with nothing to rebase - working "
+"directory parent is also destination"))
 rebase = extensions.find('rebase')
 # dummy state to trick rebase node
 if not orig.p2().rev() == node.nullrev:
 raise util.Abort(
 tr.release()
 return ret
 @command('^evolve|stabilize|solve',
-[('n', 'dry-run', False, 'do not perform actions, just print what would be done'),
+[('n', 'dry-run', False,
+'do not perform actions, just print what would be done'),
 ('A', 'any', False, 'evolve any troubled changeset'),
 ('a', 'all', False, 'evolve all troubled changesets'),
 ('c', 'continue', False, 'continue an interrupted evolution'), ],
 _('[OPTIONS]...'))
 def evolve(ui, repo, **opts):
 return graftcmd(ui, repo, old_obsolete=True, **{'continue': True})
 tr = _picknexttroubled(ui, repo, anyopt or allopt)
 if tr is None:
 if repo['.'].obsolete():
-displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
+displayer = cmdutil.show_changeset(
+ui, repo, {'template': shorttemplate})
 successors = set()
 for successorsset in obsolete.successorssets(repo, repo['.'].node()):
 for nodeid in successorsset:
 successors.add(repo[nodeid])
 try:
 relocate(repo, orig, target)
 except MergeFailure:
 repo.opener.write('graftstate', orig.hex() + '\n')
 repo.ui.write_err(_('evolve failed!\n'))
-repo.ui.write_err(_('fix conflict and run "hg evolve --continue"\n'))
+repo.ui.write_err(
+_('fix conflict and run "hg evolve --continue"\n'))
 raise
 finally:
 lock.release()
 def _solvebumped(ui, repo, bumped, dryrun=False, progresscb=None):
 # Basic check for common parent. Far too complicated and fragile
 tr = repo.transaction('bumped-stabilize')
 try:
 if not list(repo.set('parents(%d) and parents(%d)', bumped, prec)):
 # Need to rebase the changeset at the right place
-repo.ui.status(_('rebasing to destination parent: %s\n') % prec.p1())
+repo.ui.status(
+_('rebasing to destination parent: %s\n') % prec.p1())
 try:
 tmpid = relocate(repo, bumped, prec.p1())
 if tmpid is not None:
 tmpctx = repo[tmpid]
 createmarkers(repo, [(bumped, (tmpctx,))])
 except MergeFailure:
 repo.opener.write('graftstate', bumped.hex() + '\n')
 repo.ui.write_err(_('evolution failed!\n'))
-repo.ui.write_err(_('fix conflict and run "hg evolve --continue"\n'))
+repo.ui.write_err(
+_('fix conflict and run "hg evolve --continue"\n'))
 raise
 # Create the new commit context
 repo.ui.status(_('computing new diff\n'))
 files = set()
 copied = copies.pathcopies(prec, bumped)
 raise util.Abort("we do not handle divergence with split yet",
 hint='')
 other = others[0]
 if divergent.phase() <= phases.public:
 raise util.Abort("we can't resolve this conflict from the public side",
 hint="%s is public, try from %s" % (divergent, other))
 if len(other.parents()) > 1:
 raise util.Abort("divergent changeset can't be a merge (yet)",
 hint="You have to fallback to solving this by hand...\n"
 "| This probably means redoing the merge and using "
 "| `hg prune` to kill older version.")
 if other.p1() not in divergent.parents():
 raise util.Abort("parents are not common (not handled yet)",
 hint="| %(d)s, %(o)s are not based on the same changeset."
 "| With the current state of its implementation, "
 "| evolve does not work in that case.\n"
 "| rebase one of them next to the other and run "
 "| this command again.\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})
 ui.status(_('merge:'))
 if not ui.quiet:
 displayer.show(c)
 return 0
 else:
 for c in children:
 displayer.show(c)
-ui.warn(_('multiple non-obsolete children, explicitly update to one\n'))
+ui.warn(_('multiple non-obsolete children, '
+'explicitly update to one of them\n'))
 return 1
 def _reachablefrombookmark(repo, revs, mark):
 """filter revisions and bookmarks reachable from the given bookmark
 yoinked from mq.py
 if not biject and len(sucs) > 1 and len(precs) > 1:
 msg = "Can't use multiple successors for multiple precursors"
 raise util.Abort(msg)
 if biject and len(sucs) != len(precs):
-msg = "Can't use %d successors for %d precursors" % (len(sucs), len(precs))
+msg = "Can't use %d successors for %d precursors" \
+% (len(sucs), len(precs))
 raise util.Abort(msg)
 relations = [(p, sucs) for p in precs]
 if biject:
 relations = [(p, (s,)) for p, s in zip(precs, sucs)]

branch	stable
changeset 949	2b2a4ab0eb68
parent 948	b2b3d5aa16bc
child 950	cf4dcf49d998
child 1399	9ff6d9240f16