Mercurial > public > mercurial-scm > hg
diff 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.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Wed, 04 Apr 2018 23:26:49 +0900 |
| parents | 24ab3381bf15 |
| children | b23e3cc1afd4 |
line wrap: on
line diff
--- a/mercurial/util.py Fri Mar 30 18:57:13 2018 -0700 +++ b/mercurial/util.py Wed Apr 04 23:26:49 2018 +0900 @@ -748,10 +748,10 @@ # 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)) + self.fh.write(': %s\n' % stringutil.escapestr(data)) else: self.fh.write('%s> %s\n' - % (self.name, stringutil.escapedata(data))) + % (self.name, stringutil.escapestr(data))) self.fh.flush() return @@ -762,7 +762,7 @@ lines = data.splitlines(True) for line in lines: self.fh.write('%s> %s\n' - % (self.name, stringutil.escapedata(line))) + % (self.name, stringutil.escapestr(line))) self.fh.flush() class fileobjectobserver(baseproxyobserver): @@ -3845,7 +3845,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')