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

r43385:4aa72cdf default
r43703:6469c23a stable
Show More
commitextras.py
89 lines | 2.4 KiB | text/x-python | PythonLexer
Pulkit Goyal
commitextras: move fb extension to core which add extras to a commit...
r33546 # commitextras.py
#
# Copyright 2013 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.
Pulkit Goyal
commitextras: mark the extension as ADVANCED
r33562 '''adds a new flag extras to commit (ADVANCED)'''
Pulkit Goyal
commitextras: move fb extension to core which add extras to a commit...
r33546
from __future__ import absolute_import
Pulkit Goyal
commitextras: make sure keys contains ascii letters, numbers, '_' and '-' only
r33603 import re
Pulkit Goyal
commitextras: move fb extension to core which add extras to a commit...
r33546 from mercurial.i18n import _
from mercurial import (
commands,
Pulkit Goyal
commitextras: check the format of the arguments and no internal key is used...
r33547 error,
Pulkit Goyal
commitextras: move fb extension to core which add extras to a commit...
r33546 extensions,
registrar,
Valentin Gatien-Baron
commitextras: work nicely with other extensions...
r39330 util,
Pulkit Goyal
commitextras: move fb extension to core which add extras to a commit...
r33546 )
cmdtable = {}
command = registrar.command(cmdtable)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 testedwith = b'ships-with-hg-core'
Pulkit Goyal
commitextras: move fb extension to core which add extras to a commit...
r33546
Pulkit Goyal
commitextras: check the format of the arguments and no internal key is used...
r33547 usedinternally = {
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'amend_source',
b'branch',
b'close',
b'histedit_source',
b'topic',
b'rebase_source',
b'intermediate-source',
b'__touch-noise__',
b'source',
b'transplant_source',
Pulkit Goyal
commitextras: check the format of the arguments and no internal key is used...
r33547 }
Augie Fackler
formatting: blacken the codebase...
r43346
Pulkit Goyal
commitextras: move fb extension to core which add extras to a commit...
r33546 def extsetup(ui):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 entry = extensions.wrapcommand(commands.table, b'commit', _commit)
Pulkit Goyal
commitextras: move fb extension to core which add extras to a commit...
r33546 options = entry[1]
Augie Fackler
formatting: blacken the codebase...
r43346 options.append(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 (
b'',
b'extra',
[],
_(b'set a changeset\'s extra values'),
_(b"KEY=VALUE"),
)
Augie Fackler
formatting: blacken the codebase...
r43346 )
Pulkit Goyal
commitextras: move fb extension to core which add extras to a commit...
r33546
def _commit(orig, ui, repo, *pats, **opts):
Martin von Zweigbergk
py3: delete b'' prefix from safehasattr arguments...
r43385 if util.safehasattr(repo, 'unfiltered'):
Valentin Gatien-Baron
commitextras: work nicely with other extensions...
r39330 repo = repo.unfiltered()
Augie Fackler
formatting: blacken the codebase...
r43346
Valentin Gatien-Baron
commitextras: work nicely with other extensions...
r39330 class repoextra(repo.__class__):
def commit(self, *innerpats, **inneropts):
Pulkit Goyal
py3: handle keyword arguments in hgext/commitextras.py...
r34976 extras = opts.get(r'extra')
Valentin Gatien-Baron
commitextras: no need to special case extras=[]...
r39331 for raw in extras:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if b'=' not in raw:
Augie Fackler
formatting: blacken the codebase...
r43346 msg = _(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"unable to parse '%s', should follow "
b"KEY=VALUE format"
Augie Fackler
formatting: blacken the codebase...
r43346 )
Valentin Gatien-Baron
commitextras: no need to special case extras=[]...
r39331 raise error.Abort(msg % raw)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 k, v = raw.split(b'=', 1)
Valentin Gatien-Baron
commitextras: no need to special case extras=[]...
r39331 if not k:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 msg = _(b"unable to parse '%s', keys can't be empty")
Valentin Gatien-Baron
commitextras: no need to special case extras=[]...
r39331 raise error.Abort(msg % raw)
Gregory Szorc
global: use raw strings for regular expressions with escapes...
r41673 if re.search(br'[^\w-]', k):
Augie Fackler
formatting: blacken the codebase...
r43346 msg = _(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"keys can only contain ascii letters, digits,"
b" '_' and '-'"
Augie Fackler
formatting: blacken the codebase...
r43346 )
Valentin Gatien-Baron
commitextras: no need to special case extras=[]...
r39331 raise error.Abort(msg)
if k in usedinternally:
Augie Fackler
formatting: blacken the codebase...
r43346 msg = _(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"key '%s' is used internally, can't be set "
b"manually"
Augie Fackler
formatting: blacken the codebase...
r43346 )
Valentin Gatien-Baron
commitextras: no need to special case extras=[]...
r39331 raise error.Abort(msg % k)
inneropts[r'extra'][k] = v
Valentin Gatien-Baron
commitextras: work nicely with other extensions...
r39330 return super(repoextra, self).commit(*innerpats, **inneropts)
Augie Fackler
formatting: blacken the codebase...
r43346
Valentin Gatien-Baron
commitextras: work nicely with other extensions...
r39330 repo.__class__ = repoextra
return orig(ui, repo, *pats, **opts)