##// 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:

r49730:6000f5b2 default
r50337:81623652 default
Show More
dirstateguard.py
96 lines | 3.0 KiB | text/x-python | PythonLexer
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 # dirstateguard.py - class to allow restoring dirstate after failure
#
Raphaël Gomès
contributor: change mentions of mpm to olivia...
r47575 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 #
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
Kyle Lippincott
dirstateguard: use mktemp-like functionality to generate the backup filenames...
r47777 import os
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 from .i18n import _
from . import (
error,
Martin von Zweigbergk
narrow: call narrowspec.{save,restore,clear}backup directly...
r38905 narrowspec,
Kyle Lippincott
dirstateguard: use mktemp-like functionality to generate the backup filenames...
r47777 requirements,
Martin von Zweigbergk
util: add base class for transactional context managers...
r33790 util,
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 )
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Martin von Zweigbergk
util: add base class for transactional context managers...
r33790 class dirstateguard(util.transactional):
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """Restore dirstate at unexpected failure.
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488
At the construction, this class does:
- write current ``repo.dirstate`` out, and
- save ``.hg/dirstate`` into the backup file
This restores ``.hg/dirstate`` from backup file, if ``release()``
is invoked before ``close()``.
This just removes the backup file at ``close()`` before ``release()``.
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488
def __init__(self, repo, name):
self._repo = repo
self._active = False
self._closed = False
Kyle Lippincott
dirstateguard: use mktemp-like functionality to generate the backup filenames...
r47777
def getname(prefix):
fd, fname = repo.vfs.mkstemp(prefix=prefix)
os.close(fd)
return fname
self._backupname = getname(b'dirstate.backup.%s.' % name)
Adam Simpkins
dirstate: update backup functions to take full backup filename...
r33440 repo.dirstate.savebackup(repo.currenttransaction(), self._backupname)
Kyle Lippincott
dirstateguard: use mktemp-like functionality to generate the backup filenames...
r47777 # Don't make this the empty string, things may join it with stuff and
# blindly try to unlink it, which could be bad.
self._narrowspecbackupname = None
if requirements.NARROW_REQUIREMENT in repo.requirements:
self._narrowspecbackupname = getname(
b'narrowspec.backup.%s.' % name
)
narrowspec.savewcbackup(repo, self._narrowspecbackupname)
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 self._active = True
def __del__(self):
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 if self._active: # still active
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 # this may occur, even if this class is used correctly:
# for example, releasing other resources like transaction
# may raise exception before ``dirstateguard.release`` in
# ``release(tr, ....)``.
self._abort()
def close(self):
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 if not self._active: # already inactivated
msg = (
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b"can't close already inactivated backup: %s")
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 % self._backupname
)
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 raise error.Abort(msg)
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 self._repo.dirstate.clearbackup(
self._repo.currenttransaction(), self._backupname
)
Kyle Lippincott
dirstateguard: use mktemp-like functionality to generate the backup filenames...
r47777 if self._narrowspecbackupname:
narrowspec.clearwcbackup(self._repo, self._narrowspecbackupname)
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 self._active = False
self._closed = True
def _abort(self):
Kyle Lippincott
dirstateguard: use mktemp-like functionality to generate the backup filenames...
r47777 if self._narrowspecbackupname:
narrowspec.restorewcbackup(self._repo, self._narrowspecbackupname)
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 self._repo.dirstate.restorebackup(
self._repo.currenttransaction(), self._backupname
)
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 self._active = False
def release(self):
if not self._closed:
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 if not self._active: # already inactivated
msg = (
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b"can't release already inactivated backup: %s")
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 % self._backupname
)
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 raise error.Abort(msg)
self._abort()