Move Client compression spec from constructor to new_packwriter().

This makes remote usage match local usage, where the compression is
per-PackWriter.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/cmd/split-cmd.py b/cmd/split-cmd.py
index 3faac3375c236f8db7085c2b3a29e609418afa08..7d209a86879fe6a06a91877f2ee6fb239300b856 100755 (executable)
--- a/cmd/split-cmd.py
+++ b/cmd/split-cmd.py
@@ -86,9 +86,9 @@ refname = opt.name and 'refs/heads/%s' % opt.name or None
 if opt.noop or opt.copy:
     cli = pack_writer = oldref = None
 elif opt.remote or is_reverse:
-    cli = client.Client(opt.remote, compression_level=opt.compress)
+    cli = client.Client(opt.remote)
     oldref = refname and cli.read_ref(refname) or None
-    pack_writer = cli.new_packwriter()
+    pack_writer = cli.new_packwriter(compression_level=opt.compress)
 else:
     cli = None
     oldref = refname and git.read_ref(refname) or None

diff --git a/lib/bup/client.py b/lib/bup/client.py
index 7f9334b146361d259135067ddbf73784571e5905..54b8b50f824e1584f74335f5c4e706578197f90f 100644 (file)
--- a/lib/bup/client.py
+++ b/lib/bup/client.py
@@ -52,10 +52,9 @@ def parse_remote(remote):
 
 
 class Client:
-    def __init__(self, remote, create=False, compression_level=1):
+    def __init__(self, remote, create=False):
         self._busy = self.conn = None
         self.sock = self.p = self.pout = self.pin = None
-        self.compression_level = compression_level
         is_reverse = os.environ.get('BUP_SERVER_REVERSE')
         if is_reverse:
             assert(not remote)
@@ -237,7 +236,7 @@ class Client:
             self.conn.write('%s\n' % ob)
         return idx
 
-    def new_packwriter(self):
+    def new_packwriter(self, compression_level = 1):
         self.check_busy()
         def _set_busy():
             self._busy = 'receive-objects-v2'
@@ -248,7 +247,7 @@ class Client:
                                  onopen = _set_busy,
                                  onclose = self._not_busy,
                                  ensure_busy = self.ensure_busy,
-                                 compression_level = self.compression_level)
+                                 compression_level = compression_level)
 
     def read_ref(self, refname):
         self.check_busy()
@@ -297,7 +296,6 @@ class PackWriter_Remote(git.PackWriter):
         self._packopen = False
         self._bwcount = 0
         self._bwtime = time.time()
-        self.compression_level = compression_level
 
     def _open(self):
         if not self._packopen: