hgext/rebase.py

6922:1ec2d227a521

                rebasenode(repo, rev, target, state, skipped, targetancestors,
                                                                collapsef)
        ui.note(_('rebase merging completed\n'))

        if collapsef:
            p1, p2 = defineparents(repo, min(state), target, 
                                                        state, targetancestors)
            concludenode(repo, rev, p1, external, state, collapsef,
                                                last=True, skipped=skipped)

        if 'qtip' in repo.tags():
            updatemq(repo, state, skipped, **opts)

        if not opts.get('keep'):
            # Remove no more useful revisions
            if (util.set(repo.changelog.descendants(min(state))) 
                                                    - util.set(state.keys())):
                ui.warn(_("warning: new changesets detected on source branch, "
                                                        "not stripping\n"))
            else:
                repair.strip(repo.ui, repo, repo[min(state)].node(), "strip")

        if not collapse:
            repo.ui.note('no changes, revision %d skipped\n' % rev)
            repo.ui.debug('next revision set to %s\n' % p1)
            skipped[rev] = True
        state[rev] = p1
       
def defineparents(repo, rev, target, state, targetancestors):
    'Return the new parent relationship of the revision that will be rebased'
    parents = repo[rev].parents()
    p1 = p2 = nullrev

        mq.reverse()
        for rev in mq:
            if rev not in skipped:
                repo.ui.debug('import mq patch %d (%s)\n' % (state[rev],
                                                            mqrebase[rev]))
                repo.mq.qimport(repo, (), patchname=mqrebase[rev], 
                            git=opts.get('git', False),rev=[str(state[rev])])
        repo.mq.save_dirty()

def storestatus(repo, originalwd, target, state, collapse, external):
    'Store the current status to allow recovery'

        cwdancestors = util.set(repo.changelog.ancestors(cwd))
        cwdancestors.add(cwd)
        rebasingbranch = cwdancestors - targetancestors
        source = min(rebasingbranch)
        
    repo.ui.debug(_('rebase onto %d starting from %d\n') % (dest, source))
    state = dict.fromkeys(repo.changelog.descendants(source), nullrev)
    external = nullrev
    if collapse:
        if not targetancestors:

    decorator = lambda ui, repo, *args, **opts: \
                    pulldelegate(cmdentry[0], repo, *args, **opts)
    # make sure 'hg help cmd' still works
    decorator.__doc__ = cmdentry[0].__doc__
    decoratorentry = (decorator,) + cmdentry[1:]
    rebaseopt = ('', 'rebase', None, 
                            _("rebase working directory to branch head"))
    decoratorentry[1].append(rebaseopt)
    commands.table[cmdkey] = decoratorentry

cmdtable = {

6923:ebf1462f2145

                rebasenode(repo, rev, target, state, skipped, targetancestors,
                                                                collapsef)
        ui.note(_('rebase merging completed\n'))

        if collapsef:
            p1, p2 = defineparents(repo, min(state), target,
                                                        state, targetancestors)
            concludenode(repo, rev, p1, external, state, collapsef,
                                                last=True, skipped=skipped)

        if 'qtip' in repo.tags():
            updatemq(repo, state, skipped, **opts)

        if not opts.get('keep'):
            # Remove no more useful revisions
            if (util.set(repo.changelog.descendants(min(state)))
                                                    - util.set(state.keys())):
                ui.warn(_("warning: new changesets detected on source branch, "
                                                        "not stripping\n"))
            else:
                repair.strip(repo.ui, repo, repo[min(state)].node(), "strip")

        if not collapse:
            repo.ui.note('no changes, revision %d skipped\n' % rev)
            repo.ui.debug('next revision set to %s\n' % p1)
            skipped[rev] = True
        state[rev] = p1

def defineparents(repo, rev, target, state, targetancestors):
    'Return the new parent relationship of the revision that will be rebased'
    parents = repo[rev].parents()
    p1 = p2 = nullrev

        mq.reverse()
        for rev in mq:
            if rev not in skipped:
                repo.ui.debug('import mq patch %d (%s)\n' % (state[rev],
                                                            mqrebase[rev]))
                repo.mq.qimport(repo, (), patchname=mqrebase[rev],
                            git=opts.get('git', False),rev=[str(state[rev])])
        repo.mq.save_dirty()

def storestatus(repo, originalwd, target, state, collapse, external):
    'Store the current status to allow recovery'

        cwdancestors = util.set(repo.changelog.ancestors(cwd))
        cwdancestors.add(cwd)
        rebasingbranch = cwdancestors - targetancestors
        source = min(rebasingbranch)

    repo.ui.debug(_('rebase onto %d starting from %d\n') % (dest, source))
    state = dict.fromkeys(repo.changelog.descendants(source), nullrev)
    external = nullrev
    if collapse:
        if not targetancestors:

    decorator = lambda ui, repo, *args, **opts: \
                    pulldelegate(cmdentry[0], repo, *args, **opts)
    # make sure 'hg help cmd' still works
    decorator.__doc__ = cmdentry[0].__doc__
    decoratorentry = (decorator,) + cmdentry[1:]
    rebaseopt = ('', 'rebase', None,
                            _("rebase working directory to branch head"))
    decoratorentry[1].append(rebaseopt)
    commands.table[cmdkey] = decoratorentry

cmdtable = {