##// END OF EJS Templates
fsmonitor: refresh pywatchman with upstream...
fsmonitor: refresh pywatchman with upstream This commit vendors pywatchman commit 259dc66dc9591f9b7ce76d0275bb1065f390c9b1 from upstream without modifications. The previously vendored pywatchman from changeset 16f4b341288d was from Git commit c77452. This commit effectively undoes the following Mercurial changesets: * dd35abc409ee fsmonitor: correct an error message * b1f62cd39b5c fsmonitor: layer on another hack in bser.c for os.stat() compat (issue5811) * c31ce080eb75 py3: convert arguments, cwd and env to native strings when spawning subprocess * 876494fd967d cleanup: delete lots of unused local variables * 57264906a996 watchman: add the possibility to set the exact watchman binary location The newly-vendored code has support for specifying the binary location, so 57264906a996 does not need applied. But we do need to modify our code to specify a proper argument name. 876494fd967d is not important, so it will be ignored. c31ce080eb75 globally changed the code base to always pass str to subprocess. But pywatchman's code is Python 3 clean, so we don't need to do this. This leaves dd35abc409ee and b1f62cd39b5c, which will be re-applied in subsequent commits. Differential Revision: https://phab.mercurial-scm.org/D7201

File last commit:

r43347:687b865b default
r43703:6469c23a stable
Show More
pager.py
81 lines | 2.6 KiB | text/x-python | PythonLexer
# pager.py - display output using a pager
#
# Copyright 2008 David Soria Parra <dsp@php.net>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
#
# To load the extension, add it to your configuration file:
#
# [extension]
# pager =
#
# Run 'hg help pager' to get info on configuration.
'''browse command output with an external pager (DEPRECATED)
Forcibly enable paging for individual commands that don't typically
request pagination with the attend-<command> option. This setting
takes precedence over ignore options and defaults::
[pager]
attend-cat = false
'''
from __future__ import absolute_import
from mercurial import (
cmdutil,
commands,
dispatch,
extensions,
registrar,
)
# 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 = b'ships-with-hg-core'
configtable = {}
configitem = registrar.configitem(configtable)
configitem(
b'pager', b'attend', default=lambda: attended,
)
def uisetup(ui):
def pagecmd(orig, ui, options, cmd, cmdfunc):
auto = options[b'pager'] == b'auto'
if auto and not ui.pageractive:
usepager = False
attend = ui.configlist(b'pager', b'attend')
ignore = ui.configlist(b'pager', b'ignore')
cmds, _ = cmdutil.findcmd(cmd, commands.table)
for cmd in cmds:
var = b'attend-%s' % cmd
if ui.config(b'pager', var, None):
usepager = ui.configbool(b'pager', var, True)
break
if cmd in attend or (cmd not in ignore and not attend):
usepager = True
break
if usepager:
# Slight hack: the attend list is supposed to override
# the ignore list for the pager extension, but the
# core code doesn't know about attend, so we have to
# lobotomize the ignore list so that the extension's
# behavior is preserved.
ui.setconfig(b'pager', b'ignore', b'', b'pager')
ui.pager(b'extension-via-attend-' + cmd)
else:
ui.disablepager()
return orig(ui, options, cmd, cmdfunc)
extensions.wrapfunction(dispatch, b'_runcommand', pagecmd)
attended = [b'annotate', b'cat', b'diff', b'export', b'glog', b'log', b'qdiff']