comparison hgext/histedit.py @ 22979:bb22cd700e0a

histedit: let the state expose a context but serialize correctly to nodes

The histedit code often expects a context. However histedit hands
around the tuple for the serialization and therefore hand over a
parentctxnode. This leads to code having to return a context based
on the parentctxnode. We let the state only return a context but
correctly serialize and deserialze to a node.

22978:d4e764521249

#  m, mess = edit message without changing commit content
#
""")

class histeditstate(object):
    def __init__(self, repo, parentctxnode=None, rules=None, keep=None,
            topmost=None, replacements=None):
        self.repo = repo
        self.parentctxnode = parentctxnode
        self.rules = rules
        self.keep = keep
        self.topmost = topmost
        if replacements is None:
            self.replacements = []
        else:
            self.replacements = replacements

    def write(self):
        fp = self.repo.vfs('histedit-state', 'w')
        pickle.dump((self.parentctxnode, self.rules, self.keep,
            self.topmost, self.replacements), fp)
        fp.close()

    def clear(self):
        self.repo.vfs.unlink('histedit-state')

    keep = opts.get('keep', False)

    # rebuild state
    if goal == 'continue':
        state = readstate(repo)
        parentctx = repo[state.parentctxnode]
        parentctx, repl = bootstrapcontinue(ui, repo, parentctx, state.rules,
                opts)
        state.replacements.extend(repl)
        state.parentctxnode = parentctx.node()
    elif goal == 'abort':
        state = readstate(repo)
        mapping, tmpnodes, leafs, _ntm = processreplacement(repo,
                state.replacements)
        ui.debug('restore wc to old parent %s\n' % node.short(state.topmost))
        # check whether we should update away
        parentnodes = [c.node() for c in repo[None].parents()]
        for n in leafs | set([state.parentctxnode]):
            if n in parentnodes:
                hg.clean(repo, state.topmost)
                break
        else:
            pass

                 if l and not l.startswith('#')]
        rules = verifyrules(rules, repo, ctxs)

        parentctx = repo[root].parents()[0]

        state = histeditstate(repo, parentctx.node(), rules, keep,
                    topmost, replacements)

    while state.rules:
        state.write()
        action, ha = state.rules.pop(0)
        ui.debug('histedit: processing %s %s\n' % (action, ha))
        actfunc = actiontable[action]
        parentctx = repo[state.parentctxnode]
        parentctx, replacement_ = actfunc(ui, repo, parentctx,
                ha, opts)
        state.parentctxnode = parentctx.node()
        state.replacements.extend(replacement_)

    hg.update(repo, state.parentctxnode)

    mapping, tmpnodes, created, ntm = processreplacement(repo,
            state.replacements)
    if mapping:
        for prec, succs in mapping.iteritems():

            raise
        raise util.Abort(_('no histedit in progress'))

    (parentctxnode, rules, keep, topmost, replacements) = pickle.load(fp)

    return histeditstate(repo, parentctxnode, rules,
        keep, topmost, replacements)

def makedesc(c):
    """build a initial action line for a ctx `c`

22979:bb22cd700e0a

#  m, mess = edit message without changing commit content
#
""")

class histeditstate(object):
    def __init__(self, repo, parentctx=None, rules=None, keep=None,
            topmost=None, replacements=None):
        self.repo = repo
        self.rules = rules
        self.keep = keep
        self.topmost = topmost
        self.parentctx = parentctx
        if replacements is None:
            self.replacements = []
        else:
            self.replacements = replacements

    def write(self):
        fp = self.repo.vfs('histedit-state', 'w')
        pickle.dump((self.parentctx.node(), self.rules, self.keep,
            self.topmost, self.replacements), fp)
        fp.close()

    def clear(self):
        self.repo.vfs.unlink('histedit-state')

    keep = opts.get('keep', False)

    # rebuild state
    if goal == 'continue':
        state = readstate(repo)
        state.parentctx, repl = bootstrapcontinue(ui, repo, state.parentctx,
                state.rules, opts)
        state.replacements.extend(repl)
    elif goal == 'abort':
        state = readstate(repo)
        mapping, tmpnodes, leafs, _ntm = processreplacement(repo,
                state.replacements)
        ui.debug('restore wc to old parent %s\n' % node.short(state.topmost))
        # check whether we should update away
        parentnodes = [c.node() for c in repo[None].parents()]
        for n in leafs | set([state.parentctx.node()]):
            if n in parentnodes:
                hg.clean(repo, state.topmost)
                break
        else:
            pass

                 if l and not l.startswith('#')]
        rules = verifyrules(rules, repo, ctxs)

        parentctx = repo[root].parents()[0]

        state = histeditstate(repo, parentctx, rules, keep,
                    topmost, replacements)

    while state.rules:
        state.write()
        action, ha = state.rules.pop(0)
        ui.debug('histedit: processing %s %s\n' % (action, ha))
        actfunc = actiontable[action]
        state.parentctx, replacement_ = actfunc(ui, repo, state.parentctx,
                ha, opts)
        state.replacements.extend(replacement_)

    hg.update(repo, state.parentctx.node())

    mapping, tmpnodes, created, ntm = processreplacement(repo,
            state.replacements)
    if mapping:
        for prec, succs in mapping.iteritems():

            raise
        raise util.Abort(_('no histedit in progress'))

    (parentctxnode, rules, keep, topmost, replacements) = pickle.load(fp)

    return histeditstate(repo, repo[parentctxnode], rules,
        keep, topmost, replacements)

def makedesc(c):
    """build a initial action line for a ctx `c`