get: adjust for python 3 and test there

[bup.git] / lib / bup / repo.py

diff --git a/lib/bup/repo.py b/lib/bup/repo.py
index ca092192e64c3719ecc6760b425b3638b2697386..dd6ef3f90674537ee2813a12d1530bf94e4c32ac 100644 (file)
--- a/lib/bup/repo.py
+++ b/lib/bup/repo.py
@@ -1,15 +1,58 @@
 
 from __future__ import absolute_import
+from os.path import realpath
 from functools import partial
 
-from bup import client, git
+from bup import client, git, vfs
 
 
+_next_repo_id = 0
+_repo_ids = {}
+
+def _repo_id(key):
+    global _next_repo_id, _repo_ids
+    repo_id = _repo_ids.get(key)
+    if repo_id:
+        return repo_id
+    next_id = _next_repo_id = _next_repo_id + 1
+    _repo_ids[key] = next_id
+    return next_id
+
 class LocalRepo:
     def __init__(self, repo_dir=None):
-        self.repo_dir = repo_dir or git.repo()
-        self._cp = git.cp(repo_dir)
-        self.rev_list = partial(git.rev_list, repo_dir=repo_dir)
+        self.repo_dir = realpath(repo_dir or git.repo())
+        self._cp = git.cp(self.repo_dir)
+        self.update_ref = partial(git.update_ref, repo_dir=self.repo_dir)
+        self.rev_list = partial(git.rev_list, repo_dir=self.repo_dir)
+        self._id = _repo_id(self.repo_dir)
+
+    def close(self):
+        pass
+
+    def __del__(self):
+        self.close()
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, type, value, traceback):
+        self.close()
+
+    def id(self):
+        """Return an identifier that differs from any other repository that
+        doesn't share the same repository-specific information
+        (e.g. refs, tags, etc.)."""
+        return self._id
+
+    def is_remote(self):
+        return False
+
+    def new_packwriter(self, compression_level=1,
+                       max_pack_size=None, max_pack_objects=None):
+        return git.PackWriter(repo_dir=self.repo_dir,
+                              compression_level=compression_level,
+                              max_pack_size=max_pack_size,
+                              max_pack_objects=max_pack_objects)
 
     def cat(self, ref):
         """If ref does not exist, yield (None, None, None).  Otherwise yield
@@ -35,11 +78,44 @@ class LocalRepo:
                                  repo_dir=self.repo_dir):
             yield ref
 
+    ## Of course, the vfs better not call this...
+    def resolve(self, path, parent=None, want_meta=True, follow=True):
+        ## FIXME: mode_only=?
+        return vfs.resolve(self, path,
+                           parent=parent, want_meta=want_meta, follow=follow)
+
+
 class RemoteRepo:
     def __init__(self, address):
         self.address = address
         self.client = client.Client(address)
+        self.new_packwriter = self.client.new_packwriter
+        self.update_ref = self.client.update_ref
         self.rev_list = self.client.rev_list
+        self._id = _repo_id(self.address)
+
+    def close(self):
+        if self.client:
+            self.client.close()
+            self.client = None
+
+    def __del__(self):
+        self.close()
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, type, value, traceback):
+        self.close()
+
+    def id(self):
+        """Return an identifier that differs from any other repository that
+        doesn't share the same repository-specific information
+        (e.g. refs, tags, etc.)."""
+        return self._id
+
+    def is_remote(self):
+        return True
 
     def cat(self, ref):
         """If ref does not exist, yield (None, None, None).  Otherwise yield
@@ -67,3 +143,8 @@ class RemoteRepo:
                                     limit_to_heads=limit_to_heads,
                                     limit_to_tags=limit_to_tags):
             yield ref
+
+    def resolve(self, path, parent=None, want_meta=True, follow=True):
+        ## FIXME: mode_only=?
+        return self.client.resolve(path, parent=parent, want_meta=want_meta,
+                                   follow=follow)