comparison hgext/evolve.py @ 1319:8376fe35ebda

evolve: add new variable and comment

Add comment and introduce a new variable to keep track of if the progress ui
is shown. Later on we will use this variable in the implementation of the --rev
option.

1318:29363f79514f

    ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'evolve')

    # Progress handling
    seen = 1
    count = allopt and _counttroubled(ui, repo) or 1

    def progresscb():
        if allopt:
            ui.progress('evolve', seen, unit='changesets', total=count)

    if contopt:
        if anyopt:
            raise util.Abort('cannot specify both "--any" and "--continue"')
        if allopt:
            raise util.Abort('cannot specify both "--all" and "--continue"')

                ui.status(_('working directory is now at %s\n') % repo['.'])
            return result
        progresscb()
        nexttrouble = _picknexttroubled(ui, repo, anyopt or allopt)

    if allopt:
        ui.progress('evolve', None)

    if repo['.'] != startnode:
        ui.status(_('working directory is now at %s\n') % repo['.'])

1319:8376fe35ebda

    ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'evolve')

    # Progress handling
    seen = 1
    count = allopt and _counttroubled(ui, repo) or 1
    showprogress = allopt

    def progresscb():
        if allopt:
            ui.progress('evolve', seen, unit='changesets', total=count)

    # Continuation handling
    if contopt:
        if anyopt:
            raise util.Abort('cannot specify both "--any" and "--continue"')
        if allopt:
            raise util.Abort('cannot specify both "--all" and "--continue"')

                ui.status(_('working directory is now at %s\n') % repo['.'])
            return result
        progresscb()
        nexttrouble = _picknexttroubled(ui, repo, anyopt or allopt)

    # Cleanup
    if showprogress:
        ui.progress('evolve', None)

    if repo['.'] != startnode:
        ui.status(_('working directory is now at %s\n') % repo['.'])