comparison mercurial/merge.py @ 26615:c9223a3979b7

merge.mergestate: add a wrapper around resolve

The resolve function will be broken up into separate pre-resolve and resolve
steps.

26614:ef1eb6df7071

        for f, entry in self._state.items():
            if entry[0] == 'u':
                yield f

    def resolve(self, dfile, wctx, labels=None):
        """rerun merge process for file path `dfile`"""
        if self[dfile] == 'r':
            return 0
        stateentry = self._state[dfile]
        state, hash, lfile, afile, anode, ofile, onode, flags = stateentry

            del self._state[dfile]
            self._dirty = True
        elif not r:
            self.mark(dfile, 'r')
        return r

def _checkunknownfile(repo, wctx, mctx, f, f2=None):
    if f2 is None:
        f2 = f
    return (os.path.isfile(repo.wjoin(f))

26615:c9223a3979b7

        for f, entry in self._state.items():
            if entry[0] == 'u':
                yield f

    def _resolve(self, dfile, wctx, labels=None):
        """rerun merge process for file path `dfile`"""
        if self[dfile] == 'r':
            return 0
        stateentry = self._state[dfile]
        state, hash, lfile, afile, anode, ofile, onode, flags = stateentry

            del self._state[dfile]
            self._dirty = True
        elif not r:
            self.mark(dfile, 'r')
        return r

    def resolve(self, dfile, wctx, labels=None):
        """rerun merge process for file path `dfile`"""
        return self._resolve(dfile, wctx, labels=labels)

def _checkunknownfile(repo, wctx, mctx, f, f2=None):
    if f2 is None:
        f2 = f
    return (os.path.isfile(repo.wjoin(f))