| hg-reviewers |
This patch add supports to remotenames(), remotebookmarks() and remotebranches()
revsets to accept literal/re patterns which is similar to the behavior what we
have in bookmark() revset.
New tests are added for pattern matching and not breaking of existing tests
shows that we are fine.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/remotenames.py (55 lines) | |||
| M | tests/test-logexchange.t (28 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Pulkit Goyal | Jun 26 2018, 5:25 PM |
| namespaces, | namespaces, | ||||
| pycompat, | pycompat, | ||||
| registrar, | registrar, | ||||
| revsetlang, | revsetlang, | ||||
| smartset, | smartset, | ||||
| templateutil, | templateutil, | ||||
| ) | ) | ||||
| from mercurial.utils import ( | |||||
| stringutil, | |||||
| ) | |||||
| if pycompat.ispy3: | if pycompat.ispy3: | ||||
| import collections.abc | import collections.abc | ||||
| mutablemapping = collections.abc.MutableMapping | mutablemapping = collections.abc.MutableMapping | ||||
| else: | else: | ||||
| import collections | import collections | ||||
| mutablemapping = collections.MutableMapping | mutablemapping = collections.MutableMapping | ||||
| # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | ||||
| return templateutil.compatlist(context, mapping, 'remotebranch', | return templateutil.compatlist(context, mapping, 'remotebranch', | ||||
| remotebranches, plural='remotebranches') | remotebranches, plural='remotebranches') | ||||
| def _revsetutil(repo, subset, x, rtypes, paths): | def _revsetutil(repo, subset, x, rtypes, paths): | ||||
| """utility function to return a set of revs based on the rtypes""" | """utility function to return a set of revs based on the rtypes""" | ||||
| revs = set() | revs = set() | ||||
| cl = repo.changelog | cl = repo.changelog | ||||
| literals, matchers = paths | |||||
| # whether arguments were passed or not | |||||
| argspassed = bool(literals or matchers) | |||||
| for rtype in rtypes: | for rtype in rtypes: | ||||
| if rtype in repo.names: | if rtype in repo.names: | ||||
| ns = repo.names[rtype] | ns = repo.names[rtype] | ||||
| for name in ns.listnames(repo): | for name in ns.listnames(repo): | ||||
| if paths: | if argspassed: | ||||
| if name.split('/')[0] in paths: | rname = name.split('/')[0] | ||||
| if rname in literals: | |||||
| revs.update(ns.nodes(repo, name)) | |||||
| continue | |||||
| for matcher in matchers: | |||||
| if matcher(rname): | |||||
| revs.update(ns.nodes(repo, name)) | revs.update(ns.nodes(repo, name)) | ||||
| break | |||||
| else: | else: | ||||
| revs.update(ns.nodes(repo, name)) | revs.update(ns.nodes(repo, name)) | ||||
| results = (cl.rev(n) for n in revs if cl.hasnode(n)) | results = (cl.rev(n) for n in revs if cl.hasnode(n)) | ||||
| return subset & smartset.baseset(sorted(results)) | return subset & smartset.baseset(sorted(results)) | ||||
| def _parsepaths(x): | def _parsepaths(x): | ||||
| """parses the argument passed in revsets as paths and return | """parses the argument passed in revsets as paths | ||||
| them as a set or returns None if no path is specified""" | |||||
| returns (literals, matchers) where, | |||||
| literals is a set of literals passed by user | |||||
| matchers is a list of matcher objects for patterns passed by user | |||||
| """ | |||||
| # set of paths passed as literals | |||||
| literals = set() | |||||
| # list of matcher to match the patterns passed as paths | |||||
| matchers = [] | |||||
| if not x: | if not x: | ||||
| return None | return literals, matchers | ||||
| paths = set() | paths = set() | ||||
| lx = revsetlang.getlist(x) | lx = revsetlang.getlist(x) | ||||
| err = _('the argument must be a string') | err = _('the argument must be a string') | ||||
| for entry in lx: | for entry in lx: | ||||
| paths.add(revsetlang.getstring(entry, err)) | paths.add(revsetlang.getstring(entry, err)) | ||||
| return paths | for p in paths: | ||||
| kind, pattern, matcher = stringutil.stringmatcher(p) | |||||
| if kind == 'literal': | |||||
| literals.add(pattern) | |||||
| else: | |||||
| matchers.append(matcher) | |||||
| return literals, matchers | |||||
| @revsetpredicate('remotenames([path, ...])') | @revsetpredicate('remotenames([path, ...])') | ||||
| def remotenamesrevset(repo, subset, x): | def remotenamesrevset(repo, subset, x): | ||||
| """All changesets which have a remotename on them. If paths are specified, | """All changesets which have a remotename on them. If paths are specified, | ||||
| remotenames of those remote paths are only considered.""" | remotenames of those remote paths are only considered. | ||||
| Pattern matching is supported for `path`. See :hg:`help revisions.patterns`. | |||||
| """ | |||||
| paths = _parsepaths(x) | paths = _parsepaths(x) | ||||
| return _revsetutil(repo, subset, x, ('remotebookmarks', 'remotebranches'), | return _revsetutil(repo, subset, x, ('remotebookmarks', 'remotebranches'), | ||||
| paths) | paths) | ||||
| @revsetpredicate('remotebranches([path, ...])') | @revsetpredicate('remotebranches([path, ...])') | ||||
| def remotebranchesrevset(repo, subset, x): | def remotebranchesrevset(repo, subset, x): | ||||
| """All changesets which are branch heads on remotes. If paths are specified, | """All changesets which are branch heads on remotes. If paths are specified, | ||||
| only those remotes paths are considered""" | only those remotes paths are considered. | ||||
| Pattern matching is supported for `path`. See :hg:`help revisions.patterns`. | |||||
| """ | |||||
| paths = _parsepaths(x) | paths = _parsepaths(x) | ||||
| return _revsetutil(repo, subset, x, ('remotebranches',), paths) | return _revsetutil(repo, subset, x, ('remotebranches',), paths) | ||||
| @revsetpredicate('remotebookmarks([path, ...])') | @revsetpredicate('remotebookmarks([path, ...])') | ||||
| def remotebmarksrevset(repo, subset, x): | def remotebmarksrevset(repo, subset, x): | ||||
| """All changesets which have bookmarks on remotes. If paths are specified, | """All changesets which have bookmarks on remotes. If paths are specified, | ||||
| only those remote paths are considered""" | only those remote paths are considered. | ||||
| Pattern matching is supported for `path`. See :hg:`help revisions.patterns`. | |||||
| """ | |||||
| paths = _parsepaths(x) | paths = _parsepaths(x) | ||||
| return _revsetutil(repo, subset, x, ('remotebookmarks',), paths) | return _revsetutil(repo, subset, x, ('remotebookmarks',), paths) | ||||
| Where multiple paths specified and None of them exists | Where multiple paths specified and None of them exists | ||||
| $ hg log -r 'remotenames(def, serv2)' -GT "{rev}:{node|short} {remotenames}\n" | $ hg log -r 'remotenames(def, serv2)' -GT "{rev}:{node|short} {remotenames}\n" | ||||
| $ hg log -r 'remotebranches(defu, server)' -GT "{rev}:{node|short} {remotebranches}\n" | $ hg log -r 'remotebranches(defu, server)' -GT "{rev}:{node|short} {remotebranches}\n" | ||||
| $ hg log -r 'remotebookmarks(delt, serv)' -GT "{rev}:{node|short} {remotebookmarks}\n" | $ hg log -r 'remotebookmarks(delt, serv)' -GT "{rev}:{node|short} {remotebookmarks}\n" | ||||
| Testing pattern matching | |||||
| $ hg log -r 'remotenames("re:def")' -GT "{rev}:{node|short} {remotenames}\n" | |||||
| o 8:3e1487808078 default/foo default/wat | |||||
| | | |||||
| ~ | |||||
| @ 7:ec2426147f0e default/default | |||||
| | | |||||
| o 6:87d6d6676308 default/bar server2/bar | |||||
| | | |||||
| ~ | |||||
| $ hg log -r 'remotebranches("re:ser.*2")' -GT "{rev}:{node|short} {remotebranches}\n" | |||||
| o 10:bf433e48adea server2/default | |||||
| | | |||||
| ~ | |||||
| o 9:f34adec73c21 server2/wat | |||||
| | | |||||
| ~ | |||||
| $ hg log -r 'remotebookmarks("re:def", "re:.*2")' -GT "{rev}:{node|short} {remotebookmarks}\n" | |||||
| o 8:3e1487808078 default/foo | |||||
| : | |||||
| : o 6:87d6d6676308 default/bar server2/bar | |||||
| :/ | |||||
| o 3:62615734edd5 server2/foo | |||||
| | | |||||
| ~ | |||||