diff options
| author | Jeff Carr <[email protected]> | 2025-08-21 22:35:17 -0500 |
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2025-08-21 22:38:37 -0500 |
| commit | 6a1541c132277af7c905a83ccd9d825fc88c1587 (patch) | |
| tree | f68e321e76f1205b6730c94b19e9deb9a3f85e45 | |
| parent | 6db458b2dfbc45b63db0d5a6b37515df33599e3a (diff) | |
switch to namespace fix send patches
| -rw-r--r-- | patchset.Make.go | 2 | ||||
| -rw-r--r-- | patchset.Send.go | 8 | ||||
| -rw-r--r-- | patchset.proto | 9 |
3 files changed, 14 insertions, 5 deletions
diff --git a/patchset.Make.go b/patchset.Make.go index a33c930..a5e8db7 100644 --- a/patchset.Make.go +++ b/patchset.Make.go @@ -187,7 +187,7 @@ func (p *Patchset) addPatchFiles(repo *gitpb.Repo) error { patch.parseData() patch.StartHash = repo.DevelHash() patch.NewHash = "na" - patch.RepoNamespace = repo.GetGoPath() + patch.Namespace = repo.GetGoPath() if p.Patches == nil { p.Patches = new(Patches) } diff --git a/patchset.Send.go b/patchset.Send.go index 3677a4f..44d9a26 100644 --- a/patchset.Send.go +++ b/patchset.Send.go @@ -11,6 +11,14 @@ import ( "go.wit.com/log" ) +// makes a new patches protobuf. These are all the patches on your machine. +func NewPatches() *Patches { + x := new(Patches) + x.Uuid = "2679065e-c81d-4a00-aca4-03c158a834fb" + x.Version = "v2.0.0 go.wit.com/lib/protobuf/forgepb" + return x +} + func (f *Forge) SendPatchSet(pset *Patchset) error { var err error data, err := pset.Marshal() diff --git a/patchset.proto b/patchset.proto index f400ed8..96f20ea 100644 --- a/patchset.proto +++ b/patchset.proto @@ -30,7 +30,7 @@ import "google/protobuf/timestamp.proto"; // Import the well-known type for Time // git log -1 --format="%H %aI %cI %an %ae %cn %ce" message Patch { - string repoNamespace = 1; // the base repo git URL + string namespace = 1; // the base repo git namespace bytes data = 2; // the raw data of the whole patch string gH = 3; // after some deliberation, I think I'll just try variable names string gT = 4; @@ -58,9 +58,10 @@ message Patch { bool upstream = 26; // has this patch been applied upstream? } -message Patches { // this is a "PATCH: [1/x]" series `autogenpb:gui:Patch` - string uuid = 1; // `autogenpb:uuid:be926ad9-1111-484c-adf2-d96eeabf3079` - string version = 2; // `autogenpb:version:v0.0.45` +// this is a "PATCH: [1/x]" series +message Patches { // `autogenpb:marshal` `autogenpb:gui:Patch` + string uuid = 1; // `autogenpb:uuid:2679065e-c81d-4a00-aca4-03c158a834fb` + string version = 2; // `autogenpb:version:v2.0.0` repeated Patch Patches = 3; } |