hgext/mq.py

2297:936b615eb44e

        pf = os.path.join(self.path, patch)
        message = []
        comments = []
        user = None
        format = None
        subject = None
        diffstart = 0

        for line in file(pf):

                continue
            elif format == "hgpatch":
                # parse values when importing the result of an hg export
                if line.startswith("# User "):
                    user = line[7:]
                elif not line.startswith("# ") and line:
                    message.append(line)
                    format = None
            elif line == '# HG changeset patch':
                format = "hgpatch"

        # make sure message isn't empty
        if format and format.startswith("tag") and subject:
            message.insert(0, "")
            message.insert(0, subject)
        return (message, comments, user, diffstart > 1)

    def mergeone(self, repo, mergeq, head, patch, rev, wlock):
        # first try just applying the patch
        (err, n) = self.apply(repo, [ patch ], update_status=False,
                              strict=True, merge=rev, wlock=wlock)

        n = repo.commit(None, c[4], c[1], force=1, wlock=wlock)
        if n == None:
            self.ui.warn("repo commit failed\n")
            sys.exit(1)
        try:
            message, comments, user, patchfound = mergeq.readheaders(patch)
        except:
            self.ui.warn("Unable to read %s\n" % patch)
            sys.exit(1)

        patchf = self.opener(patch, "w")

        for patch in series:
            self.ui.warn("applying %s\n" % patch)
            pf = os.path.join(patchdir, patch)

            try:
                message, comments, user, patchfound = self.readheaders(patch)
            except:
                self.ui.warn("Unable to read %s\n" % pf)
                err = 1
                break

                p1, p2 = repo.dirstate.parents()
                repo.dirstate.setparents(p1, merge)
            if len(files) > 0:
                commands.addremove_lock(self.ui, repo, files,
                                        opts={}, wlock=wlock)
            n = repo.commit(files, message, user, force=1, lock=lock,
                            wlock=wlock)

            if n == None:
                self.ui.warn("repo commit failed\n")
                sys.exit(1)

        qp = self.qparents(repo)
        (top, patch) = self.applied[-1].split(':')
        top = revlog.bin(top)
        cparents = repo.changelog.parents(top)
        patchparent = self.qparents(repo, top)
        message, comments, user, patchfound = self.readheaders(patch)

        patchf = self.opener(patch, "w")
        if comments:
            comments = "\n".join(comments) + '\n\n'
            patchf.write(comments)

2299:dacf718e1d48

        pf = os.path.join(self.path, patch)
        message = []
        comments = []
        user = None
        date = None
        format = None
        subject = None
        diffstart = 0

        for line in file(pf):

                continue
            elif format == "hgpatch":
                # parse values when importing the result of an hg export
                if line.startswith("# User "):
                    user = line[7:]
                elif line.startswith("# Timestamp "):
                    date = line[12:]
                elif not line.startswith("# ") and line:
                    message.append(line)
                    format = None
            elif line == '# HG changeset patch':
                format = "hgpatch"

        # make sure message isn't empty
        if format and format.startswith("tag") and subject:
            message.insert(0, "")
            message.insert(0, subject)
        return (message, comments, user, date, diffstart > 1)

    def mergeone(self, repo, mergeq, head, patch, rev, wlock):
        # first try just applying the patch
        (err, n) = self.apply(repo, [ patch ], update_status=False,
                              strict=True, merge=rev, wlock=wlock)

        n = repo.commit(None, c[4], c[1], force=1, wlock=wlock)
        if n == None:
            self.ui.warn("repo commit failed\n")
            sys.exit(1)
        try:
            message, comments, user, date, patchfound = mergeq.readheaders(patch)
        except:
            self.ui.warn("Unable to read %s\n" % patch)
            sys.exit(1)

        patchf = self.opener(patch, "w")

        for patch in series:
            self.ui.warn("applying %s\n" % patch)
            pf = os.path.join(patchdir, patch)

            try:
                message, comments, user, date, patchfound = self.readheaders(patch)
            except:
                self.ui.warn("Unable to read %s\n" % pf)
                err = 1
                break

                p1, p2 = repo.dirstate.parents()
                repo.dirstate.setparents(p1, merge)
            if len(files) > 0:
                commands.addremove_lock(self.ui, repo, files,
                                        opts={}, wlock=wlock)
            n = repo.commit(files, message, user, date, force=1, lock=lock,
                            wlock=wlock)

            if n == None:
                self.ui.warn("repo commit failed\n")
                sys.exit(1)

        qp = self.qparents(repo)
        (top, patch) = self.applied[-1].split(':')
        top = revlog.bin(top)
        cparents = repo.changelog.parents(top)
        patchparent = self.qparents(repo, top)
        message, comments, user, date, patchfound = self.readheaders(patch)

        patchf = self.opener(patch, "w")
        if comments:
            comments = "\n".join(comments) + '\n\n'
            patchf.write(comments)