This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6682

fsmonitor: add support for extra `hg debuginstall` data
ClosedPublic

Authored by durin42 on Jul 23 2019, 3:40 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG684b56ade431: fsmonitor: add support for extra `hg debuginstall` data
rHG3358dc6e7c04: fsmonitor: add support for extra `hg debuginstall` data
Summary

This might make some things easier to debug, and for default bug
report templates it'll help collect more data from users all at
once. I don't actually need fsmonitor in our bug reports (we don't use
it), but this demonstrates the utility of the preceding patches
without having to add new things to core.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Jul 23 2019, 3:40 PM
pulkit accepted this revision.Jul 24 2019, 5:22 AM
pulkit added a subscriber: pulkit.
pulkit added inline comments.
hgext/fsmonitor/__init__.py
183

Moved this import to top level in flight.

192

This might make py3 unhappy.

This revision is now accepted and ready to land.Jul 24 2019, 5:22 AM
durin42 added a commit: rHG3358dc6e7c04: fsmonitor: add support for extra `hg debuginstall` data.Jul 24 2019, 5:32 AM
Closed by commit rHG3358dc6e7c04: fsmonitor: add support for extra `hg debuginstall` data (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/fsmonitor/__init__.py (18 lines)
Mtests/test-install.t (10 lines)

Diff 16035

hgext/fsmonitor/__init__.py

from __future__ import absolute_import from __future__ import absolute_import
import codecs import codecs
import hashlib import hashlib
import os import os
import stat import stat
import sys import sys
import tempfile
import weakref import weakref
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import ( from mercurial.node import (
hex, hex,
) )
from mercurial import ( from mercurial import (
configitem('experimental', 'fsmonitor.transaction_notify', configitem('experimental', 'fsmonitor.transaction_notify',
default=False, default=False,
) )
# This extension is incompatible with the following blacklisted extensions # This extension is incompatible with the following blacklisted extensions
# and will disable itself when encountering one of these: # and will disable itself when encountering one of these:
_blacklist = ['largefiles', 'eol'] _blacklist = ['largefiles', 'eol']
def debuginstall(ui, fm):
fm.write("fsmonitor-watchman",
_("fsmonitor checking for watchman binary... (%s)\n"),
ui.configpath("fsmonitor", "watchman_exe"))
root = tempfile.mkdtemp()
pulkitUnsubmitted
Not Done

Moved this import to top level in flight.

pulkit: Moved this import to top level in flight.
c = watchmanclient.client(ui, root)
err = None
try:
v = c.command("version")
fm.write("fsmonitor-watchman-version",
_(" watchman binary version %s\n"), v["version"])
except watchmanclient.Unavailable as e:
err = str(e)
fm.condwrite(err, "fsmonitor-watchman-error",
pulkitUnsubmitted
Not Done

This might make py3 unhappy.

pulkit: This might make py3 unhappy.
_(" watchman binary missing or broken: %s\n"), err)
return 1 if err else 0
def _handleunavailable(ui, state, ex): def _handleunavailable(ui, state, ex):
"""Exception handler for Watchman interaction exceptions""" """Exception handler for Watchman interaction exceptions"""
if isinstance(ex, watchmanclient.Unavailable): if isinstance(ex, watchmanclient.Unavailable):
# experimental config: fsmonitor.verbose # experimental config: fsmonitor.verbose
if ex.warn and ui.configbool('fsmonitor', 'verbose'): if ex.warn and ui.configbool('fsmonitor', 'verbose'):
if 'illegal_fstypes' not in str(ex): if 'illegal_fstypes' not in str(ex):
ui.warn(str(ex) + '\n') ui.warn(str(ex) + '\n')
if ex.invalidate: if ex.invalidate:

tests/test-install.t

Can't find editor 'c:\foo\bar\baz.exe' in PATH (windows !) Can't find editor 'c:\foo\bar\baz.exe' in PATH (windows !)
checking commit editor... (c:foobarbaz.exe) (no-windows !) checking commit editor... (c:foobarbaz.exe) (no-windows !)
Can't find editor 'c:foobarbaz.exe' in PATH (no-windows !) Can't find editor 'c:foobarbaz.exe' in PATH (no-windows !)
(specify a commit editor in your configuration file) (specify a commit editor in your configuration file)
checking username (test) checking username (test)
1 problems detected, please check your install! 1 problems detected, please check your install!
[1] [1]
debuginstall extension support
$ hg debuginstall --config extensions.fsmonitor= --config fsmonitor.watchman_exe=false | grep atchman
fsmonitor checking for watchman binary... (false)
watchman binary missing or broken: warning: Watchman unavailable: watchman exited with code 1
Verify the json works too:
$ hg debuginstall --config extensions.fsmonitor= --config fsmonitor.watchman_exe=false -Tjson | grep atchman
"fsmonitor-watchman": "false",
"fsmonitor-watchman-error": "warning: Watchman unavailable: watchman exited with code 1",
#if test-repo #if test-repo
$ . "$TESTDIR/helpers-testrepo.sh" $ . "$TESTDIR/helpers-testrepo.sh"
$ cat >> wixxml.py << EOF $ cat >> wixxml.py << EOF
> import os > import os
> import subprocess > import subprocess
> import sys > import sys
> import xml.etree.ElementTree as ET > import xml.etree.ElementTree as ET