no going back now

3 files changed, 39 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index d796cbd..cbcbf93 100644
--- a/Makefile
+++ b/Makefile
@@ -29,5 +29,5 @@ forgeConfig.pb.go: forgeConfig.proto
 uuid.pb.go: uuid.proto
 	autogenpb --proto uuid.proto
 
-patch.pb.go: patch.proto
-	autogenpb --proto patch.proto
+patchset.pb.go: patchset.proto
+	autogenpb --proto patchset.proto
diff --git a/patchset.proto b/patchset.proto
new file mode 100644
index 0000000..afb725a
--- /dev/null
+++ b/patchset.proto
@@ -0,0 +1,37 @@
+syntax = "proto3";
+
+package forgepb;
+
+import "google/protobuf/timestamp.proto"; // Import the well-known type for Timestamp
+
+message Patch {
+  string filename                       = 1; // `autogenpb:unique`
+  bytes  data                           = 2; //
+  string repoPath       		= 3; // path to the git repo
+  string branchName     		= 4; //
+  string branchHash     		= 5; //
+  google.protobuf.Timestamp ctime       = 7; // the git commit timestamp of this patch
+  string commitHash     		= 8; // the git commit hash of this patch
+  string startHash         		= 9; // the start commit hash
+  repeated string Files                 = 10; // the filenames this patch changes
+}
+
+message Patchset {			// `autogenpb:marshal`
+	repeated Patch Patches  = 1;
+	string   name           = 2;    //
+	string   comment        = 3;    //
+	string   gitAuthorName  = 4;    //
+	string   gitAuthorEmail = 5;    //
+        google.protobuf.Timestamp ctime = 6;    // create time of this patchset
+	string   tmpDir                 = 7;    // temp dir
+	string   startBranchName        = 8;    //
+	string   endBranchName          = 9;    //
+	string   startBranchHash        = 10;   //
+	string   endBranchHash          = 11;   //
+}
+
+message Patchsets {			// `autogenpb:marshal`
+	string   uuid	        = 1;    // `autogenpb:uuid:be926ad9-f07f-484c-adf2-d96eeabf3079` // todo: add autogenpb support for this
+	string   version        = 2;    // could be used for protobuf schema change violations?
+	repeated Patchset Patchsets  = 3;
+}
diff --git a/uuid.proto b/uuid.proto
deleted file mode 100644
index 64e4dfe..0000000
--- a/uuid.proto
+++ /dev/null
@@ -1,16 +0,0 @@
-syntax = "proto3";
-
-// experiment to identify .pb files incase things go sideways
-package forgepb;
-
-// autogenpb:no-sort
-message Uuid {			// `autogenpb:marshal`
-	string   name	        = 1;
-}
-
-// autogenpb:no-sort
-message Uuids {
-	string   uuid	        = 1;    // `autogenpb:uuid`
-	string   version        = 2;    // `autogenpb:version`
-	repeated Uuid Uuids     = 3;
-}