| indygreg |
| hg-reviewers |
Recently in core, util.py is splitted into various modules in mercurial/utils/.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/infinitepush/__init__.py (12 lines) | |||
| M | hgext/infinitepush/fileindexapi.py (4 lines) |
| from mercurial.node import ( | from mercurial.node import ( | ||||
| bin, | bin, | ||||
| hex, | hex, | ||||
| ) | ) | ||||
| from mercurial.i18n import _ | from mercurial.i18n import _ | ||||
| from mercurial.utils import ( | |||||
| procutil, | |||||
| stringutil, | |||||
| ) | |||||
| from mercurial import ( | from mercurial import ( | ||||
| bundle2, | bundle2, | ||||
| changegroup, | changegroup, | ||||
| commands, | commands, | ||||
| discovery, | discovery, | ||||
| encoding, | encoding, | ||||
| error, | error, | ||||
| exchange, | exchange, | ||||
| clientextsetup(ui) | clientextsetup(ui) | ||||
| def commonsetup(ui): | def commonsetup(ui): | ||||
| wireproto.commands['listkeyspatterns'] = ( | wireproto.commands['listkeyspatterns'] = ( | ||||
| wireprotolistkeyspatterns, 'namespace patterns') | wireprotolistkeyspatterns, 'namespace patterns') | ||||
| scratchbranchpat = ui.config('infinitepush', 'branchpattern') | scratchbranchpat = ui.config('infinitepush', 'branchpattern') | ||||
| if scratchbranchpat: | if scratchbranchpat: | ||||
| global _scratchbranchmatcher | global _scratchbranchmatcher | ||||
| kind, pat, _scratchbranchmatcher = util.stringmatcher(scratchbranchpat) | kind, pat, _scratchbranchmatcher = \ | ||||
| stringutil.stringmatcher(scratchbranchpat) | |||||
| def serverextsetup(ui): | def serverextsetup(ui): | ||||
| origpushkeyhandler = bundle2.parthandlermapping['pushkey'] | origpushkeyhandler = bundle2.parthandlermapping['pushkey'] | ||||
| def newpushkeyhandler(*args, **kwargs): | def newpushkeyhandler(*args, **kwargs): | ||||
| bundle2pushkey(origpushkeyhandler, *args, **kwargs) | bundle2pushkey(origpushkeyhandler, *args, **kwargs) | ||||
| newpushkeyhandler.params = origpushkeyhandler.params | newpushkeyhandler.params = origpushkeyhandler.params | ||||
| bundle2.parthandlermapping['pushkey'] = newpushkeyhandler | bundle2.parthandlermapping['pushkey'] = newpushkeyhandler | ||||
| if namespace == 'bookmarks' and patterns: | if namespace == 'bookmarks' and patterns: | ||||
| index = self.bundlestore.index | index = self.bundlestore.index | ||||
| results = {} | results = {} | ||||
| bookmarks = orig(self, namespace) | bookmarks = orig(self, namespace) | ||||
| for pattern in patterns: | for pattern in patterns: | ||||
| results.update(index.getbookmarks(pattern)) | results.update(index.getbookmarks(pattern)) | ||||
| if pattern.endswith('*'): | if pattern.endswith('*'): | ||||
| pattern = 're:^' + pattern[:-1] + '.*' | pattern = 're:^' + pattern[:-1] + '.*' | ||||
| kind, pat, matcher = util.stringmatcher(pattern) | kind, pat, matcher = stringutil.stringmatcher(pattern) | ||||
| for bookmark, node in bookmarks.iteritems(): | for bookmark, node in bookmarks.iteritems(): | ||||
| if matcher(bookmark): | if matcher(bookmark): | ||||
| results[bookmark] = node | results[bookmark] = node | ||||
| return results | return results | ||||
| else: | else: | ||||
| return orig(self, namespace) | return orig(self, namespace) | ||||
| @peer.batchable | @peer.batchable | ||||
| **kwargs) | **kwargs) | ||||
| raise | raise | ||||
| def _getorcreateinfinitepushlogger(op): | def _getorcreateinfinitepushlogger(op): | ||||
| logger = op.records['infinitepushlogger'] | logger = op.records['infinitepushlogger'] | ||||
| if not logger: | if not logger: | ||||
| ui = op.repo.ui | ui = op.repo.ui | ||||
| try: | try: | ||||
| username = util.getuser() | username = procutil.getuser() | ||||
| except Exception: | except Exception: | ||||
| username = 'unknown' | username = 'unknown' | ||||
| # Generate random request id to be able to find all logged entries | # Generate random request id to be able to find all logged entries | ||||
| # for the same request. Since requestid is pseudo-generated it may | # for the same request. Since requestid is pseudo-generated it may | ||||
| # not be unique, but we assume that (hostname, username, requestid) | # not be unique, but we assume that (hostname, username, requestid) | ||||
| # is unique. | # is unique. | ||||
| random.seed() | random.seed() | ||||
| requestid = random.randint(0, 2000000000) | requestid = random.randint(0, 2000000000) | ||||
| # Filesystem path to the index store | # Filesystem path to the index store | ||||
| indexpath = PATH | indexpath = PATH | ||||
| """ | """ | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| import os | import os | ||||
| from mercurial import util | from mercurial.utils import stringutil | ||||
| from . import indexapi | from . import indexapi | ||||
| class fileindexapi(indexapi.indexapi): | class fileindexapi(indexapi.indexapi): | ||||
| def __init__(self, repo): | def __init__(self, repo): | ||||
| super(fileindexapi, self).__init__() | super(fileindexapi, self).__init__() | ||||
| self._repo = repo | self._repo = repo | ||||
| root = repo.ui.config('infinitepush', 'indexpath') | root = repo.ui.config('infinitepush', 'indexpath') | ||||
| def saveoptionaljsonmetadata(self, node, jsonmetadata): | def saveoptionaljsonmetadata(self, node, jsonmetadata): | ||||
| vfs = self._repo.vfs | vfs = self._repo.vfs | ||||
| vfs.write(os.path.join(self._metadatamap, node), jsonmetadata) | vfs.write(os.path.join(self._metadatamap, node), jsonmetadata) | ||||
| def _listbookmarks(self, pattern): | def _listbookmarks(self, pattern): | ||||
| if pattern.endswith('*'): | if pattern.endswith('*'): | ||||
| pattern = 're:^' + pattern[:-1] + '.*' | pattern = 're:^' + pattern[:-1] + '.*' | ||||
| kind, pat, matcher = util.stringmatcher(pattern) | kind, pat, matcher = stringutil.stringmatcher(pattern) | ||||
| prefixlen = len(self._bookmarkmap) + 1 | prefixlen = len(self._bookmarkmap) + 1 | ||||
| for dirpath, _, books in self._repo.vfs.walk(self._bookmarkmap): | for dirpath, _, books in self._repo.vfs.walk(self._bookmarkmap): | ||||
| for book in books: | for book in books: | ||||
| bookmark = os.path.join(dirpath, book)[prefixlen:] | bookmark = os.path.join(dirpath, book)[prefixlen:] | ||||
| if not matcher(bookmark): | if not matcher(bookmark): | ||||
| continue | continue | ||||
| yield bookmark, self._read(os.path.join(dirpath, book)) | yield bookmark, self._read(os.path.join(dirpath, book)) | ||||