comparison mercurial/localrepo.py @ 8407:223000a687b0

commit: move commit editor to cmdutil, pass as function

8406:6ad1f72bdf34

            changelist.append(fname)

        return fparent1

    def commit(self, files=None, text="", user=None, date=None, match=None,
               force=False, force_editor=False, extra={}, empty_ok=False):
        wlock = lock = None
        if extra.get("close"):
            force = True
        if files:
            files = list(set(files))

                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, force_editor, empty_ok, True)
            ms.reset()
            return r

        finally:
            wlock.release()

        """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, force_editor=False,
                               empty_ok=True, working=False)

    def _commitctx(self, ctx, force=False, force_editor=False, empty_ok=False,
                   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())

                    del m1[f]
                    removed1.append(f)
            mn = self.manifest.add(m1, trp, linkrev, c1[0], c2[0],
                                   (new, removed1))

            # add changeset
            if (not empty_ok and not text) or force_editor:
                edittext = []
                if text:
                    edittext.append(text)
                edittext.append("")
                edittext.append("") # Empty line between message and comments.
                edittext.append(_("HG: Enter commit message."
                                  "  Lines beginning with 'HG:' are removed."))
                edittext.append("HG: --")
                edittext.append(_("HG: user: %s") % user)
                if p2 != nullid:
                    edittext.append(_("HG: branch merge"))
                if branchname:
                    edittext.append(_("HG: branch '%s'")
                                    % encoding.tolocal(branchname))
                edittext.extend([_("HG: added %s") % f for f in added])
                edittext.extend([_("HG: changed %s") % f for f in updated])
                edittext.extend([_("HG: removed %s") % f for f in removed])
                if not added and not updated and not removed:
                    edittext.append(_("HG: no files changed"))
                edittext.append("")
                # run editor in the repository root
                olddir = os.getcwd()
                os.chdir(self.root)
                text = self.ui.edit("\n".join(edittext), user)
                os.chdir(olddir)

            lines = [line.rstrip() for line in text.rstrip().splitlines()]
            while lines and not lines[0]:
                del lines[0]
            if not lines and working:
                raise util.Abort(_("empty commit message"))
            text = '\n'.join(lines)

            self.changelog.delayupdate()
            n = self.changelog.add(mn, changed + removed, text, trp, p1, p2,
                                   user, ctx.date(), extra)

8407:223000a687b0

            changelist.append(fname)

        return fparent1

    def commit(self, files=None, text="", user=None, date=None, match=None,
               force=False, editor=False, extra={}):
        wlock = lock = None
        if extra.get("close"):
            force = True
        if files:
            files = list(set(files))

                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()

        """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())

                    del m1[f]
                    removed1.append(f)
            mn = self.manifest.add(m1, trp, linkrev, c1[0], c2[0],
                                   (new, removed1))

            if editor:
                text = editor(self, ctx, added, updated, removed)

            lines = [line.rstrip() for line in text.rstrip().splitlines()]
            while lines and not lines[0]:
                del lines[0]
            text = '\n'.join(lines)

            self.changelog.delayupdate()
            n = self.changelog.add(mn, changed + removed, text, trp, p1, p2,
                                   user, ctx.date(), extra)