--- a/mercurial/wireprotov1server.py	Mon Sep 24 14:46:37 2018 -0700
+++ b/mercurial/wireprotov1server.py	Thu Jan 17 09:17:12 2019 -0800
@@ -424,8 +424,6 @@
             raise error.Abort(bundle2requiredmain,
                               hint=bundle2requiredhint)
 
-    prefercompressed = True
-
     try:
         clheads = set(repo.changelog.heads())
         heads = set(opts.get('heads', set()))
@@ -578,7 +576,6 @@
                     repo.ui.debug('redirecting incoming bundle to %s\n' %
                         tempname)
                     fp = os.fdopen(fd, pycompat.sysstr('wb+'))
-                    r = 0
                     for p in payload:
                         fp.write(p)
                     fp.seek(0)