##// END OF EJS Templates
bisect: avoid adding irrelevant revisions to bisect state...
bisect: avoid adding irrelevant revisions to bisect state When adding new revisions to the bisect state, it only makes sense to add information about revisions that are under consideration (i.e., those that are topologically between the known good and bad revisions). However, if the user passes in a revset (e.g., '!merge()' to exclude merge commits), hg will resolve the revset first and add all matching revisions to the bisect state (which in this case would likely be the majority of revisions in the repo). To avoid this, revisions should only be added to the bisect state if they are between the good and bad revisions (and therefore relevant to the bisection). -- Here are the results of some performance tests using the `mozilla-central` repo (since it is one of the largest freely-available hg repositories in the wild). These tests compare the performance of a locally-built `hg` before and after application of this series. Note that `--noupdate` is passed to avoid including update time (which should not vary across cases). Setup (run between each test): $ hg bisect --reset $ hg bisect --noupdate --bad 56c3ad4bde5c70714b784ccf15d099e0df0f5bde $ hg bisect --noupdate --good 57426696adaf08298af3027fa77486fee0633b13 Test using a revset that returns a very large number of revisions: $ time hg bisect --noupdate --skip '!merge()' > /dev/null Before: real 0m9.398s user 0m9.233s sys 0m0.120s After: real 0m1.513s user 0m1.425s sys 0m0.052s Test using a revset that is expensive to compute: $ time hg bisect --noupdate --skip 'desc("Bug")' > /dev/null Before: real 0m49.853s user 0m49.580s sys 0m0.243s After: real 0m4.120s user 0m4.036s sys 0m0.048s

File last commit:

r50179:d44e3c45 default
r50337:81623652 default
Show More
loggingutil.py
142 lines | 3.8 KiB | text/x-python | PythonLexer
Yuya Nishihara
loggingutil: extract openlogfile() and proxylogger to new module...
r40830 # loggingutil.py - utility for logging events
#
# Copyright 2010 Nicolas Dumazet
# Copyright 2013 Facebook, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
import errno
Valentin Gatien-Baron
blackbox: fix type error on log rotation on read-only filesystem...
r47654 from . import (
encoding,
)
Yuya Nishihara
loggingutil: extract openlogfile() and proxylogger to new module...
r40830
Yuya Nishihara
loggingutil: add basic logger backends...
r40856 from .utils import (
dateutil,
procutil,
stringutil,
)
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
loggingutil: extract openlogfile() and proxylogger to new module...
r40830 def openlogfile(ui, vfs, name, maxfiles=0, maxsize=0):
Yuya Nishihara
loggingutil: document openlogfile()...
r40831 """Open log file in append mode, with optional rotation
If maxsize > 0, the log file will be rotated up to maxfiles.
"""
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
loggingutil: extract openlogfile() and proxylogger to new module...
r40830 def rotate(oldpath, newpath):
try:
vfs.unlink(newpath)
except OSError as err:
if err.errno != errno.ENOENT:
Augie Fackler
formatting: blacken the codebase...
r43346 ui.debug(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"warning: cannot remove '%s': %s\n"
Valentin Gatien-Baron
blackbox: fix type error on log rotation on read-only filesystem...
r47654 % (newpath, encoding.strtolocal(err.strerror))
Augie Fackler
formatting: blacken the codebase...
r43346 )
Yuya Nishihara
loggingutil: extract openlogfile() and proxylogger to new module...
r40830 try:
if newpath:
vfs.rename(oldpath, newpath)
except OSError as err:
if err.errno != errno.ENOENT:
Augie Fackler
formatting: blacken the codebase...
r43346 ui.debug(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"warning: cannot rename '%s' to '%s': %s\n"
Valentin Gatien-Baron
blackbox: fix type error on log rotation on read-only filesystem...
r47654 % (newpath, oldpath, encoding.strtolocal(err.strerror))
Augie Fackler
formatting: blacken the codebase...
r43346 )
Yuya Nishihara
loggingutil: extract openlogfile() and proxylogger to new module...
r40830
if maxsize > 0:
try:
st = vfs.stat(name)
except OSError:
pass
else:
if st.st_size >= maxsize:
path = vfs.join(name)
Manuel Jacob
py3: replace `pycompat.xrange` by `range`
r50179 for i in range(maxfiles - 1, 1, -1):
Augie Fackler
formatting: blacken the codebase...
r43346 rotate(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 oldpath=b'%s.%d' % (path, i - 1),
newpath=b'%s.%d' % (path, i),
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 rotate(oldpath=path, newpath=maxfiles > 0 and path + b'.1')
return vfs(name, b'a', makeparentdirs=False)
Yuya Nishihara
loggingutil: extract openlogfile() and proxylogger to new module...
r40830
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
loggingutil: add basic logger backends...
r40856 def _formatlogline(msg):
date = dateutil.datestr(format=b'%Y/%m/%d %H:%M:%S')
pid = procutil.getpid()
return b'%s (%d)> %s' % (date, pid, msg)
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
loggingutil: add basic logger backends...
r40856 def _matchevent(event, tracked):
return b'*' in tracked or event in tracked
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
py3: use class X: instead of class X(object):...
r49801 class filelogger:
Yuya Nishihara
loggingutil: add basic logger backends...
r40856 """Basic logger backed by physical file with optional rotation"""
def __init__(self, vfs, name, tracked, maxfiles=0, maxsize=0):
self._vfs = vfs
self._name = name
self._trackedevents = set(tracked)
self._maxfiles = maxfiles
self._maxsize = maxsize
def tracked(self, event):
return _matchevent(event, self._trackedevents)
def log(self, ui, event, msg, opts):
line = _formatlogline(msg)
try:
Augie Fackler
formatting: blacken the codebase...
r43346 with openlogfile(
ui,
self._vfs,
self._name,
maxfiles=self._maxfiles,
maxsize=self._maxsize,
) as fp:
Yuya Nishihara
loggingutil: add basic logger backends...
r40856 fp.write(line)
except IOError as err:
Augie Fackler
formatting: blacken the codebase...
r43346 ui.debug(
b'cannot write to %s: %s\n'
% (self._name, stringutil.forcebytestr(err))
)
Yuya Nishihara
loggingutil: add basic logger backends...
r40856
Gregory Szorc
py3: use class X: instead of class X(object):...
r49801 class fileobjectlogger:
Yuya Nishihara
loggingutil: add basic logger backends...
r40856 """Basic logger backed by file-like object"""
def __init__(self, fp, tracked):
self._fp = fp
self._trackedevents = set(tracked)
def tracked(self, event):
return _matchevent(event, self._trackedevents)
def log(self, ui, event, msg, opts):
line = _formatlogline(msg)
try:
self._fp.write(line)
self._fp.flush()
except IOError as err:
Augie Fackler
formatting: blacken the codebase...
r43346 ui.debug(
b'cannot write to %s: %s\n'
% (
stringutil.forcebytestr(self._fp.name),
stringutil.forcebytestr(err),
)
)
Yuya Nishihara
loggingutil: add basic logger backends...
r40856
Gregory Szorc
py3: use class X: instead of class X(object):...
r49801 class proxylogger:
Yuya Nishihara
loggingutil: extract openlogfile() and proxylogger to new module...
r40830 """Forward log events to another logger to be set later"""
def __init__(self):
self.logger = None
def tracked(self, event):
return self.logger is not None and self.logger.tracked(event)
def log(self, ui, event, msg, opts):
assert self.logger is not None
self.logger.log(ui, event, msg, opts)