diff options
Diffstat (limited to 'windowPatchsets.go')
| -rw-r--r-- | windowPatchsets.go | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/windowPatchsets.go b/windowPatchsets.go index e62d601..4b102b2 100644 --- a/windowPatchsets.go +++ b/windowPatchsets.go @@ -150,7 +150,7 @@ func makePatchsetsWin() *stdPatchsetTableWin { for patch := range notdone.IterAll() { comment := cleanSubject(patch.Comment) - log.Info("new patch:", patch.NewHash, "commithash:", patch.CommitHash, patch.RepoNamespace, comment) + log.Info("new patch:", patch.NewHash, "commithash:", patch.CommitHash, patch.Namespace, comment) } // savePatchsets() makePatchesWin(notdone) @@ -263,10 +263,10 @@ func setPatchsetState(p *forgepb.Patchset) { all := p.Patches.All() for all.Scan() { patch := all.Next() - // log.Info("patch:", patch.StartHash, patch.CommitHash, patch.RepoNamespace, patch.Filename) - repo := me.forge.FindByGoPath(patch.RepoNamespace) + // log.Info("patch:", patch.StartHash, patch.CommitHash, patch.Namespace, patch.Filename) + repo := me.forge.FindByGoPath(patch.Namespace) if repo == nil { - log.Info("could not find repo", patch.RepoNamespace) + log.Info("could not find repo", patch.Namespace) bad = true continue } @@ -278,11 +278,11 @@ func setPatchsetState(p *forgepb.Patchset) { } if name, err := repo.GetHashName(patch.StartHash); err == nil { // it might be possible to apply this patch - log.Info("patch may be good:", patch.RepoNamespace, name, patch.CommitHash, patch.Filename) + log.Info("patch may be good:", patch.Namespace, name, patch.CommitHash, patch.Filename) good = true } else { // probably screwed up git trees - log.Info("patch with unknown origin:", patch.RepoNamespace, name, err, patch.CommitHash, patch.Filename) + log.Info("patch with unknown origin:", patch.Namespace, name, err, patch.CommitHash, patch.Filename) bad = true } } @@ -351,27 +351,27 @@ func setNewCommitHash(p *forgepb.Patchset) bool { for patch := range p.Patches.IterAll() { // parts := strings.Fields(patch.Comment) - repo := me.forge.FindByGoPath(patch.RepoNamespace) + repo := me.forge.FindByGoPath(patch.Namespace) if repo == nil { - log.Info("could not find repo", patch.RepoNamespace) + log.Info("could not find repo", patch.Namespace) continue } comment := cleanSubject(patch.Comment) if patch.NewHash != "na" { - log.Info("patch: newhash:", patch.NewHash, "commithash:", patch.CommitHash, patch.RepoNamespace, comment) + log.Info("patch: newhash:", patch.NewHash, "commithash:", patch.CommitHash, patch.Namespace, comment) continue } done = false os.Chdir(repo.GetFullPath()) newhash, err := findCommitBySubject(comment) if err != nil { - log.Info("patch: not found hash:", patch.CommitHash, patch.RepoNamespace, comment, newhash, err) + log.Info("patch: not found hash:", patch.CommitHash, patch.Namespace, comment, newhash, err) continue } patch.NewHash = newhash - log.Info("patch: found hash:", patch.CommitHash, newhash, patch.RepoNamespace, comment) + log.Info("patch: found hash:", patch.CommitHash, newhash, patch.Namespace, comment) } return done @@ -382,13 +382,13 @@ func AddNotDonePatches(notdone *forgepb.Patches, pset *forgepb.Patchset, full bo comment := cleanSubject(patch.Comment) if found := notdone.FindByCommitHash(patch.CommitHash); found != nil { - log.Info("duplicate notdone", patch.RepoNamespace, "patch:", patch.NewHash, "commithash:", patch.CommitHash, comment) + log.Info("duplicate notdone", patch.Namespace, "patch:", patch.NewHash, "commithash:", patch.CommitHash, comment) continue } - repo := me.forge.FindByGoPath(patch.RepoNamespace) + repo := me.forge.FindByGoPath(patch.Namespace) if repo == nil { - log.Info("could not find repo", patch.RepoNamespace) + log.Info("could not find repo", patch.Namespace) if full { notdone.AppendByCommitHash(patch) // double check to ensure the commit hash isn't added twice } @@ -396,14 +396,14 @@ func AddNotDonePatches(notdone *forgepb.Patches, pset *forgepb.Patchset, full bo } if patch.NewHash != "na" { - log.Info("already applied patch", patch.RepoNamespace, ": newhash:", patch.NewHash, "commithash:", patch.CommitHash, comment) + log.Info("already applied patch", patch.Namespace, ": newhash:", patch.NewHash, "commithash:", patch.CommitHash, comment) continue } os.Chdir(repo.GetFullPath()) newhash, err := findCommitByHash(patch.StartHash, comment) if err != nil { // this patch has not been applied yet - log.Info("patch: not found hash:", patch.RepoNamespace, patch.CommitHash, comment, err) + log.Info("patch: not found hash:", patch.Namespace, patch.CommitHash, comment, err) notdone.AppendByCommitHash(patch) // double check to ensure the commit hash isn't added twice continue } @@ -411,12 +411,12 @@ func AddNotDonePatches(notdone *forgepb.Patches, pset *forgepb.Patchset, full bo newhash, err = findCommitBySubject(comment) if err == nil { patch.NewHash = newhash - log.Info("patch: found hash:", patch.RepoNamespace, "commit patch", patch.CommitHash, "new hash", newhash, "start hash", patch.StartHash, comment) + log.Info("patch: found hash:", patch.Namespace, "commit patch", patch.CommitHash, "new hash", newhash, "start hash", patch.StartHash, comment) continue } // this patch has not been applied yet - log.Info("patch: not found hash:", patch.RepoNamespace, patch.CommitHash, comment, newhash, err) + log.Info("patch: not found hash:", patch.Namespace, patch.CommitHash, comment, newhash, err) notdone.AppendByCommitHash(patch) // double check to ensure the commit hash isn't added twice } } |