Mercurial > hg
diff hgext/largefiles/uisetup.py @ 36760:7bf80d9d9543
merge with stable
There were a handful of merge conflicts in the wire protocol code due
to significant refactoring in default. When resolving the conflicts,
I tried to produce the minimal number of changes to make the incoming
security patches work with the new code.
I will send some follow-up commits to get the security patches better
integrated into default.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Tue, 06 Mar 2018 14:32:14 -0800 |
| parents | f540b6448738 e3c228b4510d |
| children | 0b18604db95e |
line wrap: on
line diff
--- a/hgext/largefiles/uisetup.py Sun Mar 04 21:16:36 2018 -0500 +++ b/hgext/largefiles/uisetup.py Tue Mar 06 14:32:14 2018 -0800 @@ -12,7 +12,6 @@ from mercurial.i18n import _ from mercurial.hgweb import ( - hgweb_mod, webcommands, ) @@ -175,9 +174,10 @@ # make putlfile behave the same as push and {get,stat}lfile behave # the same as pull w.r.t. permissions checks - hgweb_mod.perms['putlfile'] = 'push' - hgweb_mod.perms['getlfile'] = 'pull' - hgweb_mod.perms['statlfile'] = 'pull' + wireproto.permissions['putlfile'] = 'push' + wireproto.permissions['getlfile'] = 'pull' + wireproto.permissions['statlfile'] = 'pull' + wireproto.permissions['lheads'] = 'pull' extensions.wrapfunction(webcommands, 'decodepath', overrides.decodepath)