This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10293

blackbox: fix type error on log rotation on read-only filesystem
ClosedPublic

Authored by valentin.gatienbaron on Mar 31 2021, 6:11 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG4a6024b87dfc: blackbox: fix type error on log rotation on read-only filesystem
Summary

Grepping around, the code uses either encoding.strtolocal or
stringutil.forcebytestr in this situation. No idea which is best.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit added subscribers: mharbison72, pulkit.Apr 1 2021, 4:48 AM

@mharbison72 these should have been caught by pytype IIUC.

Alphare accepted this revision.Apr 1 2021, 8:52 AM
Alphare added a subscriber: Alphare.

strtolocal sounds like the right pick.

pulkit accepted this revision.Apr 11 2021, 5:24 PM
This revision is now accepted and ready to land.Apr 11 2021, 5:24 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/loggingutil.py (9 lines)
Mtests/test-blackbox.t (11 lines)

Diff 26804

mercurial/loggingutil.py

# loggingutil.py - utility for logging events # loggingutil.py - utility for logging events
# #
# Copyright 2010 Nicolas Dumazet # Copyright 2010 Nicolas Dumazet
# Copyright 2013 Facebook, Inc. # Copyright 2013 Facebook, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import errno import errno
from . import pycompat from . import (
encoding,
pycompat,
)
from .utils import ( from .utils import (
dateutil, dateutil,
procutil, procutil,
stringutil, stringutil,
) )
def openlogfile(ui, vfs, name, maxfiles=0, maxsize=0): def openlogfile(ui, vfs, name, maxfiles=0, maxsize=0):
"""Open log file in append mode, with optional rotation """Open log file in append mode, with optional rotation
If maxsize > 0, the log file will be rotated up to maxfiles. If maxsize > 0, the log file will be rotated up to maxfiles.
""" """
def rotate(oldpath, newpath): def rotate(oldpath, newpath):
try: try:
vfs.unlink(newpath) vfs.unlink(newpath)
except OSError as err: except OSError as err:
if err.errno != errno.ENOENT: if err.errno != errno.ENOENT:
ui.debug( ui.debug(
b"warning: cannot remove '%s': %s\n" b"warning: cannot remove '%s': %s\n"
% (newpath, err.strerror) % (newpath, encoding.strtolocal(err.strerror))
) )
try: try:
if newpath: if newpath:
vfs.rename(oldpath, newpath) vfs.rename(oldpath, newpath)
except OSError as err: except OSError as err:
if err.errno != errno.ENOENT: if err.errno != errno.ENOENT:
ui.debug( ui.debug(
b"warning: cannot rename '%s' to '%s': %s\n" b"warning: cannot rename '%s' to '%s': %s\n"
% (newpath, oldpath, err.strerror) % (newpath, oldpath, encoding.strtolocal(err.strerror))
) )
if maxsize > 0: if maxsize > 0:
try: try:
st = vfs.stat(name) st = vfs.stat(name)
except OSError: except OSError:
pass pass
else: else:

tests/test-blackbox.t

1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug commit -m commit2 -d 2000-01-02 foo exited 0 after *.?? seconds (glob) 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug commit -m commit2 -d 2000-01-02 foo exited 0 after *.?? seconds (glob)
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r 0 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r 0
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> writing .hg/cache/tags2-visible with 0 tags 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> writing .hg/cache/tags2-visible with 0 tags
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r 0 exited 0 after *.?? seconds (glob) 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r 0 exited 0 after *.?? seconds (glob)
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r tip 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r tip
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r tip exited 0 after *.?? seconds (glob) 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r tip exited 0 after *.?? seconds (glob)
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> blackbox 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> blackbox
Skip rotation if the .hg is read-only
#if unix-permissions
$ chmod -w .hg
$ hg log -r. -T '{rev}\n' --config blackbox.maxsize=1 --debug
warning: cannot rename '$TESTTMP/blackboxtest3/.hg/blackbox.log.1' to '$TESTTMP/blackboxtest3/.hg/blackbox.log': Permission denied
warning: cannot write to blackbox.log: Permission denied
1
$ chmod +w .hg
#endif
Test log recursion from dirty status check Test log recursion from dirty status check
$ cat > ../r.py <<EOF $ cat > ../r.py <<EOF
> from mercurial import context, error, extensions > from mercurial import context, error, extensions
> x=[False] > x=[False]
> def status(orig, *args, **opts): > def status(orig, *args, **opts):
> args[0].repo().ui.log(b"broken", b"recursion?") > args[0].repo().ui.log(b"broken", b"recursion?")
> return orig(*args, **opts) > return orig(*args, **opts)