summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2025-01-05 03:21:47 -0600
committerJeff Carr <[email protected]>2025-01-05 03:21:47 -0600
commitac57825c107b84a8728cea425a1f3f639ab146a8 (patch)
tree1528b43f61713f88b3048347b1e8e6d5badd23de
parent338018376b48d5ccdc20cb9733acd0db2a9ccc79 (diff)
start adding something to check the hashes
-rw-r--r--patch.Make.go6
-rw-r--r--patch.proto4
2 files changed, 7 insertions, 3 deletions
diff --git a/patch.Make.go b/patch.Make.go
index 7a061f1..0920fdf 100644
--- a/patch.Make.go
+++ b/patch.Make.go
@@ -102,11 +102,12 @@ func (pset *Patchs) makePatchSetNew(repo *gitpb.Repo) error {
return nil
}
- return pset.addPatchFiles(repo.GetGoPath())
+ return pset.addPatchFiles(repo)
}
// process each file in pDir/
-func (p *Patchs) addPatchFiles(psetDir string) error {
+func (p *Patchs) addPatchFiles(repo *gitpb.Repo) error {
+ psetDir := repo.GetGoPath()
tmpDir := p.TmpDir
log.Info("ADD PATCH FILES ADDED DIR", tmpDir)
fullDir := filepath.Join(tmpDir, psetDir)
@@ -135,6 +136,7 @@ func (p *Patchs) addPatchFiles(psetDir string) error {
patch := new(Patch)
patch.Filename, _ = filepath.Rel(p.TmpDir, path)
patch.Data = data
+ patch.StartHash = repo.DevelHash()
p.Patchs = append(p.Patchs, patch)
log.Info("ADDED PATCH FILE", path)
return nil
diff --git a/patch.proto b/patch.proto
index 2e463b5..4c8de21 100644
--- a/patch.proto
+++ b/patch.proto
@@ -10,7 +10,9 @@ message Patch {
string repoPath = 3; // path to the git repo
string branchName = 4; //
string branchHash = 5; //
- google.protobuf.Timestamp ctime = 7; // the git commit timestamp of the version
+ 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
}
message Patchs { // `autogenpb:marshal`