##// END OF EJS Templates
pathcopies: give up any optimization based on `introrev`...
pathcopies: give up any optimization based on `introrev` Between 8a0136f69027 and d98fb3f42f33, we sped up the search for the introduction revision during path copies. However, further checking show that finding the introduction revision is still expensive and that we are better off without it. So we simply drop it and only rely on the linkrev optimisation. I ran `perfpathcopies` on 6989 pair of revision in the pypy repository (`hg perfhelper-pathcopies`. The result is massively in favor of dropping this condition. The result of the copy tracing are unchanged. Attempt to use a smaller changes preserving linkrev usage were unsuccessful, it can return wrong result. The following changesets broke test-mv-cp-st-diff.t - if not f.isintroducedafter(limit): + if limit >= 0 and f.linkrev() < limit: return None Here are various numbers (before this changeset/after this changesets) source destination before after saved-time ratio worth cases e66f24650daf 695dfb0f493b 1.062843 1.246369 -0.183526 1.172675 c979853a3b6a 8d60fe293e79 1.036985 1.196414 -0.159429 1.153743 22349fa2fc33 fbb1c9fd86c0 0.879926 1.038682 -0.158756 1.180420 682b98f3e672 a4878080a536 0.909952 1.063801 -0.153849 1.169074 5adabc9b9848 920958a93997 0.993622 1.147452 -0.153830 1.154817 worse 1% dbfbfcf077e9 aea8f2fd3593 1.016595 1.082999 -0.066404 1.065320 worse 5% c95f1ced15f2 7d29d5e39734 0.453694 0.471156 -0.017462 1.038488 worse 10% 3e144ed1d5b7 2aef0e942480 0.035140 0.037535 -0.002395 1.068156 worse 25% 321fc60db035 801748ba582a 0.009267 0.009325 -0.000058 1.006259 median 2088ce763fc2 e6991321d78b 0.000665 0.000651 0.000014 0.978947 best 25% 915631a97de6 385b31354be6 0.040743 0.040363 0.000380 0.990673 best 10% ad495c36a765 19c10384d3e7 0.431658 0.411490 0.020168 0.953278 best 5% d13ae7d283ae 813c99f810ac 1.141404 1.075346 0.066058 0.942126 best 1% 81593cb4a496 99ae11866969 1.833297 0.063823 1.769474 0.034813 best cases c3b14617fbd7 743a0fcaa4eb 1101.811740 2.735970 1099.075770 0.002483 c3b14617fbd7 9ba6ab77fd29 1116.753953 2.800729 1113.953224 0.002508 058b99d6e81f 57e249b7a3ea 1246.128485 3.042762 1243.085723 0.002442 9a8c361aab49 0354a250d371 1253.111894 3.085796 1250.026098 0.002463 442dbbc53c68 3ec1002a818c 1261.786294 3.138607 1258.647687 0.002487 As one can see, the average case is not really impacted. However, the worth case we get after this changeset are much better than the one we had before it. We have 30 pairs where improvements are above 10 minutes. This reflect in the combined time for all pairs before: 26256s after: 1300s (-95%) If we remove these pathological 30 cases, we still see a significant improvements: before: 1631s after: 1245s (-24%)

File last commit:

r43357:66f2cc21 default
r43469:c16fe77e default
Show More
factotum.py
156 lines | 4.8 KiB | text/x-python | PythonLexer
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 # factotum.py - Plan 9 factotum integration for Mercurial
#
# Copyright (C) 2012 Steven Stallion <sstallion@gmail.com>
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2 of the License, or (at your
# option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
'''http authentication with factotum
Steven Stallion
factotum: add man reference to help output
r16582 This extension allows the factotum(4) facility on Plan 9 from Bell Labs
platforms to provide authentication information for HTTP access. Configuration
entries specified in the auth section as well as authentication information
provided in the repository URL are fully supported. If no prefix is specified,
a value of "*" will be assumed.
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383
By default, keys are specified as::
proto=pass service=hg prefix=<prefix> user=<username> !password=<password>
If the factotum extension is unable to read the required key, one will be
requested interactively.
A configuration section is available to customize runtime behavior. By
default, these entries are::
[factotum]
Steven Stallion
factotum: rename mount and path configuration entries...
r16463 executable = /bin/auth/factotum
mountpoint = /mnt/factotum
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 service = hg
Steven Stallion
factotum: rename mount and path configuration entries...
r16463 The executable entry defines the full path to the factotum binary. The
mountpoint entry defines the path to the factotum file service. Lastly, the
service entry controls the service name used when reading keys.
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383
'''
Pulkit Goyal
py3: make factotum use absolute_import...
r28971 from __future__ import absolute_import
import os
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 from mercurial.i18n import _
Gregory Szorc
py3: manually import pycompat.setattr where it is needed...
r43357 from mercurial.pycompat import setattr
Augie Fackler
formatting: blacken the codebase...
r43346 from mercurial.utils import procutil
Pulkit Goyal
py3: make factotum use absolute_import...
r28971 from mercurial import (
error,
httpconnection,
configitems: register the 'factotum.executable' config
r33238 registrar,
Pulkit Goyal
py3: make factotum use absolute_import...
r28971 url,
util,
)
urlreq = util.urlreq
passwordmgr = url.passwordmgr
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383
ERRMAX = 128
Yuya Nishihara
factotum: initialize global variables to suppress pyflakes warning
r21228 _executable = _mountpoint = _service = None
configitems: register the 'factotum.executable' config
r33238 configtable = {}
configitem = registrar.configitem(configtable)
Augie Fackler
formatting: blacken the codebase...
r43346 configitem(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'factotum', b'executable', default=b'/bin/auth/factotum',
configitems: register the 'factotum.executable' config
r33238 )
Augie Fackler
formatting: blacken the codebase...
r43346 configitem(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'factotum', b'mountpoint', default=b'/mnt/factotum',
configitems: register the 'factotum.mountpoint' config
r33239 )
Augie Fackler
formatting: blacken the codebase...
r43346 configitem(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'factotum', b'service', default=b'hg',
configitems: register the 'factotum.service' config
r33240 )
configitems: register the 'factotum.executable' config
r33238
Augie Fackler
formatting: blacken the codebase...
r43346
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 def auth_getkey(self, params):
if not self.ui.interactive():
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise error.Abort(_(b'factotum not interactive'))
if b'user=' not in params:
params = b'%s user?' % params
params = b'%s !password?' % params
os.system(procutil.tonativestr(b"%s -g '%s'" % (_executable, params)))
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383
Augie Fackler
formatting: blacken the codebase...
r43346
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 def auth_getuserpasswd(self, getkey, params):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 params = b'proto=pass %s' % params
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 while True:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 fd = os.open(b'%s/rpc' % _mountpoint, os.O_RDWR)
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 try:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 os.write(fd, b'start %s' % params)
Matt Mackall
factotum: use try/except/finally
r25078 l = os.read(fd, ERRMAX).split()
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if l[0] == b'ok':
os.write(fd, b'read')
Matt Mackall
factotum: use try/except/finally
r25078 status, user, passwd = os.read(fd, ERRMAX).split(None, 2)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if status == b'ok':
if passwd.startswith(b"'"):
if passwd.endswith(b"'"):
passwd = passwd[1:-1].replace(b"''", b"'")
Matt Mackall
factotum: use try/except/finally
r25078 else:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise error.Abort(_(b'malformed password string'))
Matt Mackall
factotum: use try/except/finally
r25078 return (user, passwd)
except (OSError, IOError):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise error.Abort(_(b'factotum not responding'))
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 finally:
os.close(fd)
getkey(self, params)
Augie Fackler
formatting: blacken the codebase...
r43346
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 def monkeypatch_method(cls):
def decorator(func):
setattr(cls, func.__name__, func)
return func
Augie Fackler
formatting: blacken the codebase...
r43346
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 return decorator
Augie Fackler
formatting: blacken the codebase...
r43346
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 @monkeypatch_method(passwordmgr)
def find_user_password(self, realm, authuri):
liscju
url: extract password database from password manager...
r29377 user, passwd = self.passwddb.find_user_password(realm, authuri)
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 if user and passwd:
self._writedebug(user, passwd)
return (user, passwd)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 prefix = b''
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 res = httpconnection.readauthforuri(self.ui, authuri, user)
if res:
_, auth = res
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 prefix = auth.get(b'prefix')
user, passwd = auth.get(b'username'), auth.get(b'password')
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 if not user or not passwd:
if not prefix:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 prefix = realm.split(b' ')[0].lower()
params = b'service=%s prefix=%s' % (_service, prefix)
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 if user:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 params = b'%s user=%s' % (params, user)
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 user, passwd = auth_getuserpasswd(self, auth_getkey, params)
self.add_password(realm, authuri, user, passwd)
self._writedebug(user, passwd)
return (user, passwd)
Augie Fackler
formatting: blacken the codebase...
r43346
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 def uisetup(ui):
Steven Stallion
factotum: rename mount and path configuration entries...
r16463 global _executable
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _executable = ui.config(b'factotum', b'executable')
Steven Stallion
factotum: rename mount and path configuration entries...
r16463 global _mountpoint
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _mountpoint = ui.config(b'factotum', b'mountpoint')
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 global _service
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _service = ui.config(b'factotum', b'service')