diff options
| -rw-r--r-- | patchset.Make.go | 3 | ||||
| -rw-r--r-- | patchset.proto | 18 |
2 files changed, 13 insertions, 8 deletions
diff --git a/patchset.Make.go b/patchset.Make.go index e3be08c..aa1660e 100644 --- a/patchset.Make.go +++ b/patchset.Make.go @@ -159,6 +159,7 @@ func (p *Patchset) addPatchFiles(repo *gitpb.Repo) error { patch.Data = data patch.parseData() patch.StartHash = repo.DevelHash() + patch.RepoNamespace = repo.GetGoPath() if p.Patches == nil { p.Patches = new(Patches) } @@ -182,6 +183,8 @@ func (p *Patch) parseData() string { switch fields[0] { case "From": p.CommitHash = fields[1] + case "Subject:": + p.Comment = line case "diff": p.Files = append(p.Files, line) } diff --git a/patchset.proto b/patchset.proto index 6d42add..b21dbee 100644 --- a/patchset.proto +++ b/patchset.proto @@ -5,15 +5,17 @@ package forgepb; import "google/protobuf/timestamp.proto"; // Import the well-known type for Timestamp message Patch { - string filename = 1; // `autogenpb:unique` `autogenpb:sort` - 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 filename = 1; // `autogenpb:unique` `autogenpb:sort` + 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 + repeated string Files = 10; // the filenames this patch changes + string comment = 11; // the git commit message (in patch form) + string repoNamespace = 12; // the base repo git URL } message Patches { // `autogenpb:marshal` |