This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1273

sparse: disable automatically when fbsparse is detected
ClosedPublic

Authored by quark on Oct 31 2017, 1:40 PM.
Tags
None
Subscribers
None

Details

Reviewers
durham
Group Reviewers
Restricted Project
Commits
rFBHGX57202c135fb8: sparse: disable automatically when fbsparse is detected
Summary

There are some places that both fbsparse and sparse are enabled. To help
them migrate smoothly, let's disable sparse automatically if fbsparse is
detected.

Test Plan

Run:

hg --config extensions.fbsparse --config extensions.sparse= sparse -h

Make sure it does not complain about:

extension 'sparse' overrides commands: ^sparse

Diff Detail

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

Event Timeline

quark created this revision.Oct 31 2017, 1:40 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 31 2017, 1:40 PM
quark edited the test plan for this revision. (Show Details)Oct 31 2017, 1:42 PM
quark added a child revision: D1274: rage: import fbsparse instead.
durham accepted this revision.Oct 31 2017, 4:10 PM
This revision is now accepted and ready to land.Oct 31 2017, 4:10 PM
Closed by commit rFBHGX57202c135fb8: sparse: disable automatically when fbsparse is detected (authored by quark). · Explain WhyNov 2 2017, 3:04 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/sparse.py (11 lines)

Diff 3217

hgext3rd/sparse.py

import os, collections, hashlib import os, collections, hashlib
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
testedwith = 'ships-with-fb-hgext' testedwith = 'ships-with-fb-hgext'
cwdrealtivepatkinds = ('glob', 'relpath') cwdrealtivepatkinds = ('glob', 'relpath')
def _fbsparseexists(ui):
return not ui.config('extensions', 'fbsparse', '!').startswith('!')
def uisetup(ui): def uisetup(ui):
if _fbsparseexists(ui):
cmdtable.clear()
return
_setupupdates(ui) _setupupdates(ui)
_setupcommit(ui) _setupcommit(ui)
def extsetup(ui): def extsetup(ui):
if _fbsparseexists(ui):
cmdtable.clear()
return
_setupclone(ui) _setupclone(ui)
_setuplog(ui) _setuplog(ui)
_setupadd(ui) _setupadd(ui)
_setupdirstate(ui) _setupdirstate(ui)
_setupdiff(ui) _setupdiff(ui)
# if fsmonitor is enabled, tell it to use our hash function # if fsmonitor is enabled, tell it to use our hash function
try: try:
fsmonitor = extensions.find('fsmonitor') fsmonitor = extensions.find('fsmonitor')
def _hashignore(orig, ignore): def _hashignore(orig, ignore):
return _hashmatcher(ignore) return _hashmatcher(ignore)
extensions.wrapfunction(fsmonitor, '_hashignore', _hashignore) extensions.wrapfunction(fsmonitor, '_hashignore', _hashignore)
except KeyError: except KeyError:
pass pass
# do the same for hgwatchman, old name # do the same for hgwatchman, old name
try: try:
hgwatchman = extensions.find('hgwatchman') hgwatchman = extensions.find('hgwatchman')
def _hashignore(orig, ignore): def _hashignore(orig, ignore):
return _hashmatcher(ignore) return _hashmatcher(ignore)
extensions.wrapfunction(hgwatchman, '_hashignore', _hashignore) extensions.wrapfunction(hgwatchman, '_hashignore', _hashignore)
except KeyError: except KeyError:
pass pass
def reposetup(ui, repo): def reposetup(ui, repo):
if _fbsparseexists(repo.ui):
return
if not util.safehasattr(repo, 'dirstate'): if not util.safehasattr(repo, 'dirstate'):
return return
_wraprepo(ui, repo) _wraprepo(ui, repo)
def replacefilecache(cls, propname, replacement): def replacefilecache(cls, propname, replacement):
"""Replace a filecache property with a new class. This allows changing the """Replace a filecache property with a new class. This allows changing the
cache invalidation condition.""" cache invalidation condition."""