This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2202

tests: remove code to support Mercurial 4.3
ClosedPublic

Authored by indygreg on Feb 12 2018, 7:31 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG48797b21882e: tests: remove code to support Mercurial 4.3
Summary

Now that narrow lives in core, we don't need the legacy support.

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

indygreg created this revision.Feb 12 2018, 7:31 PM
durin42 accepted this revision.Feb 13 2018, 11:19 AM
This revision is now accepted and ready to land.Feb 13 2018, 11:19 AM
Closed by commit rHG48797b21882e: tests: remove code to support Mercurial 4.3 (authored by indygreg). · Explain WhyFeb 13 2018, 12:27 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-narrow-expanddirstate.t (10 lines)

Diff 5648

tests/test-narrow-expanddirstate.t

> added = matchmod.differencematcher(newmatcher, currentmatcher) > added = matchmod.differencematcher(newmatcher, currentmatcher)
> for f in repo['.'].manifest().walk(added): > for f in repo['.'].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__):
> # Mercurial 4.4 uses this version.
> @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'): > 'expandnarrowspec'):
> expandnarrowspec(ui, repo, os.environ.get('DIRSTATEINCLUDES')) > expandnarrowspec(ui, repo, os.environ.get('DIRSTATEINCLUDES'))
> return ret > return ret
> # Mercurial 4.3.3 and earlier uses this version. It seems that
> # narrowhg does not currently support this version, but we include
> # it just in case backwards compatibility is restored.
> def _read(self):
> ret = super(expandingdirstate, self)._read()
> with repo.wlock(), repo.lock(), repo.transaction(
> 'expandnarrowspec'):
> expandnarrowspec(ui, repo, os.environ.get('DIRSTATEINCLUDES'))
> 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, 'dirstate',
> makeds(ui, repo)) > makeds(ui, repo))
> def overridepatch(orig, *args, **kwargs): > def overridepatch(orig, *args, **kwargs):