comparison mercurial/util.py @ 37322:a67fd1fe5109

stringutil: drop escapedata() in favor of escapestr()

They are quite similar. Let's choose one that uses standard Python escape.

37321:e826fe7a08c7

            return

        # Simple case writes all data on a single line.
        if b'\n' not in data:
            if self.logdataapis:
                self.fh.write(': %s\n' % stringutil.escapedata(data))
            else:
                self.fh.write('%s>     %s\n'
                              % (self.name, stringutil.escapedata(data)))
            self.fh.flush()
            return

        # Data with newlines is written to multiple lines.
        if self.logdataapis:
            self.fh.write(':\n')

        lines = data.splitlines(True)
        for line in lines:
            self.fh.write('%s>     %s\n'
                          % (self.name, stringutil.escapedata(line)))
        self.fh.flush()

class fileobjectobserver(baseproxyobserver):
    """Logs file object activity."""
    def __init__(self, fh, name, reads=True, writes=True, logdata=False,

system = _deprecatedfunc(procutil.system, '4.6')
gui = _deprecatedfunc(procutil.gui, '4.6')
hgcmd = _deprecatedfunc(procutil.hgcmd, '4.6')
rundetached = _deprecatedfunc(procutil.rundetached, '4.6')

escapedata = _deprecatedfunc(stringutil.escapedata, '4.6')
binary = _deprecatedfunc(stringutil.binary, '4.6')
stringmatcher = _deprecatedfunc(stringutil.stringmatcher, '4.6')
shortuser = _deprecatedfunc(stringutil.shortuser, '4.6')
emailuser = _deprecatedfunc(stringutil.emailuser, '4.6')
email = _deprecatedfunc(stringutil.email, '4.6')

37322:a67fd1fe5109

            return

        # Simple case writes all data on a single line.
        if b'\n' not in data:
            if self.logdataapis:
                self.fh.write(': %s\n' % stringutil.escapestr(data))
            else:
                self.fh.write('%s>     %s\n'
                              % (self.name, stringutil.escapestr(data)))
            self.fh.flush()
            return

        # Data with newlines is written to multiple lines.
        if self.logdataapis:
            self.fh.write(':\n')

        lines = data.splitlines(True)
        for line in lines:
            self.fh.write('%s>     %s\n'
                          % (self.name, stringutil.escapestr(line)))
        self.fh.flush()

class fileobjectobserver(baseproxyobserver):
    """Logs file object activity."""
    def __init__(self, fh, name, reads=True, writes=True, logdata=False,

system = _deprecatedfunc(procutil.system, '4.6')
gui = _deprecatedfunc(procutil.gui, '4.6')
hgcmd = _deprecatedfunc(procutil.hgcmd, '4.6')
rundetached = _deprecatedfunc(procutil.rundetached, '4.6')

binary = _deprecatedfunc(stringutil.binary, '4.6')
stringmatcher = _deprecatedfunc(stringutil.stringmatcher, '4.6')
shortuser = _deprecatedfunc(stringutil.shortuser, '4.6')
emailuser = _deprecatedfunc(stringutil.emailuser, '4.6')
email = _deprecatedfunc(stringutil.email, '4.6')