comparison mercurial/localrepo.py @ 8410:1d11d985c179

commit: combine _commitctx and commitctx, drop unused force argument

8409:e84a8482c6f2

                if f in ms and ms[f] == 'u':
                    raise util.Abort(_("unresolved merge conflicts "
                                                    "(see hg resolve)"))
            wctx = context.workingctx(self, (p1, p2), text, user, date,
                                      extra, changes)
            r = self._commitctx(wctx, force, editor, True)
            ms.reset()
            return r

        finally:
            wlock.release()

    def commitctx(self, ctx):
        """Add a new revision to current repository.

        Revision information is passed in the context.memctx argument.
        commitctx() does not touch the working directory.
        """
        return self._commitctx(ctx, force=True, editor=None, working=False)

    def _commitctx(self, ctx, force=False, editor=None, working=True):
        lock = self.lock()
        tr = None
        valid = 0 # don't save the dirstate if this isn't set
        try:
            commit = sorted(ctx.modified() + ctx.added())

8410:1d11d985c179

                if f in ms and ms[f] == 'u':
                    raise util.Abort(_("unresolved merge conflicts "
                                                    "(see hg resolve)"))
            wctx = context.workingctx(self, (p1, p2), text, user, date,
                                      extra, changes)
            r = self.commitctx(wctx, editor, True)
            ms.reset()
            return r

        finally:
            wlock.release()

    def commitctx(self, ctx, editor=None, working=False):
        """Add a new revision to current repository.

        Revision information is passed via the context argument.
        If editor is supplied, it is called to get a commit message.
        If working is set, the working directory is affected.
        """

        lock = self.lock()
        tr = None
        valid = 0 # don't save the dirstate if this isn't set
        try:
            commit = sorted(ctx.modified() + ctx.added())