##// END OF EJS Templates
phases: large rewrite on retract boundary...
phases: large rewrite on retract boundary The new code is still pure Python, so we still have room to going significantly faster. However its complexity of the complex part is `O(|[min_new_draft, tip]|)` instead of `O(|[min_draft, tip]|` which should help tremendously one repository with old draft (like mercurial-devel or mozilla-try). This is especially useful as the most common "retract boundary" operation happens when we commit/rewrite new drafts or when we push new draft to a non-publishing server. In this case, the smallest new_revs is very close to the tip and there is very few work to do. A few smaller optimisation could be done for these cases and will be introduced in later changesets. We still have iterate over large sets of roots, but this is already a great improvement for a very small amount of work. We gather information on the affected changeset as we go as we can put it to use in the next changesets. This extra data collection might slowdown the `register_new` case a bit, however for register_new, it should not really matters. The set of new nodes is either small, so the impact is negligible, or the set of new nodes is large, and the amount of work to do to had them will dominate the overhead the collecting information in `changed_revs`. As this new code compute the changes on the fly, it unlock other interesting improvement to be done in later changeset.

File last commit:

r50655:5bceea1a default
r52302:2f39c7ae default
Show More
logexchange.py
167 lines | 4.9 KiB | text/x-python | PythonLexer
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348 # logexchange.py
#
# Copyright 2017 Augie Fackler <raf@durin42.com>
# Copyright 2017 Sean Farley <sean@farley.io>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from .node import hex
from . import (
Pulkit Goyal
logexchange: introduce helper function to get remote path name...
r36076 util,
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348 vfs as vfsmod,
)
urlutil: extract `url` related code from `util` into the new module...
r47669 from .utils import (
urlutil,
)
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348
# directory name in .hg/ in which remotenames files will be present
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 remotenamedir = b'logexchange'
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348
Augie Fackler
formatting: blacken the codebase...
r43346
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348 def readremotenamefile(repo, filename):
"""
reads a file from .hg/logexchange/ directory and yields it's content
filename: the file to be read
yield a tuple (node, remotepath, name)
"""
vfs = vfsmod.vfs(repo.vfs.join(remotenamedir))
if not vfs.exists(filename):
return
f = vfs(filename)
lineno = 0
for line in f:
line = line.strip()
if not line:
continue
# contains the version number
if lineno == 0:
lineno += 1
try:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 node, remote, rname = line.split(b'\0')
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348 yield node, remote, rname
except ValueError:
pass
f.close()
Augie Fackler
formatting: blacken the codebase...
r43346
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348 def readremotenames(repo):
"""
read the details about the remotenames stored in .hg/logexchange/ and
yields a tuple (node, remotepath, name). It does not yields information
about whether an entry yielded is branch or bookmark. To get that
information, call the respective functions.
"""
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 for bmentry in readremotenamefile(repo, b'bookmarks'):
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348 yield bmentry
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 for branchentry in readremotenamefile(repo, b'branches'):
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348 yield branchentry
Augie Fackler
formatting: blacken the codebase...
r43346
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348 def writeremotenamefile(repo, remotepath, names, nametype):
vfs = vfsmod.vfs(repo.vfs.join(remotenamedir))
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 f = vfs(nametype, b'w', atomictemp=True)
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348 # write the storage version info on top of file
# version '0' represents the very initial version of the storage format
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 f.write(b'0\n\n')
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348
olddata = set(readremotenamefile(repo, nametype))
# re-save the data from a different remote than this one.
for node, oldpath, rname in sorted(olddata):
if oldpath != remotepath:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 f.write(b'%s\0%s\0%s\n' % (node, oldpath, rname))
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348
Gregory Szorc
global: bulk replace simple pycompat.iteritems(x) with x.items()...
r49768 for name, node in sorted(names.items()):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if nametype == b"branches":
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348 for n in node:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 f.write(b'%s\0%s\0%s\n' % (n, remotepath, name))
elif nametype == b"bookmarks":
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348 if node:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 f.write(b'%s\0%s\0%s\n' % (node, remotepath, name))
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348
f.close()
Augie Fackler
formatting: blacken the codebase...
r43346
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348 def saveremotenames(repo, remotepath, branches=None, bookmarks=None):
"""
save remotenames i.e. remotebookmarks and remotebranches in their
respective files under ".hg/logexchange/" directory.
"""
wlock = repo.wlock()
try:
if bookmarks:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 writeremotenamefile(repo, remotepath, bookmarks, b'bookmarks')
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348 if branches:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 writeremotenamefile(repo, remotepath, branches, b'branches')
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348 finally:
wlock.release()
Augie Fackler
formatting: blacken the codebase...
r43346
Pulkit Goyal
logexchange: introduce helper function to get remote path name...
r36076 def activepath(repo, remote):
"""returns remote path"""
# is the remote a local peer
local = remote.local()
# determine the remote path from the repo, if possible; else just
# use the string given to us
rpath = remote
if local:
Matt Harbison
logexchange: convert paths to unix when detecting the active path...
r40471 rpath = util.pconvert(remote._repo.root)
Pulkit Goyal
py3: use bytes instead of str in instance()...
r37383 elif not isinstance(remote, bytes):
logexchange: use the proper accessors to get the remote url...
r50655 rpath = remote.url()
Pulkit Goyal
logexchange: introduce helper function to get remote path name...
r36076
# represent the remotepath with user defined path name if exists
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 for path, url in repo.ui.configitems(b'paths'):
Pulkit Goyal
logexchange: introduce helper function to get remote path name...
r36076 # remove auth info from user defined url
urlutil: extract `url` related code from `util` into the new module...
r47669 noauthurl = urlutil.removeauth(url)
Matt Harbison
logexchange: convert paths to unix when detecting the active path...
r40471
# Standardize on unix style paths, otherwise some {remotenames} end up
# being an absolute path on Windows.
url = util.pconvert(bytes(url))
noauthurl = util.pconvert(noauthurl)
Pulkit Goyal
remotenames: check the remotepath with url containing user information too...
r38001 if url == rpath or noauthurl == rpath:
Pulkit Goyal
logexchange: introduce helper function to get remote path name...
r36076 rpath = path
break
return rpath
Augie Fackler
formatting: blacken the codebase...
r43346
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348 def pullremotenames(localrepo, remoterepo):
"""
pulls bookmarks and branches information of the remote repo during a
pull or clone operation.
localrepo is our local repository
remoterepo is the peer instance
"""
Pulkit Goyal
logexchange: introduce helper function to get remote path name...
r36076 remotepath = activepath(localrepo, remoterepo)
Gregory Szorc
logexchange: use command executor for wire protocol commands...
r37657
with remoterepo.commandexecutor() as e:
Augie Fackler
formatting: blacken the codebase...
r43346 bookmarks = e.callcommand(
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 b'listkeys',
{
b'namespace': b'bookmarks',
},
Augie Fackler
formatting: blacken the codebase...
r43346 ).result()
Gregory Szorc
logexchange: use command executor for wire protocol commands...
r37657
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348 # on a push, we don't want to keep obsolete heads since
# they won't show up as heads on the next pull, so we
# remove them here otherwise we would require the user
# to issue a pull to refresh the storage
bmap = {}
repo = localrepo.unfiltered()
Gregory Szorc
logexchange: use command executor for wire protocol commands...
r37657
with remoterepo.commandexecutor() as e:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 branchmap = e.callcommand(b'branchmap', {}).result()
Gregory Szorc
logexchange: use command executor for wire protocol commands...
r37657
Gregory Szorc
global: bulk replace simple pycompat.iteritems(x) with x.items()...
r49768 for branch, nodes in branchmap.items():
Pulkit Goyal
remotenames: rename related file and storage dir to logexchange...
r35348 bmap[branch] = []
for node in nodes:
if node in repo and not repo[node].obsolete():
bmap[branch].append(hex(node))
saveremotenames(localrepo, remotepath, bmap, bookmarks)