##// END OF EJS Templates
test: stabilize test-wireproto-exchangev2.t flaky output...
test: stabilize test-wireproto-exchangev2.t flaky output When running the test suite with multiple processes, we often get flaky outputs, like here: https://ci.octobus.net/job/MercurialPy2/267/console ``` - received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) add changeset cd2534766bec add changeset e96ae20f4188 add changeset caa2a465451d + received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) ``` Instead of simply sorting the clone and pull output, I saved the output in a separate file and checked the `received frame` messages on one side and then the rest of the output on the other side. This way we conserve the order of messages as it seems important. Differential Revision: https://phab.mercurial-scm.org/D5897

File last commit:

r40105:fd4d59cf default
r41831:1ab6f5df default
Show More
remotenames.py
403 lines | 13.5 KiB | text/x-python | PythonLexer
Pulkit Goyal
remotenames: introduce class to encapsulate remotenames info in an extension...
r36077 # remotenames.py - extension to display remotenames
#
# 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.
Pulkit Goyal
remotenames: mark the extension as EXPERIMENTAL...
r37835 """ showing remotebookmarks and remotebranches in UI (EXPERIMENTAL)
Pulkit Goyal
remotenames: add new namespaces for remotebookmarks and remotebranches...
r36079
By default both remotebookmarks and remotebranches are turned on. Config knob to
control the individually are as follows.
Config options to tweak the default behaviour:
remotenames.bookmarks
Pulkit Goyal
remotenames: add functionality to hoist remotebookmarks...
r37107 Boolean value to enable or disable showing of remotebookmarks (default: True)
Pulkit Goyal
remotenames: add new namespaces for remotebookmarks and remotebranches...
r36079
remotenames.branches
Pulkit Goyal
remotenames: add functionality to hoist remotebookmarks...
r37107 Boolean value to enable or disable showing of remotebranches (default: True)
remotenames.hoistedpeer
Name of the peer whose remotebookmarks should be hoisted into the top-level
namespace (default: 'default')
Pulkit Goyal
remotenames: add new namespaces for remotebookmarks and remotebranches...
r36079 """
Pulkit Goyal
remotenames: introduce class to encapsulate remotenames info in an extension...
r36077
from __future__ import absolute_import
Pulkit Goyal
remotenames: add three new revsets related to remotenames...
r36167 from mercurial.i18n import _
Pulkit Goyal
remotenames: introduce a class to lazily resolve remotnames...
r36078 from mercurial.node import (
bin,
)
Pulkit Goyal
remotenames: introduce class to encapsulate remotenames info in an extension...
r36077 from mercurial import (
Pulkit Goyal
remotenames: show remote bookmarks in `hg bookmarks`...
r37108 bookmarks,
Yuya Nishihara
remotenames: abort if literal revset pattern matches nothing...
r40105 error,
Pulkit Goyal
remotenames: show remote bookmarks in `hg bookmarks`...
r37108 extensions,
Pulkit Goyal
remotenames: introduce class to encapsulate remotenames info in an extension...
r36077 logexchange,
Pulkit Goyal
remotenames: add new namespaces for remotebookmarks and remotebranches...
r36079 namespaces,
Augie Fackler
remotenames: work around move of ABCs in collections...
r36974 pycompat,
Pulkit Goyal
remotenames: add new namespaces for remotebookmarks and remotebranches...
r36079 registrar,
Pulkit Goyal
remotenames: add three new revsets related to remotenames...
r36167 revsetlang,
smartset,
Yuya Nishihara
templater: move hybrid class and functions to templateutil module...
r36939 templateutil,
Yuya Nishihara
remotenames: use util.always instead of handcrafted lambda
r40102 util,
Pulkit Goyal
remotenames: introduce class to encapsulate remotenames info in an extension...
r36077 )
Pulkit Goyal
remotenames: add names argument to remotenames revset...
r40095 from mercurial.utils import (
stringutil,
)
Augie Fackler
remotenames: work around move of ABCs in collections...
r36974 if pycompat.ispy3:
import collections.abc
mutablemapping = collections.abc.MutableMapping
else:
import collections
mutablemapping = collections.MutableMapping
Pulkit Goyal
remotenames: introduce class to encapsulate remotenames info in an extension...
r36077 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified.
testedwith = 'ships-with-hg-core'
Pulkit Goyal
remotenames: add new namespaces for remotebookmarks and remotebranches...
r36079 configtable = {}
configitem = registrar.configitem(configtable)
Pulkit Goyal
remotenames: introduce new template keywords for remotenames...
r36080 templatekeyword = registrar.templatekeyword()
Pulkit Goyal
remotenames: add three new revsets related to remotenames...
r36167 revsetpredicate = registrar.revsetpredicate()
Pulkit Goyal
remotenames: add new namespaces for remotebookmarks and remotebranches...
r36079
configitem('remotenames', 'bookmarks',
default=True,
)
configitem('remotenames', 'branches',
default=True,
)
Pulkit Goyal
remotenames: add functionality to hoist remotebookmarks...
r37107 configitem('remotenames', 'hoistedpeer',
default='default',
)
Pulkit Goyal
remotenames: add new namespaces for remotebookmarks and remotebranches...
r36079
Augie Fackler
remotenames: work around move of ABCs in collections...
r36974 class lazyremotenamedict(mutablemapping):
Pulkit Goyal
remotenames: introduce a class to lazily resolve remotnames...
r36078 """
Read-only dict-like Class to lazily resolve remotename entries
We are doing that because remotenames startup was slow.
We lazily read the remotenames file once to figure out the potential entries
and store them in self.potentialentries. Then when asked to resolve an
entry, if it is not in self.potentialentries, then it isn't there, if it
is in self.potentialentries we resolve it and store the result in
self.cache. We cannot be lazy is when asked all the entries (keys).
"""
def __init__(self, kind, repo):
self.cache = {}
self.potentialentries = {}
self._kind = kind # bookmarks or branches
self._repo = repo
self.loaded = False
def _load(self):
""" Read the remotenames file, store entries matching selected kind """
self.loaded = True
repo = self._repo
for node, rpath, rname in logexchange.readremotenamefile(repo,
self._kind):
name = rpath + '/' + rname
self.potentialentries[name] = (node, rpath, name)
def _resolvedata(self, potentialentry):
""" Check that the node for potentialentry exists and return it """
if not potentialentry in self.potentialentries:
return None
node, remote, name = self.potentialentries[potentialentry]
repo = self._repo
binnode = bin(node)
# if the node doesn't exist, skip it
try:
repo.changelog.rev(binnode)
except LookupError:
return None
# Skip closed branches
if (self._kind == 'branches' and repo[binnode].closesbranch()):
return None
return [binnode]
def __getitem__(self, key):
if not self.loaded:
self._load()
val = self._fetchandcache(key)
if val is not None:
return val
else:
raise KeyError()
Augie Fackler
remotenames: port partway to python3 by using collections.MutableMapping...
r36266 def __iter__(self):
return iter(self.potentialentries)
def __len__(self):
return len(self.potentialentries)
def __setitem__(self):
raise NotImplementedError
def __delitem__(self):
raise NotImplementedError
Pulkit Goyal
remotenames: introduce a class to lazily resolve remotnames...
r36078 def _fetchandcache(self, key):
if key in self.cache:
return self.cache[key]
val = self._resolvedata(key)
if val is not None:
self.cache[key] = val
return val
else:
return None
def keys(self):
""" Get a list of bookmark or branch names """
if not self.loaded:
self._load()
return self.potentialentries.keys()
def iteritems(self):
""" Iterate over (name, node) tuples """
if not self.loaded:
self._load()
for k, vtup in self.potentialentries.iteritems():
yield (k, [bin(vtup[0])])
Pulkit Goyal
remotenames: don't inherit the remotenames class from dict class...
r36481 class remotenames(object):
Pulkit Goyal
remotenames: introduce class to encapsulate remotenames info in an extension...
r36077 """
This class encapsulates all the remotenames state. It also contains
Pulkit Goyal
remotenames: introduce a class to lazily resolve remotnames...
r36078 methods to access that state in convenient ways. Remotenames are lazy
loaded. Whenever client code needs to ensure the freshest copy of
remotenames, use the `clearnames` method to force an eventual load.
Pulkit Goyal
remotenames: introduce class to encapsulate remotenames info in an extension...
r36077 """
def __init__(self, repo, *args):
self._repo = repo
Pulkit Goyal
remotenames: introduce a class to lazily resolve remotnames...
r36078 self.clearnames()
Pulkit Goyal
remotenames: introduce class to encapsulate remotenames info in an extension...
r36077
def clearnames(self):
""" Clear all remote names state """
Pulkit Goyal
remotenames: don't inherit the remotenames class from dict class...
r36481 self.bookmarks = lazyremotenamedict("bookmarks", self._repo)
self.branches = lazyremotenamedict("branches", self._repo)
Pulkit Goyal
remotenames: introduce class to encapsulate remotenames info in an extension...
r36077 self._invalidatecache()
def _invalidatecache(self):
self._nodetobmarks = None
self._nodetobranch = None
Pulkit Goyal
remotenames: add functionality to hoist remotebookmarks...
r37107 self._hoisttonodes = None
self._nodetohoists = None
Pulkit Goyal
remotenames: introduce class to encapsulate remotenames info in an extension...
r36077
def bmarktonodes(self):
Pulkit Goyal
remotenames: don't inherit the remotenames class from dict class...
r36481 return self.bookmarks
Pulkit Goyal
remotenames: introduce class to encapsulate remotenames info in an extension...
r36077
def nodetobmarks(self):
if not self._nodetobmarks:
bmarktonodes = self.bmarktonodes()
self._nodetobmarks = {}
for name, node in bmarktonodes.iteritems():
self._nodetobmarks.setdefault(node[0], []).append(name)
return self._nodetobmarks
def branchtonodes(self):
Pulkit Goyal
remotenames: don't inherit the remotenames class from dict class...
r36481 return self.branches
Pulkit Goyal
remotenames: introduce class to encapsulate remotenames info in an extension...
r36077
def nodetobranch(self):
if not self._nodetobranch:
branchtonodes = self.branchtonodes()
self._nodetobranch = {}
for name, nodes in branchtonodes.iteritems():
for node in nodes:
self._nodetobranch.setdefault(node, []).append(name)
return self._nodetobranch
Pulkit Goyal
remotenames: add new namespaces for remotebookmarks and remotebranches...
r36079
Pulkit Goyal
remotenames: add functionality to hoist remotebookmarks...
r37107 def hoisttonodes(self, hoist):
if not self._hoisttonodes:
marktonodes = self.bmarktonodes()
self._hoisttonodes = {}
hoist += '/'
for name, node in marktonodes.iteritems():
if name.startswith(hoist):
name = name[len(hoist):]
self._hoisttonodes[name] = node
return self._hoisttonodes
def nodetohoists(self, hoist):
if not self._nodetohoists:
marktonodes = self.bmarktonodes()
self._nodetohoists = {}
hoist += '/'
for name, node in marktonodes.iteritems():
if name.startswith(hoist):
name = name[len(hoist):]
self._nodetohoists.setdefault(node[0], []).append(name)
return self._nodetohoists
Yuya Nishihara
bookmarks: pass in formatter to printbookmarks() instead of opts (API)...
r39782 def wrapprintbookmarks(orig, ui, repo, fm, bmarks):
Pulkit Goyal
remotenames: show remote bookmarks in `hg bookmarks`...
r37108 if 'remotebookmarks' not in repo.names:
return
ns = repo.names['remotebookmarks']
for name in ns.listnames(repo):
nodes = ns.nodes(repo, name)
if not nodes:
continue
node = nodes[0]
bmarks[name] = (node, ' ', '')
Yuya Nishihara
bookmarks: pass in formatter to printbookmarks() instead of opts (API)...
r39782 return orig(ui, repo, fm, bmarks)
Pulkit Goyal
remotenames: show remote bookmarks in `hg bookmarks`...
r37108
def extsetup(ui):
extensions.wrapfunction(bookmarks, '_printbookmarks', wrapprintbookmarks)
Pulkit Goyal
remotenames: add new namespaces for remotebookmarks and remotebranches...
r36079 def reposetup(ui, repo):
Pulkit Goyal
remotenames: enable the storage config option if extension is enabled...
r38003
# set the config option to store remotenames
repo.ui.setconfig('experimental', 'remotenames', True, 'remotenames-ext')
Pulkit Goyal
remotenames: add new namespaces for remotebookmarks and remotebranches...
r36079 if not repo.local():
return
repo._remotenames = remotenames(repo)
ns = namespaces.namespace
if ui.configbool('remotenames', 'bookmarks'):
remotebookmarkns = ns(
'remotebookmarks',
templatename='remotebookmarks',
colorname='remotebookmark',
Pulkit Goyal
remotenames: don't use the default value of logfmt for namespaces...
r36278 logfmt='remote bookmark: %s\n',
Pulkit Goyal
remotenames: add new namespaces for remotebookmarks and remotebranches...
r36079 listnames=lambda repo: repo._remotenames.bmarktonodes().keys(),
namemap=lambda repo, name:
repo._remotenames.bmarktonodes().get(name, []),
nodemap=lambda repo, node:
repo._remotenames.nodetobmarks().get(node, []))
repo.names.addnamespace(remotebookmarkns)
Pulkit Goyal
remotenames: add functionality to hoist remotebookmarks...
r37107 # hoisting only works if there are remote bookmarks
hoist = ui.config('remotenames', 'hoistedpeer')
if hoist:
hoistednamens = ns(
'hoistednames',
templatename='hoistednames',
colorname='hoistedname',
logfmt='hoisted name: %s\n',
listnames = lambda repo:
repo._remotenames.hoisttonodes(hoist).keys(),
namemap = lambda repo, name:
repo._remotenames.hoisttonodes(hoist).get(name, []),
nodemap = lambda repo, node:
repo._remotenames.nodetohoists(hoist).get(node, []))
repo.names.addnamespace(hoistednamens)
Pulkit Goyal
remotenames: add new namespaces for remotebookmarks and remotebranches...
r36079 if ui.configbool('remotenames', 'branches'):
remotebranchns = ns(
'remotebranches',
templatename='remotebranches',
colorname='remotebranch',
Pulkit Goyal
remotenames: don't use the default value of logfmt for namespaces...
r36278 logfmt='remote branch: %s\n',
Pulkit Goyal
remotenames: add new namespaces for remotebookmarks and remotebranches...
r36079 listnames = lambda repo: repo._remotenames.branchtonodes().keys(),
namemap = lambda repo, name:
repo._remotenames.branchtonodes().get(name, []),
nodemap = lambda repo, node:
repo._remotenames.nodetobranch().get(node, []))
repo.names.addnamespace(remotebranchns)
Pulkit Goyal
remotenames: introduce new template keywords for remotenames...
r36080
Yuya Nishihara
templater: use template context to render old-style list template...
r37086 @templatekeyword('remotenames', requires={'repo', 'ctx'})
Yuya Nishihara
templatekw: switch most of showlist template keywords to new API (issue5779)...
r36609 def remotenameskw(context, mapping):
Yuya Nishihara
remotenames: drop redundant templatekw names from help text...
r36458 """List of strings. Remote names associated with the changeset."""
Yuya Nishihara
templatekw: switch most of showlist template keywords to new API (issue5779)...
r36609 repo = context.resource(mapping, 'repo')
ctx = context.resource(mapping, 'ctx')
Pulkit Goyal
remotenames: introduce new template keywords for remotenames...
r36080
remotenames = []
if 'remotebookmarks' in repo.names:
remotenames = repo.names['remotebookmarks'].names(repo, ctx.node())
if 'remotebranches' in repo.names:
remotenames += repo.names['remotebranches'].names(repo, ctx.node())
Yuya Nishihara
templater: move hybrid class and functions to templateutil module...
r36939 return templateutil.compatlist(context, mapping, 'remotename', remotenames,
plural='remotenames')
Pulkit Goyal
remotenames: introduce new template keywords for remotenames...
r36080
Yuya Nishihara
templater: use template context to render old-style list template...
r37086 @templatekeyword('remotebookmarks', requires={'repo', 'ctx'})
Yuya Nishihara
templatekw: switch most of showlist template keywords to new API (issue5779)...
r36609 def remotebookmarkskw(context, mapping):
Yuya Nishihara
remotenames: drop redundant templatekw names from help text...
r36458 """List of strings. Remote bookmarks associated with the changeset."""
Yuya Nishihara
templatekw: switch most of showlist template keywords to new API (issue5779)...
r36609 repo = context.resource(mapping, 'repo')
ctx = context.resource(mapping, 'ctx')
Pulkit Goyal
remotenames: introduce new template keywords for remotenames...
r36080
remotebmarks = []
if 'remotebookmarks' in repo.names:
remotebmarks = repo.names['remotebookmarks'].names(repo, ctx.node())
Yuya Nishihara
templater: move hybrid class and functions to templateutil module...
r36939 return templateutil.compatlist(context, mapping, 'remotebookmark',
remotebmarks, plural='remotebookmarks')
Pulkit Goyal
remotenames: introduce new template keywords for remotenames...
r36080
Yuya Nishihara
templater: use template context to render old-style list template...
r37086 @templatekeyword('remotebranches', requires={'repo', 'ctx'})
Yuya Nishihara
templatekw: switch most of showlist template keywords to new API (issue5779)...
r36609 def remotebrancheskw(context, mapping):
Yuya Nishihara
remotenames: drop redundant templatekw names from help text...
r36458 """List of strings. Remote branches associated with the changeset."""
Yuya Nishihara
templatekw: switch most of showlist template keywords to new API (issue5779)...
r36609 repo = context.resource(mapping, 'repo')
ctx = context.resource(mapping, 'ctx')
Pulkit Goyal
remotenames: introduce new template keywords for remotenames...
r36080
remotebranches = []
if 'remotebranches' in repo.names:
remotebranches = repo.names['remotebranches'].names(repo, ctx.node())
Yuya Nishihara
templater: move hybrid class and functions to templateutil module...
r36939 return templateutil.compatlist(context, mapping, 'remotebranch',
remotebranches, plural='remotebranches')
Pulkit Goyal
remotenames: add three new revsets related to remotenames...
r36167
Yuya Nishihara
remotenames: inline _parseargs() into _revsetutil()...
r40101 def _revsetutil(repo, subset, x, rtypes):
Pulkit Goyal
remotenames: add three new revsets related to remotenames...
r36167 """utility function to return a set of revs based on the rtypes"""
Yuya Nishihara
remotenames: inline _parseargs() into _revsetutil()...
r40101 args = revsetlang.getargs(x, 0, 1, _('only one argument accepted'))
if args:
kind, pattern, matcher = stringutil.stringmatcher(
revsetlang.getstring(args[0], _('argument must be a string')))
else:
Yuya Nishihara
remotenames: abort if literal revset pattern matches nothing...
r40105 kind = pattern = None
Yuya Nishihara
remotenames: use util.always instead of handcrafted lambda
r40102 matcher = util.always
Pulkit Goyal
remotenames: add three new revsets related to remotenames...
r36167
Yuya Nishihara
remotenames: don't call a set of nodes as "revs"
r40103 nodes = set()
Pulkit Goyal
remotenames: add three new revsets related to remotenames...
r36167 cl = repo.changelog
for rtype in rtypes:
if rtype in repo.names:
ns = repo.names[rtype]
for name in ns.listnames(repo):
Augie Fackler
remotenames: follow-up on D3639 to make revset funcs take only one arg...
r40096 if not matcher(name):
continue
Yuya Nishihara
remotenames: don't call a set of nodes as "revs"
r40103 nodes.update(ns.nodes(repo, name))
Yuya Nishihara
remotenames: abort if literal revset pattern matches nothing...
r40105 if kind == 'literal' and not nodes:
raise error.RepoLookupError(_("remote name '%s' does not exist")
% pattern)
Pulkit Goyal
remotenames: add three new revsets related to remotenames...
r36167
Yuya Nishihara
remotenames: don't call a set of nodes as "revs"
r40103 revs = (cl.rev(n) for n in nodes if cl.hasnode(n))
Yuya Nishihara
remotenames: remove unneeded sorted() from revset implementation...
r40104 return subset & smartset.baseset(revs)
Pulkit Goyal
remotenames: add three new revsets related to remotenames...
r36167
Augie Fackler
remotenames: follow-up on D3639 to make revset funcs take only one arg...
r40096 @revsetpredicate('remotenames([name])')
Pulkit Goyal
remotenames: add three new revsets related to remotenames...
r36167 def remotenamesrevset(repo, subset, x):
Augie Fackler
remotenames: follow-up on D3639 to make revset funcs take only one arg...
r40096 """All changesets which have a remotename on them. If `name` is
specified, only remotenames of matching remote paths are considered.
Pulkit Goyal
remotenames: add names argument to remotenames revset...
r40095
Pattern matching is supported for `name`. See :hg:`help revisions.patterns`.
"""
Yuya Nishihara
remotenames: inline _parseargs() into _revsetutil()...
r40101 return _revsetutil(repo, subset, x, ('remotebookmarks', 'remotebranches'))
Pulkit Goyal
remotenames: add names argument to remotenames revset...
r40095
Augie Fackler
remotenames: follow-up on D3639 to make revset funcs take only one arg...
r40096 @revsetpredicate('remotebranches([name])')
Pulkit Goyal
remotenames: add three new revsets related to remotenames...
r36167 def remotebranchesrevset(repo, subset, x):
Augie Fackler
remotenames: follow-up on D3639 to make revset funcs take only one arg...
r40096 """All changesets which are branch heads on remotes. If `name` is
specified, only remotenames of matching remote paths are considered.
Pulkit Goyal
remotenames: add names argument to remotenames revset...
r40095
Pattern matching is supported for `name`. See :hg:`help revisions.patterns`.
"""
Yuya Nishihara
remotenames: inline _parseargs() into _revsetutil()...
r40101 return _revsetutil(repo, subset, x, ('remotebranches',))
Pulkit Goyal
remotenames: add three new revsets related to remotenames...
r36167
Augie Fackler
remotenames: follow-up on D3639 to make revset funcs take only one arg...
r40096 @revsetpredicate('remotebookmarks([name])')
Pulkit Goyal
remotenames: add three new revsets related to remotenames...
r36167 def remotebmarksrevset(repo, subset, x):
Augie Fackler
remotenames: follow-up on D3639 to make revset funcs take only one arg...
r40096 """All changesets which have bookmarks on remotes. If `name` is
specified, only remotenames of matching remote paths are considered.
Pulkit Goyal
remotenames: add names argument to remotenames revset...
r40095
Pattern matching is supported for `name`. See :hg:`help revisions.patterns`.
"""
Yuya Nishihara
remotenames: inline _parseargs() into _revsetutil()...
r40101 return _revsetutil(repo, subset, x, ('remotebookmarks',))