Update manifest PR with small changes from @sbwsg.

Author: wlynch

cmd/pullrequest-init/disk.go

@@ -175,28 +175,23 @@ func FromDisk(path string) (*PullRequest, map[string]Manifest, error) {
 	var err error
 	var manifest Manifest
 
-	// Start with comments
 	pr.Comments, manifest, err = commentsFromDisk(commentsPath)
 	if err != nil {
 		return nil, nil, err
 	}
 	manifests["comments"] = manifest
 
-	// Now Labels
 	pr.Labels, manifest, err = labelsFromDisk(labelsPath)
 	if err != nil {
 		return nil, nil, err
 	}
 	manifests["labels"] = manifest
 
-	// Now statuses
 	pr.Statuses, err = statusesFromDisk(statusesPath)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	// Finally refs
-
 	pr.Base, err = refFromDisk(path, "base.json")
 	if err != nil {
 		return nil, nil, err

cmd/pullrequest-init/disk_test.go

@@ -146,7 +146,7 @@ func TestToDisk(t *testing.T) {
 		}
 	}
 	if len(labelManifest) != len(gotManifest) {
-		t.Errorf("Label manifest does not match expected length. %d !=  %d, got %+v", len(labelManifest), len(gotManifest), gotManifest)
+		t.Errorf("Label manifest does not match expected length. expected %d, got %d: %+v", len(labelManifest), len(gotManifest), gotManifest)
 	}
 
 	// Check the comments

cmd/pullrequest-init/fake_github.go

@@ -261,6 +261,7 @@ func (g *FakeGitHub) listLabels(w http.ResponseWriter, r *http.Request) {
 	key, err := prKey(r)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
+		return
 	}
 
 	pr, ok := g.pr[key]