##// END OF EJS Templates
log: add support for bookmarks...
log: add support for bookmarks A bookmark can already be pushed with 'hg push origin -B topic-foo'. The pull command also supports bookmarks. This patch adds support for bookmarks using the '_opt2logrevset' code path. The list of changesets for a bookmark can now be obtained simply with: 'hg log -B topic-foo'. Reviewed-by: Elenie Godzaridis <arangradient@gmail.com> Differential Revision: https://phab.mercurial-scm.org/D8973

File last commit:

r44531:806d14ef default
r46123:2517df77 default
Show More
watchmanclient.py
129 lines | 3.8 KiB | text/x-python | PythonLexer
Martijn Pieters
fsmonitor: new experimental extension...
r28433 # watchmanclient.py - Watchman client for the fsmonitor extension
#
# Copyright 2013-2016 Facebook, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
import getpass
Gregory Szorc
fsmonitor: normalize exception types to bytes...
r43716 from mercurial import (
encoding,
util,
)
from mercurial.utils import (
procutil,
stringutil,
)
Martijn Pieters
fsmonitor: new experimental extension...
r28433
from . import pywatchman
Augie Fackler
formatting: blacken the codebase...
r43346
Martijn Pieters
fsmonitor: new experimental extension...
r28433 class Unavailable(Exception):
def __init__(self, msg, warn=True, invalidate=False):
self.msg = msg
self.warn = warn
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if self.msg == b'timed out waiting for response':
Martijn Pieters
fsmonitor: new experimental extension...
r28433 self.warn = False
self.invalidate = invalidate
Gregory Szorc
fsmonitor: normalize exception types to bytes...
r43716 def __bytes__(self):
Martijn Pieters
fsmonitor: new experimental extension...
r28433 if self.warn:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return b'warning: Watchman unavailable: %s' % self.msg
Martijn Pieters
fsmonitor: new experimental extension...
r28433 else:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return b'Watchman unavailable: %s' % self.msg
Martijn Pieters
fsmonitor: new experimental extension...
r28433
Gregory Szorc
fsmonitor: normalize exception types to bytes...
r43716 __str__ = encoding.strmethod(__bytes__)
Augie Fackler
formatting: blacken the codebase...
r43346
Martijn Pieters
fsmonitor: new experimental extension...
r28433 class WatchmanNoRoot(Unavailable):
def __init__(self, root, msg):
self.root = root
super(WatchmanNoRoot, self).__init__(msg)
Augie Fackler
formatting: blacken the codebase...
r43346
Martijn Pieters
fsmonitor: new experimental extension...
r28433 class client(object):
Augie Fackler
fsmonitor: refactor watchmanclient.client to accept ui and repo path...
r42877 def __init__(self, ui, root, timeout=1.0):
Martijn Pieters
fsmonitor: new experimental extension...
r28433 err = None
if not self._user:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 err = b"couldn't get user"
Martijn Pieters
fsmonitor: new experimental extension...
r28433 warn = True
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if self._user in ui.configlist(b'fsmonitor', b'blacklistusers'):
err = b'user %s in blacklist' % self._user
Martijn Pieters
fsmonitor: new experimental extension...
r28433 warn = False
if err:
raise Unavailable(err, warn)
self._timeout = timeout
self._watchmanclient = None
Augie Fackler
fsmonitor: refactor watchmanclient.client to accept ui and repo path...
r42877 self._root = root
self._ui = ui
Martijn Pieters
fsmonitor: new experimental extension...
r28433 self._firsttime = True
def settimeout(self, timeout):
self._timeout = timeout
if self._watchmanclient is not None:
self._watchmanclient.setTimeout(timeout)
def getcurrentclock(self):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 result = self.command(b'clock')
Martin von Zweigbergk
py3: delete b'' prefix from safehasattr arguments...
r43385 if not util.safehasattr(result, 'clock'):
Augie Fackler
formatting: blacken the codebase...
r43346 raise Unavailable(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'clock result is missing clock value', invalidate=True
Augie Fackler
formatting: blacken the codebase...
r43346 )
Martijn Pieters
fsmonitor: new experimental extension...
r28433 return result.clock
def clearconnection(self):
self._watchmanclient = None
def available(self):
return self._watchmanclient is not None or self._firsttime
@util.propertycache
def _user(self):
try:
return getpass.getuser()
except KeyError:
# couldn't figure out our user
return None
def _command(self, *args):
watchmanargs = (args[0], self._root) + args[1:]
try:
if self._watchmanclient is None:
self._firsttime = False
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 watchman_exe = self._ui.configpath(
b'fsmonitor', b'watchman_exe'
)
Martijn Pieters
fsmonitor: new experimental extension...
r28433 self._watchmanclient = pywatchman.client(
timeout=self._timeout,
Boris Feld
watchman: add the possibility to set the exact watchman binary location...
r42134 useImmutableBser=True,
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703 binpath=procutil.tonativestr(watchman_exe),
Augie Fackler
formatting: blacken the codebase...
r43346 )
Martijn Pieters
fsmonitor: new experimental extension...
r28433 return self._watchmanclient.query(*watchmanargs)
except pywatchman.CommandError as ex:
Gregory Szorc
fsmonitor: properly handle str ex.msg...
r44531 if 'unable to resolve root' in ex.msg:
Gregory Szorc
fsmonitor: normalize exception types to bytes...
r43716 raise WatchmanNoRoot(
self._root, stringutil.forcebytestr(ex.msg)
)
Gregory Szorc
fsmonitor: properly handle str ex.msg...
r44531 raise Unavailable(stringutil.forcebytestr(ex.msg))
Martijn Pieters
fsmonitor: new experimental extension...
r28433 except pywatchman.WatchmanError as ex:
Gregory Szorc
fsmonitor: normalize exception types to bytes...
r43716 raise Unavailable(stringutil.forcebytestr(ex))
Martijn Pieters
fsmonitor: new experimental extension...
r28433
def command(self, *args):
try:
try:
return self._command(*args)
except WatchmanNoRoot:
# this 'watch' command can also raise a WatchmanNoRoot if
# watchman refuses to accept this root
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self._command(b'watch')
Martijn Pieters
fsmonitor: new experimental extension...
r28433 return self._command(*args)
except Unavailable:
# this is in an outer scope to catch Unavailable form any of the
# above _command calls
self._watchmanclient = None
raise