comparison hglib/client.py @ 216:68588c652ac6

client: handle commit messages with \0 characters

Mercurial allows commit messages containing \0 characters,
but hglib does not properly handle them.

By using the json template, these characters are correctly escaped.

Note: initial change only modifies this for the 'log' command,
I'll follow-up for other commands if this is ok.

215:1e7a64588ab0

import struct, re, datetime
import hglib
from hglib import error, util, templates, merge, context

from hglib.util import b, cmdbuilder, BytesIO, strtobytes

            dt = datetime.datetime.fromtimestamp(posixtime)
            revs.append(revision(rev[0], rev[1], rev[2], rev[3],
                                 rev[4], rev[5], dt))
        return revs

    def runcommand(self, args, inchannels, outchannels):
        def writeblock(data):
            if self._protocoltracefn is not None:
                self._protocoltracefn('w', None, data)
            self.server.stdin.write(struct.pack(self.inputfmt, len(data)))

        exclude - exclude names matching the given patterns

        """
        if hidden is None:
            hidden = self.hidden
        args = cmdbuilder(b('log'), template=templates.changeset,
                          r=revrange, f=follow, follow_first=followfirst,
                          d=date, C=copies, k=keyword, removed=removed,
                          m=onlymerges, u=user, b=branch, P=prune,
                          l=limit, M=nomerges, I=include, X=exclude,
                          hidden=hidden, *files)

        out = self.rawcommand(args)
        out = out.split(b('\0'))[:-1]

        return self._parserevs(out)

    def manifest(self, rev=None, all=False):
        """Yields (nodeid, permission, executable, symlink, file path) tuples
        for version controlled files for the given revision. If no
        revision is given, the first parent of the working directory

216:68588c652ac6

import struct, re, datetime, json
import hglib
from hglib import error, util, templates, merge, context

from hglib.util import b, cmdbuilder, BytesIO, strtobytes

            dt = datetime.datetime.fromtimestamp(posixtime)
            revs.append(revision(rev[0], rev[1], rev[2], rev[3],
                                 rev[4], rev[5], dt))
        return revs

    @staticmethod
    def _parsejsonrevs(jsonrevs):
        revs = []
        for rev in jsonrevs:
            # truncate the timezone and convert to a local datetime
            posixtime = float(rev["date"][0])
            dt = datetime.datetime.fromtimestamp(posixtime)
            revs.append(revision(str(rev["rev"]).encode(), rev["node"].encode(),
                                 ' '.join(rev["tags"]).encode(),
                                 rev["branch"].encode(), rev["user"].encode(),
                                 rev["desc"].encode(), dt))
        return revs

    def runcommand(self, args, inchannels, outchannels):
        def writeblock(data):
            if self._protocoltracefn is not None:
                self._protocoltracefn('w', None, data)
            self.server.stdin.write(struct.pack(self.inputfmt, len(data)))

        exclude - exclude names matching the given patterns

        """
        if hidden is None:
            hidden = self.hidden
        args = cmdbuilder(b('log'), template="json",
                          r=revrange, f=follow, follow_first=followfirst,
                          d=date, C=copies, k=keyword, removed=removed,
                          m=onlymerges, u=user, b=branch, P=prune,
                          l=limit, M=nomerges, I=include, X=exclude,
                          hidden=hidden, *files)

        out = self.rawcommand(args)
        json_out = json.loads(out)

        return self._parsejsonrevs(json_out)

    def manifest(self, rev=None, all=False):
        """Yields (nodeid, permission, executable, symlink, file path) tuples
        for version controlled files for the given revision. If no
        revision is given, the first parent of the working directory