mercurial/localrepo.py

26740:f4a27c05c43f

                return None

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

            ms = mergemod.mergestate(self)
            for f in status.modified:
                if f in ms and ms[f] == 'u':
                    raise error.Abort(_('unresolved merge conflicts '
                                       '(see "hg help resolve")'))

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

26741:e1568d5eb052

                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:
                raise error.Abort(_('driver-resolved merge conflicts'),
                                  hint=_('run "hg resolve --all" to resolve'))

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