'bup save' now generates a hierarchical set of git trees as it should.

diff --git a/cmd-save.py b/cmd-save.py
index 8b32e5e18b121cd70b57e76229fc186940bbfa41..e1888609ef4a98cd101fa7ab2491f420624dc1ec 100755 (executable)
--- a/cmd-save.py
+++ b/cmd-save.py
@@ -25,6 +25,66 @@ def direxpand(names):
                 add_error(e)
             else:
                 raise
+            
+
+def _normpath(dir):
+    p = os.path.normpath(dir)
+    return (p != '.') and p or ''
+
+
+class Tree:
+    def __init__(self, parent, name):
+        assert(name != '.')
+        assert(not (parent and not name))
+        self.parent = parent
+        self.name = name
+        self.sha = None
+        self.children = {}
+        if self.parent:
+            self.parent.children[self.name] = self
+    
+    def fullpath(self):
+        if self.parent:
+            return os.path.join(self.parent.fullpath(), self.name)
+        else:
+            return self.name
+        
+    def gettop(self):
+        p = self
+        while p.parent:
+            p = p.parent
+        return p
+        
+    def getdir(self, dir):
+        # FIXME: deal with '..' somehow
+        if dir.startswith('/'):
+            dir = dir[1:]
+        top = self.gettop()
+        if not dir:
+            return top
+        for part in _normpath(dir).split('/'):
+            sub = top.children.get(part)
+            if not sub:
+                sub = top.children[part] = Tree(top, part)
+            top = sub
+        return top
+    
+    def addfile(self, mode, fullname, id):
+        (dir, name) = os.path.split(fullname)
+        self.getdir(dir).children[name] = (mode, name, id)
+        
+    def shalist(self):
+        for c in self.children.values():
+            if isinstance(c, tuple):  # sha1 entry for a file
+                yield c
+            else:  # tree
+                t = ('40000', c.name, c.gen_tree())
+                yield t
+        
+    def gen_tree(self):
+        if not self.sha:
+            self.sha = git.gen_tree(self.shalist())
+        return self.sha
 
 
 optspec = """
@@ -41,7 +101,7 @@ if not (opt.tree or opt.commit or opt.name):
     log("bup save: use one or more of -t, -c, -n\n")
     o.usage()
 
-shalist = []
+root = Tree(None, '')
 for fn in direxpand(extra):
     try:
         # FIXME: symlinks etc.
@@ -53,8 +113,8 @@ for fn in direxpand(extra):
         add_error(e)
         continue
     (mode, id) = hashsplit.split_to_blob_or_tree([f])
-    shalist.append((mode, re.sub(r'/', '_', fn), id))
-tree = git.gen_tree(shalist)
+    root.addfile(mode, fn, id)
+tree = root.gen_tree()
 if opt.tree:
     print tree
 if opt.commit or opt.name:

diff --git a/git.py b/git.py
index d30dd0a19827338483bfab166106dfa0bb470807..61e37cd57ed581965565592d3145c2aa32d93c94 100644 (file)
--- a/git.py
+++ b/git.py
@@ -35,6 +35,7 @@ def hash_blob(blob):
 
 
 def gen_tree(shalist):
+    shalist = sorted(shalist, key = lambda x: x[1])
     l = ['%s %s\0%s' % (mode,name,hex.decode('hex')) 
          for (mode,name,hex) in shalist]
     return hash_raw('tree', ''.join(l))

diff --git a/hashsplit.py b/hashsplit.py
index eb8139529a1be6a3ffb8813861d453930f55159f..4a9e07a299bf4ee904eae8439f05dc7e3ac81b57 100644 (file)
--- a/hashsplit.py
+++ b/hashsplit.py
@@ -120,4 +120,4 @@ def split_to_blob_or_tree(files):
     elif len(shalist) == 0:
         return ('100644', git.hash_blob(''))
     else:
-        return ('040000', tree)
+        return ('40000', tree)