comparison hgext/evolve.py @ 707:f914e315b717

evolve: remove magic return values from utility functions

706:90f0a1ede70a

            ui.write_err(_('no troubled changeset\n')) 
            return 1

    while tr is not None:
        result = _evolveany(ui, repo, tr, dryrunopt)
        if 2 == result or not allopt:
            return result
        tr = _picknexttroubled(ui, repo, anyopt or allopt)
        

def _evolveany(ui, repo, tr, dryrunopt):

        ui.debug("stabilize target %s is plain dead,"
                 " trying to stabilize on its parent")
        obs = obs.parents()[0]
        newer = obsolete.successorssets(repo, obs.node())
    if len(newer) > 1:
        ui.write_err(_("conflict rewriting. can't choose destination\n"))
        return 2
    targets = newer[0]
    assert targets
    if len(targets) > 1:
        ui.write_err(_("does not handle splitted parent yet\n"))
        return 2
    target = targets[0]
    displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
    target = repo[target]
    repo.ui.status(_('move:'))

707:f914e315b717

            ui.write_err(_('no troubled changeset\n')) 
            return 1

    while tr is not None:
        result = _evolveany(ui, repo, tr, dryrunopt)
        if not allopt:
            return result
        tr = _picknexttroubled(ui, repo, anyopt or allopt)
        

def _evolveany(ui, repo, tr, dryrunopt):

        ui.debug("stabilize target %s is plain dead,"
                 " trying to stabilize on its parent")
        obs = obs.parents()[0]
        newer = obsolete.successorssets(repo, obs.node())
    if len(newer) > 1:
        raise util.Abort(_("conflict rewriting. can't choose destination\n"))
    targets = newer[0]
    assert targets
    if len(targets) > 1:
        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]
    repo.ui.status(_('move:'))