comparison hglib/client.py @ 224:2ab42323f149

client: handle commit messages with \0 characters for all commands

Each of the impacted commands will now use the 'json' template,
which they all support as of Mercurial 3.7.3 (the first version
tested in the regression tests).

Note: I tried to add a test with null bytes,
but both hglib and using hg directly through subprocess
rejected adding a commit message with a null byte.

223:3f9dd44be8c2

            return channel, length
        else:
            return channel, self.server.stdout.read(length)

    @staticmethod
    def _parserevs(splitted):
        '''splitted is a list of fields according to our rev.style, where
        each 6 fields compose one revision.
        '''
        revs = []
        for rev in util.grouper(7, splitted):
            # truncate the timezone and convert to a local datetime
            posixtime = float(rev[6].split(b('.'), 1)[0])
            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])

        """
        if not isinstance(rev, list):
            rev = [rev]

        args = cmdbuilder(b('heads'), r=startrev, t=topological, c=closed,
                          template=templates.changeset, hidden=self.hidden,
                          *rev)

        def eh(ret, out, err):
            if ret != 1:
                raise error.CommandError(args, ret, out, err)
            return b('')

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

    def identify(self, rev=None, source=None, num=False, id=False, branch=False,
                 tags=False, bookmarks=False):
        """Return a summary string identifying the repository state at rev
        using one or two parent hash identifiers, followed by a "+" if

        insecure- do not verify server certificate (ignoring web.cacerts config)
        subrepos - recurse into subrepositories

        """
        args = cmdbuilder(b('incoming'), path,
                          template=templates.changeset, r=revrange,
                          f=force, n=newest, bundle=bundle,
                          B=bookmarks, b=branch, l=limit, M=nomerges,
                          S=subrepos)

        def eh(ret, out, err):

        out = self.rawcommand(args, eh=eh)
        if not out:
            return []

        out = util.eatlines(out, 2)
        if bookmarks:
            bms = []
            for line in out.splitlines():
                bms.append(tuple(line.split()))
            return bms
        else:
            out = out.split(b('\0'))[:-1]
            return self._parserevs(out)

    def log(self, revrange=None, files=[], follow=False,
            followfirst=False, date=None, copies=False, keyword=None,
            removed=False, onlymerges=False, user=None, branch=None,
            prune=None, hidden=None, limit=None, nomerges=False,

        subrepositories

        """
        args = cmdbuilder(b('outgoing'),
                          path,
                          template=templates.changeset, r=revrange,
                          f=force, n=newest, B=bookmarks,
                          b=branch, S=subrepos)

        def eh(ret, out, err):
            if ret != 1:

            bms = []
            for line in out.splitlines():
                bms.append(tuple(line.split()))
            return bms
        else:
            out = out.split(b('\0'))[:-1]
            return self._parserevs(out)

    def parents(self, rev=None, file=None):
        """Return the working directory's parent revisions. If rev is given,
        the parent of that revision will be printed. If file is given,
        the revision in which the file was last changed (before the
        working directory revision or the revision specified by rev)
        is returned.

        """
        args = cmdbuilder(b('parents'), file, template=templates.changeset,
                          r=rev, hidden=self.hidden)

        out = self.rawcommand(args)
        if not out:
            return

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

        return self._parserevs(out)

    def paths(self, name=None):
        """
        Return the definition of given symbolic path name. If no name is given,
        return a dictionary of pathname : url of all available names.

        """
        Return the tip revision (usually just called the tip) which is the
        changeset most recently added to the repository (and therefore the most
        recently changed head).
        """
        args = cmdbuilder(b('tip'), template=templates.changeset,
                          hidden=self.hidden)
        out = self.rawcommand(args)
        out = out.split(b('\0'))

        return self._parserevs(out)[0]

    def update(self, rev=None, clean=False, check=False, date=None):
        """
        Update the repository's working directory to changeset specified by rev.
        If rev isn't specified, update to the tip of the current named branch.

224:2ab42323f149

            return channel, length
        else:
            return channel, self.server.stdout.read(length)

    @staticmethod
    def _parsejsonrevs(jsonrevs):
        revs = []
        for rev in jsonrevs:
            # truncate the timezone and convert to a local datetime
            posixtime = float(rev["date"][0])

        """
        if not isinstance(rev, list):
            rev = [rev]

        args = cmdbuilder(b('heads'), r=startrev, t=topological, c=closed,
                          template="json", hidden=self.hidden,
                          *rev)

        def eh(ret, out, err):
            if ret != 1:
                raise error.CommandError(args, ret, out, err)
            return b('')

        out = self.rawcommand(args, eh=eh)
        if not out:
            return []
        json_out = json.loads(out)

        return self._parsejsonrevs(json_out)

    def identify(self, rev=None, source=None, num=False, id=False, branch=False,
                 tags=False, bookmarks=False):
        """Return a summary string identifying the repository state at rev
        using one or two parent hash identifiers, followed by a "+" if

        insecure- do not verify server certificate (ignoring web.cacerts config)
        subrepos - recurse into subrepositories

        """
        args = cmdbuilder(b('incoming'), path,
                          template="json", r=revrange,
                          f=force, n=newest, bundle=bundle,
                          B=bookmarks, b=branch, l=limit, M=nomerges,
                          S=subrepos)

        def eh(ret, out, err):

        out = self.rawcommand(args, eh=eh)
        if not out:
            return []

        out = util.eatlines(out, 2)

        if bookmarks:
            bms = []
            for line in out.splitlines():
                bms.append(tuple(line.split()))
            return bms
        else:
            json_out = json.loads(out)
            return self._parsejsonrevs(json_out)

    def log(self, revrange=None, files=[], follow=False,
            followfirst=False, date=None, copies=False, keyword=None,
            removed=False, onlymerges=False, user=None, branch=None,
            prune=None, hidden=None, limit=None, nomerges=False,

        subrepositories

        """
        args = cmdbuilder(b('outgoing'),
                          path,
                          template="json", r=revrange,
                          f=force, n=newest, B=bookmarks,
                          b=branch, S=subrepos)

        def eh(ret, out, err):
            if ret != 1:

            bms = []
            for line in out.splitlines():
                bms.append(tuple(line.split()))
            return bms
        else:
            json_out = json.loads(out)
            return self._parsejsonrevs(json_out)

    def parents(self, rev=None, file=None):
        """Return the working directory's parent revisions. If rev is given,
        the parent of that revision will be printed. If file is given,
        the revision in which the file was last changed (before the
        working directory revision or the revision specified by rev)
        is returned.

        """
        args = cmdbuilder(b('parents'), file, template="json",
                          r=rev, hidden=self.hidden)

        out = self.rawcommand(args)
        if not out:
            return

        json_out = json.loads(out)

        if not json_out:
            return

        return self._parsejsonrevs(json_out)

    def paths(self, name=None):
        """
        Return the definition of given symbolic path name. If no name is given,
        return a dictionary of pathname : url of all available names.

        """
        Return the tip revision (usually just called the tip) which is the
        changeset most recently added to the repository (and therefore the most
        recently changed head).
        """
        args = cmdbuilder(b('tip'), template="json",
                          hidden=self.hidden)
        out = self.rawcommand(args)
        json_out = json.loads(out)

        return self._parsejsonrevs(json_out)[0]

    def update(self, rev=None, clean=False, check=False, date=None):
        """
        Update the repository's working directory to changeset specified by rev.
        If rev isn't specified, update to the tip of the current named branch.