# HG changeset patch # User Mads Kiilerich # Date 2015-08-05 12:29:41 # Node ID eb337bdaa0e105d4d115719852c7e676f64d0dae # Parent f6fcb21db7b3480595c7824fd3db70ddc314df8c mercurial: support Mercurial 3.5 test_archive failed without the hgcompat workaround. diff --git a/kallithea/lib/vcs/utils/hgcompat.py b/kallithea/lib/vcs/utils/hgcompat.py --- a/kallithea/lib/vcs/utils/hgcompat.py +++ b/kallithea/lib/vcs/utils/hgcompat.py @@ -44,3 +44,5 @@ if inspect.getargspec(memfilectx.__init_ # workaround for 3.3 94ac64bcf6fe and not calling largefiles reposetup correctly localrepository._lfstatuswriters = [lambda *msg, **opts: None] +# 3.5 7699d3212994 added the invariant that repo.lfstatus must exist before hitting overridearchive +localrepository.lfstatus = False diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -57,6 +57,7 @@ requirements = [ "URLObject==2.3.4", "Routes==1.13", "dulwich>=0.9.9,<=0.9.9", + "mercurial>=2.9,<3.6", ] if sys.version_info < (2, 7): @@ -64,7 +65,6 @@ if sys.version_info < (2, 7): requirements.append("unittest2") requirements.append("argparse") -requirements.append("mercurial>=2.9,<3.4") if not is_windows: requirements.append("py-bcrypt>=0.3.0,<=0.4")