X-Git-Url: https://gitweb.ps.run/ziggit/blobdiff_plain/5fee30bf784534a6f8d62a8f9be70f3bd6471f66..HEAD:/git.zig

diff --git a/git.zig b/git.zig
index c45963e..07be390 100644
--- a/git.zig
+++ b/git.zig
@@ -23,6 +23,11 @@ const Tree = std.ArrayList(TreeEntry);
 const Blob = struct {
     data: []u8,
 };
+const ParsedObject = union(enum) {
+    c: Commit,
+    t: Tree,
+    b: Blob,
+};
 const Object = struct {
     kind: u3,
     data: []u8,
@@ -33,7 +38,7 @@ const Object = struct {
             .data = data,
         };
     }
-    pub fn parse(self: Object, alloc: Alloc) !union(enum) { c: Commit, t: Tree, b: Blob } {
+    pub fn parse(self: Object, alloc: Alloc) !ParsedObject {
         switch (self.kind) {
             1 => {
                 const authorOffset = std.mem.indexOf(u8, self.data, "author ") orelse return error.InvalidCommitFormat;
@@ -317,11 +322,9 @@ const PackFile = struct {
 
         try self.pckFile.seekBy(-offset);
         const baseObject = try self.readObject(pckReader);
-        defer self.alloc.free(baseObject.data);
 
         try self.pckFile.seekTo(pos);
         const deltaData = try decompress(self.alloc, pckReader);
-        defer self.alloc.free(deltaData);
 
         const objectData = try applyDelta(self.alloc, baseObject.data, deltaData);
         return Object.init(baseObject.kind, objectData);
@@ -350,7 +353,9 @@ const PackFile = struct {
             const pckReader = self.pckFile.reader().any();
             try self.pckFile.seekTo(offset);
 
-            return try self.readObject(pckReader);
+            const o = try self.readObject(pckReader);
+
+            return o;
         }
         return null;
     }
@@ -383,7 +388,6 @@ const Repo = struct {
     pub fn getHead(self: *Repo) !Id {
         // read file HEAD
         const head = try self.dir.readFileAlloc(self.alloc, "HEAD", 1024);
-        defer self.alloc.free(head);
 
         // read file pointed at by HEAD
         const headPath = head[5 .. head.len - 1];
@@ -403,7 +407,11 @@ const Repo = struct {
 };
 
 test "print HEAD" {
-    var repo = try Repo.open(std.testing.allocator, "../imgui/.git");
+    var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
+    defer arena.deinit();
+    const alloc = arena.allocator();
+
+    var repo = try Repo.open(alloc, "../imgui/.git");
     defer repo.close();
 
     const head = try repo.getHead();
@@ -412,7 +420,11 @@ test "print HEAD" {
 }
 
 test "parse idx" {
-    var repo = try Repo.open(std.testing.allocator, "../imgui/.git");
+    var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
+    defer arena.deinit();
+    const alloc = arena.allocator();
+
+    var repo = try Repo.open(alloc, "../imgui/.git");
     defer repo.close();
 
     if (repo.packfile) |packfile| {
@@ -422,28 +434,32 @@ test "parse idx" {
 }
 
 test "get object" {
-    var repo = try Repo.open(std.testing.allocator, "../imgui/.git");
+    var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
+    defer arena.deinit();
+    const alloc = arena.allocator();
+
+    var repo = try Repo.open(alloc, "../imgui/.git");
     defer repo.close();
 
     const head = try repo.getHead();
 
     if (try repo.getObject(head)) |o| {
-        defer std.testing.allocator.free(o.data);
-
         std.debug.print("object({}): {s}\n", .{ o.kind, o.data });
     }
 }
 
 test "parse commit" {
-    var repo = try Repo.open(std.testing.allocator, "../imgui/.git");
+    var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
+    defer arena.deinit();
+    const alloc = arena.allocator();
+
+    var repo = try Repo.open(alloc, "../imgui/.git");
     defer repo.close();
 
     const head = try repo.getHead();
 
     if (try repo.getObject(head)) |o| {
-        defer std.testing.allocator.free(o.data);
-
-        switch (try o.parse(std.testing.allocator)) {
+        switch (try o.parse(alloc)) {
             .c => |c| {
                 std.debug.print("commit:\n  tree: {x}\n  parent: {x}\n  author: {s}\n  committer: {s}\n  message: {s}\n", .{ c.tree, c.parent, c.author, c.committer, c.message });
             },
@@ -453,24 +469,28 @@ test "parse commit" {
 }
 
 test "get tree" {
-    var repo = try Repo.open(std.testing.allocator, "../imgui/.git");
+    var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
+    defer arena.deinit();
+    const alloc = arena.allocator();
+
+    var repo = try Repo.open(alloc, "../imgui/.git");
     defer repo.close();
 
     if (try repo.getObject(0xceb2b2c62d6f8f3686dcacecd5be931839b02c77)) |o| {
-        defer std.testing.allocator.free(o.data);
-
-        // std.debug.print("tree({}): {any}\n", .{ o.kind, o.data });
+        std.debug.print("tree({}): {any}\n", .{ o.kind, o.data });
     }
 }
 
 test "parse tree" {
-    var repo = try Repo.open(std.testing.allocator, "../imgui/.git");
+    var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
+    defer arena.deinit();
+    const alloc = arena.allocator();
+
+    var repo = try Repo.open(alloc, "../imgui/.git");
     defer repo.close();
 
     if (try repo.getObject(0xceb2b2c62d6f8f3686dcacecd5be931839b02c77)) |o| {
-        defer std.testing.allocator.free(o.data);
-
-        switch (try o.parse(std.testing.allocator)) {
+        switch (try o.parse(alloc)) {
             .t => |t| {
                 defer t.deinit();
                 for (t.items) |treeEntry| {
@@ -483,7 +503,11 @@ test "parse tree" {
 }
 
 test "list commits" {
-    var repo = try Repo.open(std.testing.allocator, "../imgui/.git");
+    var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
+    defer arena.deinit();
+    const alloc = arena.allocator();
+
+    var repo = try Repo.open(alloc, "../imgui/.git");
     defer repo.close();
 
     const head = try repo.getHead();
@@ -492,9 +516,7 @@ test "list commits" {
 
     for (0..3) |_| {
         if (try repo.getObject(id)) |o| {
-            defer std.testing.allocator.free(o.data);
-
-            switch (try o.parse(std.testing.allocator)) {
+            switch (try o.parse(alloc)) {
                 .c => |c| {
                     std.debug.print("commit {x}:\n  tree: {x}\n  parent: {x}\n  author: {s}\n  committer: {s}\n  message: {s}\n", .{ id, c.tree, c.parent, c.author, c.committer, c.message });
                     id = c.parent;
@@ -506,19 +528,19 @@ test "list commits" {
 }
 
 test "list blobs" {
-    var repo = try Repo.open(std.testing.allocator, "../imgui/.git");
+    var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
+    defer arena.deinit();
+    const alloc = arena.allocator();
+
+    var repo = try Repo.open(alloc, "../imgui/.git");
     defer repo.close();
 
     if (try repo.getObject(0xceb2b2c62d6f8f3686dcacecd5be931839b02c77)) |o| {
-        defer std.testing.allocator.free(o.data);
-
-        switch (try o.parse(std.testing.allocator)) {
+        switch (try o.parse(alloc)) {
             .t => |t| {
                 defer t.deinit();
                 for (t.items) |treeEntry| {
                     if (try repo.getObject(treeEntry.id)) |bo| {
-                        defer std.testing.allocator.free(bo.data);
-
                         if (treeEntry.permissions.len == 6) {
                             std.debug.print("{s}: [{x} {}]{s}\n", .{ treeEntry.name, treeEntry.id, bo.data.len, bo.data[0..50] });
                         } else {
@@ -531,3 +553,28 @@ test "list blobs" {
         }
     }
 }
+
+test "basic frontend" {
+    var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
+    defer arena.deinit();
+    const alloc = arena.allocator();
+
+    var repo = try Repo.open(alloc, "../imgui/.git");
+    defer repo.close();
+
+    const head = try repo.getHead();
+
+    var id = head;
+
+    for (0..3) |_| {
+        if (try repo.getObject(id)) |o| {
+            switch (try o.parse(alloc)) {
+                .c => |c| {
+                    std.debug.print("commit {x}:\n  tree: {x}\n  parent: {x}\n  author: {s}\n  committer: {s}\n  message: {s}\n", .{ id, c.tree, c.parent, c.author, c.committer, c.message });
+                    id = c.parent;
+                },
+                else => {},
+            }
+        }
+    }
+}