##// 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:

r43375:649d3ac3 default
r43703:6469c23a stable
Show More
pointer.py
89 lines | 2.8 KiB | text/x-python | PythonLexer
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 # pointer.py - Git-LFS pointer serialization
#
# Copyright 2017 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 re
Matt Harbison
lfs: quiesce check-module-import warnings...
r35098 from mercurial.i18n import _
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 from mercurial import (
error,
Augie Fackler
lfs: use byteskwargs() on some **kwargs for python 3 compat...
r36620 pycompat,
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 )
Augie Fackler
formatting: blacken the codebase...
r43346 from mercurial.utils import stringutil
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
Gregory Szorc
global: replace most uses of RevlogError with StorageError (API)...
r39813 class InvalidPointer(error.StorageError):
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 pass
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 class gitlfspointer(dict):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 VERSION = b'https://git-lfs.github.com/spec/v1'
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
def __init__(self, *args, **kwargs):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self[b'version'] = self.VERSION
Augie Fackler
lfs: use byteskwargs() on some **kwargs for python 3 compat...
r36620 super(gitlfspointer, self).__init__(*args)
self.update(pycompat.byteskwargs(kwargs))
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
@classmethod
def deserialize(cls, text):
try:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return cls(l.split(b' ', 1) for l in text.splitlines()).validate()
Augie Fackler
formatting: blacken the codebase...
r43346 except ValueError: # l.split returns 1 item instead of 2
raise InvalidPointer(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b'cannot parse git-lfs text: %s') % stringutil.pprint(text)
Augie Fackler
formatting: blacken the codebase...
r43346 )
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
def serialize(self):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 sortkeyfunc = lambda x: (x[0] != b'version', x)
Gregory Szorc
py3: define and use pycompat.iteritems() for hgext/...
r43375 items = sorted(pycompat.iteritems(self.validate()), key=sortkeyfunc)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return b''.join(b'%s %s\n' % (k, v) for k, v in items)
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
def oid(self):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return self[b'oid'].split(b':')[-1]
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
def size(self):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return int(self[b'size'])
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
# regular expressions used by _validate
# see https://github.com/git-lfs/git-lfs/blob/master/docs/spec.md
Augie Fackler
lfs: add missing b prefixes on some regular expressions...
r36618 _keyre = re.compile(br'\A[a-z0-9.-]+\Z')
_valuere = re.compile(br'\A[^\n]*\Z')
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 _requiredre = {
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'size': re.compile(br'\A[0-9]+\Z'),
b'oid': re.compile(br'\Asha256:[0-9a-f]{64}\Z'),
b'version': re.compile(br'\A%s\Z' % stringutil.reescape(VERSION)),
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 }
def validate(self):
"""raise InvalidPointer on error. return self if there is no error"""
requiredcount = 0
Gregory Szorc
py3: define and use pycompat.iteritems() for hgext/...
r43375 for k, v in pycompat.iteritems(self):
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 if k in self._requiredre:
if not self._requiredre[k].match(v):
Matt Harbison
lfs: clarify pointer validation error messages...
r38178 raise InvalidPointer(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b'unexpected lfs pointer value: %s=%s')
Augie Fackler
formatting: blacken the codebase...
r43346 % (k, stringutil.pprint(v))
)
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 requiredcount += 1
elif not self._keyre.match(k):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise InvalidPointer(_(b'unexpected lfs pointer key: %s') % k)
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 if not self._valuere.match(v):
Augie Fackler
formatting: blacken the codebase...
r43346 raise InvalidPointer(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b'unexpected lfs pointer value: %s=%s')
Augie Fackler
formatting: blacken the codebase...
r43346 % (k, stringutil.pprint(v))
)
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 if len(self._requiredre) != requiredcount:
miss = sorted(set(self._requiredre.keys()).difference(self.keys()))
Augie Fackler
formatting: blacken the codebase...
r43346 raise InvalidPointer(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b'missing lfs pointer keys: %s') % b', '.join(miss)
Augie Fackler
formatting: blacken the codebase...
r43346 )
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 return self
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 deserialize = gitlfspointer.deserialize