Mercurial > kallithea
changeset 5357:eb337bdaa0e1
mercurial: support Mercurial 3.5
test_archive failed without the hgcompat workaround.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 05 Aug 2015 12:29:41 +0200 |
| parents | f6fcb21db7b3 |
| children | 68bdd7646187 |
| files | kallithea/lib/vcs/utils/hgcompat.py setup.py |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/lib/vcs/utils/hgcompat.py Wed Aug 05 12:29:41 2015 +0200 +++ b/kallithea/lib/vcs/utils/hgcompat.py Wed Aug 05 12:29:41 2015 +0200 @@ -44,3 +44,5 @@ # 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
--- a/setup.py Wed Aug 05 12:29:41 2015 +0200 +++ b/setup.py Wed Aug 05 12:29:41 2015 +0200 @@ -57,6 +57,7 @@ "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 @@ 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")