wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into speculator-list

Browse source 
Conflicts:
	scripts/speculator/main.go
This commit is contained in:
Daniel Wagner-Hall 2015-09-11 15:31:32 +01:00
commit f9ef934625
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
scripts/speculator/main.go
View file

@ -73,13 +73,18 @@ func gitCheckout(path, sha string) error {
return nil
}
func lookupPullRequest(prNumber string) (PullRequest, error) {
resp, _ := http.Get(fmt.Sprintf("%s/%s", pullsPrefix, prNumber))
func lookupPullRequest(prNumber string) (*PullRequest, error) {
resp, err := http.Get(fmt.Sprintf("%s/%s", pullsPrefix, prNumber))
defer resp.Body.Close()
if err != nil {
return nil, fmt.Errorf("error getting pulls: %v", err)
}
dec := json.NewDecoder(resp.Body)
var pr PullRequest
_ = dec.Decode(&pr)
return pr, nil
if err := dec.Decode(&pr); err != nil {
return nil, fmt.Errorf("error decoding pulls: %v", err)
}
return &pr, nil
}
func generate(dir string) error {
@ -188,7 +193,7 @@ func serveRstDiff(w http.ResponseWriter, req *http.Request) {
return
}
diffCmd := exec.Command("diff", path.Join(base, "scripts", "tmp", "full_spec.rst"), path.Join(head, "scripts", "tmp", "full_spec.rst"))
diffCmd := exec.Command("diff", "-u", path.Join(base, "scripts", "tmp", "full_spec.rst"), path.Join(head, "scripts", "tmp", "full_spec.rst"))
var diff bytes.Buffer
diffCmd.Stdout = &diff
if err := ignoreExitCodeOne(diffCmd.Run()); err != nil {