mercurial/localrepo.py

8411:4d5916358abd

        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.
        """

        tr = None
        valid = 0 # don't save the dirstate if this isn't set
        lock = None
        commit = sorted(ctx.modified() + ctx.added())
        remove = ctx.removed()
        extra = ctx.extra().copy()
        branchname = extra['branch']
        user = ctx.user()
        text = ctx.description()

        p1, p2 = [p.node() for p in ctx.parents()]
        c1 = self.changelog.read(p1)
        c2 = self.changelog.read(p2)
        m1 = self.manifest.read(c1[0]).copy()
        m2 = self.manifest.read(c2[0])

        xp1 = hex(p1)
        if p2 == nullid: xp2 = ''
        else: xp2 = hex(p2)
        self.hook("precommit", throw=True, parent1=xp1, parent2=xp2)

        lock = self.lock()
        try:
            tr = self.transaction()

            # check in files
            new = {}
            changed = []
            linkrev = len(self)
            for f in commit:
                self.ui.note(f + "\n")
                try:
                    fctx = ctx[f]
                    new[f] = self._filecommit(fctx, m1, m2, linkrev, trp,
                                              changed)

                    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)
            p = lambda: self.changelog.writepending() and self.root or ""
            self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
                      parent2=xp2, pending=p)
            self.changelog.finalize(trp)
            tr.close()

8412:2bf4f380f6ab

        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.
        """

        tr = lock = None
        valid = 0 # don't save the dirstate if this isn't set
        remove = ctx.removed()

        p1, p2 = [p.node() for p in ctx.parents()]
        c1 = self.changelog.read(p1)
        c2 = self.changelog.read(p2)
        m1 = self.manifest.read(c1[0]).copy()
        m2 = self.manifest.read(c2[0])
        user = ctx.user()

        xp1, xp2 = hex(p1), hex(p2)
        if p2 == nullid:
            xp2 = ''
        self.hook("precommit", throw=True, parent1=xp1, parent2=xp2)

        lock = self.lock()
        try:
            tr = self.transaction()

            # check in files
            new = {}
            changed = []
            linkrev = len(self)
            for f in sorted(ctx.modified() + ctx.added()):
                self.ui.note(f + "\n")
                try:
                    fctx = ctx[f]
                    new[f] = self._filecommit(fctx, m1, m2, linkrev, trp,
                                              changed)

                    del m1[f]
                    removed1.append(f)
            mn = self.manifest.add(m1, trp, linkrev, c1[0], c2[0],
                                   (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)

            self.changelog.delayupdate()
            n = self.changelog.add(mn, changed + removed, text, trp, p1, p2,
                                   user, ctx.date(), ctx.extra().copy())
            p = lambda: self.changelog.writepending() and self.root or ""
            self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
                      parent2=xp2, pending=p)
            self.changelog.finalize(trp)
            tr.close()