| quark |
| Restricted Project |
Run unittests
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| from collections import deque | from collections import deque | ||||
| conduit = None | conduit = None | ||||
| FASTLOG_MAX = 500 | FASTLOG_MAX = 500 | ||||
| FASTLOG_QUEUE_SIZE = 1000 | FASTLOG_QUEUE_SIZE = 1000 | ||||
| FASTLOG_TIMEOUT = 20 | FASTLOG_TIMEOUT = 20 | ||||
| USE_FASTLOG = False | |||||
| def extsetup(ui): | def extsetup(ui): | ||||
| global conduit | global conduit | ||||
| try: | try: | ||||
| conduit = extensions.find("fbconduit") | conduit = extensions.find("fbconduit") | ||||
| except KeyError: | except KeyError: | ||||
| from hgext3rd import fbconduit as conduit | from hgext3rd import fbconduit as conduit | ||||
| except ImportError: | except ImportError: | ||||
| ui.warn(_('Unable to find fbconduit extension\n')) | ui.warn(_('Unable to find fbconduit extension\n')) | ||||
| LOCAL = 'L' | LOCAL = 'L' | ||||
| REMOTE = 'R' | REMOTE = 'R' | ||||
| queue = util.queue(FASTLOG_QUEUE_SIZE + 100) | queue = util.queue(FASTLOG_QUEUE_SIZE + 100) | ||||
| hash = repo[rev].hex() | hash = repo[rev].hex() | ||||
| local = LocalIteratorThread(queue, LOCAL, rev, | local = LocalIteratorThread(queue, LOCAL, rev, | ||||
| dirs, localmatch, repo) | dirs, localmatch, repo) | ||||
| remote = FastLogThread(queue, REMOTE, reponame, 'hg', hash, dirs, | remote = FastLogThread(queue, REMOTE, reponame, 'hg', hash, dirs, | ||||
| repo) | repo) | ||||
| # Allow debugging either remote or local path | # Allow debugging either remote or local path | ||||
| debug = repo.ui.config('fastlog', 'debug') | debug = repo.ui.config('fastlog', 'debug') | ||||
| if debug != 'local': | if debug != 'local': | ||||
| repo.ui.debug('starting fastlog at %s\n' % hash) | repo.ui.debug('starting fastlog at %s\n' % hash) | ||||
| remote.start() | remote.start() | ||||
| if debug != 'remote': | if debug != 'remote': | ||||
| local.start() | local.start() | ||||
| seen.add(rev) | seen.add(rev) | ||||
| yield rev | yield rev | ||||
| finally: | finally: | ||||
| local.stop() | local.stop() | ||||
| remote.stop() | remote.stop() | ||||
| # Complex match - use a revset. | # Complex match - use a revset. | ||||
| complex = ['date', 'exclude', 'include', 'keyword', 'no_merges', | complex = ['date', 'exclude', 'include', 'keyword', 'no_merges', | ||||
| 'only_merges', 'prune', 'user'] | 'only_merges', 'prune', 'user'] | ||||
| if match.anypats() or any(opts.get(opt) for opt in complex): | if match.anypats() or any(opts.get(opt) for opt in complex): | ||||
| f = fastlog(repo, rev, dirs, None) | f = fastlog(repo, rev, dirs, None) | ||||
| revs = smartset.generatorset(f, iterasc=False) | revs = smartset.generatorset(f, iterasc=False) | ||||
| revs.reverse() | revs.reverse() | ||||
| if not revs: | if not revs: | ||||
| return smartset.baseset([]), None, None | return smartset.baseset([]), None, None | ||||
| expr, filematcher = cmdutil._makelogrevset(repo, pats, opts, revs) | expr, filematcher = cmdutil._makelogrevset(repo, pats, opts, revs) | ||||
| matcher = revset.match(repo.ui, expr) | matcher = revset.match(repo.ui, expr) | ||||
| except Exception as e: | except Exception as e: | ||||
| self.ui.traceback() | self.ui.traceback() | ||||
| queue.put((self.id, False, str(e))) | queue.put((self.id, False, str(e))) | ||||
| finally: | finally: | ||||
| queue.put((self.id, True, None)) | queue.put((self.id, True, None)) | ||||
| class FastLogThread(Thread): | class FastLogThread(Thread): | ||||
| """Class which talks to a remote SCMQuery or fastlog server | """Class which talks to a remote SCMQuery | ||||
| Like the above, results are sent to a queue, and tagged with the | Like the above, results are sent to a queue, and tagged with the | ||||
| id passed to this class' initializer. Same rules for termination. | id passed to this class' initializer. Same rules for termination. | ||||
| We page results in windows of up to FASTLOG_MAX to avoid generating | We page results in windows of up to FASTLOG_MAX to avoid generating | ||||
| too many results; this has been optimized on the server to cache | too many results; this has been optimized on the server to cache | ||||
| fast continuations but this assumes service stickiness. | fast continuations but this assumes service stickiness. | ||||
| while True: | while True: | ||||
| if self.stopped(): | if self.stopped(): | ||||
| break | break | ||||
| results = None | results = None | ||||
| todo = self.gettodo() | todo = self.gettodo() | ||||
| try: | try: | ||||
| if USE_FASTLOG: | results = conduit.call_conduit( | ||||
| results = conduit.call_conduit('fastlog.log', | 'scmquery.log_v2', | ||||
| rev = start, | |||||
| file_paths = [path], | |||||
| skip = skip, | |||||
| number = todo, | |||||
| ) | |||||
| else: | |||||
| results = conduit.call_conduit('scmquery.log_v2', | |||||
| repo = reponame, | repo=reponame, | ||||
| scm_type = self.scm, | scm_type=self.scm, | ||||
| rev = start, | rev=start, | ||||
| file_paths = [path], | file_paths=[path], | ||||
| skip = skip, | skip=skip, | ||||
| number = todo, | number=todo, | ||||
| ) | ) | ||||
| except Exception as e: | except Exception as e: | ||||
| if self.ui.config('fastlog', 'debug'): | if self.ui.config('fastlog', 'debug'): | ||||
| self.ui.traceback(force=True) | self.ui.traceback(force=True) | ||||
| self.queue.put((self.id, False, str(e))) | self.queue.put((self.id, False, str(e))) | ||||
| self.stop() | self.stop() | ||||
| return | return | ||||
| if results is None: | if results is None: | ||||