comparison mercurial/localrepo.py @ 27102:f97bb61b51e6 stable

localrepo.commit: check all files for resolve state (issue4972)

Previously we were only checking modified files for their resolve state. But a
file might be unresolved yet not in the modified state. Handle all such cases
properly.

26960:6979fe2a6d75

                return None

            if merge and cctx.deleted():
                raise error.Abort(_("cannot commit merge with missing files"))

            unresolved, driverresolved = False, False
            ms = mergemod.mergestate(self)
            for f in status.modified:
                if f in ms:
                    if ms[f] == 'u':
                        unresolved = True
                    elif ms[f] == 'd':
                        driverresolved = True

            if unresolved:
                raise error.Abort(_('unresolved merge conflicts '
                                    '(see "hg help resolve")'))
            if driverresolved or ms.mdstate() != 's':
                raise error.Abort(_('driver-resolved merge conflicts'),
                                  hint=_('run "hg resolve --all" to resolve'))

            if editor:
                cctx._text = editor(self, cctx, subs)

27102:f97bb61b51e6

                return None

            if merge and cctx.deleted():
                raise error.Abort(_("cannot commit merge with missing files"))

            ms = mergemod.mergestate(self)

            if list(ms.unresolved()):
                raise error.Abort(_('unresolved merge conflicts '
                                    '(see "hg help resolve")'))
            if ms.mdstate() != 's' or list(ms.driverresolved()):
                raise error.Abort(_('driver-resolved merge conflicts'),
                                  hint=_('run "hg resolve --all" to resolve'))

            if editor:
                cctx._text = editor(self, cctx, subs)