largefiles: wrap heads command handler more directly

extensions.wrapfunction() is a more robust method for wrapping a
function, since it allows multiple wrappers.

While we're here, wrap the function registered with the command instead
of installing a new command handler.

Differential Revision: https://phab.mercurial-scm.org/D3178

hgext/largefiles/proto.py

@@ -168,12 +168,13 b' def _capabilities(orig, repo, proto):'
     caps.append('largefiles=serve')
     return caps
 
-def heads(repo, proto):
+def heads(orig, repo, proto):
     '''Wrap server command - largefile capable clients will know to call
     lheads instead'''
     if lfutil.islfilesrepo(repo):
         return wireprototypes.ooberror(LARGEFILES_REQUIRED_MSG)
-    return wireproto.heads(repo, proto)
+
+    return orig(repo, proto)
 
 def sshrepocallstream(self, cmd, **args):
     if cmd == 'heads' and self.capable('largefiles'):

hgext/largefiles/uisetup.py

@@ -174,7 +174,7 b' def uisetup(ui):'
         wireproto.heads)
 
     # ... and wrap some existing ones
-    wireproto.commands['heads'].func = proto.heads
+    extensions.wrapfunction(wireproto.commands['heads'], 'func', proto.heads)
     # TODO also wrap wireproto.commandsv2 once heads is implemented there.
 
     extensions.wrapfunction(webcommands, 'decodepath', overrides.decodepath)