| pulkit | |
| indygreg |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| since it depends on some other source for providing the manifests (when using | since it depends on some other source for providing the manifests (when using | ||||
| treemanifests) and file contents. Something like a virtual filesystem and/or | treemanifests) and file contents. Something like a virtual filesystem and/or | ||||
| remotefilelog. We want to be useful when not using those systems, so we do not | remotefilelog. We want to be useful when not using those systems, so we do not | ||||
| have this method available in narrowhg proper at the moment. | have this method available in narrowhg proper at the moment. | ||||
| $ cat > "$TESTTMP/expand_extension.py" <<EOF | $ cat > "$TESTTMP/expand_extension.py" <<EOF | ||||
| > import os | > import os | ||||
| > import sys | > import sys | ||||
| > | > | ||||
| > from mercurial import encoding | |||||
| > from mercurial import extensions | > from mercurial import extensions | ||||
| > from mercurial import localrepo | > from mercurial import localrepo | ||||
| > from mercurial import match as matchmod | > from mercurial import match as matchmod | ||||
| > from mercurial import narrowspec | > from mercurial import narrowspec | ||||
| > from mercurial import patch | > from mercurial import patch | ||||
| > from mercurial import util as hgutil | > from mercurial import util as hgutil | ||||
| > | > | ||||
| > def expandnarrowspec(ui, repo, newincludes=None): | > def expandnarrowspec(ui, repo, newincludes=None): | ||||
| > if not newincludes: | > if not newincludes: | ||||
| > return | > return | ||||
| > import sys | > import sys | ||||
| > newincludes = set([newincludes]) | > newincludes = set([newincludes]) | ||||
| > includes, excludes = repo.narrowpats | > includes, excludes = repo.narrowpats | ||||
| > currentmatcher = narrowspec.match(repo.root, includes, excludes) | > currentmatcher = narrowspec.match(repo.root, includes, excludes) | ||||
| > includes = includes | newincludes | > includes = includes | newincludes | ||||
| > if not repo.currenttransaction(): | > if not repo.currenttransaction(): | ||||
| > ui.develwarn('expandnarrowspec called outside of transaction!') | > ui.develwarn(b'expandnarrowspec called outside of transaction!') | ||||
| > repo.setnarrowpats(includes, excludes) | > repo.setnarrowpats(includes, excludes) | ||||
| > newmatcher = narrowspec.match(repo.root, includes, excludes) | > newmatcher = narrowspec.match(repo.root, includes, excludes) | ||||
| > added = matchmod.differencematcher(newmatcher, currentmatcher) | > added = matchmod.differencematcher(newmatcher, currentmatcher) | ||||
| > for f in repo['.'].manifest().walk(added): | > for f in repo[b'.'].manifest().walk(added): | ||||
| > repo.dirstate.normallookup(f) | > repo.dirstate.normallookup(f) | ||||
| > | > | ||||
| > def makeds(ui, repo): | > def makeds(ui, repo): | ||||
| > def wrapds(orig, self): | > def wrapds(orig, self): | ||||
| > ds = orig(self) | > ds = orig(self) | ||||
| > class expandingdirstate(ds.__class__): | > class expandingdirstate(ds.__class__): | ||||
| > @hgutil.propertycache | > @hgutil.propertycache | ||||
| > def _map(self): | > def _map(self): | ||||
| > ret = super(expandingdirstate, self)._map | > ret = super(expandingdirstate, self)._map | ||||
| > with repo.wlock(), repo.lock(), repo.transaction( | > with repo.wlock(), repo.lock(), repo.transaction( | ||||
| > 'expandnarrowspec'): | > b'expandnarrowspec'): | ||||
| > expandnarrowspec(ui, repo, os.environ.get('DIRSTATEINCLUDES')) | > expandnarrowspec(ui, repo, | ||||
| > encoding.environ.get(b'DIRSTATEINCLUDES')) | |||||
| > return ret | > return ret | ||||
| > ds.__class__ = expandingdirstate | > ds.__class__ = expandingdirstate | ||||
| > return ds | > return ds | ||||
| > return wrapds | > return wrapds | ||||
| > | > | ||||
| > def reposetup(ui, repo): | > def reposetup(ui, repo): | ||||
| > extensions.wrapfilecache(localrepo.localrepository, 'dirstate', | > extensions.wrapfilecache(localrepo.localrepository, b'dirstate', | ||||
| > makeds(ui, repo)) | > makeds(ui, repo)) | ||||
| > def overridepatch(orig, *args, **kwargs): | > def overridepatch(orig, *args, **kwargs): | ||||
| > with repo.wlock(): | > with repo.wlock(): | ||||
| > expandnarrowspec(ui, repo, os.environ.get('PATCHINCLUDES')) | > expandnarrowspec(ui, repo, encoding.environ.get(b'PATCHINCLUDES')) | ||||
| > return orig(*args, **kwargs) | > return orig(*args, **kwargs) | ||||
| > | > | ||||
| > extensions.wrapfunction(patch, 'patch', overridepatch) | > extensions.wrapfunction(patch, b'patch', overridepatch) | ||||
| > EOF | > EOF | ||||
| $ cat >> ".hg/hgrc" <<EOF | $ cat >> ".hg/hgrc" <<EOF | ||||
| > [extensions] | > [extensions] | ||||
| > expand_extension = $TESTTMP/expand_extension.py | > expand_extension = $TESTTMP/expand_extension.py | ||||
| > EOF | > EOF | ||||
| Since we do not have the ability to rely on a virtual filesystem or | Since we do not have the ability to rely on a virtual filesystem or | ||||
| remotefilelog in the test, we just fake it by copying the data from the 'master' | remotefilelog in the test, we just fake it by copying the data from the 'master' | ||||