comparison hgext/histedit.py @ 22983:a3a981563ce8

histedit: read state from histeditstate

Read the state in histeditstate. This allows us to correctly update
internal variables when necessary without having to recreate a new
state.  When we read a state in _histedit state while we will already
have state passed from histedit(), we can read the state in place
and don't have to merge two histeditstates.

22982:52f10a4d13dd

        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)

    replacements = []
    keep = opts.get('keep', False)

    # rebuild state
    if goal == 'continue':
        state = readstate(repo)
        state = bootstrapcontinue(ui, state, opts)
    elif goal == 'abort':
        state = readstate(repo)
        mapping, tmpnodes, leafs, _ntm = processreplacement(repo, state)
        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 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))

            raise util.Abort(_('cannot edit history that contains merges'))
        root = ctxs[0] # list is already sorted by repo.set
        if not root.mutable():
            raise util.Abort(_('cannot edit immutable changeset: %s') % root)
    return [c.node() for c in ctxs]

def readstate(repo):
    """Reads a state from file and returns a histeditstate object
    """
    try:
        fp = repo.vfs('histedit-state', 'r')
    except IOError, err:
        if err.errno != errno.ENOENT:
            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`

    line are in the form:

        release(lock)

def summaryhook(ui, repo):
    if not os.path.exists(repo.join('histedit-state')):
        return
    state = readstate(repo)
    if state.rules:
        # i18n: column positioning for "hg summary"
        ui.write(_('hist:   %s (histedit --continue)\n') %
                 (ui.label(_('%d remaining'), 'histedit.remaining') %
                  len(state.rules)))

22983:a3a981563ce8

        self.parentctx = parentctx
        if replacements is None:
            self.replacements = []
        else:
            self.replacements = replacements

    def read(self):
        """Reads a state from file and returns a histeditstate object
        """
        try:
            fp = self.repo.vfs('histedit-state', 'r')
        except IOError, err:
            if err.errno != errno.ENOENT:
                raise
            raise util.Abort(_('no histedit in progress'))

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

        self.parentctx = self.repo[parentctxnode]
        self.rules = rules
        self.keep = keep
        self.topmost = topmost
        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)

    replacements = []
    keep = opts.get('keep', False)

    # rebuild state
    if goal == 'continue':
        state = histeditstate(repo)
        state.read()
        state = bootstrapcontinue(ui, state, opts)
    elif goal == 'abort':
        state = histeditstate(repo)
        state.read()
        mapping, tmpnodes, leafs, _ntm = processreplacement(repo, state)
        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 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))

            raise util.Abort(_('cannot edit history that contains merges'))
        root = ctxs[0] # list is already sorted by repo.set
        if not root.mutable():
            raise util.Abort(_('cannot edit immutable changeset: %s') % root)
    return [c.node() for c in ctxs]

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

    line are in the form:

        release(lock)

def summaryhook(ui, repo):
    if not os.path.exists(repo.join('histedit-state')):
        return
    state = histeditstate(repo)
    state.read()
    if state.rules:
        # i18n: column positioning for "hg summary"
        ui.write(_('hist:   %s (histedit --continue)\n') %
                 (ui.label(_('%d remaining'), 'histedit.remaining') %
                  len(state.rules)))