diff options
| -rw-r--r-- | patch.Make.go | 6 | ||||
| -rw-r--r-- | patch.proto | 4 |
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` |