comparison mercurial/localrepo.py @ 8496:a21605de1509

commit: move editor outside transaction

The commit editor is now invoked before files and manifest are
committed. The editor is now run with only the wlock held and aborting
an edit no longer requires rolling back a transaction. Changes to
files during a commit still result in undefined behavior.

(This is preliminary work for committing subrepositories)

8495:5b7596b142ad

            ms = merge_.mergestate(self)
            for f in changes[0]:
                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)
            ret = self.commitctx(wctx, editor, True)
            ms.reset()

            # update dirstate
            for f in changes[0] + changes[1]:
                self.dirstate.normal(f)

        finally:
            if ret == None:
                self.dirstate.invalidate() # didn't successfully commit
            wlock.release()

    def commitctx(self, ctx, editor=None, error=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.

                        self.ui.warn(_("trouble committing %s!\n") % f)
                        raise
                    else:
                        remove.append(f)

            updated, added = [], []
            for f in sorted(changed):
                if f in m1 or f in m2:
                    updated.append(f)
                else:
                    added.append(f)

            # update manifest
            m1.update(new)
            removed = [f for f in sorted(remove) if f in m1 or f in m2]
            removed1 = []

                    removed1.append(f)
            mn = self.manifest.add(m1, trp, linkrev, p1.manifestnode(),
                                   p2.manifestnode(), (new, removed1))

            text = ctx.description()
            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)

8496:a21605de1509

            ms = merge_.mergestate(self)
            for f in changes[0]:
                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)
            if editor:
                wctx._text = editor(self, wctx,
                                    changes[1], changes[0], changes[2])

            ret = self.commitctx(wctx, True)
            ms.reset()

            # update dirstate
            for f in changes[0] + changes[1]:
                self.dirstate.normal(f)

        finally:
            if ret == None:
                self.dirstate.invalidate() # didn't successfully commit
            wlock.release()

    def commitctx(self, ctx, error=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.

                        self.ui.warn(_("trouble committing %s!\n") % f)
                        raise
                    else:
                        remove.append(f)

            # update manifest
            m1.update(new)
            removed = [f for f in sorted(remove) if f in m1 or f in m2]
            removed1 = []

                    removed1.append(f)
            mn = self.manifest.add(m1, trp, linkrev, p1.manifestnode(),
                                   p2.manifestnode(), (new, removed1))

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